public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/release.nix: generalize `modules` copy-paste into `makeModules`

This commit is contained in:
Jan Malakhovski 2018-11-07 09:07:38 +00:00
parent 26cce54d88
commit 2403464720
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixos/release.nix
View File

@ -45,6 +45,7 @@ let
system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev; system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev;
}; };
makeModules = module: rest: [ configuration versionModule module rest ];
makeIso = makeIso =
{ module, type, system, ... }: { module, type, system, ... }:
@ -53,7 +54,9 @@ let
hydraJob ((import lib/eval-config.nix { hydraJob ((import lib/eval-config.nix {
inherit system; inherit system;
modules = [ configuration module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ]; modules = makeModules module {
isoImage.isoBaseName = "nixos-${type}";
};
}).config.system.build.isoImage); }).config.system.build.isoImage);
@ -64,7 +67,7 @@ let
hydraJob ((import lib/eval-config.nix { hydraJob ((import lib/eval-config.nix {
inherit system; inherit system;
modules = [ configuration module versionModule ]; modules = makeModules module {};
}).config.system.build.sdImage); }).config.system.build.sdImage);
@ -77,7 +80,7 @@ let
config = (import lib/eval-config.nix { config = (import lib/eval-config.nix {
inherit system; inherit system;
modules = [ configuration module versionModule ]; modules = makeModules module {};
}).config; }).config;
tarball = config.system.build.tarball; tarball = config.system.build.tarball;
@ -97,7 +100,7 @@ let
buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix { buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix {
inherit system; inherit system;
modules = [ configuration module versionModule ] ++ singleton modules = makeModules module
({ ... }: ({ ... }:
{ fileSystems."/".device = mkDefault "/dev/sda1"; { fileSystems."/".device = mkDefault "/dev/sda1";
boot.loader.grub.device = mkDefault "/dev/sda"; boot.loader.grub.device = mkDefault "/dev/sda";
@ -108,7 +111,7 @@ let
let let
configEvaled = import lib/eval-config.nix { configEvaled = import lib/eval-config.nix {
inherit system; inherit system;
modules = [ module versionModule ]; modules = makeModules module {};
}; };
build = configEvaled.config.system.build; build = configEvaled.config.system.build;
kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget; kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget;