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

Gate dynamic-derivations with drv fromJSON too

Browse source 
Don't want `nix derivation add` to be a way to sneak by experimental
feature checks!
This commit is contained in:
John Ericson 2023-04-19 11:33:48 -04:00
parent 76baaeb341
commit 20decfd302
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/derivations.cc
View file

@ -1005,6 +1005,8 @@ DerivationOutput DerivationOutput::fromJSON(
// remaining to parse, will be mutated by parsers // remaining to parse, will be mutated by parsers
std::string_view s = hashAlgo; std::string_view s = hashAlgo;
ContentAddressMethod method = ContentAddressMethod::parsePrefix(s); ContentAddressMethod method = ContentAddressMethod::parsePrefix(s);
if (method == TextIngestionMethod {})
xpSettings.require(Xp::DynamicDerivations);
auto hashType = parseHashType(s); auto hashType = parseHashType(s);
return { std::move(method), std::move(hashType) }; return { std::move(method), std::move(hashType) };
}; };

10
src/libstore/tests/derivation.cc
View file

@ -26,6 +26,14 @@ class CaDerivationTest : public DerivationTest
} }
}; };
class DynDerivationTest : public DerivationTest
{
void SetUp() override
{
mockXpSettings.set("experimental-features", "dynamic-derivations ca-derivations");
}
};
class ImpureDerivationTest : public DerivationTest class ImpureDerivationTest : public DerivationTest
{ {
void SetUp() override void SetUp() override
@ -83,7 +91,7 @@ TEST_JSON(DerivationTest, caFixed,
}), }),
"drv-name", "output-name") "drv-name", "output-name")
TEST_JSON(CaDerivationTest, caFixedText, TEST_JSON(DynDerivationTest, caFixedText,
R"({ R"({
"hashAlgo": "text:sha256", "hashAlgo": "text:sha256",
"hash": "894517c9163c896ec31a2adbd33c0681fd5f45b2c0ef08a64c92a03fb97f390f", "hash": "894517c9163c896ec31a2adbd33c0681fd5f45b2c0ef08a64c92a03fb97f390f",