diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-11 06:01:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-11 06:01:11 +0000 |
| commit | 491c6c405d8bd11aa264c8f1e07deb524fed9bf0 (patch) | |
| tree | 3713c23455c0991417495e8506f44aab815984e3 /pkgs/top-level | |
| parent | 9ea095f7596e9ca34a0b9e256929bab6ca924ade (diff) | |
| parent | 64aff417d17306e1a91d7eb0ee378bc60307c504 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/release-lib.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 9f28868956899..a1dcc3e9f3349 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -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; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d11d1d1dbd43b..4f95c7d084ef3 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -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; |