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

6
pkgs/tools/security/afl/default.nix
View File

@@ -4,9 +4,9 @@
let
afl-qemu = callPackage ./qemu.nix {};
qemu-exe-name = if stdenv.system == "x86_64-linux" then "qemu-x86_64"
else if stdenv.system == "i686-linux" then "qemu-i386"
else throw "afl: no support for ${stdenv.system}!";
qemu-exe-name = if stdenv.hostPlatform.system == "x86_64-linux" then "qemu-x86_64"
else if stdenv.hostPlatform.system == "i686-linux" then "qemu-i386"
else throw "afl: no support for ${stdenv.hostPlatform.system}!";
in
stdenv.mkDerivation rec {

8
pkgs/tools/security/afl/qemu.nix
View File

@@ -16,9 +16,9 @@ let
aflTypesFile = writeText "afl-types.h"
(builtins.readFile ./qemu-patches/afl-types.h);
cpuTarget = if stdenv.system == "x86_64-linux" then "x86_64-linux-user"
else if stdenv.system == "i686-linux" then "i386-linux-user"
else throw "afl: no support for ${stdenv.system}!";
cpuTarget = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux-user"
else if stdenv.hostPlatform.system == "i686-linux" then "i386-linux-user"
else throw "afl: no support for ${stdenv.hostPlatform.system}!";
in
stdenv.mkDerivation rec {
name = "afl-${n}";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
vde2 texinfo libuuid flex bison lzo snappy autoconf
libcap_ng gnutls
]
++ optionals (hasSuffix "linux" stdenv.system) [ libaio ];
++ optionals (hasSuffix "linux" stdenv.hostPlatform.system) [ libaio ];
enableParallelBuilding = true;

12
pkgs/tools/security/encryptr/default.nix
View File

@@ -5,13 +5,13 @@
}:
let
arch = if stdenv.system == "x86_64-linux" then "amd"
else if stdenv.system == "i686-linux" then "i386"
else throw "Encryptr for ${stdenv.system} not supported!";
arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd"
else if stdenv.hostPlatform.system == "i686-linux" then "i386"
else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!";
sha256 = if stdenv.system == "x86_64-linux" then "1j3g467g7ar86hpnh6q9mf7mh2h4ia94mwhk1283zh739s2g53q2"
else if stdenv.system == "i686-linux" then "02j9hg9b1jlv25q1sjfhv8d46mii33f94dj0ccn83z9z18q4y2cm"
else throw "Encryptr for ${stdenv.system} not supported!";
sha256 = if stdenv.hostPlatform.system == "x86_64-linux" then "1j3g467g7ar86hpnh6q9mf7mh2h4ia94mwhk1283zh739s2g53q2"
else if stdenv.hostPlatform.system == "i686-linux" then "02j9hg9b1jlv25q1sjfhv8d46mii33f94dj0ccn83z9z18q4y2cm"
else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!";
in stdenv.mkDerivation rec {
name = "encryptr-${version}";

7
pkgs/tools/security/enpass/default.nix
View File

@@ -1,8 +1,9 @@
{stdenv, system, fetchurl, dpkg, openssl, xorg
{ stdenv, fetchurl, dpkg, openssl, xorg
, glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype
, gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig
, makeWrapper , python, pythonPackages, lib
, libredirect, lsof}:
, libredirect, lsof
}:
let
all_data = builtins.fromJSON (builtins.readFile ./data.json);
@@ -11,7 +12,7 @@ let
x86_64-linux = "amd64";
};
data = all_data.${system_map.${system} or (throw "Unsupported platform")};
data = all_data.${system_map.${stdenv.hostPlatform.system} or (throw "Unsupported platform")};
baseUrl = http://repo.sinew.in;

6
pkgs/tools/security/pcsc-scm-scl011/default.nix
View File

@@ -1,9 +1,9 @@
{ stdenv, fetchurl, unzip, libusb }:
let
arch = if stdenv.system == "i686-linux" then "32"
else if stdenv.system == "x86_64-linux" then "64"
else throw "Unsupported system: ${stdenv.system}";
arch = if stdenv.hostPlatform.system == "i686-linux" then "32"
else if stdenv.hostPlatform.system == "x86_64-linux" then "64"
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
in
stdenv.mkDerivation rec {
name = "pcsc-scm-scl-${version}";

2
pkgs/tools/security/sshuttle/default.nix
View File

@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
patches = [ ./sudo.patch ];
nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc;
nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.hostPlatform.system != "i686-linux") pandoc;
buildInputs =
[ coreutils openssh procps nettools ]
++ stdenv.lib.optionals stdenv.isLinux [ iptables ];