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

nixos/release.nix: Move forAllSystems to release-lib

Browse Source 
There's already a similar forTheseSystems in release-lib, so be more
consistent.
This commit is contained in:
Tuomas Tynkkynen 2018-01-16 18:29:43 +02:00
parent 82cab72dd4
commit b3c50ec1e9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/release.nix
View File

@ -3,6 +3,7 @@
, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
}: }:
with import ../pkgs/top-level/release-lib.nix { inherit supportedSystems; };
with import ../lib; with import ../lib;
let let
@ -11,8 +12,6 @@ let
versionSuffix = versionSuffix =
(if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
forAllSystems = genAttrs supportedSystems;
importTest = fn: args: system: import fn ({ importTest = fn: args: system: import fn ({
inherit system; inherit system;
} // args); } // args);

1
pkgs/top-level/release-lib.nix
View File

@ -58,6 +58,7 @@ rec {
interested in the result of cross building a package. */ interested in the result of cross building a package. */
crossMaintainers = [ maintainers.viric ]; crossMaintainers = [ maintainers.viric ];
forAllSystems = genAttrs supportedSystems;
forTheseSystems = systems: f: forTheseSystems = systems: f:
genAttrs (filter (x: elem x supportedSystems) systems) f; genAttrs (filter (x: elem x supportedSystems) systems) f;