lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Fix compilation, style fixes

Browse source
This commit is contained in:
Eelco Dolstra 2022-04-19 12:09:12 +02:00
parent b529a41814
commit 2016b7142a
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/nix/app.cc
View file

@ -62,22 +62,17 @@ std::string resolveString(Store & store, const std::string & toResolve, const Bu
UnresolvedApp Installable::toApp(EvalState & state) UnresolvedApp Installable::toApp(EvalState & state)
{ {
auto cursor = getCursor(state); auto cursor = getCursor(state);
auto attrPath = cursor->getAttrPath();
auto type = cursor->getAttr("type")->getString(); auto type = cursor->getAttr("type")->getString();
std::string expected; std::string expected = !attrPath.empty() && attrPath[0] == "apps" ? "app" : "derivation";
if (hasPrefix(attrPath,"apps.")) { if (type != expected)
expected = "app"; throw Error("attribute '%s' should have type '%s'", cursor->getAttrPathStr(), expected);
} else {
expected = "derivation";
}
if (type != expected) {
throw Error("Attribute '%s' should have type '%s'.", attrPath, expected);
}
if (type == "app") { if (type == "app") {
auto [program, context] = cursor->getAttr("program")->getStringWithContext(); auto [program, context] = cursor->getAttr("program")->getStringWithContext();
std::vector<StorePathWithOutputs> context2; std::vector<StorePathWithOutputs> context2;
for (auto & [path, name] : context) for (auto & [path, name] : context)
context2.push_back({path, {name}}); context2.push_back({path, {name}});

16
tests/flakes-run.sh
View file

@ -8,22 +8,22 @@ cd $TEST_HOME
cat <<EOF > flake.nix cat <<EOF > flake.nix
{ {
outputs = {self}: { outputs = {self}: {
packages.$system.PkgAsPkg = (import ./shell-hello.nix).hello; packages.$system.pkgAsPkg = (import ./shell-hello.nix).hello;
packages.$system.AppAsApp = self.packages.$system.AppAsApp; packages.$system.appAsApp = self.packages.$system.appAsApp;
apps.$system.PkgAsApp = self.packages.$system.PkgAsPkg; apps.$system.pkgAsApp = self.packages.$system.pkgAsPkg;
apps.$system.AppAsApp = { apps.$system.appAsApp = {
type = "app"; type = "app";
program = "\${(import ./shell-hello.nix).hello}/bin/hello"; program = "\${(import ./shell-hello.nix).hello}/bin/hello";
}; };
}; };
} }
EOF EOF
nix run --no-write-lock-file .#AppAsApp nix run --no-write-lock-file .#appAsApp
nix run --no-write-lock-file .#PkgAsPkg nix run --no-write-lock-file .#pkgAsPkg
! nix run --no-write-lock-file .#PkgAsApp || fail "'nix run' shouldn’t accept an 'app' defined under 'packages'" ! nix run --no-write-lock-file .#pkgAsApp || fail "'nix run' shouldn’t accept an 'app' defined under 'packages'"
! nix run --no-write-lock-file .#AppAsPkg || fail "elements of 'apps' should be of type 'app'" ! nix run --no-write-lock-file .#appAsPkg || fail "elements of 'apps' should be of type 'app'"
clearStore clearStore