From b3c50ec1e9a3e2a4f356c4eaed46450b73f52dba Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 16 Jan 2018 18:29:43 +0200 Subject: [PATCH] nixos/release.nix: Move forAllSystems to release-lib There's already a similar forTheseSystems in release-lib, so be more consistent. --- nixos/release.nix | 3 +-- pkgs/top-level/release-lib.nix | 1 + 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;