Skip to content

Commit d1b5e1c

Browse files
authored
Merge pull request #25 from winterqt/push-kquyuqrokotp
artifact-builder: use testers.invalidateFetcherByDrvHash to ensure output hash validity
2 parents 98eee52 + 2ea14e9 commit d1b5e1c

1 file changed

Lines changed: 27 additions & 26 deletions

File tree

  • package-sets/top-level/nixos-branding/artifact-builder
Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
1-
# artifact-builder
21
{
32
jura,
43
nixos-color-palette,
54
python3,
65
route159,
76
runCommandLocal,
7+
testers,
88
}:
9-
# artifact
10-
{
11-
name,
12-
outputHash,
13-
script,
14-
}:
15-
runCommandLocal name
9+
testers.invalidateFetcherByDrvHash (
1610
{
17-
inherit script;
11+
name,
12+
outputHash,
13+
script,
14+
}:
15+
runCommandLocal name
16+
{
17+
inherit script;
1818

19-
nativeBuildInputs = [
20-
(python3.withPackages (ps: [ ps.nixoslogo ]))
21-
];
19+
nativeBuildInputs = [
20+
(python3.withPackages (ps: [ ps.nixoslogo ]))
21+
];
2222

23-
outputHash = outputHash;
24-
outputHashAlgo = "sha256";
25-
outputHashMode = "recursive";
23+
outputHash = outputHash;
24+
outputHashAlgo = "sha256";
25+
outputHashMode = "recursive";
2626

27-
env = {
28-
NIXOS_ANNOTATIONS_FONT_FILE = "${jura}/share/fonts/truetype/jura/Jura-Regular.ttf";
29-
NIXOS_COLOR_PALETTE_FILE = "${nixos-color-palette}/colors.toml";
30-
NIXOS_LOGOTYPE_FONT_FILE = "${route159}/share/fonts/opentype/route159/Route159-Regular.otf";
31-
};
27+
env = {
28+
NIXOS_ANNOTATIONS_FONT_FILE = "${jura}/share/fonts/truetype/jura/Jura-Regular.ttf";
29+
NIXOS_COLOR_PALETTE_FILE = "${nixos-color-palette}/colors.toml";
30+
NIXOS_LOGOTYPE_FONT_FILE = "${route159}/share/fonts/opentype/route159/Route159-Regular.otf";
31+
};
3232

33-
}
34-
''
35-
python $script
36-
mkdir $out
37-
cp *.svg $out/
38-
''
33+
}
34+
''
35+
python $script
36+
mkdir $out
37+
cp *.svg $out/
38+
''
39+
)

0 commit comments

Comments
 (0)