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

reewide: Purge all uses stdenv.system and top-level system

Browse Source 
It is deprecated and will be removed after 18.09.
This commit is contained in:
John Ericson
2018-08-20 15:11:29 -04:00
parent 94f71d800d
commit 2c2f1e37d4
263 changed files with 594 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/misc/cflow/default.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gettext ] ++
# We don't have Emacs/GTK/etc. on {Dar,Cyg}win.
stdenv.lib.optional
(! (stdenv.lib.lists.any (x: stdenv.system == x)
(! (stdenv.lib.lists.any (x: stdenv.hostPlatform.system == x)
[ "i686-cygwin" ]))
emacs;

10
pkgs/development/tools/misc/iozone/default.nix
View File

@@ -1,15 +1,15 @@
{ stdenv, fetchurl, gnuplot }:
let
target = if stdenv.system == "i686-linux" then
target = if stdenv.hostPlatform.system == "i686-linux" then
"linux"
else if stdenv.system == "x86_64-linux" then
else if stdenv.hostPlatform.system == "x86_64-linux" then
"linux-AMD64"
else if stdenv.system == "x86_64-darwin" then
else if stdenv.hostPlatform.system == "x86_64-darwin" then
"macosx"
else if stdenv.system == "aarch64-linux" then
else if stdenv.hostPlatform.system == "aarch64-linux" then
"linux-arm"
else throw "Platform ${stdenv.system} not yet supported.";
else throw "Platform ${stdenv.hostPlatform.system} not yet supported.";
in
stdenv.mkDerivation rec {

4
pkgs/development/tools/misc/kibana/5.x.nix
View File

@@ -6,7 +6,7 @@ let
archOverrides = {
"i686" = "x86";
};
info = splitString "-" stdenv.system;
info = splitString "-" stdenv.hostPlatform.system;
arch = (elemAt info 0);
elasticArch = archOverrides."${arch}" or arch;
plat = elemAt info 1;
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${elasticArch}.tar.gz";
sha256 = shas."${stdenv.system}" or (throw "Unknown architecture");
sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
};
buildInputs = [ makeWrapper ];

4
pkgs/development/tools/misc/kibana/default.nix
View File

@@ -12,7 +12,7 @@
with stdenv.lib;
let
inherit (builtins) elemAt;
info = splitString "-" stdenv.system;
info = splitString "-" stdenv.hostPlatform.system;
arch = elemAt info 0;
plat = elemAt info 1;
shas =
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz";
sha256 = shas."${stdenv.system}" or (throw "Unknown architecture");
sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
};
buildInputs = [ makeWrapper ];

2
pkgs/development/tools/misc/lsof/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, buildPackages, ncurses }:
let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in
let dialect = with stdenv.lib; last (splitString "-" stdenv.hostPlatform.system); in
stdenv.mkDerivation rec {
name = "lsof-${version}";

4
pkgs/development/tools/misc/saleae-logic/default.nix
View File

@@ -27,13 +27,13 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src =
if stdenv.system == "i686-linux" then
if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
name = "saleae-logic-${version}-32bit.zip";
url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(32-bit).zip";
sha256 = "1dyrj07cgj2fvwi1sk97vady9ri8f8n7mxy9zyzmw9isngs7bmll";
}
else if stdenv.system == "x86_64-linux" then
else if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
name = "saleae-logic-${version}-64bit.zip";
url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip";