From 855e0463abe182e4cb481db8246ae5cd029c1298 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 30 Apr 2018 17:43:54 -0500 Subject: tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linux "platforms.gnu" has been linux-only since at least 17.03: $ nix eval -f channel:nixos-17.03 lib.platforms.gnu [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ] Unlike platforms.linux, platforms.gnu indicates "must use glibc" which for the most part is not intended. Replacing platforms.gnu with platforms.linux would be the same "today" but let's err on preserving existing behavior and be optimistic about platforms these packages work on. --- pkgs/applications/audio/mpg321/default.nix | 2 +- pkgs/applications/graphics/geeqie/default.nix | 2 +- pkgs/applications/graphics/ocrad/default.nix | 2 +- pkgs/applications/graphics/scantailor/advanced.nix | 2 +- pkgs/applications/networking/instant-messengers/bitlbee/default.nix | 2 +- .../networking/instant-messengers/telepathy/logger/default.nix | 2 +- .../networking/instant-messengers/telepathy/salut/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/default.nix | 2 +- pkgs/development/guile-modules/guile-lib/default.nix | 2 +- pkgs/development/guile-modules/guile-ncurses/default.nix | 2 +- pkgs/development/libraries/libchamplain/default.nix | 2 +- pkgs/development/libraries/libchop/default.nix | 2 +- pkgs/development/libraries/vcdimager/default.nix | 2 +- pkgs/tools/graphics/logstalgia/default.nix | 2 +- pkgs/tools/misc/grub/pvgrub_image/default.nix | 2 +- pkgs/tools/misc/grub/trusted.nix | 2 +- pkgs/tools/networking/mailutils/default.nix | 2 +- pkgs/tools/security/gnupg/1.nix | 2 +- pkgs/tools/text/numdiff/default.nix | 2 +- pkgs/tools/video/dvgrab/default.nix | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index ee0ebf234ce..3ffc5265f7a 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://mpg321.sourceforge.net/; license = licenses.gpl2; maintainers = [ maintainers.rycee ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index d034f5d64d9..a1ea88da84b 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = http://geeqie.sourceforge.net; maintainers = with maintainers; [ jfrankenau pSub ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index ac67759c258..d8811791627 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index bea4fe9b2c6..1fb8d572e95 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { description = "Interactive post-processing tool for scanned pages"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jfrankenau ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index fa1c64ba0ad..fa3c66e67b6 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ wkennington pSub ]; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 111970ab711..f1b3c55d14c 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = https://telepathy.freedesktop.org/components/telepathy-logger/; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.gnu; # Arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index e060eaabf28..17cd20c09cb 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Link-local XMPP connection manager for Telepathy"; - platforms = platforms.gnu; # Random choice + platforms = platforms.gnu ++ platforms.linux; # Random choice maintainers = [ maintainers.lethalman ]; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index d1834217724..e15c3588c29 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ viric vrthra ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 95741e07600..35eb4667bd6 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -40,6 +40,6 @@ in stdenv.mkDerivation { homepage = "http://www.nongnu.org/guile-lib/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 152a3488304..8f601858267 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -39,6 +39,6 @@ in stdenv.mkDerivation { homepage = "https://www.gnu.org/software/guile-ncurses/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 74e5bbc952a..418e9cf0b57 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { ''; maintainers = gnome3.maintainers; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 1be3a74fbff..5790672d8e5 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = http://nongnu.org/libchop/; license = licenses.gpl3Plus; maintainers = with maintainers; [ viric ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 48ad33424f6..77956be3b12 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = http://www.gnu.org/software/vcdimager/; description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; - platforms = platforms.gnu; # random choice + platforms = platforms.gnu ++ platforms.linux; # random choice license = licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 0fa99163845..be4cf0f493b 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { a Miscellaneous section. ''; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index ee6e5065f40..df5e3f15e95 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { Xen guests ''; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; }) diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index e57c98bf51b..2bf7e3dcf43 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)"; homepage = https://github.com/Sirrix-AG/TrustedGRUB2; license = licenses.gpl3Plus; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 26bfd27bf9a..4df7f80fff6 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -116,6 +116,6 @@ in stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/mailutils/; # Some of the dependencies fail to build on {cyg,dar}win. - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index fa4555dcafb..9a147caa7e2 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { other applications. A wealth of frontend applications and libraries are available. ''; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 96c91def9ac..4741fecb90c 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/numdiff/; license = licenses.gpl3Plus; maintainers = with maintainers; [ ndowens ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index cec4fc1ce8b..752a6f31432 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = http://kinodv.org/; license = licenses.gpl2Plus; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } -- cgit 1.4.1