swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-23 21:55:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #201342 from lovesegfault/link-farm-last-wins

Browse source
This commit is contained in:
Bernardo Meurer 2022-11-15 15:33:19 -05:00 committed by GitHub
parent be2bc696fa 43bf542ccd
commit a9a047ac44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/build-support/trivial-builders.nix
View file

@ -489,7 +489,8 @@ rec {
let
entries' =
if (lib.isAttrs entries) then entries
else if (lib.isList entries) then lib.listToAttrs (map (x: lib.nameValuePair x.name x.path) entries)
# We do this foldl to have last-wins semantics in case of repeated entries
else if (lib.isList entries) then lib.foldl (a: b: a // { "${b.name}" = b.path; }) { } entries
else throw "linkFarm entries must be either attrs or a list!";
linkCommands = lib.mapAttrsToList (name: path: ''

45
pkgs/build-support/trivial-builders/test/link-farm.nix Normal file
View file

@ -0,0 +1,45 @@
{ linkFarm, hello, writeTextFile, runCommand }:
let
foo = writeTextFile {
name = "foo";
text = "foo";
};
linkFarmFromList = linkFarm "linkFarmFromList" [
{ name = "foo"; path = foo; }
{ name = "hello"; path = hello; }
];
linkFarmWithRepeats = linkFarm "linkFarmWithRepeats" [
{ name = "foo"; path = foo; }
{ name = "hello"; path = hello; }
{ name = "foo"; path = hello; }
];
linkFarmFromAttrs = linkFarm "linkFarmFromAttrs" {
inherit foo hello;
};
in
runCommand "test-linkFarm" { } ''
function assertPathEquals() {
local a b;
a="$(realpath "$1")"
b="$(realpath "$2")"
if [ "$a" != "$b" ]; then
echo "path mismatch!"
echo "a: $1 -> $a"
echo "b: $2 -> $b"
exit 1
fi
}
assertPathEquals "${linkFarmFromList}/foo" "${foo}"
assertPathEquals "${linkFarmFromList}/hello" "${hello}"
assertPathEquals "${linkFarmWithRepeats}/foo" "${hello}"
assertPathEquals "${linkFarmWithRepeats}/hello" "${hello}"
assertPathEquals "${linkFarmFromAttrs}/foo" "${foo}"
assertPathEquals "${linkFarmFromAttrs}/hello" "${hello}"
touch $out
''

1
pkgs/test/default.nix
View file

@ -67,6 +67,7 @@ with pkgs;
references = callPackage ../build-support/trivial-builders/test/references.nix {};
overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {};
concat = callPackage ../build-support/trivial-builders/test/concat-test.nix {};
linkFarm = callPackage ../build-support/trivial-builders/test/link-farm.nix {};
};
writers = callPackage ../build-support/writers/test.nix {};