ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 02:44:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36985 from obsidiansystems/no-allBut

Browse Source 
treewide: get rid of platforms.allBut
This commit is contained in:
John Ericson 2018-03-14 18:57:28 -04:00 committed by GitHub
commit 2e87550ace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/systems/doubles.nix
View File

@ -24,10 +24,11 @@ let
in rec {
inherit all;
allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
none = [];
arm = filterDoubles predicates.isArm;
aarch64 = filterDoubles predicates.isAarch64;
x86 = filterDoubles predicates.isx86;
i686 = filterDoubles predicates.isi686;
mips = filterDoubles predicates.isMips;
x86_64 = filterDoubles predicates.isx86_64;

4
pkgs/applications/graphics/ahoviewer/default.nix
View File

@ -37,7 +37,9 @@ stdenv.mkDerivation rec {
description = "A GTK2 image viewer, manga reader, and booru browser";
maintainers = with maintainers; [ skrzyp xzfc ];
license = licenses.mit;
platforms = platforms.allBut [ "darwin" "cygwin" ];
# Unintentionally not working on Darwin:
# https://github.com/ahodesuka/ahoviewer/issues/62
platforms = platforms.linux;
};
}

2
pkgs/applications/window-managers/i3/lock-color.nix
View File

@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
# Needs the SSE2 instruction set. See upstream issue
# https://github.com/chrjguill/i3lock-color/issues/44
platforms = platforms.i686 ++ platforms.x86_64;
platforms = platforms.x86;
};
}

2
pkgs/data/icons/numix-icon-theme-square/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
description = "Numix icon theme (square version)";
homepage = https://numixproject.org;
license = licenses.gpl3;
platforms = with platforms; allBut darwin;
platforms = platforms.linux; # Maybe other non-darwin Unix
maintainers = with maintainers; [ romildo ];
};
}

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

@ -63,7 +63,7 @@ stdenv.mkDerivation {
homepage = http://www.call-cc.org/;
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
platforms = with stdenv.lib.platforms; allBut darwin;
platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
description = "A portable compiler for the Scheme programming language";
longDescription = ''
CHICKEN is a compiler for the Scheme programming language.

2
pkgs/development/compilers/mono/generic.nix
View File

@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://mono-project.com/;
description = "Cross platform, open source .NET development framework";
platforms = with stdenv.lib.platforms; allBut [ "aarch64-linux" ];
platforms = stdenv.lib.platforms.x86;
maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ];
license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
};

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 = with stdenv.lib.platforms; allBut cygwin;
platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
maintainers = [ stdenv.lib.maintainers.peti ];
};
}

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

@ -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
};
}

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

@ -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
};
}

2
pkgs/development/libraries/cloog/0.18.0.nix
View File

@ -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
};
}

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

@ -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
};
}

2
pkgs/development/libraries/rocksdb/default.nix
View File

@ -77,7 +77,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 ];
};
}

2
pkgs/development/tools/rtags/default.nix
View File

@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
description = "C/C++ client-server indexer based on clang";
homepage = https://github.com/andersbakken/rtags;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.allBut [ "i686-linux" ];
platforms = with stdenv.lib.platforms; x86_64 ++ aarch64;
};
}

2
pkgs/games/endless-sky/default.nix
View File

@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain
];
maintainers = with maintainers; [ lheckemann ];
platforms = with platforms; allBut darwin;
platforms = platforms.linux; # Maybe other non-darwin Unix
};
}

2
pkgs/misc/screensavers/alock/default.nix
View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
xscreensaver and never will. It's just for locking the current
X session.
'';
platforms = with platforms; allBut cygwin;
platforms = platforms.unix; # Cygwin had problems at one point
maintainers = with maintainers; [ ftrvxmtrx chris-martin ];
};
}

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

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
homepage = https://www.jwz.org/xscreensaver/;
description = "A set of screensavers";
maintainers = with stdenv.lib.maintainers; [ raskin ];
platforms = with stdenv.lib.platforms; allBut cygwin;
platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
inherit version;
downloadPage = "https://www.jwz.org/xscreensaver/download.html";
updateWalker = true;

2
pkgs/tools/graphics/barcode/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "GNU barcode generator";
maintainers = with maintainers; [ raskin ];
platforms = with platforms; allBut darwin;
platforms = platforms.linux; # Maybe other non-darwin Unix
downloadPage = "http://ftp.gnu.org/gnu/barcode/";
updateWalker = true;
homepage = http://ftp.gnu.org/gnu/barcode/;

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 = stdenv.lib.licenses.free;
platforms = with stdenv.lib.platforms; allBut cygwin;
platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
maintainers = [ ];
};
}

2
pkgs/tools/misc/mbuffer/default.nix
View File

@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
description = "A tool for buffering data streams with a large set of unique features";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ tokudan ];
platforms = with stdenv.lib.platforms; allBut darwin;
platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
};
}

2
pkgs/tools/networking/dnscrypt-proxy/default.nix
View File

@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
license = licenses.isc;
maintainers = with maintainers; [ joachifm jgeerds ];
# upstream claims OSX support, but Hydra fails
platforms = with platforms; allBut darwin;
platforms = platforms.linux; # Maybe other non-darwin Unix
};
}

2
pkgs/tools/networking/zerotierone/default.nix
View File

@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
homepage = https://www.zerotier.com;
license = licenses.gpl3;
maintainers = with maintainers; [ sjmackenzie zimbatm ehmry ];
platforms = platforms.allBut [ "i686-linux" ];
platforms = platforms.x86_64 ++ platforms.aarch64;
};
}

2
pkgs/top-level/python-packages.nix
View File

@ -13322,7 +13322,7 @@ in {
homepage = https://pypi.python.org/pypi/PyICU/;
description = "Python extension wrapping the ICU C++ API";
license = licenses.mit;
platforms = with platforms; allBut darwin;
platforms = platforms.linux; # Maybe other non-darwin Unix
maintainers = [ maintainers.rycee ];
};
};

2
pkgs/top-level/release-lib.nix
View File

@ -108,7 +108,7 @@ rec {
/* Common platform groups on which to test packages. */
inherit (platforms) unix linux darwin cygwin allBut all mesaPlatforms;
inherit (platforms) unix linux darwin cygwin all mesaPlatforms;
/* Platform groups for specific kinds of applications. */
x11Supported = linux;

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

@ -21,7 +21,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
atlas = linux;
autoconf = all;
automake = all;
avahi = allBut cygwin; # Cygwin builds fail
avahi = unix; # Cygwin builds fail
bash = all;
bashInteractive = all;
bc = all;
@ -54,7 +54,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
gnumake = all;
gnupatch = all;
gnupg = linux;
gnuplot = allBut cygwin;
gnuplot = unix; # Cygwin builds fail
gnused = all;
gnutar = all;
gnutls = linux;
@ -128,7 +128,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
pkgconfig = all;
pmccabe = linux;
procps = linux;
python = allBut cygwin;
python = unix; # Cygwin builds fail
readline = all;
rlwrap = all;
rpm = linux;
@ -138,9 +138,9 @@ with import ./release-lib.nix { inherit supportedSystems; };
scrot = linux;
sdparm = linux;
sharutils = all;
sloccount = allBut cygwin;
sloccount = unix; # Cygwin builds fail
smartmontools = all;
sqlite = allBut cygwin;
sqlite = unix; # Cygwin builds fail
squid = linux;
ssmtp = linux;
stdenv = all;