Sergei Zimmerman
c43ea09b9b
Merge pull request #14100 from obsidiansystems/add-missing-pragma-once
...
Add `#pragma once` to `dummy-store.hh`
2025-09-28 16:41:28 +00:00
John Ericson
582d3ee611
Add #pragma once to dummy-store.hh
...
We should have a lint for this.
In later (yet to be merged at this time) commits, this started causing
problems that only the sanitzer caught.
2025-09-28 12:12:24 -04:00
John Ericson
f7d35dc1dc
Merge pull request #14099 from xokdvium/fix-assert-failure
...
libstore: Call canonPath for constructing LocalFSStoreConfig::rootDir
2025-09-28 12:06:02 -04:00
Sergei Zimmerman
0866ba0b4a
libstore: Deduplicate LocalFSStoreConfig::rootDir initializers
...
Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
2025-09-28 18:38:57 +03:00
John Ericson
a01d52e57b
Merge pull request #14063 from obsidiansystems/test-less-macro
...
Minimize the use of C Macros for characterization tests
2025-09-28 11:14:29 -04:00
John Ericson
87fc579bb7
Merge pull request #14098 from xokdvium/store-references-fixes
...
libstore: Make all StoreConfig::getReference implementations return s…
2025-09-28 11:11:49 -04:00
Sergei Zimmerman
3a64d3c0da
libstore: Call canonPath for constructing LocalFSStoreConfig::rootDir
...
This mirrors what OptionalPathSetting does. Otherwise we run into
an assertion failure for relative paths specified as the authority + path:
nix build nixpkgs#hello --store "local://a/b"
nix: ../posix-source-accessor.cc:13: nix::PosixSourceAccessor::PosixSourceAccessor(std::filesystem::__cxx11::path&&): Assertion `root.empty() || root.is_absolute()' failed.
This is now diagnosed properly:
error: not an absolute path: 'a/b'
Just as you'd specify the root via a query parameter:
nix build nixpkgs#hello --store "local?root=a/b"
2025-09-28 17:42:19 +03:00
John Ericson
01b2037bc0
Minimize the use of C Macros for characterization tests
...
Fewer macros is better!
Introduce a new `JsonChacterizationTest` mixin class to help with this.
Also, avoid some needless copies with `GetParam`.
Part of my effort shoring up the JSON formats with #13570 .
2025-09-28 09:54:46 -04:00
Sergei Zimmerman
426a72c9cf
libstore: Make all StoreConfig::getReference implementations return store parameters
...
These stragglers have been accidentally left out when implementing the StoreConfig::getReference.
Also HttpBinaryCacheStore::getReference now returns the actual store parameters, not the cacheUri
parameters.
2025-09-28 16:29:12 +03:00
John Ericson
e35abb1102
Create test for issue 13247
...
This test ends up being skipped, since the bug has not yet been fixed. A
future commit will fix the bug.
Progress on #13247 , naturally.
2025-09-27 21:53:14 -04:00
John Ericson
3c610df550
Delete scratch data for CA derivation that produced already-extant output
...
In the case where the store object doesn't exist, we do correctly move
(rather than copy) the scratch data into place. In this case, the
destination store object already exists, but we still want to clean up
after ourselves.
2025-09-27 15:14:33 -04:00
John Ericson
3bf1268ac6
Merge pull request #14096 from Mic92/concurrency-bugs-2
...
document thread-unsafe mutation in PosixSourceAccessor
2025-09-27 11:18:56 -04:00
Sergei Zimmerman
b9571b6e52
Merge pull request #13508 from CertainLach/push-oyyysvytlnpr
...
fix: wait on incomplete assignment in REPL
2025-09-27 10:43:41 +00:00
Yaroslav Bolyukin
0a3eb22360
fix: wait on incomplete assignment in REPL
...
Fixes: https://github.com/NixOS/nix/issues/13507
2025-09-27 13:25:27 +03:00
Jörg Thalheim
866c9179a0
document thread-unsafe mutation in PosixSourceAccessor
2025-09-26 23:31:56 +02:00
Jörg Thalheim
7817239644
Merge pull request #14092 from rszyma/fix-devshell-attrpath-in-docs
...
doc: Fix invalid devshell attrpath
2025-09-26 21:01:02 +02:00
Jörg Thalheim
be92b18add
Merge pull request #14083 from fzakaria/fzakaria/shellcheck-multiple-2
...
shellcheck fixes
2025-09-26 20:42:43 +02:00
rszyma
7bd67cd8dc
doc: Fix invalid devshell attrpath
...
`native-clangStdenvPackages` devshell attrpath was being mentioned in
development docs, but doesn't work anymore (since 69fde530
2025-09-26 19:49:36 +02:00
Jörg Thalheim
b5f765b7eb
Merge pull request #14047 from Radvendii/eval-memory
...
libexpr: move eval memory allocation to own struct
2025-09-26 19:24:30 +02:00
Farid Zakaria
2a6724299a
shellcheck fix: tests/functional/flakes/follow-paths.sh
2025-09-26 08:41:30 -07:00
Farid Zakaria
6fc8f04ecb
shellcheck fix: tests/functional/flakes/flakes.sh
2025-09-26 08:41:30 -07:00
Farid Zakaria
ac5615dd91
shellcheck fix: tests/functional/flakes/config.sh
2025-09-26 08:41:30 -07:00
Farid Zakaria
26a10453c3
shellcheck fix: tests/functional/flakes/check.sh
2025-09-26 08:41:30 -07:00
Farid Zakaria
9bf8e7b730
shellcheck fix: tests/functional/flakes/absolute-paths.sh
2025-09-26 08:41:30 -07:00
Farid Zakaria
8839bab84d
shellcheck fix: completion files
2025-09-26 08:41:30 -07:00
Farid Zakaria
f8e351cd94
shellcheck fix: tests/functional/fixed
2025-09-26 08:41:30 -07:00
Farid Zakaria
4cec876319
shellcheck fix: tests/functional/fetchMercurial.sh
2025-09-26 08:41:30 -07:00
Farid Zakaria
c4c3524318
shellcheck fix: tests/functional/fetchGitVerification.sh
2025-09-26 08:41:29 -07:00
Tristan Ross
bb6a4dccdf
libutil-c: add nix_set_verbosity function
2025-09-26 08:31:23 -07:00
Eelco Dolstra
8aa4669328
Merge pull request #14086 from getchoo-contrib/getchoo/help-pure-eval
...
nix-cli: use pure/restricted eval for help pages
2025-09-26 11:32:14 +02:00
Seth Flynn
ff82de86da
nix-cli: use pure/restricted eval for help pages
...
This avoids any complications that can arise from the environment
affecting evaluation of the help pages (which don't need to be calling
out to anything external anyways)
A recent example of one of these problems is
https://github.com/NixOS/nix/issues/14085 , which would break help pages
by causing them to make invalid calls to the dummy store they're
evaluated with
Fixes: https://github.com/NixOS/nix/issues/14062
Co-authored-by: Sergei Zimmerman <sergei@zimmerman.foo>
2025-09-26 02:05:58 -04:00
Taeer Bar-Yam
7b3c193bd3
libexpr: move eval memory allocation to own struct
...
Co-authored-by: eldritch horrors <pennae@lix.systems>
Co-authored-by: Sergei Zimmerman <sergei@zimmerman.foo>
See original commit on lix:
f5754dc90a
2025-09-26 00:40:43 +03:00
Farid Zakaria
53ad2433b4
shellcheck fix: tests/functional/fetchGitSubmodules.sh
2025-09-25 13:09:36 -07:00
Farid Zakaria
ea035ae165
shellcheck fix: tests/tests/functional/dump-db.sh
2025-09-25 13:07:41 -07:00
John Ericson
89141f1d67
Merge pull request #14082 from fzakaria/fzakaria/shellcheck-multiple
...
shellcheck: multiple file fixes
2025-09-25 15:59:43 -04:00
Farid Zakaria
1619409bf2
shellcheck fix: tests/functional/fetchGitRefs.sh
2025-09-25 12:45:43 -07:00
Farid Zakaria
32e1b5209b
shellcheck fix: tests/functional/fetchGit.sh
2025-09-25 12:45:43 -07:00
Farid Zakaria
d07dd92db3
shellcheck fix: tests/functional/fetchClosure.sh
2025-09-25 12:45:43 -07:00
Farid Zakaria
230da1cbe7
shellcheck fix: tests/functional/export.sh
2025-09-25 12:45:40 -07:00
Tristan Ross
cf595b81d5
libmain-c: add nix_set_log_format function
2025-09-25 10:57:48 -07:00
Farid Zakaria
9e3c502521
shellcheck fix: tests/functional/extra-sandbox-profile.sh
2025-09-25 10:35:26 -07:00
Farid Zakaria
a209748ec0
shellcheck fix: tests/functional/export-graph.sh
2025-09-25 10:35:01 -07:00
Farid Zakaria
b8c24cdaef
shellcheck fix: tests/functional/eval-store.sh
2025-09-25 10:33:40 -07:00
Jörg Thalheim
e3d62f35ea
Merge pull request #14075 from fzakaria/fzakaria/shellcheck-functional-dump-db
...
shellcheck fix functional/dump-db.sh
2025-09-25 19:31:49 +02:00
Farid Zakaria
dc69e2e520
shellcheck fix: tests/functional/dyn-drv/recursive-mod-json.sh
2025-09-25 10:31:06 -07:00
Farid Zakaria
119489f253
shellcheck fix: tests/functional/dyn-drv/old-daemon-error-hack.sh
2025-09-25 10:30:03 -07:00
Farid Zakaria
412e51215f
shellcheck fix: functional/dyn-drv/eval-outputOf.sh
2025-09-25 10:29:27 -07:00
John Ericson
46095284f1
Merge pull request #14080 from NixOS/storeFS-prep
...
Some `storeFS` and similar cleanup
2025-09-25 10:50:25 -04:00
Jörg Thalheim
099a74e9f4
Merge pull request #14041 from getchoo-contrib/getchoo/cache-substituted-inputs
...
libfetchers: avoid re-copying substituted inputs
2025-09-25 13:27:02 +02:00
Seth Flynn
74305d5260
libfetchers: avoid re-copying substituted inputs
...
Previously, Nix would not create a cache entry for substituted/cached
inputs
This led to severe slowdowns in some scenarios where a large input (like
Nixpkgs) had already been unpacked to the store but didn't exist in a
users cache, as described in https://github.com/NixOS/nix/issues/11228
Using the same method as https://github.com/NixOS/nix/pull/12911 , we can
create a cache entry for the fingerprint of substituted/cached inputs
and avoid this problem entirely
2025-09-25 04:04:57 -04:00
