diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-03 13:33:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-03 13:33:42 -0500 |
| commit | b45ef79b74d267891a11c1775a473c610ecebe78 (patch) | |
| tree | 4d64fccd8636a4166de6885dde679962537a5a54 /pkgs/development/tools | |
| parent | 40f809c214d4e83b8cbc8efcd13276cac9237ac8 (diff) | |
| parent | 143978a477e4891bd94be6d9fcf257f726b403cd (diff) | |
| download | nixlib-b45ef79b74d267891a11c1775a473c610ecebe78.tar nixlib-b45ef79b74d267891a11c1775a473c610ecebe78.tar.gz nixlib-b45ef79b74d267891a11c1775a473c610ecebe78.tar.bz2 nixlib-b45ef79b74d267891a11c1775a473c610ecebe78.tar.lz nixlib-b45ef79b74d267891a11c1775a473c610ecebe78.tar.xz nixlib-b45ef79b74d267891a11c1775a473c610ecebe78.tar.zst nixlib-b45ef79b74d267891a11c1775a473c610ecebe78.zip | |
Merge pull request #39907 from matthewbauer/work
Miscellaneous cleanups
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/iaca/2.1.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/tools/iaca/3.0.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/saleae-logic/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/phantomjs/default.nix | 1 |
4 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index c434fd5a7dec..e71e296212cd 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -1,5 +1,4 @@ { stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }: -assert stdenv.system == "x86_64-linux"; with stdenv.lib; # v2.1: last version with NHM/WSM arch support diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index 025dfc56721d..af738bc71a93 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/pkgs/development/tools/iaca/3.0.nix @@ -1,5 +1,4 @@ { stdenv, requireFile, patchelf, unzip }: -assert stdenv.system == "x86_64-linux"; with stdenv.lib; stdenv.mkDerivation { diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index de2d6c5b7bfd..a8183aa4ba08 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -21,8 +21,6 @@ let in -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { pname = "saleae-logic"; version = "1.2.10"; @@ -93,7 +91,7 @@ stdenv.mkDerivation rec { description = "Software for Saleae logic analyzers"; homepage = http://www.saleae.com/; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 8b6b655b6a56..51a83760be39 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -3,7 +3,6 @@ let platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; in -assert lib.elem stdenv.system platforms; stdenv.mkDerivation rec { name = "phantomjs-1.9.8"; |