From b370464c269702a2d7a3a23ee671053af5c4018f Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 17:56:48 +0700 Subject: [PATCH 01/17] lambda-mod-zsh-theme: expand platforms to all --- pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index d9a846c9e06f..e8d00d73d1aa 100644 --- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals"; homepage = "https://github.com/halfo/lambda-mod-zsh-theme/"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ ma27 ]; }; } From 14f6fef684b47b8e9f4bbcff7f58072246283456 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 17:57:05 +0700 Subject: [PATCH 02/17] makefile2graph: expand platforms to all --- pkgs/development/tools/analysis/makefile2graph/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix index 66f767f47028..1f9e2ba3c562 100644 --- a/pkgs/development/tools/analysis/makefile2graph/default.nix +++ b/pkgs/development/tools/analysis/makefile2graph/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file"; maintainers = with maintainers; [ cmcdragonkai ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; }; } From 45e990022e7992f506a8128d8e1afdbaabff07e1 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 17:57:18 +0700 Subject: [PATCH 03/17] menmonicode: expand platforms to all --- pkgs/misc/mnemonicode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/misc/mnemonicode/default.nix index ec0dd0b1fd52..352dd038fb5a 100644 --- a/pkgs/misc/mnemonicode/default.nix +++ b/pkgs/misc/mnemonicode/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { back to data on the other side. ''; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.cstrahan ]; }; } From 1030d6406f4d12afb564012b8b049271d0d33ebb Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 17:57:40 +0700 Subject: [PATCH 04/17] postsrsd: expand platforms to all --- pkgs/servers/mail/postsrsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix index 2ba07ee5739e..b61332be2432 100644 --- a/pkgs/servers/mail/postsrsd/default.nix +++ b/pkgs/servers/mail/postsrsd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/roehling/postsrsd"; description = "Postfix Sender Rewriting Scheme daemon"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; }; } From 29f5f8a98b78c19dbbf8b8dd205a589ec36a61c8 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 17:58:01 +0700 Subject: [PATCH 05/17] tinyobjloader: expand platforms to all --- pkgs/development/libraries/tinyobjloader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/development/libraries/tinyobjloader/default.nix index c7939a6be255..ad4a999e45cd 100644 --- a/pkgs/development/libraries/tinyobjloader/default.nix +++ b/pkgs/development/libraries/tinyobjloader/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Tiny but powerful single file wavefront obj loader"; license = licenses.mit; maintainers = [ maintainers.ivar ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From ad09618b6cf933981d9f0726c0290452361e7b54 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 17:58:22 +0700 Subject: [PATCH 06/17] r2mod_cli: expand platforms to unix --- pkgs/games/r2mod_cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index a966731725d3..f45dd3948626 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/foldex/r2mod_cli"; license = licenses.gpl3Only; maintainers = [ maintainers.reedrw ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From d2005bd29cefc9d7026674c6711d5c36891e8146 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 17:58:37 +0700 Subject: [PATCH 07/17] restya-board: expand platforms to unix --- pkgs/servers/web-apps/restya-board/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix index 934ef81ac90e..e260702d5759 100644 --- a/pkgs/servers/web-apps/restya-board/default.nix +++ b/pkgs/servers/web-apps/restya-board/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { license = licenses.osl3; homepage = "https://restya.com"; maintainers = with maintainers; [ tstrobel ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 843e7004204aeef460753190331f01ae70995009 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 17:58:56 +0700 Subject: [PATCH 08/17] rocm-cmake: expand platforms to unix --- pkgs/development/tools/build-managers/rocm-cmake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 5b9a456ce75f..9ef0cfe10e7a 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From f1e0c9f6d591791d9a24c8bccc9c1a65c4461b27 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 17:59:13 +0700 Subject: [PATCH 09/17] swarm: expand platforms to unix --- pkgs/development/tools/analysis/swarm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index 894d9a2357ea..e4ebb85f27f4 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { description = "Verification script generator for Spin"; homepage = "http://spinroot.com/"; license = licenses.free; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; } From 5c5dd904295b4fc58b9773281b5744997bc427b7 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 17:59:41 +0700 Subject: [PATCH 10/17] tllist: expand platforms to all --- pkgs/development/libraries/tllist/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tllist/default.nix b/pkgs/development/libraries/tllist/default.nix index 11e61e93a0c1..c84973919990 100644 --- a/pkgs/development/libraries/tllist/default.nix +++ b/pkgs/development/libraries/tllist/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ fionera AndersonTorres ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } From 03ec81f41fde1b3ce989b0fcbfceed2bf5cc4c0c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 17:59:53 +0700 Subject: [PATCH 11/17] updt: expand platforms to all --- pkgs/servers/udpt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index b681727c08f9..3eb51b68b8cd 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "A lightweight UDP torrent tracker"; homepage = "https://naim94a.github.io/udpt"; license = lib.licenses.gpl3; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ makefu ]; }; } From af96ff1194c17e58c9bc9b672b895c066bedf0be Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 18:00:13 +0700 Subject: [PATCH 12/17] utf8cpp: expand platforms to all --- pkgs/development/libraries/utf8cpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index e627b97849a0..30129992c73d 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "UTF-8 with C++ in a Portable Way"; license = licenses.free; maintainers = with maintainers; [ jobojeha ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From 88ff5e40ea534d038bf8c125e528262811586bb4 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 18:00:27 +0700 Subject: [PATCH 13/17] vcg: expand platforms to all --- pkgs/development/libraries/vcg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index 380f533fe6f7..d8c83bf54a8a 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "http://vcg.isti.cnr.it/vcglib/install.html"; description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; }; } From 1a3b74cf751489d7780f4b8a80e300cf7923c935 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 18:48:59 +0700 Subject: [PATCH 14/17] p910nd: fix darwin build --- pkgs/servers/p910nd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix index e5e4df1a292b..9cd06a3ebc6c 100644 --- a/pkgs/servers/p910nd/default.nix +++ b/pkgs/servers/p910nd/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; postPatch = '' - sed -e "s|/usr||g" -i Makefile + substituteInPlace Makefile --replace "/usr" "" + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" ''; makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" ]; @@ -39,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "http://p910nd.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/p910nd/"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } From da14f782bf0e9ee1ff61894d1047ec71bf3f94d0 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 18:52:55 +0700 Subject: [PATCH 15/17] analog: fix darwin build --- pkgs/tools/admin/analog/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index 68046be2eeea..d85e5365d63a 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -11,10 +11,11 @@ stdenv.mkDerivation rec { sha256 = "15hi8kfknldwpvm885r9s7zd5h7cirs7x0zazx2nnz62xvz3iymk"; }; - configurePhase = '' + postPatch = '' sed -i src/anlghead.h \ -e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \ -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/$pname}/lang/\"|g" + substituteInPlace src/Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" ''; installPhase = '' @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; maintainers = [ lib.maintainers.peti ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } From e79822050cb5b0f33333e13f4ccf1a31ec22fcb0 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 19:00:33 +0700 Subject: [PATCH 16/17] midicsv: fix darwin build --- pkgs/tools/audio/midicsv/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/midicsv/default.nix b/pkgs/tools/audio/midicsv/default.nix index f02f6ed956d6..cf55e0dd81d5 100644 --- a/pkgs/tools/audio/midicsv/default.nix +++ b/pkgs/tools/audio/midicsv/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { }; postPatch = '' - substituteInPlace Makefile --replace /usr/local $out + substituteInPlace Makefile \ + --replace /usr/local $out \ + --replace gcc "${stdenv.cc.targetPrefix}cc" ''; meta = with lib; { @@ -17,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://www.fourmilab.ch/webtools/midicsv/"; license = licenses.publicDomain; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From 593629b7a931bfb481291d13c167408beaaedb25 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 10 Mar 2021 19:04:25 +0700 Subject: [PATCH 17/17] routinator: fix darwin build --- pkgs/servers/routinator/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index f1e705b0693e..4d326c0bd621 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "routinator"; @@ -11,6 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE="; }; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "sha256-lhSSyJxxHc0t43xoDMtr/lSVL0xZl6poPYiyYXNvKKQ="; meta = with lib; { @@ -18,6 +19,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/NLnetLabs/routinator"; license = licenses.bsd3; maintainers = with maintainers; [ _0x4A6F ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26f4e09cceab..2a03eebb65f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2887,7 +2887,9 @@ in roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { }); - routinator = callPackage ../servers/routinator { }; + routinator = callPackage ../servers/routinator { + inherit (darwin.apple_sdk.frameworks) Security; + }; rsbep = callPackage ../tools/backup/rsbep { };