From 8838533ec12db36483a6e3aee903075b62b14130 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:28:11 -0500 Subject: [PATCH 01/11] dejagnu: supports darwin --- pkgs/development/tools/misc/dejagnu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 0cb483027c1..b734eadae90 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/dejagnu/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ wkennington vrthra ]; }; } From 85e1f22b98a022fb3a3fb0be15bee6771cd81c25 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:28:42 -0500 Subject: [PATCH 02/11] inetutils: cleanup - supports darwin (only when servers are disabled) - pass SUIDMODE= to avoid setuid - add myself as maintainer --- pkgs/tools/networking/inetutils/default.nix | 23 ++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 04045615a9b..c050758a8ee 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl, help2man }: +{ stdenv, lib, fetchurl, ncurses, perl, help2man }: stdenv.mkDerivation rec { name = "inetutils-1.9.4"; @@ -16,25 +16,20 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ]; configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd + ++ lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd "--disable-rcp" "--disable-rsh" "--disable-rlogin" "--disable-rexec" - ]; + ] ++ lib.optional stdenv.isDarwin "--disable-servers"; # Test fails with "UNIX socket name too long", probably because our # $TMPDIR is too long. - #doCheck = true; + doCheck = false; + installFlags = [ "SUIDMODE=" ]; - postInstall = '' - # XXX: These programs are normally installed setuid but since it - # fails, they end up being non-executable, hence this hack. - chmod +x $out/bin/{ping,ping6,${stdenv.lib.optionalString (!stdenv.hostPlatform.isMusl) ''rcp,rlogin,rsh,''}traceroute} - ''; - - meta = { + meta = with lib; { description = "Collection of common network programs"; longDescription = @@ -45,9 +40,9 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/inetutils/; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.unix; }; } From e1bc2fbfdd18ae04343ebe50f736d2601e751b8e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:44:14 -0500 Subject: [PATCH 03/11] moe: supports darwin --- pkgs/applications/editors/moe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index 751b78ab674..764877a11cb 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/moe/; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } # TODO: a configurable, global moerc file From 426a9acf1e266308b05975694d2125381b27ae94 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 22:54:42 -0500 Subject: [PATCH 04/11] dirmngr: supports darwin --- pkgs/tools/security/dirmngr/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix index bd94c6786d7..888fa48eab9 100644 --- a/pkgs/tools/security/dirmngr/default.nix +++ b/pkgs/tools/security/dirmngr/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap }: +{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap +, libiconv}: stdenv.mkDerivation rec { name = "dirmngr-1.1.1"; @@ -6,9 +7,10 @@ stdenv.mkDerivation rec { url = "mirror://gnupg/dirmngr/${name}.tar.bz2"; sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j"; }; - buildInputs = [ libgpgerror libgcrypt libassuan libksba pth openldap ]; + buildInputs = [ libgpgerror libgcrypt libassuan libksba + pth openldap libiconv ]; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 884babe32431ba40e9aa1d7160bc42daaf926f13 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:07:57 -0500 Subject: [PATCH 05/11] ballandpaddle: supports darwin --- pkgs/games/ball-and-paddle/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index 4a7eb9376da..dbd2814a6fb 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; - # The fancy libs aren't available on {Cyg,Dar}win. - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From d424d34bf7faa42277e9ec506647e25128d54eaf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:15:33 -0500 Subject: [PATCH 06/11] jwhois: supports darwin - also set license to gpl3 --- pkgs/tools/networking/jwhois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index cd0821ef9ef..be8e9e210d1 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = http://www.gnu.org/software/jwhois/; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } From 262fdca5e90eb7fb8d0ca994b834a401dada0acf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:16:14 -0500 Subject: [PATCH 07/11] gcal: supports darwin --- pkgs/applications/misc/gcal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 67bb5feff8c..f3f7fe2aacb 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.gnu.org/software/gcal/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; }; } From 7cbf40808631996d5fca0785026c31e09e4413b1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:30:42 -0500 Subject: [PATCH 08/11] vcdimager: supports darwin --- pkgs/development/libraries/vcdimager/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 77956be3b12..ddecf4a96a7 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt }: +{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt +, libiconv, darwin }: stdenv.mkDerivation rec { name = "vcdimager-2.0.1"; @@ -10,14 +11,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 popt ]; + buildInputs = [ libxml2 popt libiconv ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]); propagatedBuildInputs = [ libcdio ]; 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 ++ platforms.linux; # random choice + platforms = platforms.unix; license = licenses.gpl2; }; } From ccaebf04c15ce3b0c8f054d2e48826c68e7cbee0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 30 Apr 2018 23:33:49 -0500 Subject: [PATCH 09/11] ocrad: supports darwin --- pkgs/applications/graphics/ocrad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index d8811791627..2ff62cc9eef 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 ++ platforms.linux; # arbitrary choice + platforms = platforms.unix; }; } From 1beb4236a21f2e9e7adcad1aa97191a4420295da Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 00:07:39 -0500 Subject: [PATCH 10/11] gpa: supports darwin --- pkgs/applications/misc/gpa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index ef805a31567..149092c70d3 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Graphical user interface for the GnuPG"; homepage = https://www.gnupg.org/related_software/gpa/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 57a4db244995c9852cf5a202bd7540a5c1e7c410 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 1 May 2018 00:45:05 -0500 Subject: [PATCH 11/11] pspp: supports darwin --- pkgs/applications/science/math/pspp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index 486a2e69d26..957a4cf6421 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { more traditional syntax commands. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; }