From 7a4f83fc9dfcb55e2e2570410260b0ed8f848a36 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 21:39:35 +0700 Subject: [PATCH 01/17] csa: expand platforms to unix --- pkgs/applications/audio/csa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/applications/audio/csa/default.nix index 5121f6d616b2..0f7ad460a8c6 100644 --- a/pkgs/applications/audio/csa/default.nix +++ b/pkgs/applications/audio/csa/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From a903fedd90d7ceca1412c68959e54a793011e0ca Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 21:45:09 +0700 Subject: [PATCH 02/17] ceptre: expand platforms to unix --- pkgs/development/interpreters/ceptre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index a9b8f54ab877..c3fa6a645e07 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { description = "A linear logic programming language for modeling generative interactive systems"; homepage = "https://github.com/chrisamaphone/interactive-lp"; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } From dc2e30b7afc4b2b17dac26a68cd7f890e1a9fbec Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 21:48:12 +0700 Subject: [PATCH 03/17] duktape: fix darwin build --- pkgs/development/interpreters/duktape/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index f864f5bf6f9e..360666d898af 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "19szwxzvl2g65fw95ggvb8h0ma5bd9vvnnccn59hwnc4dida1x4n"; }; + postPatch = '' + substituteInPlace Makefile.sharedlibrary \ + --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \ + --replace 'g++' '${stdenv.cc.targetPrefix}c++' + substituteInPlace Makefile.cmdline \ + --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \ + --replace 'g++' '${stdenv.cc.targetPrefix}c++' + ''; buildPhase = '' make -f Makefile.sharedlibrary make -f Makefile.cmdline @@ -27,6 +35,6 @@ stdenv.mkDerivation rec { downloadPage = "https://duktape.org/download.html"; license = licenses.mit; maintainers = [ maintainers.fgaz ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From ed7f2582bf6618fd64fae9f18822d0de586f70ad Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 21:53:38 +0700 Subject: [PATCH 04/17] brigand: expand platforms to all --- pkgs/development/libraries/brigand/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix index eb46ccc8cd7c..3c0778de1d30 100644 --- a/pkgs/development/libraries/brigand/default.nix +++ b/pkgs/development/libraries/brigand/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = "https://github.com/edouarda/brigand"; license = licenses.boost; maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From b8b075a9e6f7e1a78797cb7f76d27712329d38e7 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 21:54:00 +0700 Subject: [PATCH 05/17] backward-cpp: expand platforms to all --- pkgs/development/libraries/backward-cpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix index af727e394d16..03f49c3ee504 100644 --- a/pkgs/development/libraries/backward-cpp/default.nix +++ b/pkgs/development/libraries/backward-cpp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Beautiful stack trace pretty printer for C++"; homepage = "https://github.com/bombela/backward-cpp"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ cstrahan ]; }; } From 10e7da1041b5eb09b1c14d37fd66741e26ab7c82 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 21:56:33 +0700 Subject: [PATCH 06/17] ethash: expand platforms to unix --- pkgs/development/libraries/ethash/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index 0a10fa3c48c1..2c9eb3ca4444 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; homepage = "https://github.com/ethereum/ethash"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ nand0p ]; license = licenses.asl20; }; From 23d7ea3d2a44e4335fcdf483a2a390a97114e2cd Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 21:57:56 +0700 Subject: [PATCH 07/17] gensio: expand platforms to unix --- pkgs/development/libraries/gensio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 4efc713bb1d7..aef412468a95 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/ser2net/"; license = licenses.gpl2; maintainers = with maintainers; [ emantor ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } From 9ddb9054a2b370c4eeedc76e4c3c6c6eb193b219 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 21:59:54 +0700 Subject: [PATCH 08/17] rman: fix darwin build --- pkgs/development/tools/misc/rman/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix index 1f7de915c974..bf71b619e5aa 100644 --- a/pkgs/development/tools/misc/rman/default.nix +++ b/pkgs/development/tools/misc/rman/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace Makefile \ - --replace ginstall install + --replace ginstall install \ + --replace gcc '${stdenv.cc.targetPrefix}cc' ''; makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/share/man" ]; @@ -27,6 +28,6 @@ stdenv.mkDerivation { meta = { description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats"; license = "artistic"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } From a95cfe1b82c136d36c7a8c6d63943421943b5449 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 22:12:29 +0700 Subject: [PATCH 09/17] wipe: expand platforms to all --- pkgs/tools/security/wipe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/tools/security/wipe/default.nix index 2c3c9376f67b..5b0f079e5a60 100644 --- a/pkgs/tools/security/wipe/default.nix +++ b/pkgs/tools/security/wipe/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Secure file wiping utility"; homepage = "http://wipe.sourceforge.net/"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.abbradar ]; }; } From 9836213f73eeab3851a9c762ccbffeb7bc134df5 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 22:15:04 +0700 Subject: [PATCH 10/17] hashcat-utils: expand platforms to unix --- pkgs/tools/security/hashcat-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/hashcat-utils/default.nix b/pkgs/tools/security/hashcat-utils/default.nix index 8b91a53db013..ccd6230b06f2 100644 --- a/pkgs/tools/security/hashcat-utils/default.nix +++ b/pkgs/tools/security/hashcat-utils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Small utilities that are useful in advanced password cracking"; homepage = "https://github.com/hashcat/hashcat-utils"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ fadenb ]; }; } From 6d567e072e8f1816caeaac6bb6610989e8353a9a Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 22:39:29 +0700 Subject: [PATCH 11/17] lyra: expand platforms to unix --- pkgs/development/libraries/lyra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix index 9f5fd1d3a342..ed02af56f784 100644 --- a/pkgs/development/libraries/lyra/default.nix +++ b/pkgs/development/libraries/lyra/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/bfgroup/Lyra"; description = "A simple to use, composable, command line parser for C++ 11 and beyond"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.boost; maintainers = with maintainers; [ davidtwco ]; }; From 8529cfe268319a56801f3c69f704d57ec2b03f49 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 22:39:44 +0700 Subject: [PATCH 12/17] openpa: expand platforms to unix --- pkgs/development/libraries/openpa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix index bc8efdc857eb..23f025e2aa63 100644 --- a/pkgs/development/libraries/openpa/default.nix +++ b/pkgs/development/libraries/openpa/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://trac.mpich.org/projects/openpa"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ leenaars ]; - platforms = with lib.platforms; linux; + platforms = lib.platforms.unix; longDescription = '' OPA (or sometimes OpenPA or Open Portable Atomics) is an open source library intended to provide a consistent C API for performing From 9ed137b640625fbc715be9c19ec9320cdd513e42 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 22:48:42 +0700 Subject: [PATCH 13/17] croaring: expand platforms to all --- pkgs/development/libraries/croaring/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/croaring/default.nix b/pkgs/development/libraries/croaring/default.nix index b9c293edfb81..5c1afcbf1365 100644 --- a/pkgs/development/libraries/croaring/default.nix +++ b/pkgs/development/libraries/croaring/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "http://roaringbitmap.org/"; license = licenses.asl20; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From 06f3076639a85720976822808a47e1f1a0770134 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 22:54:25 +0700 Subject: [PATCH 14/17] cminpack: fix darwin build --- pkgs/development/libraries/cminpack/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index 39d4849f3801..10d068604369 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -8,8 +8,12 @@ stdenv.mkDerivation rec { sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw"; }; - patchPhase = '' - sed -i s,/usr/local,$out, Makefile + postPatch = '' + substituteInPlace Makefile \ + --replace '/usr/local' '${placeholder "out"}' \ + --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \ + --replace 'ranlib -t' '${stdenv.cc.targetPrefix}ranlib' \ + --replace 'ranlib' '${stdenv.cc.targetPrefix}ranlib' ''; preInstall = '' @@ -20,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html"; license = lib.licenses.bsd3; description = "Software for solving nonlinear equations and nonlinear least squares problems"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } From 8bd1dd33d195a92af22b2e6b8595fb712a40b230 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 22:59:32 +0700 Subject: [PATCH 15/17] uptimed: expand platforms to unix --- pkgs/tools/system/uptimed/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index 0e427a66b261..a703feb48db0 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/rpodgorny/uptimed/"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 30350ec028f41b35a309cad5c0a55e92a80adb92 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 23:14:33 +0700 Subject: [PATCH 16/17] ripemime: fix darwin build --- pkgs/tools/networking/ripmime/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index d40c1d10aa7c..0dfeb900c9a8 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { pname = "ripmime"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9"; }; + buildInputs = [ libiconv ]; preInstall = '' sed -i Makefile -e "s@LOCATION=.*@LOCATION=$out@" -e "s@man/man1@share/&@" mkdir -p "$out/bin" "$out/share/man/man1" @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { description = "Attachment extractor for MIME messages"; maintainers = with maintainers; [ raskin ]; homepage = "http://www.pldaniels.com/ripmime/"; - platforms = platforms.linux; + platforms = platforms.all; }; passthru = { From 0be95fbe46b23fc790e6db9c5f4e188ef8926c3a Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 8 Mar 2021 23:23:18 +0700 Subject: [PATCH 17/17] jikespg: fix darwin build --- .../tools/parsing/jikespg/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix index 34e628866838..8179855e6ebc 100644 --- a/pkgs/development/tools/parsing/jikespg/default.nix +++ b/pkgs/development/tools/parsing/jikespg/default.nix @@ -1,25 +1,28 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jikespg-1.3"; + pname = "jikespg"; + version = "1.3"; src = fetchurl { - url = "mirror://sourceforge/jikes/${name}.tar.gz"; + url = "mirror://sourceforge/jikes/${pname}-${version}.tar.gz"; sha256 = "083ibfxaiw1abxmv1crccx1g6sixkbyhxn2hsrlf6fwii08s6rgw"; }; + postPatch = '' + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" + ''; + sourceRoot = "jikespg/src"; - installPhase = - '' - mkdir -p $out/bin - cp jikespg $out/bin - ''; + installPhase = '' + install -Dm755 -t $out/bin jikespg + ''; meta = with lib; { homepage = "http://jikes.sourceforge.net/"; description = "The Jikes Parser Generator"; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.ipl10; maintainers = with maintainers; [ pSub ]; };