b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Make platforms.allBut accept a list rather than a single platform

Browse source
This commit is contained in:
Luca Bruno 2014-08-09 12:28:16 +02:00
parent 9300470b5e
commit b331ae33d7
12 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/platforms.nix
View file

@ -11,6 +11,6 @@ rec {
unix = linux ++ darwin ++ freebsd ++ openbsd;
all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd;
none = [];
allBut = platform: lists.filter (x: platform != x) all;
allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"];
}

2
pkgs/development/compilers/chicken/default.nix
View file

@ -24,7 +24,7 @@ stdenv.mkDerivation {
homepage = http://www.call-cc.org/;
license = "BSD";
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
platforms = stdenv.lib.platforms.allBut "x86_64-darwin";
platforms = with stdenv.lib.platforms; allBut darwin;
description = "A portable compiler for the Scheme programming language";
longDescription = ''
CHICKEN is a compiler for the Scheme programming language.

2
pkgs/development/libraries/buddy/default.nix
View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
description = "binary decision diagram package";
license = "as-is";
platforms = stdenv.lib.platforms.allBut "i686-cygwin";
platforms = with stdenv.lib.platforms; allBut cygwin;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

2
pkgs/development/libraries/cln/default.nix
View file

@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
description = "C/C++ library for numbers, a part of GiNaC";
homepage = http://www.ginac.de/CLN/;
maintainers = [ stdenv.lib.maintainers.urkud ];
platforms = stdenv.lib.platforms.allBut "i686-cygwin";
platforms = with stdenv.lib.platforms; allBut cygwin;
};
}

2
pkgs/development/libraries/cloog-ppl/default.nix
View file

@ -74,6 +74,6 @@ stdenv.mkDerivation rec {
make[3]: *** [Box.lo] Error 1
*/
platforms = stdenv.lib.platforms.allBut "i686-cygwin";
platforms = with stdenv.lib.platforms; allBut cygwin;
};
}

2
pkgs/development/libraries/cloog/default.nix
View file

@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
make[3]: *** [Box.lo] Error 1
*/
platforms = stdenv.lib.platforms.allBut "i686-cygwin";
platforms = with stdenv.lib.platforms; allBut cygwin;
};
}

2
pkgs/development/libraries/commoncpp2/default.nix
View file

@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.ludo
];
platforms = stdenv.lib.platforms.allBut "i686-freebsd";
platforms = with stdenv.lib.platforms; allBut freebsd;
};
}

2
pkgs/misc/screensavers/xscreensaver/default.nix
View file

@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.jwz.org/xscreensaver/";
description = "A set of screensavers";
maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
platforms = stdenv.lib.platforms.allBut "i686-cygwin";
platforms = with stdenv.lib.platforms; allBut cygwin;
};
}

2
pkgs/tools/graphics/dcraw/default.nix
View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = http://www.cybercom.net/~dcoffin/dcraw/;
description = "Decoder for many camera raw picture formats";
license = "free";
platforms = stdenv.lib.platforms.allBut "i686-cygwin";
platforms = with stdenv.lib.platforms; allBut cygwin;
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}

2
pkgs/tools/system/acct/default.nix
View file

@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/acct/;
maintainers = [ ];
platforms = stdenv.lib.platforms.allBut "i686-cygwin";
platforms = with stdenv.lib.platforms; allBut cygwin;
};
}

10
pkgs/top-level/release-small.nix
View file

@ -23,7 +23,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
aterm28 = all;
autoconf = all;
automake = all;
avahi = allBut "i686-cygwin"; # Cygwin builds fail
avahi = allBut cygwin; # Cygwin builds fail
bash = all;
bashInteractive = all;
bc = all;
@ -59,7 +59,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
gnumake = all;
gnupatch = all;
gnupg = linux;
gnuplot = allBut "i686-cygwin";
gnuplot = allBut cygwin;
gnused = all;
gnutar = all;
gnutls = linux;
@ -142,7 +142,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
policykit = linux;
portmap = linux;
procps = linux;
python = allBut "i686-cygwin";
python = allBut cygwin;
pythonFull = linux;
readline = all;
rlwrap = all;
@ -152,9 +152,9 @@ with import ./release-lib.nix { inherit supportedSystems; };
scrot = linux;
sdparm = linux;
sharutils = all;
sloccount = allBut "i686-cygwin";
sloccount = allBut cygwin;
smartmontools = all;
sqlite = allBut "i686-cygwin";
sqlite = allBut cygwin;
squid = linux;
ssmtp = linux;
stdenv = prio 175 all;

14
pkgs/top-level/release.nix
View file

@ -53,7 +53,7 @@ let
audacious = linux;
autoconf = all;
automake = all;
avahi = allBut "i686-cygwin"; # Cygwin builds fail
avahi = allBut cygwin; # Cygwin builds fail
bash = all;
bashInteractive = all;
bazaar = linux; # first let sqlite3 work on darwin
@ -133,7 +133,7 @@ let
gnumake = all;
gnupatch = all;
gnupg = linux;
gnuplot = allBut "i686-cygwin";
gnuplot = allBut cygwin;
gnused = all;
gnutar = all;
gnutls = linux;
@ -211,7 +211,7 @@ let
mysql = linux;
mysql51 = linux;
mysql55 = linux;
nano = allBut "i686-cygwin";
nano = allBut cygwin;
ncat = linux;
netcat = all;
nfsUtils = linux;
@ -244,7 +244,7 @@ let
pthreadmanpages = linux;
pygtk = linux;
pyqt4 = linux;
python = allBut "i686-cygwin";
python = allBut cygwin;
pythonFull = linux;
sbcl = linux;
qt3 = linux;
@ -255,7 +255,7 @@ let
rogue = all;
rpm = linux;
rsync = linux;
rubber = allBut "i686-cygwin";
rubber = allBut cygwin;
ruby = all;
rxvt_unicode = linux;
screen = linux ++ darwin;
@ -265,10 +265,10 @@ let
sgtpuzzles = linux;
sharutils = all;
slim = linux;
sloccount = allBut "i686-cygwin";
sloccount = allBut cygwin;
smartmontools = linux;
spidermonkey = linux;
sqlite = allBut "i686-cygwin";
sqlite = allBut cygwin;
squid = linux;
ssmtp = linux;
stdenv = prio 175 all;