From f79f80dbf267036a96f8eae281c8501482756d03 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 13 Mar 2018 18:00:52 -0400 Subject: treewide: get rid of platforms.allBut Negative reasoning like `allBut` is a bad idea with an open world of platforms. Concretely, if we add a new, quite different sort of platform, existing packages with `allBut` will claim they work on it even though they probably won't. --- pkgs/development/libraries/buddy/default.nix | 2 +- pkgs/development/libraries/cln/default.nix | 2 +- pkgs/development/libraries/cloog-ppl/default.nix | 2 +- pkgs/development/libraries/cloog/0.18.0.nix | 2 +- pkgs/development/libraries/cloog/default.nix | 2 +- pkgs/development/libraries/rocksdb/default.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 313ac086726..00e236eba8c 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Binary decision diagram package"; license = "as-is"; - platforms = with stdenv.lib.platforms; allBut cygwin; + platforms = stdenv.lib.platforms.unix; # Once had cygwin problems maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 9d7c9c4f30f..e39386dca3f 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "C/C++ library for numbers, a part of GiNaC"; homepage = http://www.ginac.de/CLN/; maintainers = [ ]; - platforms = with stdenv.lib.platforms; allBut cygwin; + platforms = stdenv.lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index 2c49e036358..442b115a408 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = with stdenv.lib.platforms; allBut cygwin; + platforms = stdenv.lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix index ccd93828319..fa4e19f716a 100644 --- a/pkgs/development/libraries/cloog/0.18.0.nix +++ b/pkgs/development/libraries/cloog/0.18.0.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = with stdenv.lib.platforms; allBut cygwin; + platforms = stdenv.lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index 5da29273a8b..902e0b26687 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = with stdenv.lib.platforms; allBut cygwin; + platforms = stdenv.lib.platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 562942f230f..6ccb78003cf 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = http://rocksdb.org; description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.bsd3; - platforms = platforms.allBut [ "i686-linux" ]; + platforms = platforms.x86_64 ++ platforms.aarch64; maintainers = with maintainers; [ adev wkennington ]; }; } -- cgit 1.4.1