nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00
Code Activity

libexpr: Move derivation-internal.nix from corepkgsFS to internalFS

Browse source 
Best I can tell this was never supposed to be exposed to the user
and has been this way since 2.19.

2.18 did not expose this file to the user:

nix run nix/2.18-maintenance -- eval --expr "import <nix/derivation-internal.nix>"

error: getting status of '/__corepkgs__/derivation-internal.nix': No such file or directory
This commit is contained in:
Sergei Zimmerman 2025-10-01 23:13:11 +03:00
parent 8a968c599d
commit 2a0fddc7d5
No known key found for this signature in database
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/eval.cc
View file

@ -268,7 +268,7 @@ EvalState::EvalState(
}()) }())
, corepkgsFS(make_ref<MemorySourceAccessor>()) , corepkgsFS(make_ref<MemorySourceAccessor>())
, internalFS(make_ref<MemorySourceAccessor>()) , internalFS(make_ref<MemorySourceAccessor>())
, derivationInternal{corepkgsFS->addFile( , derivationInternal{internalFS->addFile(
CanonPath("derivation-internal.nix"), CanonPath("derivation-internal.nix"),
#include "primops/derivation.nix.gen.hh" #include "primops/derivation.nix.gen.hh"
)} )}

6
tests/functional/lang/eval-fail-derivation-name.err.exp
View file

@ -1,20 +1,20 @@
error: error:
… while evaluating the attribute 'outPath' … while evaluating the attribute 'outPath'
at <nix/derivation-internal.nix>:<number>:<number>: at «nix-internal»/derivation-internal.nix:<number>:<number>:
<number>| value = commonAttrs // { <number>| value = commonAttrs // {
<number>| outPath = builtins.getAttr outputName strict; <number>| outPath = builtins.getAttr outputName strict;
| ^ | ^
<number>| drvPath = strict.drvPath; <number>| drvPath = strict.drvPath;
… while calling the 'getAttr' builtin … while calling the 'getAttr' builtin
at <nix/derivation-internal.nix>:<number>:<number>: at «nix-internal»/derivation-internal.nix:<number>:<number>:
<number>| value = commonAttrs // { <number>| value = commonAttrs // {
<number>| outPath = builtins.getAttr outputName strict; <number>| outPath = builtins.getAttr outputName strict;
| ^ | ^
<number>| drvPath = strict.drvPath; <number>| drvPath = strict.drvPath;
… while calling the 'derivationStrict' builtin … while calling the 'derivationStrict' builtin
at <nix/derivation-internal.nix>:<number>:<number>: at «nix-internal»/derivation-internal.nix:<number>:<number>:
<number>| <number>|
<number>| strict = derivationStrict drvAttrs; <number>| strict = derivationStrict drvAttrs;
| ^ | ^