mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

pkgs/top-level/release{,-lib}.nix: remove hardcoded system

Browse source 
(cherry picked from commit d2adfad3bd)
This commit is contained in:
Tristan Ross 2024-06-06 19:34:06 -07:00 committed by github-actions[bot]
parent c24bf950ab
commit 7e62b740f0
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/top-level/release-lib.nix
View file

@ -1,4 +1,5 @@
{ supportedSystems
, system ? builtins.currentSystem
, packageSet ? (import ../..)
, scrubJobs ? true
, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
@ -33,7 +34,7 @@ let
systems
;
pkgs = packageSet (recursiveUpdate { system = "x86_64-linux"; config.allowUnsupportedSystem = true; } nixpkgsArgs);
pkgs = packageSet (recursiveUpdate { inherit system; config.allowUnsupportedSystem = true; } nixpkgsArgs);
hydraJob' = if scrubJobs then hydraJob else id;

3
pkgs/top-level/release.nix
View file

@ -9,6 +9,7 @@
$ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
*/
{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; }
, system ? builtins.currentSystem
, officialRelease ? false
# The platform doubles for which we build Nixpkgs.
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]
@ -54,7 +55,7 @@
let
release-lib = import ./release-lib.nix {
inherit supportedSystems scrubJobs nixpkgsArgs;
inherit supportedSystems scrubJobs nixpkgsArgs system;
};
inherit (release-lib) mapTestOn pkgs;