diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-15 13:48:45 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-15 14:15:12 +0100 |
commit | 10293b87a9da30631b49b11b56cd8a55dd3c7896 (patch) | |
tree | d45a287f980104faa0729631f604b3cef6bd53db /nixos/release.nix | |
parent | 5cc7bcda3023b01bd926eccd0c5f095a050c5ab0 (diff) | |
download | nixpkgs-10293b87a9da30631b49b11b56cd8a55dd3c7896.tar nixpkgs-10293b87a9da30631b49b11b56cd8a55dd3c7896.tar.gz nixpkgs-10293b87a9da30631b49b11b56cd8a55dd3c7896.tar.bz2 nixpkgs-10293b87a9da30631b49b11b56cd8a55dd3c7896.tar.lz nixpkgs-10293b87a9da30631b49b11b56cd8a55dd3c7896.tar.xz nixpkgs-10293b87a9da30631b49b11b56cd8a55dd3c7896.tar.zst nixpkgs-10293b87a9da30631b49b11b56cd8a55dd3c7896.zip |
Combine ISO generation steps
This folds adding hydra-build-products into the actual ISO generation, preventing an unnecessary download of the ISO.
Diffstat (limited to 'nixos/release.nix')
-rw-r--r-- | nixos/release.nix | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index b697ba4c503..9d577a24b9e 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -43,34 +43,14 @@ let makeIso = - { module, type, description ? type, maintainers ? ["eelco"], system }: + { module, type, maintainers ? ["eelco"], system }: with import nixpkgs { inherit system; }; - let - - config = (import lib/eval-config.nix { - inherit system; - modules = [ module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ]; - }).config; - - iso = config.system.build.isoImage; - - in - # Declare the ISO as a build product so that it shows up in Hydra. - hydraJob (runCommand "nixos-iso-${config.system.nixosVersion}" - { meta = { - description = "NixOS installation CD (${description}) - ISO image for ${system}"; - maintainers = map (x: lib.maintainers.${x}) maintainers; - }; - inherit iso; - passthru = { inherit config; }; - preferLocalBuild = true; - } - '' - mkdir -p $out/nix-support - echo "file iso" $iso/iso/*.iso* >> $out/nix-support/hydra-build-products - ''); # */ + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = [ module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ]; + }).config.system.build.isoImage); makeSystemTarball = |