summary refs log tree commit diff
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-01-16 18:29:43 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-01-16 18:56:41 +0200
commitb3c50ec1e9a3e2a4f356c4eaed46450b73f52dba (patch)
tree0c548eb088dcabc7df9329b5f2b67ac75d097733
parent82cab72dd41cf3e243a76bdbbe2ba9631e9ffa5a (diff)
downloadnixpkgs-b3c50ec1e9a3e2a4f356c4eaed46450b73f52dba.tar
nixpkgs-b3c50ec1e9a3e2a4f356c4eaed46450b73f52dba.tar.gz
nixpkgs-b3c50ec1e9a3e2a4f356c4eaed46450b73f52dba.tar.bz2
nixpkgs-b3c50ec1e9a3e2a4f356c4eaed46450b73f52dba.tar.lz
nixpkgs-b3c50ec1e9a3e2a4f356c4eaed46450b73f52dba.tar.xz
nixpkgs-b3c50ec1e9a3e2a4f356c4eaed46450b73f52dba.tar.zst
nixpkgs-b3c50ec1e9a3e2a4f356c4eaed46450b73f52dba.zip
nixos/release.nix: Move forAllSystems to release-lib
There's already a similar forTheseSystems in release-lib, so be more
consistent.
-rw-r--r--nixos/release.nix3
-rw-r--r--pkgs/top-level/release-lib.nix1
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/release.nix b/nixos/release.nix
index 33916243e97..9a25b9a1919 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -3,6 +3,7 @@
 , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
 }:
 
+with import ../pkgs/top-level/release-lib.nix { inherit supportedSystems; };
 with import ../lib;
 
 let
@@ -11,8 +12,6 @@ let
   versionSuffix =
     (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
 
-  forAllSystems = genAttrs supportedSystems;
-
   importTest = fn: args: system: import fn ({
     inherit system;
   } // args);
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index a56df53d27e..87fb00a9682 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -58,6 +58,7 @@ rec {
      interested in the result of cross building a package. */
   crossMaintainers = [ maintainers.viric ];
 
+  forAllSystems = genAttrs supportedSystems;
   forTheseSystems = systems: f:
     genAttrs (filter (x: elem x supportedSystems) systems) f;