Eelco Dolstra
14c9755462
nix flake archive: Recurse into relative path inputs
...
We can't ignore them entirely, since we do want to archive their
transitive inputs.
Fixes #12438 .
2025-02-24 22:10:02 +01:00
John Ericson
c8a443df50
Merge pull request #12546 from DeterminateSystems/version-in-manual
...
Include the Nix version in the title of the manual
2025-02-24 13:11:30 -05:00
Robert Hensing
1f98abee84
Merge pull request #12557 from roberth/packaging-x86_64-darwin-stdenv
...
packaging: Use correct stdenv for x86_64-darwin
2025-02-24 17:04:48 +01:00
Robert Hensing
0772c2e3ab
packaging: Use correct stdenv for x86_64-darwin
2025-02-24 16:44:12 +01:00
Jörg Thalheim
d433a2242e
Merge pull request #12553 from DeterminateSystems/archive-relative-paths
...
nix flake archive: Skip relative path inputs
2025-02-24 15:48:16 +01:00
Eelco Dolstra
b4dfeafed5
nix flake archive: Skip relative path inputs
...
Fixes #12438 .
2025-02-24 15:30:30 +01:00
Eelco Dolstra
f3ea14c8dc
Merge pull request #12542 from tomberek/tomberek.ssl-default
...
doc: ssl-cert-file leaks into OSX builds
2025-02-24 14:51:34 +01:00
Eelco Dolstra
779bb3b920
Include the Nix version in the title of the manual
...
This makes it easy to see at a glance what the version of the manual
is, e.g. "Nix 2.27.0 Reference Manual".
2025-02-24 14:49:58 +01:00
Eelco Dolstra
d904921eec
Merge pull request #12510 from tie/fix-progress-parallel
...
libstore: fix expected bytes in progress bar
2025-02-21 20:11:18 +01:00
Eelco Dolstra
223f82efab
Merge pull request #12543 from B4dM4n/fix-perl-store-bindings
...
Fix perl store bindings
2025-02-21 15:46:46 +01:00
Sergei Zimmerman
0d5004508f
tests/functional: Add flake-based regression for debugger use-after-free
...
This is the simplest reproducer I have. It would be great to find
a repro without flakes, but I guess this should be ok for now.
2025-02-21 14:36:39 +00:00
Sergei Zimmerman
af2ddfdb3b
libexpr: Fix use-after-free of StaticEnv::up
...
It's not very clear what the ownership model is here, but one thing
is certain: `.up` can't be destroyed before the StaticEnv that refers
to it is.
Changing a non-owning pointer to taking shared ownership of the parent
`StaticEnv` prevents the `.up` from being freed.
I'm not a huge fan of the inverted ownership, where child `StaticEnv`
takes a refcount of the parent, but this seems like the least intrusive
way to fix the use-after-free.
This shouldn't cause any shared_ptr cycles to appear (hopefully).
2025-02-21 14:36:39 +00:00
Fabian Möller
5cf9e18167
Fix perl store bindings
...
When #9863 converted the `Nix::Store` free functions into member functions, the
implicit `this` argument was not accounted for when iterating over the variable
number of arguments in some functions.
2025-02-21 11:49:00 +01:00
Thomas Bereknyei
bbf6ff29e6
doc: ssl-cert-file leaks into OSX builds
2025-02-20 17:57:10 -05:00
John Ericson
61f49de7ae
Merge pull request #12511 from xokdvium/chore/delete-dead-code
...
libfetchers-tests: Add back git-utils.cc
2025-02-20 15:56:38 -05:00
Eelco Dolstra
0da6a4a0ec
Merge pull request #12540 from xokdvium/fix/devshell
...
packaging: Fix devShell
2025-02-20 21:53:46 +01:00
Sergei Zimmerman
d95b7fea8e
libfetchers-tests: Add back git-utils.cc
...
Seems like this got dropped at some point during meson migration, so
put it back in the build system.
Drop all tests for `parseGitUrl`, since that function doesn't exist
and migrating doesn't look sensible because git-lfs stuff seems to use
`ParsedURL`.
2025-02-20 20:19:16 +00:00
John Ericson
6877988515
Fix dev shell
...
There was one `inputs.nixFmt` left after 573ffac2e6
2025-02-20 13:01:42 -05:00
Robert Hensing
76f4119605
Merge pull request #12391 from SuperSandro2000/per-user-stat-chmod
...
Only try to chmod /nix/var/nix/profiles/per-user when necessary
2025-02-20 17:10:24 +01:00
John Ericson
0d6428821a
Merge pull request #12533 from obsidiansystems/eval-store-path-path
...
Introduce `EvalStore::storePath`
2025-02-20 01:24:39 -05:00
John Ericson
de22f58dfc
Introduce EvalStore::storePath
...
This abstracts over a common case. Good for brevity, and enabling
further experiments.
2025-02-19 21:24:26 -05:00
John Ericson
782c63fc8e
Merge pull request #12512 from DeterminateSystems/store-fs
...
Use a union source accessor to put chroot stores in the logical location
2025-02-19 19:47:49 -05:00
Eelco Dolstra
ec7dc56f4e
Remove unused variable
2025-02-20 01:09:18 +01:00
Eelco Dolstra
8dc2b2715b
In pure eval mode, restrict rootFS to just the Nix store
...
Note that in pure mode, we don't need to use the union FS even when
using a chroot store, since the user shouldn't have access to the
physical /nix/store.
2025-02-19 23:13:11 +01:00
Eelco Dolstra
4206d95996
Remove sourcePathToStorePath()
...
It's no longer needed now that all store paths inside the evaluator
are logical rather than real paths.
2025-02-19 21:31:25 +01:00
Eelco Dolstra
584ddd1b4d
UnionSourceAccessor: Don't filter out underlying files of the wrong type
...
https://github.com/NixOS/nix/pull/12512#discussion_r1961567140
2025-02-19 13:34:42 +01:00
Eelco Dolstra
99e78c37f7
Use UnionSourceAccessor to mount the chroot store on top of the real store directory
2025-02-19 12:54:09 +01:00
Eelco Dolstra
5b7c240ebd
Add a UnionSourceAccessor
2025-02-19 12:54:09 +01:00
Eelco Dolstra
c3d8799f9f
MountedSourceAccessor: Remove redundant pathExists() method
2025-02-19 12:47:28 +01:00
Eelco Dolstra
641733fd26
Add test
2025-02-19 12:47:28 +01:00
Eelco Dolstra
774b924398
Add a storeFS accessor for paths resulting from IFD
...
Hopefully fixes #11503 .
2025-02-19 12:47:28 +01:00
Eelco Dolstra
e5e0ce2334
Remove redundant call to canonPath()
...
The CanonPath constructor already does that.
2025-02-19 12:47:28 +01:00
Eelco Dolstra
e5fdb4b164
Merge pull request #12524 from NixOS/remove-nixfmt-override
...
Remove nixfmt override
2025-02-19 12:45:12 +01:00
Eelco Dolstra
2b3fed4622
Merge pull request #12525 from DeterminateSystems/move-mounted-source-accessor
...
MountedSourceAccessor: Move to libutil
2025-02-19 11:11:55 +01:00
Eelco Dolstra
d7f2c1b7f4
Remove mounted-source-accessor.hh
2025-02-19 10:44:46 +01:00
Eelco Dolstra
0da81343d7
Move MountedSourceAccessor to libutil
2025-02-19 10:44:42 +01:00
Robert Hensing
573ffac2e6
Remove nixfmt override
...
Closes https://github.com/NixOS/nix/issues/12418
IFD in nixfmt repo
2025-02-19 10:29:58 +01:00
Robert Hensing
f201446983
Merge pull request #12518 from roberth/libgit2-use-ssh-exec
...
packaging: Restore libgit2 USE_SSH=exec
2025-02-19 09:53:41 +01:00
Robert Hensing
5488e29d2f
packaging: Restore libgit2 USE_SSH=exec
...
... when nixpkgs is nixos-unstable or the overlay is used.
2025-02-19 09:38:05 +01:00
Robert Hensing
e672243bed
Merge pull request #12503 from roberth/overriding
...
Overriding the componentized build
2025-02-19 00:42:34 +01:00
Robert Hensing
f0bdb65216
packaging: Remove dead code
...
... from nixpkgs, my bad.
2025-02-19 00:10:05 +01:00
John Ericson
5aeaa25309
Merge pull request #12513 from tweag/ccacheStdenv-typo
...
doc: Fix `ccacheStdenvPackages` typo
2025-02-18 17:44:42 -05:00
Silvan Mosberger
c19914f1ab
doc: Fix ccacheStdenvPackages typo
2025-02-18 23:23:10 +01:00
Ivan Trubach
eb73bfcf73
libstore: fix expected bytes in progress bar
2025-02-18 22:09:05 +03:00
Robert Hensing
d47e3c9576
packaging: Make patch count lazier
...
This makes `nix.version` quicker to evaluate, which should speed up
package listing operations.
If you want an accurate count, use `lib.optionals` in your override
instead of `null` values.
2025-02-18 19:06:36 +01:00
Robert Hensing
0dbe28ad9d
packaging: Add patch count to version
2025-02-18 19:04:53 +01:00
Robert Hensing
03efba30da
test: Ignore packaging-overriding check on darwin for now
2025-02-18 19:04:03 +01:00
Robert Hensing
48fb6fdde9
packaging: Add source overriding "methods"
2025-02-18 19:03:29 +01:00
Robert Hensing
f31d86284f
packaging: Add overrideAllMesonComponents
2025-02-18 18:57:02 +01:00
Robert Hensing
cca01407a7
packaging: Move layers from dependencies to components
...
This makes it easier to implement batch overriding for the components.
2025-02-18 18:57:02 +01:00
