diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2018-11-08 06:28:10 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-08 06:28:10 +0000 |
commit | adf41ed942c7cf4e5b172cdf3bc740ebcd442b1c (patch) | |
tree | ac6bccbd33cd602ca64321504c776e45d3d47bfc /nixos | |
parent | 6b4be56d9bf6791e4db994729381c0e3b61ff73a (diff) | |
parent | 56802ad698583365b8509cad16c45eeae045a722 (diff) | |
download | nixlib-adf41ed942c7cf4e5b172cdf3bc740ebcd442b1c.tar nixlib-adf41ed942c7cf4e5b172cdf3bc740ebcd442b1c.tar.gz nixlib-adf41ed942c7cf4e5b172cdf3bc740ebcd442b1c.tar.bz2 nixlib-adf41ed942c7cf4e5b172cdf3bc740ebcd442b1c.tar.lz nixlib-adf41ed942c7cf4e5b172cdf3bc740ebcd442b1c.tar.xz nixlib-adf41ed942c7cf4e5b172cdf3bc740ebcd442b1c.tar.zst nixlib-adf41ed942c7cf4e5b172cdf3bc740ebcd442b1c.zip |
Merge pull request #49864 from oxij/pkgs/tiny-things
trivial: tiny cleanups and fixes
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/release.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 4647f28be186..e18b6ad310fd 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -45,6 +45,7 @@ let system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev; }; + makeModules = module: rest: [ configuration versionModule module rest ]; makeIso = { module, type, system, ... }: @@ -53,7 +54,9 @@ let hydraJob ((import lib/eval-config.nix { inherit system; - modules = [ configuration module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ]; + modules = makeModules module { + isoImage.isoBaseName = "nixos-${type}"; + }; }).config.system.build.isoImage); @@ -64,7 +67,7 @@ let hydraJob ((import lib/eval-config.nix { inherit system; - modules = [ configuration module versionModule ]; + modules = makeModules module {}; }).config.system.build.sdImage); @@ -77,7 +80,7 @@ let config = (import lib/eval-config.nix { inherit system; - modules = [ configuration module versionModule ]; + modules = makeModules module {}; }).config; tarball = config.system.build.tarball; @@ -97,7 +100,7 @@ let buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix { inherit system; - modules = [ configuration module versionModule ] ++ singleton + modules = makeModules module ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; @@ -108,7 +111,7 @@ let let configEvaled = import lib/eval-config.nix { inherit system; - modules = [ module versionModule ]; + modules = makeModules module {}; }; build = configEvaled.config.system.build; kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget; |