diff options
author | Ryan Burns <52847440+r-burns@users.noreply.github.com> | 2021-10-27 10:03:24 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-27 10:03:24 -0700 |
commit | f67d4dd9c1bf680b02903d00f20c3d97270a743d (patch) | |
tree | 4df9f08d7cb3bc854b72fd1522809b7d1a694fc0 /pkgs | |
parent | 119e5986abdf35676982dffc08b990220c268cc8 (diff) | |
parent | 4246d6ce21d2d8d33e2d30f42b3d9d446c5dc143 (diff) |
Merge pull request #142616 from r-burns/toplevel-system
treewide: remove toplevel `system` attr
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/virtualization/crun/default.nix | 3 | ||||
-rw-r--r-- | pkgs/build-support/docker/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/adguardhome/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/misc/navidrome/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/web-apps/bookstack/default.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/zigbee2mqtt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/fx_cast/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/stage.nix | 1 |
9 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 1788c970f298a..c91bf3d142aba 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -11,7 +11,6 @@ , yajl , nixosTests , criu -, system }: let @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { buildInputs = [ libcap libseccomp systemd yajl ] # Criu currently only builds on x86_64-linux - ++ lib.optional (lib.elem system criu.meta.platforms) criu; + ++ lib.optional (lib.elem stdenv.hostPlatform.system criu.meta.platforms) criu; enableParallelBuilding = true; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index a42b025bc7f2a..dcfa5ec593d1d 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -31,8 +31,6 @@ , writeText , writeTextDir , writePython3 -, system -, # Note: This is the cross system we're compiling for }: let diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 34f64edc6ba3e..848e259256b96 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, fetchzip, system ? stdenv.targetPlatform }: +{ lib, stdenv, fetchurl, fetchzip }: stdenv.mkDerivation rec { pname = "adguardhome"; version = "0.106.3"; - src = (import ./bins.nix { inherit fetchurl fetchzip; }).${system}; + src = (import ./bins.nix { inherit fetchurl fetchzip; }).${stdenv.hostPlatform.system}; installPhase = '' install -m755 -D ./AdGuardHome $out/bin/adguardhome diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index f81a2c4d9ab67..19a89bbbf1cba 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper, nixosTests }: +{ lib, stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper, nixosTests }: with lib; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.45.1"; - src = fetchurl (if pkgs.system == "x86_64-linux" + src = fetchurl (if stdenv.hostPlatform.system == "x86_64-linux" then { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; sha256 = "sha256-TZcXq51sKoeLPmcRpv4VILDmS6dsS7lxlJzTDH0tEWM="; diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index f7a02b5c13dd1..724ff4c95c65c 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -1,8 +1,9 @@ -{ pkgs, system, lib, fetchFromGitHub, dataDir ? "/var/lib/bookstack" }: +{ pkgs, stdenv, lib, fetchFromGitHub, dataDir ? "/var/lib/bookstack" }: let package = (import ./composition.nix { - inherit pkgs system; + inherit pkgs; + inherit (stdenv.hostPlatform) system; noDev = true; # Disable development dependencies }).overrideAttrs (attrs : { installPhase = attrs.installPhase + '' diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 2a7c31a47a0f5..7f561c493e663 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -1,6 +1,6 @@ -{ pkgs, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }: +{ pkgs, stdenv, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }: let - package = (import ./node.nix { inherit pkgs system; }).package; + package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package; in package.override rec { # don't upgrade! Newer versions cause stack overflows and fail trunk-combined diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index e3458ccfe5cfc..b94b16d7bf545 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -8,7 +8,7 @@ # nix run nixpkgs.nodePackages.node2nix -c node2nix -l package-lock.json -d # cp -v node-*.nix package*.json ~/p/nixpkgs/pkgs/tools/misc/fx_cast/app # ``` -{ pkgs, stdenv, system }: let +{ pkgs, stdenv }: let nodeEnv = import ./node-env.nix { inherit (pkgs) nodejs stdenv lib python2 runCommand writeTextFile; inherit pkgs; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 76de35caac941..f2a275ecc1887 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1214,4 +1214,6 @@ mapAliases ({ targetLlvmLibraries = targetPackages.llvmPackages_git.libraries; }); + inherit (stdenv.hostPlatform) system; # added 2021-10-22 + }) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index a990c5ed70cb9..7db79276d8997 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -116,7 +116,6 @@ let inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; in { inherit buildPlatform hostPlatform targetPlatform; - inherit (hostPlatform) system; }; splice = self: super: import ./splice.nix lib self (adjacentPackages != null); |