Merge pull request #225 from DeterminateSystems/backport-14189

cole-h · web-flow · commit e8da68afd7da · 2025-10-09T13:33:27.000Z
Backport changes from upstream NixOS#14189
diff --git a/src/libstore/derivation-options.cc b/src/libstore/derivation-options.cc
@@ -232,7 +232,7 @@ DerivationOptions::fromStructuredAttrs(const StringMap & env, const StructuredAt
                     for (auto & [key, value] : getObject(*e)) {
                         StringSet ss;
                         flatten(value, ss);
-                        ret.insert_or_assign(key, ss);
+                        ret.insert_or_assign(key, std::move(ss));
                     }
                 } else {
                     auto s = getOr(env, "exportReferencesGraph", "");
diff --git a/tests/functional/structured-attrs.sh b/tests/functional/structured-attrs.sh
@@ -2,9 +2,8 @@
 
 source common.sh
 
-# 27ce722638 required some incompatible changes to the nix file, so skip this
-# tests for the older versions
-requireDaemonNewerThan "2.4pre20210712"
+# https://github.com/NixOS/nix/pull/14189
+requireDaemonNewerThan "2.33"
 
 clearStoreIfPossible
 

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ DerivationOptions::fromStructuredAttrs(const StringMap & env, const StructuredAt`
`232`	`232`	`for (auto & [key, value] : getObject(*e)) {`
`233`	`233`	`StringSet ss;`
`234`	`234`	`flatten(value, ss);`
`235`		`- ret.insert_or_assign(key, ss);`
	`235`	`+ ret.insert_or_assign(key, std::move(ss));`
`236`	`236`	`}`
`237`	`237`	`} else {`
`238`	`238`	`auto s = getOr(env, "exportReferencesGraph", "");`