tjh.dev
Combine ISO generation steps
This folds adding hydra-build-products into the actual ISO generation,
preventing an unnecessary download of the ISO.
(cherry picked from commit 10293b87a9da30631b49b11b56cd8a55dd3c7896)
Signed-off-by: Domen Kožar <domen@dev.si>
authored by Eelco Dolstra and committed by Domen Kožar d24e4eef fa4b5605
+1
-2
nixos/lib/make-iso9660-image.nix
+1
-2
nixos/lib/make-iso9660-image.nix
···
39
39
40
40
, # The volume ID.
41
41
volumeID ? ""
42
-
43
42
}:
44
43
45
44
assert bootable -> bootImage != "";
···
47
46
assert usbBootable -> isohybridMbrImage != "";
48
47
49
48
stdenv.mkDerivation {
50
-
name = "iso9660-image";
49
+
name = isoName;
51
50
builder = ./make-iso9660-image.sh;
52
51
buildInputs = [perl xorriso syslinux];
53
52
+1
nixos/lib/make-iso9660-image.sh
+1
nixos/lib/make-iso9660-image.sh
+5
-25
nixos/release.nix
+5
-25
nixos/release.nix
···
43
43
44
44
45
45
makeIso =
46
-
{ module, type, description ? type, maintainers ? ["eelco"], system }:
46
+
{ module, type, maintainers ? ["eelco"], system }:
47
47
48
48
with import nixpkgs { inherit system; };
49
49
50
-
let
51
-
52
-
config = (import lib/eval-config.nix {
53
-
inherit system;
54
-
modules = [ module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ];
55
-
}).config;
56
-
57
-
iso = config.system.build.isoImage;
58
-
59
-
in
60
-
# Declare the ISO as a build product so that it shows up in Hydra.
61
-
hydraJob (runCommand "nixos-iso-${config.system.nixosVersion}"
62
-
{ meta = {
63
-
description = "NixOS installation CD (${description}) - ISO image for ${system}";
64
-
maintainers = map (x: lib.maintainers.${x}) maintainers;
65
-
};
66
-
inherit iso;
67
-
passthru = { inherit config; };
68
-
preferLocalBuild = true;
69
-
}
70
-
''
71
-
mkdir -p $out/nix-support
72
-
echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products
73
-
''); # */
50
+
hydraJob ((import lib/eval-config.nix {
51
+
inherit system;
52
+
modules = [ module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ];
53
+
}).config.system.build.isoImage);
74
54
75
55
76
56
makeSystemTarball =