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
Eelco Dolstra
1cb9a354fb
Merge remote-tracking branch 'origin/master' into lfs
2025-02-10 14:46:01 +01:00
John Ericson
967d7b9846
Merge pull request #12441 from obsidiansystems/content-addressing-derivation
...
Rename to "content-address*ing* derivation"
2025-02-10 03:01:12 -05:00
John Ericson
cafefed421
Rename to "content-address*ing* derivation"
...
"content-address*ed*" derivation is misleading because all derivations
are *themselves* content-addressed. What may or may not be
content-addressed is not derivation itself, but the *output* of the
derivation.
The outputs are not *part* of the derivation (for then the derivation
wouldn't be complete before we built it) but rather separate entities
produced by the derivation.
"content-adddress*ed*" is not correctly because it can only describe
what the derivation *is*, and that is not what we are trying to do.
"content-address*ing*" is correct because it describes what the
derivation *does* --- it produces content-addressed data.
2025-02-10 01:12:56 -05:00
John Ericson
e80d333777
Document Store Derivations and Deriving Paths ( #12290 )
...
This is a big step documenting the store layer on its own, separately from the evaluator (and `builtins.derivation`).
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2025-02-10 01:30:07 +00:00
mergify[bot]
aa383a0b85
Merge pull request #12373 from roberth/fix-pre-commit
...
pre-commit/check-merge-conflicts-2: fix use outside dev shell
2025-02-07 11:07:12 +00:00
Robert Hensing
414c346560
test: Use skipTest instead of exit 0
...
This way shellcheck is ok with it, and it conveys that a significant
chunk of the test is skipped.
2025-02-07 11:20:18 +01:00
Robert Hensing
77a8386022
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-07 10:56:15 +01:00
Robert Hensing
73060b4972
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-07 10:56:15 +01:00
John Ericson
fc83c6ccb3
Merge pull request #12379 from silvanshade/blake3-c
...
Add BLAKE3 hashing algorithm
2025-02-05 22:43:44 -05:00
silvanshade
7fd2125573
Add BLAKE3 to documentation
2025-02-05 17:49:15 -07:00
silvanshade
1f56ea4c72
Add BLAKE3 hashing algorithm
...
This uses the single-threaded C-based routines from libblake3.
This is not optimal performance-wise but should be a good starting point
for nix compatibility with BLAKE3 hashing until a more performant
implementation based on the multi-threaded BLAKE3 routines
(written in Rust) can be developed.
2025-02-05 17:49:15 -07:00
John Ericson
a562d0b6ce
Merge pull request #12386 from DeterminateSystems/git-fixes
...
Git fetcher: Don't create refs when fetching by revision
2025-02-05 15:18:58 -05:00
Eelco Dolstra
1a8dfc0540
Merge pull request #12415 from silvanshade/fix-shellcheck-lints
...
Fix shellcheck lints
2025-02-05 19:11:09 +01:00
Eelco Dolstra
d2425c5d6a
Merge pull request #12422 from ilya-bobyr/fish-profile-use-set-local
...
nix-profile.fish: set --local NIX_LINK
2025-02-05 09:38:51 +01:00
Illia Bobyr
50300772e4
nix-profile.fish: set --local NIX_LINK
...
Using `set --local` is better than using `set`/`set --erase`. `--local`
will preserve any existing `NIX_LINK` value. And the local variable is
automatically removed for any execution path.
2025-02-04 16:01:29 -08:00
Eelco Dolstra
3e8cd2ffe6
Merge pull request #12412 from obsidiansystems/simplify-state-machine-2
...
Simplify state machine 2
2025-02-04 21:24:42 +01:00
John Ericson
f90ba3a7c1
Update tests/functional/flakes/symlink-paths.sh
2025-02-04 11:25:14 -05:00
Eelco Dolstra
02e6286e8f
Merge pull request #12414 from ilya-bobyr/fish-profile-daemon-XDG_DATA_DIRS
...
nix-profile-daemon.fish: XDG_DATA_DIRS: .profile/share
2025-02-04 13:38:43 +01:00
Eelco Dolstra
5c6785e0c1
Merge pull request #12392 from obsidiansystems/simplify-state-machine
...
Simplify state machine
2025-02-04 12:08:35 +01:00
silvanshade
137ba71f02
Fix shellcheck lints
2025-02-03 17:47:37 -07:00
Illia Bobyr
85aa624126
nix-profile-daemon.fish: XDG_DATA_DIRS: .profile/share
...
It seems reasonable to add the `share` folder from the user profile into
`$XDG_DATA_DIRS` both for daemon and profile execution. Nix could add
package shared files into this folder regardless of how the nix daemon
itself is running.
2025-02-03 16:24:14 -08:00
John Ericson
b3b741973e
Inline inputsRealised
2025-02-03 13:15:49 -05:00
John Ericson
4b1753e661
Move repairClosure
...
This is necessary in order to inline `inputsRealised` in the next
commit by combing it with its adjacent function (i.e. with a small
diff).
2025-02-03 13:14:13 -05:00
John Ericson
2297cc0dab
Inline getDerivation and loadDerivation
2025-02-03 13:13:04 -05:00
John Ericson
57463ab910
Inline closureRepaired
2025-02-03 13:13:04 -05:00
John Ericson
41274f3c3e
Inline outputsSubstitutionTried
2025-02-03 13:13:04 -05:00
John Ericson
53946fe017
Narrow scope on some local variables
2025-02-03 13:13:04 -05:00
Leandro Reina
134530a534
Merge remote-tracking branch 'upstream/master' into lfs
2025-02-03 19:07:20 +01:00
John Ericson
c73096ba5f
Merge pull request #12408 from obsidiansystems/debugging-instructions
...
More debugging documentation
2025-02-03 12:57:42 -05:00
John Ericson
243467e14b
More debugging documentation
...
There are a few things I think people should know, post-Meson.
2025-02-03 10:08:13 -05:00
Eelco Dolstra
cba27bae6d
Merge pull request #12405 from ilya-bobyr/fish-profile-fix-ssl-cert-typo
...
nix-profile.fish: Typo NIX_SS{H => L}_CERT_FILE
2025-02-03 13:35:23 +01:00
Illia Bobyr
803fb83f7f
nix-profile.fish: Typo NIX_SS{H => L}_CERT_FILE
2025-02-02 22:51:47 -08:00
mergify[bot]
63c0ea5702
Merge pull request #12252 from ilya-bobyr/fish-profile-source-once-and-fmt
...
nix-profile{,-daemon}.fish: Do not source twice, fmt
2025-02-02 03:11:23 +00:00
mergify[bot]
24d11d22c3
Merge pull request #12286 from stevalkr/flakes_symlink_path
...
Fix flakes follow symlinks
2025-02-02 03:11:20 +00:00
mergify[bot]
340eae1f23
Merge pull request #12385 from DeterminateSystems/fix-git-workdir-path-display
...
Fix duplicate setPathDisplay()
2025-02-02 02:10:38 +00:00
mergify[bot]
b842103307
Merge pull request #12376 from DeterminateSystems/fetch-using-nar-hash
...
Allow fetching using NAR hash without --allow-dirty-locks
2025-02-02 02:10:35 +00:00
mergify[bot]
d5c00cfab1
Merge pull request #12387 from nix-windows/big-objs
...
Add mbig-obj flag to allow cross-compiling libexpr to mingw32
2025-02-02 01:32:15 +00:00
Steve Walker
453e8dc067
Fix flakes follow symlinks
...
Co-authored-by: Jan Christoph Bischko <jbischko@barracuda.com>
2025-02-02 08:30:04 +07:00
Brian McKenna
f62a287163
Only enable big-obj on Windows
2025-02-01 21:36:50 +11:00
John Ericson
d949c8de7c
Merge pull request #12249 from nix-windows/stack-size
...
Remove broken stack size logic from Windows
2025-01-31 22:57:01 -05:00
Eelco Dolstra
8006196c55
tests/functional/fetchGit.sh: Add a test for NAR hash mismatches
2025-01-31 17:03:27 +01:00
Eelco Dolstra
9e240ecced
Remove isConsideredLocked()
2025-01-31 17:03:27 +01:00
Eelco Dolstra
4113fdf2f0
Allow use of lock files with unlocked entries as long as they have a NAR hash
...
Fixes #12364 .
2025-01-31 17:03:27 +01:00
Eelco Dolstra
5dec1dc086
fetchGit/fetchTree: Allow fetching using only a NAR hash
...
Fixes #12027 .
2025-01-31 17:03:27 +01:00
Eelco Dolstra
a142803c28
tests/functional/fetchGit.sh: Drop unnecessary --impure flags
2025-01-31 17:03:27 +01:00
Eelco Dolstra
39ef2e28cc
Merge pull request #12375 from DeterminateSystems/fetchTree-errors
...
fetchTree: Distinguish between fetchGit and fetchTree consistently in error messages
2025-01-31 15:26:43 +01:00
Eelco Dolstra
5f6658b9c9
fetchTree: Distinguish between fetchGit and fetchTree consistently
2025-01-31 15:10:29 +01:00
Brian McKenna
26539a087f
Add mbig-obj flag to allow cross-compiling libexpr to mingw32
2025-01-31 22:53:42 +11:00
