Skip to content

Commit 6792904

Browse files
committed
libexpr: Move derivation-internal.nix from corepkgsFS to internalFS
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.19-maintenance -- eval --expr "import <nix/derivation-internal.nix>" error: getting status of '/__corepkgs__/derivation-internal.nix': No such file or directory
1 parent 8a968c5 commit 6792904

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/libexpr/eval.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ EvalState::EvalState(
268268
}())
269269
, corepkgsFS(make_ref<MemorySourceAccessor>())
270270
, internalFS(make_ref<MemorySourceAccessor>())
271-
, derivationInternal{corepkgsFS->addFile(
271+
, derivationInternal{internalFS->addFile(
272272
CanonPath("derivation-internal.nix"),
273273
#include "primops/derivation.nix.gen.hh"
274274
)}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
error:
22
… while evaluating the attribute 'outPath'
3-
at <nix/derivation-internal.nix>:<number>:<number>:
3+
at «nix-internal»/derivation-internal.nix:<number>:<number>:
44
<number>| value = commonAttrs // {
55
<number>| outPath = builtins.getAttr outputName strict;
66
| ^
77
<number>| drvPath = strict.drvPath;
88

99
… while calling the 'getAttr' builtin
10-
at <nix/derivation-internal.nix>:<number>:<number>:
10+
at «nix-internal»/derivation-internal.nix:<number>:<number>:
1111
<number>| value = commonAttrs // {
1212
<number>| outPath = builtins.getAttr outputName strict;
1313
| ^
1414
<number>| drvPath = strict.drvPath;
1515

1616
… while calling the 'derivationStrict' builtin
17-
at <nix/derivation-internal.nix>:<number>:<number>:
17+
at «nix-internal»/derivation-internal.nix:<number>:<number>:
1818
<number>|
1919
<number>| strict = derivationStrict drvAttrs;
2020
| ^

0 commit comments

Comments
 (0)