Skip to content

Backward compatibility hack for getFlake applied to unsafeDiscardStringContext #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edolstra merged 1 commit into from
Apr 10, 2026
Merged

Backward compatibility hack for getFlake applied to unsafeDiscardStringContext #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/libflake/flake-primops.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "nix/util/source-path.hh"
#include "nix/util/types.hh"
#include "nix/util/util.hh"
#include "nix/util/mounted-source-accessor.hh"

namespace nix::flake::primops {

Expand Down Expand Up @@ -74,14 +75,11 @@ PrimOp getFlake(const Settings & settings)
if (auto sourcePath = flakeRef.input.getSourcePath();
sourcePath && state.store->isInStore(sourcePath->string())) {
auto [storePath, subPath] = state.store->toStorePath(sourcePath->string());
for (auto & c : context) {
if (auto p = std::get_if<NixStringContextElem::Path>(&c.raw); p && p->storePath == storePath) {
auto path = state.storePath(storePath) / CanonPath(subPath);
if (!flakeRef.subdir.empty())
path = path / flakeRef.subdir;
callFlake(state, lockFlake(settings, state, path, lockFlags), v);
return;
}
if (auto mount = state.storeFS->getMount(CanonPath(state.store->printStorePath(storePath)))) {
auto path = state.storePath(storePath) / CanonPath(subPath);
if (!flakeRef.subdir.empty())
path = path / flakeRef.subdir;
return callFlake(state, lockFlake(settings, state, path, lockFlags), v);
}
}
}
Expand Down
19 changes: 19 additions & 0 deletions tests/functional/flakes/get-flake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,22 @@ expectStderr 0 nix eval "$flake1Dir/subflake#x" | grepQuiet "This may become a f
[[ $(nix eval "$flake1Dir/subflake#x") = 123 ]]

[[ $(nix eval "$flake1Dir/subflake#y") = 123 ]]

# Check backward compatibility with getFlake applied to a store path with discarded string context.
cat > "$flake1Dir/flake.nix" <<EOF
{
outputs =
{ self }:
let
flakeOutputs = builtins.getFlake (
builtins.unsafeDiscardStringContext "path:\${self.sourceInfo}?narHash=\${self.narHash}"
);
in
{
foo = "bar";
inherit flakeOutputs;
};
}
EOF

[[ $(nix eval --raw "$flake1Dir#flakeOutputs.foo") = bar ]]
Loading