Thomas Bereknyei
3b5514e0c6
fix: linting
2025-02-13 13:04:38 -05:00
Thomas Bereknyei
753f00c351
fix: add comment about longest-possible match
2025-02-13 12:47:09 -05:00
Thomas Bereknyei
269efa01b3
fix: ensure access-token matches are complete
2025-02-13 12:45:37 -05:00
Leandro Reina
4a1d1c7f9f
Add release note
2025-02-13 18:04:32 +01:00
Leandro Reina
b2d352e6a3
Add inputs.self.lfs
2025-02-13 17:59:27 +01:00
Robert Hensing
693a38ae2e
Merge pull request #10153 from b-camacho/lfs
...
git-lfs support
2025-02-13 14:25:30 +01:00
Thomas Bereknyei
a9f4d73d3e
feat: test and document access-token prefix support
2025-02-13 07:10:51 -05:00
Thomas Bereknyei
69c7b42d28
feat: access tokens per repo
2025-02-13 06:07:43 -05:00
Robert Hensing
eb91014928
Merge pull request #12443 from DeterminateSystems/prefetch-out-link
...
nix flake prefetch: Add --out-link option
2025-02-12 22:22:04 +01:00
Eelco Dolstra
17d46041b8
Add test
2025-02-12 22:05:38 +01:00
Eelco Dolstra
a902b84374
Formatting
2025-02-12 21:51:41 +01:00
Eelco Dolstra
970942f458
Bump version
2025-02-12 21:50:20 +01:00
John Ericson
0abc264f7d
Merge pull request #6346 from Ericson2314/impure-derivations-ng
...
Get rid of `impureOutputHash`; fix possible bug
2025-02-12 15:22:31 -05:00
mergify[bot]
b3e9204833
Merge pull request #12459 from NixOS/mergify/bp/2.26-maintenance/pr-12458
...
lockFlake(): When refetching a locked flake, use the locked ref (backport #12458 )
2025-02-12 16:09:58 +00:00
Eelco Dolstra
0ff190107f
Resolve merge conflict
2025-02-12 16:54:48 +01:00
Eelco Dolstra
dffcc184d7
lockFlake(): When refetching a locked flake, use the locked ref
...
Otherwise we may accidentally update a lock when we shouldn't.
Fixes #12445 .
(cherry picked from commit 5c552b62fc
2025-02-12 15:46:52 +00:00
Eelco Dolstra
ed38c9de00
Merge pull request #12458 from DeterminateSystems/refetch-locked
...
lockFlake(): When refetching a locked flake, use the locked ref
2025-02-12 16:45:28 +01:00
Eelco Dolstra
5c552b62fc
lockFlake(): When refetching a locked flake, use the locked ref
...
Otherwise we may accidentally update a lock when we shouldn't.
Fixes #12445 .
2025-02-12 14:53:04 +01:00
Eelco Dolstra
49f226e87b
Merge pull request #12457 from NixOS/mergify/bp/2.26-maintenance/pr-12450
...
packaging/components.nix: Don't import a symlink (backport #12450 )
2025-02-12 12:56:51 +01:00
Eelco Dolstra
ca7e686f4d
Merge pull request #12439 from MaxHearnden/cloexec
...
Set FD_CLOEXEC on sockets created by curl
2025-02-12 12:49:55 +01:00
Eelco Dolstra
d308228497
Don't import a symlink
...
This is a workaround to avoid differing evaluation results between Nix
2.19 and >= 2.20 (#12449 ).
(cherry picked from commit 2e20a5f822
2025-02-12 11:42:49 +00:00
Eelco Dolstra
fda585f35c
Merge pull request #12450 from DeterminateSystems/no-symlink
...
packaging/components.nix: Don't import a symlink
2025-02-12 12:40:45 +01:00
John Ericson
50912d02e2
Get rid of impureOutputHash
...
I do not believe there is any problem with computing
`hashDerivationModulo` the normal way with impure derivations.
Conversely, the way this used to work is very suspicious because two
almost-equal derivations that only differ in depending on different
impure derivations could have the same drv hash modulo. That is very
suspicious because there is no reason to think those two different
impure derivations will end up producing the same content-addressed
data!
Co-authored-by: Alain Zscheile <zseri.devel@ytrizja.de>
2025-02-12 01:35:07 -05:00
Jörg Thalheim
23259bde1a
Merge pull request #12255 from NaN-git/fix-7359
...
SinkToSource: avoid heap allocation
2025-02-12 13:00:36 +07:00
Eelco Dolstra
dfbd030d3f
Merge pull request #12453 from NixOS/mergify/bp/2.26-maintenance/pr-12448
...
copyPathToStore(): Preserve symlinks (backport #12448 )
2025-02-11 23:16:31 +01:00
Eelco Dolstra
83306bb841
copyPathToStore(): Preserve symlinks
...
E.g. in a derivation attribute `foo = ./bar`, if ./bar is a symlink,
we should copy the symlink to the store, not its target. This restores
the behaviour of Nix <= 2.19.
(cherry picked from commit 26b87e78b5
2025-02-11 21:51:39 +00:00
Eelco Dolstra
2e20a5f822
Don't import a symlink
...
This is a workaround to avoid differing evaluation results between Nix
2.19 and >= 2.20 (#12449 ).
2025-02-11 22:42:36 +01:00
John Ericson
c000c16509
Merge pull request #12448 from DeterminateSystems/dont-follow-symlink-attrs
...
copyPathToStore(): Preserve symlinks
2025-02-11 15:55:50 -05:00
Eelco Dolstra
26b87e78b5
copyPathToStore(): Preserve symlinks
...
E.g. in a derivation attribute `foo = ./bar`, if ./bar is a symlink,
we should copy the symlink to the store, not its target. This restores
the behaviour of Nix <= 2.19.
2025-02-11 20:58:48 +01:00
Sandro Jäckel
dcbf4dcc09
Only try to chmod /nix/var/nix/profiles/per-user when necessary
...
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2025-02-11 18:21:50 +01:00
Eelco Dolstra
254b7afe66
nix flake prefetch: Add --out-link option
...
This makes `nix flake prefetch` more useful for scripting and prevents
the result from being GC'ed prematurely.
2025-02-10 17:52:26 +01:00
Aiden Fox Ivey
55c1e4454e
Update src/libstore/unix/build/local-derivation-goal.cc
...
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2025-02-10 11:37:37 -05:00
Eelco Dolstra
92bf150b1c
Merge pull request #12421 from DeterminateSystems/self-input-attrs
...
Add `inputs.self.submodules` flake attribute
2025-02-10 17:35:46 +01:00
Eelco Dolstra
2819d8b66a
Add release note
2025-02-10 17:19:34 +01:00
Eelco Dolstra
528b286cf7
Remove stray line
2025-02-10 17:14:55 +01:00
Eelco Dolstra
4b75edacd7
Restore NAR hash assertion
2025-02-10 17:13:17 +01:00
Eelco Dolstra
b813a764e0
Merge remote-tracking branch 'origin/master' into self-input-attrs
2025-02-10 17:01:19 +01:00
John Ericson
1f485b6c5e
Merge pull request #12430 from DeterminateSystems/relative-path-literals
...
Parser: Respect the accessor of the source file for relative paths
2025-02-10 10:28:44 -05:00
Eelco Dolstra
428a3e8cc8
Add TODO
2025-02-10 16:18:57 +01:00
mergify[bot]
4c3786dd40
Merge pull request #12436 from NixOS/mergify/bp/2.26-maintenance/pr-12373
...
pre-commit/check-merge-conflicts-2: fix use outside dev shell (backport #12373 )
2025-02-10 15:15:29 +00:00
Eelco Dolstra
d4ecf15dad
smudgeLfs: Use default value
...
Eventually this should probably become a struct of options.
2025-02-10 16:11:53 +01:00
Eelco Dolstra
c02fcebb30
Add release note
2025-02-10 16:08:03 +01:00
Robert Hensing
0531f1299c
Resolve conflict
2025-02-10 16:01:13 +01:00
Eelco Dolstra
d78daaa416
getLfsEndpointUrl(): Use our RAII helpers
2025-02-10 15:59:32 +01:00
Eelco Dolstra
c210efa9ae
Move git-lfs-fetch into its own source file
2025-02-10 15:55:25 +01:00
Eelco Dolstra
9db070d7a2
Misc code cleanups
2025-02-10 15:46:46 +01:00
Eelco Dolstra
c10dbdccac
libfetchers: Drop no longer needed curl dependency
2025-02-10 15:19:28 +01:00
Eelco Dolstra
40e8c5f613
Fix possible deref of null git_config
2025-02-10 15:16:54 +01:00
Robert Hensing
df8d5e61ad
test: Fix shellcheck by giving git-hashing scripts shebangs
...
This seems to be the way to do it now, even though I can't run them
without setting at least one env var.
I'll only fix shellcheck for now. Don't shoot the messenger.
It isn't quite clear to me why the previous commit masked this problem,
but I'm glad shellcheck has an effect or more effect now.
2025-02-10 15:14:53 +01:00
Robert Hensing
30435e0559
pre-commit/check-merge-conflicts-2: fix use outside dev shell
...
Note that this is just a script that is meant to run outside a
derivation (but also can be called by a derivation builder).
`touch $out` does not belong in it.
`touch $out` worked accidentally in the derivation-based check,
and also in the dev shell, but if pre-commit is invoked without
the dev shell it would fail.
2025-02-10 15:14:44 +01:00
