From 7db50540230a09982938ee86de5f3a9cd6f09e41 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:20:00 -0500 Subject: [PATCH 001/129] age: fix build on darwin --- pkgs/tools/security/age/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index bde597ba9f3..0448faf53b7 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "age"; @@ -18,7 +18,9 @@ buildGoModule rec { sha256 = "1n1ww8yjw0mg00dvnfmggww9kwp1hls0a85iv6vx9k89mzv8mdrq"; }; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { homepage = "https://age-encryption.org/"; description = "Modern encryption tool with small explicit keys"; license = licenses.bsd3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 014bb3e0b9a..b5d1934dbb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2614,7 +2614,9 @@ in caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; }; - age = callPackage ../tools/security/age { }; + age = callPackage ../tools/security/age { + inherit (darwin.apple_sdk.frameworks) Security; + }; brotli = callPackage ../tools/compression/brotli { }; From 7449323baf9d2fb97f4248c27a4975d3a494122d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:21:00 -0500 Subject: [PATCH 002/129] aerc: fix build on darwin --- pkgs/applications/networking/mailreaders/aerc/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 7b24ed93406..e0f98208e7a 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoModule, fetchurl , go, ncurses, notmuch, scdoc -, python3, perl, w3m, dante +, python3, perl, w3m, dante, Security }: let @@ -29,7 +29,8 @@ in buildGoModule rec { python3.pkgs.colorama ]; - buildInputs = [ python3 notmuch ]; + buildInputs = [ python3 notmuch ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; GOFLAGS="-tags=notmuch"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5d1934dbb9..6d3b03780dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -553,7 +553,9 @@ in wxGTK = wxGTK30; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { }; + aerc = callPackage ../applications/networking/mailreaders/aerc { + inherit (darwin.apple_sdk.frameworks) Security; + }; aerospike = callPackage ../servers/nosql/aerospike { }; From 7e03d4416bd9d8119db5ce4db95b155fd40d6587 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:22:00 -0500 Subject: [PATCH 003/129] act: fix build on darwin --- pkgs/development/tools/misc/act/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index de1cf939e6a..17ff15265f2 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "act"; @@ -11,11 +11,13 @@ buildGoModule rec { sha256 = "0l7id483006mnii4rlcff4p0ricd8a2n24sf74a9b387x0akpbsn"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "04s4p9j6j7gw1s4v271zwzvdny7dvjaazd2pihmyjfik95xmwx9r"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Run your GitHub Actions locally"; homepage = "https://github.com/nektos/act"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3b03780dd..6714819683c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -528,7 +528,9 @@ in acpica-tools = callPackage ../tools/system/acpica-tools { }; - act = callPackage ../development/tools/misc/act {}; + act = callPackage ../development/tools/misc/act { + inherit (darwin.apple_sdk.frameworks) Security; + }; actdiag = with python3.pkgs; toPythonApplication actdiag; From 976a9ea16b883424cb31cc5b4d612def1da22cbd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:23:00 -0500 Subject: [PATCH 004/129] go-tools: fix build on darwin --- pkgs/development/tools/go-tools/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 1fd17060bd4..b047689b81f 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -1,6 +1,7 @@ { buildGoModule -, lib +, stdenv , fetchFromGitHub +, Security }: buildGoModule rec { @@ -16,9 +17,11 @@ buildGoModule rec { sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p"; - meta = with lib; { + meta = with stdenv.lib; { description = "A collection of tools and libraries for working with Go code, including linters and static analysis"; homepage = https://staticcheck.io; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6714819683c..fb882847250 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17136,7 +17136,9 @@ in govendor = callPackage ../development/tools/govendor { }; - go-tools = callPackage ../development/tools/go-tools { }; + go-tools = callPackage ../development/tools/go-tools { + inherit (darwin.apple_sdk.frameworks) Security; + }; gotools = callPackage ../development/tools/gotools { }; From 4ca044eafc4a1ec888283ec55e6b6d167494506e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:24:00 -0500 Subject: [PATCH 005/129] archiver: fix build on darwin --- pkgs/applications/misc/archiver/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 64b592b7871..8c79d867c83 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -1,6 +1,7 @@ { buildGoModule , fetchFromGitHub -, lib +, stdenv +, Security }: buildGoModule rec { @@ -16,7 +17,9 @@ buildGoModule rec { modSha256 = "1mrfqhd0zb78rlqlj2ncb0srwjfl7rzhy2p9mwa82pgysvlp08gv"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Easily create & extract archives, and compress & decompress files of various formats"; homepage = "https://github.com/mholt/archiver"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb882847250..c0a2a7c4b42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -191,7 +191,9 @@ in dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; - archiver = callPackage ../applications/misc/archiver { }; + archiver = callPackage ../applications/misc/archiver { + inherit (darwin.apple_sdk.frameworks) Security; + }; digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; From 64b130dd88c925fd54102c0df83de74a26bcdbe3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:25:00 -0500 Subject: [PATCH 006/129] argo: fix build on darwin --- pkgs/applications/networking/cluster/argo/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index f02b64e92c8..25fb33399c0 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, buildGoPackage, fetchFromGitHub, Security }: let # Argo can package a static server in the CLI using the `staticfiles` go module. @@ -32,6 +32,8 @@ buildGoModule rec { subPackages = [ "cmd/argo" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + preBuild = '' mkdir -p ui/dist/app echo "Built without static files" > ui/dist/app/index.html @@ -39,7 +41,7 @@ buildGoModule rec { ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Container native workflow engine for Kubernetes"; homepage = https://github.com/argoproj/argo; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0a2a7c4b42..043adc4a1bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18385,7 +18385,9 @@ in arelle = with python3Packages; toPythonApplication arelle; - argo = callPackage ../applications/networking/cluster/argo { }; + argo = callPackage ../applications/networking/cluster/argo { + inherit (darwin.apple_sdk.frameworks) Security; + }; argocd = callPackage ../applications/networking/cluster/argocd { }; From a963023e7b13ef06ea15d5be021bfd53f6b41de1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:26:00 -0500 Subject: [PATCH 007/129] atlantis: fix build on darwin --- pkgs/applications/networking/cluster/atlantis/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index cb846060a3d..ce3a1730ae5 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "atlantis"; @@ -15,6 +15,8 @@ buildGoModule rec { subPackages = [ "." ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { homepage = "https://github.com/runatlantis/atlantis"; description = "Terraform Pull Request Automation"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 043adc4a1bc..15ec1e2fe91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24960,7 +24960,9 @@ in ataripp = callPackage ../misc/emulators/atari++ { }; - atlantis = callPackage ../applications/networking/cluster/atlantis { }; + atlantis = callPackage ../applications/networking/cluster/atlantis { + inherit (darwin.apple_sdk.frameworks) Security; + }; auctex = callPackage ../tools/typesetting/tex/auctex { }; From 6f95d105e04ebc5b5c4972c6d4d8d140ba6ae5c5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:27:00 -0500 Subject: [PATCH 008/129] exercism: fix build on darwin --- pkgs/applications/misc/exercism/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index a071761599a..81c2d978299 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "exercism"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0pg0hxrr6jjd03wbjn5y65x02md3h352mnm1gr6vyiv7hn4ws14m"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "./exercism" ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15ec1e2fe91..135eebed8ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19129,7 +19129,9 @@ in evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); - exercism = callPackage ../applications/misc/exercism { }; + exercism = callPackage ../applications/misc/exercism { + inherit (darwin.apple_sdk.frameworks) Security; + }; go-motion = callPackage ../development/tools/go-motion { }; From acac27bbefd2918623d9d1a04e18ec5d8eb02689 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:28:00 -0500 Subject: [PATCH 009/129] ctop: fix build on darwin --- pkgs/tools/system/ctop/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 4f492def162..b9ea0c04aa8 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "ctop"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "0wxv6yzlgki7047qszx9p9xpph95bg097jkgaa0b3wbpx8vg7qml"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Top-like interface for container metrics"; homepage = "https://ctop.sh/"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 135eebed8ab..28de31d76d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18785,7 +18785,9 @@ in csdp = callPackage ../applications/science/math/csdp { }; - ctop = callPackage ../tools/system/ctop { }; + ctop = callPackage ../tools/system/ctop { + inherit (darwin.apple_sdk.frameworks) Security; + }; cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; }; From e375bd2632c2278a2995288f8c713f2a9c232111 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:29:00 -0500 Subject: [PATCH 010/129] conftest: fix build on darwin --- pkgs/development/tools/conftest/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index ae35170cd19..fe8d58f7682 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "conftest"; @@ -13,12 +13,14 @@ buildGoModule rec { modSha256 = "1p7fjg1vcrcxb4f5hd00qxx4fqcl051klcjs6ljn4v46qcpn6dcn"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = '' -ldflags= -X main.version=${version} ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Write tests against structured configuration data"; homepage = https://github.com/instrumenta/conftest; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28de31d76d1..53f1890d056 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -161,7 +161,9 @@ in cm256cc = callPackage ../development/libraries/cm256cc { }; - conftest = callPackage ../development/tools/conftest { }; + conftest = callPackage ../development/tools/conftest { + inherit (darwin.apple_sdk.frameworks) Security; + }; corgi = callPackage ../development/tools/corgi { }; From 48489b7e2c8ed3359f1452139703387f3d0a30f1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:30:00 -0500 Subject: [PATCH 011/129] bazelisk: fix build on darwin --- pkgs/development/tools/bazelisk/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 5780cf4382a..a737ddbb0fb 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "bazelisk"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "1w8k659ifapcxbbim0nf7wd7w10bhlagc33q08izh84gcgsh0yyz"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "A user-friendly launcher for Bazel"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53f1890d056..725681c394c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9889,7 +9889,9 @@ in go = go_1_12; }; - bazelisk = callPackage ../development/tools/bazelisk { }; + bazelisk = callPackage ../development/tools/bazelisk { + inherit (darwin.apple_sdk.frameworks) Security; + }; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; From 38be8fbe7f78699a4978df6d34a54b65f6eecfeb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:31:00 -0500 Subject: [PATCH 012/129] dbmate: fix build on darwin --- .../tools/database/dbmate/default.nix | 4 +- .../tools/database/dbmate/deps.nix | 84 ------------------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 6 insertions(+), 86 deletions(-) delete mode 100644 pkgs/development/tools/database/dbmate/deps.nix diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index efc20b6972b..57aa9c654d7 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "dbmate"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "12x3m5bjyx3blh5i51pd99phv73m96pmm6i3ir4vf2kms3viif9i"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Database migration tool"; homepage = https://github.com/amacneil/dbmate; diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/pkgs/development/tools/database/dbmate/deps.nix deleted file mode 100644 index 97bfc10b20a..00000000000 --- a/pkgs/development/tools/database/dbmate/deps.nix +++ /dev/null @@ -1,84 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "2cc627ac8defc45d65066ae98f898166f580f9a4"; - sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "a79fa1e548e2c689c241d10173efd51e5d689d5b"; - sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "19c8e9ad00952ce0c64489b60e8df88bb16dd514"; - sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "6c771bb9887719704b210e87e934f08be014bdb1"; - sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"; - sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; - sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; - }; - } -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 725681c394c..630ef61f264 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8044,7 +8044,9 @@ in scry = callPackage ../development/tools/scry {}; - dbmate = callPackage ../development/tools/database/dbmate { }; + dbmate = callPackage ../development/tools/database/dbmate { + inherit (darwin.apple_sdk.frameworks) Security; + }; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; From a3a9f0387d5966277d7e01dbcb640753716f4861 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:32:00 -0500 Subject: [PATCH 013/129] dive: fix build on darwin --- pkgs/development/tools/dive/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index 5d4de99ffdb..91889e80c04 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }: +{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2, Security }: buildGoModule rec { pname = "dive"; @@ -15,7 +15,8 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 630ef61f264..e240f1836d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10161,7 +10161,9 @@ in binutils = binutils; }; - dive = callPackage ../development/tools/dive { }; + dive = callPackage ../development/tools/dive { + inherit (darwin.apple_sdk.frameworks) Security; + }; doclifter = callPackage ../development/tools/misc/doclifter { }; From e00ccb36b8c599402ea415083090523add588a3a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:33:00 -0500 Subject: [PATCH 014/129] circleci-cli: fix build on darwin --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index fde1c68d34d..0ab126b63e7 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "circleci-cli"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ]; preBuild = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e240f1836d1..97ed4c25976 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2451,7 +2451,9 @@ in ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; circus = callPackage ../tools/networking/circus { }; From 4a5a07a4870efd6611f66a97bb68ec8ede454e2d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:34:00 -0500 Subject: [PATCH 015/129] croc: fix build on darwin --- pkgs/tools/networking/croc/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 52f9ef9fade..70ffe180f15 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "croc"; @@ -14,6 +14,9 @@ buildGoModule rec { }; modSha256 = "0d4mm840fjsbcyl98zg6d3i7qp1lmjkx07mh91d56jyf9j082g99"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97ed4c25976..baa8b77a2ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1434,7 +1434,9 @@ in cassowary = callPackage ../tools/networking/cassowary { }; - croc = callPackage ../tools/networking/croc { }; + croc = callPackage ../tools/networking/croc { + inherit (darwin.apple_sdk.frameworks) Security; + }; cddl = callPackage ../development/tools/cddl { }; From 028d53e9964eb867df7167d19f6d24c2c9a62d77 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:35:00 -0500 Subject: [PATCH 016/129] packr: fix build on darwin --- pkgs/development/libraries/packr/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index 4482a9cd312..b0c7ac3cab6 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -1,6 +1,7 @@ { buildGoModule , fetchFromGitHub -, lib +, stdenv +, Security }: buildGoModule rec { @@ -16,9 +17,11 @@ buildGoModule rec { subPackages = [ "packr" "v2/packr2" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv"; - meta = with lib; { + meta = with stdenv.lib; { description = "The simple and easy way to embed static files into Go binaries"; homepage = "https://github.com/gobuffalo/packr"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index baa8b77a2ff..8dd0b806f83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -292,6 +292,7 @@ in # Version 2.6.0 fails to build with go 1.13 due to nested modules: # go: directory v2/packr2 is outside main module buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; pet = callPackage ../development/tools/pet { }; From 203e2ca6f9b30685bbe3cd045402ce3e6dcbf9b0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:36:00 -0500 Subject: [PATCH 017/129] docui: fix build on darwin --- pkgs/tools/misc/docui/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index 0329c1bc4a6..c8f3dbf8009 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "docui"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "TUI Client for Docker"; homepage = "https://github.com/skanehira/docui"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8dd0b806f83..d084b2387d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -215,7 +215,9 @@ in docker-sync = callPackage ../tools/misc/docker-sync { }; - docui = callPackage ../tools/misc/docui { }; + docui = callPackage ../tools/misc/docui { + inherit (darwin.apple_sdk.frameworks) Security; + }; dotfiles = callPackage ../applications/misc/dotfiles { }; From 798569a534032f13db4b4f5b1265f11cdd2e7d2a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:37:00 -0500 Subject: [PATCH 018/129] aws-vault: fix build on darwin --- pkgs/tools/admin/aws-vault/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 48a1de61cd8..3e145f73236 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, stdenv, fetchFromGitHub, Security }: buildGoModule rec { pname = "aws-vault"; version = "5.3.2"; @@ -13,13 +13,15 @@ buildGoModule rec { modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9"; subPackages = [ "." ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + # set the version. see: aws-vault's Makefile buildFlagsArray = '' -ldflags= -X main.Version=v${version} ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A vault for securely storing and accessing AWS credentials in development environments"; homepage = "https://github.com/99designs/aws-vault"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d084b2387d7..b6d5c8e7a0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -753,7 +753,9 @@ in aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; - aws-vault = callPackage ../tools/admin/aws-vault { }; + aws-vault = callPackage ../tools/admin/aws-vault { + inherit (darwin.apple_sdk.frameworks) Security; + }; iamy = callPackage ../tools/admin/iamy { }; From f2dd2b8634572b9564af8a0b1d6e8901ac61210b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:38:00 -0500 Subject: [PATCH 019/129] dolt: fix build on darwin --- pkgs/servers/sql/dolt/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index dbface601f5..27ab7d444bf 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "dolt"; @@ -15,7 +15,9 @@ buildGoModule rec { subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; modSha256 = "04bsj8mfamnbq3y2aqbx1605azi8v15nbdh1zk5grni0ihlal75a"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Relational database with version control and CLI a-la Git."; homepage = "https://github.com/liquidata-inc/dolt"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6d5c8e7a0a..8a34ec0295d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10182,7 +10182,9 @@ in doit = callPackage ../development/tools/build-managers/doit { }; - dolt = callPackage ../servers/sql/dolt { }; + dolt = callPackage ../servers/sql/dolt { + inherit (darwin.apple_sdk.frameworks) Security; + }; dot2tex = pythonPackages.dot2tex; From e50e48e9df2127b890d60d3387ee5568f96f8ec9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:39:00 -0500 Subject: [PATCH 020/129] azure-storage-azcopy: fix build on darwin --- pkgs/development/tools/azcopy/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 328092feafc..40741d96f56 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "azure-storage-azcopy"; @@ -11,6 +11,8 @@ buildGoModule rec { sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; modSha256 = "07cy2zi7m2pkbfdcy659x4k5j2w60cmjy8kxv1dcii3dc6ls4bvb"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a34ec0295d..5902ea72da7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -761,7 +761,9 @@ in azure-cli = callPackage ../tools/admin/azure-cli { python = python3; }; - azure-storage-azcopy = callPackage ../development/tools/azcopy { }; + azure-storage-azcopy = callPackage ../development/tools/azcopy { + inherit (darwin.apple_sdk.frameworks) Security; + }; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; From 86d19c4e32ef2231179498d621e675d61550460d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:40:00 -0500 Subject: [PATCH 021/129] chezmoi: fix build on darwin --- pkgs/tools/misc/chezmoi/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index b2fb6925aba..979a658ac02 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }: buildGoModule rec { pname = "chezmoi"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5902ea72da7..bda4cd5c76d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -843,7 +843,9 @@ in certigo = callPackage ../tools/admin/certigo { }; - chezmoi = callPackage ../tools/misc/chezmoi { }; + chezmoi = callPackage ../tools/misc/chezmoi { + inherit (darwin.apple_sdk.frameworks) Security; + }; chipsec = callPackage ../tools/security/chipsec { kernel = null; From 9fe9b597572c86c7e8ab360822a495c612395503 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:41:00 -0500 Subject: [PATCH 022/129] certigo: fix build on darwin --- pkgs/tools/admin/certigo/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index 5474cb25429..89c6b8996fa 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "certigo"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "A utility to examine and validate certificates in a variety of formats"; homepage = "https://github.com/square/certigo"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bda4cd5c76d..085d5c5ea6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -841,7 +841,9 @@ in calls = callPackage ../applications/networking/calls { }; - certigo = callPackage ../tools/admin/certigo { }; + certigo = callPackage ../tools/admin/certigo { + inherit (darwin.apple_sdk.frameworks) Security; + }; chezmoi = callPackage ../tools/misc/chezmoi { inherit (darwin.apple_sdk.frameworks) Security; From a35fcc100044d9bfc0754f218e35e94ec89fa558 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:42:00 -0500 Subject: [PATCH 023/129] cassowary: fix build on darwin --- pkgs/tools/networking/cassowary/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index 6156f43b04b..5b9ba71f8c9 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "cassowary"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { homepage = "https://github.com/rogerwelin/cassowary"; description = "Modern cross-platform HTTP load-testing tool written in Go"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 085d5c5ea6b..51ec7dc3197 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1443,7 +1443,9 @@ in ccnet = callPackage ../tools/networking/ccnet { }; - cassowary = callPackage ../tools/networking/cassowary { }; + cassowary = callPackage ../tools/networking/cassowary { + inherit (darwin.apple_sdk.frameworks) Security; + }; croc = callPackage ../tools/networking/croc { inherit (darwin.apple_sdk.frameworks) Security; From 1da05f29db72e6e1209777a3f28a5938c45c9e02 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:43:00 -0500 Subject: [PATCH 024/129] awsweeper: fix build on darwin --- pkgs/tools/admin/awsweeper/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 661747c2fd0..1ea54953701 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "awsweeper"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "A tool to clean out your AWS account"; homepage = "https://github.com/cloudetc/awsweeper/"; license = licenses.mpl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51ec7dc3197..50e917c05de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1125,7 +1125,9 @@ in awstats = callPackage ../tools/system/awstats { }; - awsweeper = callPackage ../tools/admin/awsweeper { }; + awsweeper = callPackage ../tools/admin/awsweeper { + inherit (darwin.apple_sdk.frameworks) Security; + }; axel = callPackage ../tools/networking/axel { libssl = openssl; From 91aacecb693d56c2ec2de13029c3da15d6bb8dff Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:44:00 -0500 Subject: [PATCH 025/129] berglas: fix build on darwin --- pkgs/tools/admin/berglas/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index c1c46da41b7..d088184f7a1 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "berglas"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "A tool for managing secrets on Google Cloud"; homepage = "https://github.com/GoogleCloudPlatform/berglas"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50e917c05de..59b92a37447 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -769,7 +769,9 @@ in awless = callPackage ../tools/virtualization/awless { }; - berglas = callPackage ../tools/admin/berglas/default.nix { }; + berglas = callPackage ../tools/admin/berglas/default.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; brakeman = callPackage ../development/tools/analysis/brakeman { }; From b47c4218bb6eeb52c177c7cb4a5025fea8889ed4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:45:00 -0500 Subject: [PATCH 026/129] clair: fix build on darwin --- pkgs/tools/admin/clair/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 3f4d00736ad..a12b8abe120 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz }: +{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz, Security }: buildGoModule rec { pname = "clair"; @@ -13,14 +13,16 @@ buildGoModule rec { modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/clair \ - --prefix PATH : "${lib.makeBinPath [ rpm xz ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ rpm xz ]}" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Vulnerability Static Analysis for Containers"; homepage = "https://github.com/quay/clair"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59b92a37447..27c8314abde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -856,7 +856,9 @@ in withDriver = false; }; - clair = callPackage ../tools/admin/clair { }; + clair = callPackage ../tools/admin/clair { + inherit (darwin.apple_sdk.frameworks) Security; + }; cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; From 36ae531bc2e3d7266f3748e8911d0b0866e36393 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:46:00 -0500 Subject: [PATCH 027/129] coredns: fix build on darwin --- pkgs/servers/dns/coredns/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 017842f39dc..8388968298e 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "coredns"; @@ -15,6 +15,8 @@ buildGoModule rec { modSha256 = "0wlffk6wkcyn2lphw2vmdsmzag0wxljcxrvm7sv3i124x2x3yvy4"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { homepage = "https://coredns.io"; description = "A DNS server that runs middleware"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27c8314abde..21358555334 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16347,7 +16347,9 @@ in conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { }; - coredns = callPackage ../servers/dns/coredns { }; + coredns = callPackage ../servers/dns/coredns { + inherit (darwin.apple_sdk.frameworks) Security; + }; corerad = callPackage ../tools/networking/corerad { }; From 5b6342e8af8242e04a77060ca964dba29d263022 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:47:00 -0500 Subject: [PATCH 028/129] corerad: fix build on darwin --- pkgs/tools/networking/corerad/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 96798c1c17e..0cfaddcf06a 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "corerad"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = '' -ldflags= -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1583280117 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21358555334..8a29f7f8375 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16351,7 +16351,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - corerad = callPackage ../tools/networking/corerad { }; + corerad = callPackage ../tools/networking/corerad { + inherit (darwin.apple_sdk.frameworks) Security; + }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; From 59bc2841b4b960cacc558d40e25ad58414df38f3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:48:00 -0500 Subject: [PATCH 029/129] dnsproxy: fix build on darwin --- pkgs/tools/networking/dnsproxy/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 8296600cf3d..89173e7b427 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "dnsproxy"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; homepage = "https://github.com/AdguardTeam/dnsproxy"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a29f7f8375..83307c25f77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2872,7 +2872,9 @@ in dnsmasq = callPackage ../tools/networking/dnsmasq { }; - dnsproxy = callPackage ../tools/networking/dnsproxy { }; + dnsproxy = callPackage ../tools/networking/dnsproxy { + inherit (darwin.apple_sdk.frameworks) Security; + }; dnsperf = callPackage ../tools/networking/dnsperf { }; From 5ea0235ba9d44ca95dabaf436e677040566ac7ec Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:49:00 -0500 Subject: [PATCH 030/129] clash: fix build on darwin --- pkgs/tools/networking/clash/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 234fd0b31af..8e7499caa47 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "clash"; @@ -14,6 +14,8 @@ buildGoModule rec { goPackagePath = "github.com/Dreamacro/clash"; modSha256 = "02bki2iq99lc9iq1mjf9rbxwspalrj7hjlk1h384w3d4s4x4fyxy"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=" "-X ${goPackagePath}/constant.Version=${version}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83307c25f77..3e56cc51967 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1475,7 +1475,9 @@ in clac = callPackage ../tools/misc/clac {}; - clash = callPackage ../tools/networking/clash { }; + clash = callPackage ../tools/networking/clash { + inherit (darwin.apple_sdk.frameworks) Security; + }; clasp = callPackage ../tools/misc/clasp { }; From 33454dafa225bb5ca0b9ef66770fd1ae4f68115f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:50:00 -0500 Subject: [PATCH 031/129] argocd: fix build on darwin --- pkgs/applications/networking/cluster/argocd/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 7f9ebda93c0..51635292fa1 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, packr }: +{ stdenv, buildGoModule, fetchFromGitHub, packr, Security }: buildGoModule rec { pname = "argocd"; @@ -16,6 +16,8 @@ buildGoModule rec { nativeBuildInputs = [ packr ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + patches = [ ./use-go-module.patch ]; buildFlagsArray = '' @@ -31,7 +33,7 @@ buildGoModule rec { packr ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes"; homepage = "https://github.com/argoproj/argo"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e56cc51967..2e1ba3ab82f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18430,7 +18430,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - argocd = callPackage ../applications/networking/cluster/argocd { }; + argocd = callPackage ../applications/networking/cluster/argocd { + inherit (darwin.apple_sdk.frameworks) Security; + }; ario = callPackage ../applications/audio/ario { }; From 282966fc4e1a2858d3354a2a8b5faf99fb763647 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:51:00 -0500 Subject: [PATCH 032/129] cue: fix build on darwin --- pkgs/development/tools/cue/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 98bf5249b62..4950e885e25 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchgit, stdenv }: +{ buildGoModule, fetchgit, stdenv, Security }: buildGoModule rec { pname = "cue"; @@ -12,6 +12,8 @@ buildGoModule rec { modSha256 = "04dapx75zwi8cv1pj3c6266znrhwihv3df4izm3gjk34r2i07q6s"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/cue" ]; buildFlagsArray = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e1ba3ab82f..8346ef1a92a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -890,7 +890,9 @@ in crc32c = callPackage ../development/libraries/crc32c { }; - cue = callPackage ../development/tools/cue { }; + cue = callPackage ../development/tools/cue { + inherit (darwin.apple_sdk.frameworks) Security; + }; deltachat-electron = callPackage ../applications/networking/instant-messengers/deltachat-electron { }; From d557b441ace98c40ae161c9dbe316636f94f673e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:52:00 -0500 Subject: [PATCH 033/129] drone: fix build on darwin --- .../tools/continuous-integration/drone/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 05257f65af5..e1f0a8de3b8 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { name = "drone.io-${version}"; @@ -14,6 +14,8 @@ buildGoModule rec { sha256 = "05cgd72qyss836fby0adhrm5p8g7639psk2yslhg6pmz0cqfbq9m"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { maintainers = with maintainers; [ elohmeier vdemeester ]; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8346ef1a92a..e88aab49b04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2981,7 +2981,9 @@ in driftnet = callPackage ../tools/networking/driftnet {}; - drone = callPackage ../development/tools/continuous-integration/drone { }; + drone = callPackage ../development/tools/continuous-integration/drone { + inherit (darwin.apple_sdk.frameworks) Security; + }; drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; From a5a687734a963dc48ffbe2ed036809ae9e7bcb91 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:53:00 -0500 Subject: [PATCH 034/129] drone-cli: fix build on darwin --- .../continuous-integration/drone-cli/default.nix | 13 ++++++------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index a3df81d2605..c6e4878d52c 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,11 +1,8 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: -let version = "1.2.1"; -in buildGoModule rec { - inherit version; +buildGoModule rec { pname = "drone-cli"; - revision = "v${version}"; - goPackagePath = "github.com/drone/drone-cli"; + version = "1.2.1"; modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b"; @@ -16,10 +13,12 @@ in buildGoModule rec { src = fetchFromGitHub { owner = "drone"; repo = "drone-cli"; - rev = revision; + rev = "v${version}"; sha256 = "19icihi5nxcafxlh4w61nl4cd0dhvik9zl8g4gqmazikjqsjms2j"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { maintainers = with maintainers; [ bricewge ]; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e88aab49b04..33e45bed616 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2985,7 +2985,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; + drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; dropbear = callPackage ../tools/networking/dropbear { }; From ee41c79c9a1d1341b0ae07ee82d70d0ef2bda60b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:54:00 -0500 Subject: [PATCH 035/129] elvish: fix build on darwin --- pkgs/shells/elvish/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index ad2e845f9bc..228692efe85 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "elvish"; @@ -20,6 +20,8 @@ buildGoModule rec { modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "A friendly and expressive command shell"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33e45bed616..6b75b5c7788 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -917,7 +917,9 @@ in sedutil = callPackage ../tools/security/sedutil { }; - elvish = callPackage ../shells/elvish { }; + elvish = callPackage ../shells/elvish { + inherit (darwin.apple_sdk.frameworks) Security; + }; emplace = callPackage ../tools/package-management/emplace { }; From ecec7dff61f0a6af1b6b8a7164ada42dd2ae1434 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:55:00 -0500 Subject: [PATCH 036/129] echoip: fix build on darwin --- pkgs/servers/echoip/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index b3402933f9f..ae6057c3469 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule { pname = "echoip"; @@ -13,6 +13,8 @@ buildGoModule { modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + outputs = [ "out" "index" ]; postInstall = '' @@ -20,7 +22,7 @@ buildGoModule { cp $src/index.html $index/index.html ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = https://github.com/mpolden/echoip; license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b75b5c7788..abc4b8fbaa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19030,7 +19030,9 @@ in eaglemode = callPackage ../applications/misc/eaglemode { }; - echoip = callPackage ../servers/echoip { }; + echoip = callPackage ../servers/echoip { + inherit (darwin.apple_sdk.frameworks) Security; + }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { jdk = jdk11; From e260f4861c5d5b034427eac98005f228a316d478 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:56:00 -0500 Subject: [PATCH 037/129] caddy: fix build on darwin --- pkgs/servers/caddy/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index bcd4b7065b5..8b51e584e3e 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "caddy"; @@ -16,6 +16,8 @@ buildGoModule rec { }; modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + preBuild = '' cat << EOF > caddy/main.go package main diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abc4b8fbaa5..09506da906f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1400,7 +1400,9 @@ in ''; }); - caddy = callPackage ../servers/caddy { }; + caddy = callPackage ../servers/caddy { + inherit (darwin.apple_sdk.frameworks) Security; + }; caddy2 = callPackage ../servers/caddy/v2.nix { }; traefik = callPackage ../servers/traefik { }; From 5480f994e9fae7f53da1720de46844c2d56e37d4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:57:00 -0500 Subject: [PATCH 038/129] caddy2: fix build on darwin --- pkgs/servers/caddy/v2.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix index c0b2134abde..7330388a785 100644 --- a/pkgs/servers/caddy/v2.nix +++ b/pkgs/servers/caddy/v2.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, buildGoModule, fetchFromGitHub }: +{ stdenv, callPackage, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "caddy"; @@ -16,6 +16,8 @@ buildGoModule rec { }; modSha256 = "1sb8w6n84cpya2rjm0zm798kzf5vjpkr5440j1gfnnnr07jl2aqn"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { homepage = "https://caddyserver.com"; description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09506da906f..83d7248bee9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1403,7 +1403,9 @@ in caddy = callPackage ../servers/caddy { inherit (darwin.apple_sdk.frameworks) Security; }; - caddy2 = callPackage ../servers/caddy/v2.nix { }; + caddy2 = callPackage ../servers/caddy/v2.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; traefik = callPackage ../servers/traefik { }; calamares = libsForQt5.callPackage ../tools/misc/calamares { From ae47111f90316be0459bf297cf1f8b0241244972 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:58:00 -0500 Subject: [PATCH 039/129] documize-community: fix build on darwin --- pkgs/servers/documize-community/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 7780d900bad..a6477d61e98 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs }: +{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs, Security }: buildGoModule rec { pname = "documize-community"; @@ -15,6 +15,8 @@ buildGoModule rec { nativeBuildInputs = [ go-bindata go-bindata-assetfs ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "edition/community.go" ]; postInstall = '' @@ -23,7 +25,7 @@ buildGoModule rec { mv $out/bin/community $out/bin/documize ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS"; license = licenses.agpl3; maintainers = with maintainers; [ ma27 elseym ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83d7248bee9..6643f345660 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17713,7 +17713,9 @@ in documentation-highlighter = callPackage ../misc/documentation-highlighter { }; - documize-community = callPackage ../servers/documize-community { }; + documize-community = callPackage ../servers/documize-community { + inherit (darwin.apple_sdk.frameworks) Security; + }; doge = callPackage ../misc/doge { }; From b49ca4818defaeb052cb21a7afc08a393a4c36e2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 04:59:00 -0500 Subject: [PATCH 040/129] fly: fix build on darwin --- .../tools/continuous-integration/fly/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index e5454796b7e..4093e7e0172 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, writeText }: +{ buildGoModule, fetchFromGitHub, stdenv, writeText, Security }: buildGoModule rec { pname = "fly"; @@ -20,6 +20,8 @@ buildGoModule rec { -X github.com/concourse/concourse.Version=${version} ''; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + # The fly.bash file included with this derivation can be replaced by a # call to `fly completion bash` once the `completion` subcommand has # made it into a release. Similarly, `fly completion zsh` will provide @@ -28,7 +30,7 @@ buildGoModule rec { install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A command line interface to Concourse CI"; homepage = "https://concourse-ci.org"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6643f345660..bd4a3573698 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10274,7 +10274,9 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - fly = callPackage ../development/tools/continuous-integration/fly { }; + fly = callPackage ../development/tools/continuous-integration/fly { + inherit (darwin.apple_sdk.frameworks) Security; + }; foreman = callPackage ../tools/system/foreman { }; goreman = callPackage ../tools/system/goreman { }; From 6552397b674dfcd3c9b757382f708e6d54f83b3a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:00:00 -0500 Subject: [PATCH 041/129] editorconfig-checker: fix build on darwin --- .../development/tools/misc/editorconfig-checker/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 88c43a8c42a..335cd2f2524 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "editorconfig-checker"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "1iiv12ginb3ky739z7v8wf4z5lv24gmghbybs3lzay0kqn449n4x"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "A tool to verify that your files are in harmony with your .editorconfig"; homepage = "https://editorconfig-checker.github.io/"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd4a3573698..9552565dbd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10233,7 +10233,9 @@ in drush = callPackage ../development/tools/misc/drush { }; - editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; + editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { + inherit (darwin.apple_sdk.frameworks) Security; + }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; From da93b5a367ecd08d56a38b8d66ff24fca5112c32 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:01:00 -0500 Subject: [PATCH 042/129] eksctl: fix build on darwin --- pkgs/tools/admin/eksctl/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 4c01383f898..c700e4f397c 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "eksctl"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0f8dlcp3q84fa5dnnzx4347ngb1raw1mxkcqpz2s3zq6d1kv0nvf"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/eksctl" ]; buildFlags = [ "-tags netgo" "-tags release" ]; @@ -25,7 +27,7 @@ buildGoModule rec { $out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A CLI for Amazon EKS"; homepage = "https://github.com/weaveworks/eksctl"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9552565dbd5..3d5e05b79ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1750,7 +1750,9 @@ in eggdrop = callPackage ../tools/networking/eggdrop { }; - eksctl = callPackage ../tools/admin/eksctl { }; + eksctl = callPackage ../tools/admin/eksctl { + inherit (darwin.apple_sdk.frameworks) Security; + }; elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { }; From c8359c42e0d4996aa63f909c75aab118212fb205 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:02:00 -0500 Subject: [PATCH 043/129] fluxctl: fix build on darwin --- pkgs/applications/networking/cluster/fluxctl/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 982add3d517..75e097131ea 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "fluxctl"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0ij5q31a0818nmqsdql1ii6rhq6nb0liplnw509qih8py7dk5xkg"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/fluxctl" ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d5e05b79ea..3dcc312a635 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20271,7 +20271,9 @@ in k9s = callPackage ../applications/networking/cluster/k9s { }; - fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; + fluxctl = callPackage ../applications/networking/cluster/fluxctl { + inherit (darwin.apple_sdk.frameworks) Security; + }; linkerd = callPackage ../applications/networking/cluster/linkerd { }; From b1398870568b51ff90c7540f572fa58dcd580ce8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:03:00 -0500 Subject: [PATCH 044/129] frp: fix build on darwin --- pkgs/tools/networking/frp/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index f44e2208646..7323c914bfa 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, stdenv, fetchFromGitHub, Security }: buildGoModule rec { pname = "frp"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/frpc" "cmd/frps" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Fast reverse proxy"; longDescription = '' frp is a fast reverse proxy to help you expose a local server behind a diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dcc312a635..cb3d41c8997 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10289,7 +10289,9 @@ in frame = callPackage ../development/libraries/frame { }; - frp = callPackage ../tools/networking/frp { }; + frp = callPackage ../tools/networking/frp { + inherit (darwin.apple_sdk.frameworks) Security; + }; fsatrace = callPackage ../development/tools/misc/fsatrace { }; From 4f8836ee9971cf83e847bd1690851607586dfc15 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:04:00 -0500 Subject: [PATCH 045/129] iamy: fix build on darwin --- pkgs/tools/admin/iamy/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index e09cd2f5285..6a1ec948d90 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -1,11 +1,9 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "iamy"; version = "2.3.2"; - goPackagePath = "github.com/99designs/iamy"; - src = fetchFromGitHub { owner = "99designs"; repo = "iamy"; @@ -15,6 +13,8 @@ buildGoModule rec { modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [''-ldflags= -X main.Version=v${version} -s -w '']; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb3d41c8997..fdcda2867a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -757,7 +757,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - iamy = callPackage ../tools/admin/iamy { }; + iamy = callPackage ../tools/admin/iamy { + inherit (darwin.apple_sdk.frameworks) Security; + }; azure-cli = callPackage ../tools/admin/azure-cli { python = python3; }; From 26f5b0ed8f44203622b25b4a6150150d1c595e89 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:05:00 -0500 Subject: [PATCH 046/129] go-license-detector: fix build on darwin --- pkgs/development/tools/misc/go-license-detector/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix index 6675f7ed3e2..7ab7ff8b742 100644 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "go-license-detector"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Reliable project licenses detector"; homepage = "https://github.com/src-d/go-license-detector"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdcda2867a3..0299cf02347 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26348,7 +26348,9 @@ in quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; - go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; + go-license-detector = callPackage ../development/tools/misc/go-license-detector { + inherit (darwin.apple_sdk.frameworks) Security; + }; hashdeep = callPackage ../tools/security/hashdeep { }; From a8c36060b72c9bc5bc87c4102313e77c14b2dd27 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:06:00 -0500 Subject: [PATCH 047/129] grpcui: fix build on darwin --- pkgs/tools/networking/grpcui/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index 58e698ed708..de2b3f78798 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "grpcui"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "An interactive web UI for gRPC, along the lines of postman"; homepage = "https://github.com/fullstorydev/grpcui"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0299cf02347..fc2de2087fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3920,6 +3920,7 @@ in grpcui = callPackage ../tools/networking/grpcui { buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ From cb8f82b8368a2dbd9dfa8bad1ad4f33dae55aebc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:07:00 -0500 Subject: [PATCH 048/129] gortr: fix build on darwin --- pkgs/servers/gortr/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index 35c6e145243..3e5dfc87f0e 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "gortr"; @@ -12,7 +12,9 @@ buildGoModule rec { }; modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "The RPKI-to-Router server used at Cloudflare"; homepage = "https://github.com/cloudflare/gortr/"; license = licenses.gpl3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc2de2087fb..7b044f52c4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26339,7 +26339,9 @@ in sieveshell = with python3.pkgs; toPythonApplication managesieve; - gortr = callPackage ../servers/gortr {}; + gortr = callPackage ../servers/gortr { + inherit (darwin.apple_sdk.frameworks) Security; + }; sentencepiece = callPackage ../development/libraries/sentencepiece {}; From 7e4f82ce7f85633c0582a6306a40141dfcc67ceb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:08:00 -0500 Subject: [PATCH 049/129] hey: fix build on darwin --- pkgs/tools/networking/hey/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix index d65d5c9e323..69cfa452602 100644 --- a/pkgs/tools/networking/hey/default.nix +++ b/pkgs/tools/networking/hey/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, stdenv, fetchFromGitHub, Security }: buildGoModule rec { pname = "hey"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "HTTP load generator, ApacheBench (ab) replacement"; homepage = "https://github.com/rakyll/hey"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b044f52c4d..27334659972 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4147,7 +4147,9 @@ in hexd = callPackage ../tools/misc/hexd { }; pixd = callPackage ../tools/misc/pixd { }; - hey = callPackage ../tools/networking/hey { }; + hey = callPackage ../tools/networking/hey { + inherit (darwin.apple_sdk.frameworks) Security; + }; hhpc = callPackage ../tools/misc/hhpc { }; From 121bc52a524b460b87933400b32f0041727b2be8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:09:00 -0500 Subject: [PATCH 050/129] hcloud: fix build on darwin --- pkgs/development/tools/hcloud/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 477a476dfe7..c20f3b9dc12 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "hcloud"; @@ -15,6 +15,8 @@ buildGoModule rec { modSha256 = "1zy41hi2qzrdmih3pkpng8im576lhkr64zm66w73p7jyvy0kf9sx"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27334659972..f6da0d4444d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10409,7 +10409,9 @@ in halfempty = callPackage ../development/tools/halfempty {}; - hcloud = callPackage ../development/tools/hcloud { }; + hcloud = callPackage ../development/tools/hcloud { + inherit (darwin.apple_sdk.frameworks) Security; + }; help2man = callPackage ../development/tools/misc/help2man { }; From 33f90726c3c0aa390d446e51a8911edcd75f7d5b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:10:00 -0500 Subject: [PATCH 051/129] gotify-cli: fix build on darwin --- pkgs/tools/misc/gotify-cli/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index a4b9af09712..56462aa3d30 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "gotify-cli"; @@ -17,7 +17,9 @@ buildGoModule rec { mv $out/bin/cli $out/bin/gotify ''; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { license = licenses.mit; homepage = https://github.com/gotify/cli; description = "A command line interface for pushing messages to gotify/server."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6da0d4444d..ecd1d5ececf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1908,7 +1908,9 @@ in gosu = callPackage ../tools/misc/gosu { }; - gotify-cli = callPackage ../tools/misc/gotify-cli { }; + gotify-cli = callPackage ../tools/misc/gotify-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; gping = callPackage ../tools/networking/gping { }; From c058bc936d88207e73586994c16e1d31d67f33c1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:11:00 -0500 Subject: [PATCH 052/129] go-ethereum: fix build on darwin --- pkgs/applications/blockchains/go-ethereum.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index d8660967a4e..80e17cf1138 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }: +{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit, CoreServices }: buildGoModule rec { pname = "go-ethereum"; @@ -30,6 +30,8 @@ buildGoModule rec { "cmd/wnode" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecd1d5ececf..386ad5bb8f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23045,7 +23045,7 @@ in freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) CoreServices IOKit; }; ledger_agent = with python3Packages; toPythonApplication ledger_agent; From 069aff87e7e1c0a4bd209e55621c4e1302a8977d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:12:00 -0500 Subject: [PATCH 053/129] hugo: fix build on darwin --- pkgs/applications/misc/hugo/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index f1d68b92691..a88ed0bfd04 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,11 +1,9 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "hugo"; version = "0.67.1"; - goPackagePath = "github.com/gohugoio/hugo"; - src = fetchFromGitHub { owner = "gohugoio"; repo = pname; @@ -15,6 +13,8 @@ buildGoModule rec { modSha256 = "0s7a13jkhsr6h19a9ysr8877imac5skdray0zg2qgwrapic2nw17"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlags = [ "-tags" "extended" ]; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 386ad5bb8f2..616432520f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19859,7 +19859,9 @@ in wxGTK = wxGTK30; }; - hugo = callPackage ../applications/misc/hugo { }; + hugo = callPackage ../applications/misc/hugo { + inherit (darwin.apple_sdk.frameworks) Security; + }; hydrogen = callPackage ../applications/audio/hydrogen { }; From f68366f274a491272b0632b9dccb15a919cd7cfa Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:13:00 -0500 Subject: [PATCH 054/129] gobetween: fix build on darwin --- pkgs/servers/gobetween/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index ff59ad53ed1..e66d5581b3c 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }: +{ buildGoModule, fetchFromGitHub, stdenv, Security, enableStatic ? false }: buildGoModule rec { pname = "gobetween"; @@ -14,8 +14,10 @@ buildGoModule rec { modSha256 = "dd91838d20c99c73447590e43edd13c87755276f17ef3e53f24c5df3d0908f78"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildPhase = '' - make build${lib.optionalString enableStatic "-static"} + make build${stdenv.lib.optionalString enableStatic "-static"} ''; installPhase = '' @@ -25,7 +27,7 @@ buildGoModule rec { cp -r config $out/share ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Modern & minimalistic load balancer for the Сloud era"; homepage = "http://gobetween.io"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 616432520f1..d42bf5b45da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15536,6 +15536,7 @@ in gobetween = callPackage ../servers/gobetween { buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; h2o = callPackage ../servers/http/h2o { }; From 4c6e7e64a0490131a26e2dcdeac70b4e8f94ccf9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:14:00 -0500 Subject: [PATCH 055/129] golangci-lint: fix build on darwin --- pkgs/development/tools/golangci-lint/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 14311b0c7a5..00858e94bc5 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "golangci-lint"; @@ -14,7 +14,9 @@ buildGoModule rec { modSha256 = "0ab1s8pqkpss15rd9brin39lzx2fqkvq2v3nhk8kfrgpari2addk"; subPackages = [ "cmd/golangci-lint" ]; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; homepage = "https://golangci.com/"; license = licenses.agpl3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d42bf5b45da..cf6cd38a939 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17195,7 +17195,9 @@ in golint = callPackage ../development/tools/golint { }; - golangci-lint = callPackage ../development/tools/golangci-lint { }; + golangci-lint = callPackage ../development/tools/golangci-lint { + inherit (darwin.apple_sdk.frameworks) Security; + }; gocyclo = callPackage ../development/tools/gocyclo { }; From e0ce72f9010405c25b9bd748902650a36ce1ff1a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:15:00 -0500 Subject: [PATCH 056/129] hetzner-kube: fix build on darwin --- .../networking/cluster/hetzner-kube/default.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 1d9940c8f31..8a59bf3197a 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "hetzner-kube"; @@ -13,16 +13,18 @@ buildGoModule rec { modSha256 = "0jjrk93wdi13wrb5gchhqk7rgwm74kcizrbqsibgkgs2dszwfazh"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = '' -ldflags= -X github.com/xetys/hetzner-kube/cmd.version=${version} ''; - meta = { + meta = with stdenv.lib; { description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud"; homepage = "https://github.com/xetys/hetzner-kube"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ eliasp ]; - platforms = lib.platforms.unix; + license = licenses.asl20; + maintainers = with maintainers; [ eliasp ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf6cd38a939..9c50f00a2ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17838,7 +17838,9 @@ in helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; - hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { }; + hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { + inherit (darwin.apple_sdk.frameworks) Security; + }; hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; From dbb3f260cae38cd2d53a1e3744160970d5e39f13 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:16:00 -0500 Subject: [PATCH 057/129] geoipupdate: fix build on darwin --- pkgs/applications/misc/geoipupdate/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index b7b90448e4b..71ea8a3d43f 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "geoipupdate"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "1bypanvrkcqp8rk84cv2569671irgaf3cy27lcrknyina4pdvir5"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Automatic GeoIP database updater"; homepage = "https://github.com/maxmind/geoipupdate"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c50f00a2ce..c6e0fd0eb79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19326,7 +19326,9 @@ in geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; - geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; + geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; From 7faf44250d658654c2d5cd35ef77f73faf2ebe0c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:17:00 -0500 Subject: [PATCH 058/129] gomuks: fix build on darwin --- .../networking/instant-messengers/gomuks/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index a36f72c03d0..27790c2c9e0 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "gomuks"; @@ -15,6 +15,8 @@ buildGoModule rec { modSha256 = "03vbrh50pvx71rp6c23qc2sh0ir4jm1wl0gvi3z1c14ndzhsqky4"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { homepage = "https://maunium.net/go/gomuks/"; description = "A terminal based Matrix client written in Go"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6e0fd0eb79..c6cf178b390 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19367,7 +19367,9 @@ in inherit (darwin) libiconv; }; - gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; + gomuks = callPackage ../applications/networking/instant-messengers/gomuks { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (ocamlPackages) google-drive-ocamlfuse; From 73cb29e6d9c71d15d0a344bbfeb9b52ee72b3c69 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:18:00 -0500 Subject: [PATCH 059/129] glow: fix build on darwin --- pkgs/applications/editors/glow/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 928291940cf..80fdcc8a09c 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "glow"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "0r0yq7kgz7i1wf4gxxihdrn1c8mi4wcyhadncxbln24s9c5apxsf"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Render markdown on the CLI"; homepage = "https://github.com/charmbracelet/glow"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6cf178b390..fb5c2ff4af1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19690,7 +19690,9 @@ in inherit (darwin) IOKit; }; - glow = callPackage ../applications/editors/glow { }; + glow = callPackage ../applications/editors/glow { + inherit (darwin.apple_sdk.frameworks) Security; + }; glowing-bear = callPackage ../applications/networking/irc/glowing-bear { }; From 68705eee2e1878367f58205f0dd4281a16173741 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:19:00 -0500 Subject: [PATCH 060/129] hydroxide: fix build on darwin --- pkgs/applications/networking/hydroxide/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index 75c1cdaece9..d3f45f7f038 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }: buildGoModule rec { pname = "hydroxide"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0b19rcif8yiyvhrsjd3q5nsvr580lklamlphx4dk47n456ckcqfp"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + # FIXME: remove with next release patches = [ (fetchpatch { @@ -23,7 +25,7 @@ buildGoModule rec { subPackages = [ "cmd/hydroxide" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "A third-party, open-source ProtonMail bridge"; homepage = "https://github.com/emersion/hydroxide"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb5c2ff4af1..476336b5228 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19876,7 +19876,9 @@ in hydrogen = callPackage ../applications/audio/hydrogen { }; - hydroxide = callPackage ../applications/networking/hydroxide { }; + hydroxide = callPackage ../applications/networking/hydroxide { + inherit (darwin.apple_sdk.frameworks) Security; + }; hyper = callPackage ../applications/misc/hyper { }; From 2f022c86f2b374fa9c930a3c3f0dc36e0925dab7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:20:00 -0500 Subject: [PATCH 061/129] gobuster: fix build on darwin --- pkgs/tools/security/gobuster/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index c3426bee965..c9348b2f23a 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -1,6 +1,7 @@ { buildGoModule , fetchFromGitHub -, lib +, stdenv +, Security }: buildGoModule rec { @@ -16,7 +17,9 @@ buildGoModule rec { modSha256 = "0jq0z5s05vqdvq7v1gdjwlqqwbl1j2rv9f16k52idl50vdiqviql"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; homepage = "https://github.com/OJ/gobuster"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 476336b5228..fd59172bbda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25247,7 +25247,9 @@ in binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; - gobuster = callPackage ../tools/security/gobuster { }; + gobuster = callPackage ../tools/security/gobuster { + inherit (darwin.apple_sdk.frameworks) Security; + }; guetzli = callPackage ../applications/graphics/guetzli { }; From b24059bc2f370055287b09558783b29ef41f94c4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:21:00 -0500 Subject: [PATCH 062/129] gitAndTools.lefthook: fix build on darwin --- .../applications/version-management/git-and-tools/default.nix | 4 +++- .../version-management/git-and-tools/lefthook/default.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a4b3ac1a65a..3dc7b9e71df 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -179,7 +179,9 @@ let lab = callPackage ./lab { }; - lefthook = callPackage ./lefthook { }; + lefthook = callPackage ./lefthook { + inherit (darwin.apple_sdk.frameworks) Security; + }; pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 9fc89d520ae..c80cff15265 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "lefthook"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Fast and powerful Git hooks manager for any type of projects"; homepage = "https://github.com/Arkweid/lefthook"; From b30c0c8d5f821d1d3ff8d642ce232a0710c4ed83 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:22:00 -0500 Subject: [PATCH 063/129] gitAndTools.lab: fix build on darwin --- .../applications/version-management/git-and-tools/default.nix | 4 +++- .../version-management/git-and-tools/lab/default.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 3dc7b9e71df..5d13fd38584 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -177,7 +177,9 @@ let inherit (darwin) Security; }; - lab = callPackage ./lab { }; + lab = callPackage ./lab { + inherit (darwin.apple_sdk.frameworks) Security; + }; lefthook = callPackage ./lefthook { inherit (darwin.apple_sdk.frameworks) Security; diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index 3e47631caf6..8780ce4a220 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "lab"; @@ -15,6 +15,8 @@ buildGoModule rec { modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' From 3e92406ab0692dcefe4207ea1f9dd333bd90b24d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:23:00 -0500 Subject: [PATCH 064/129] gitAndTools.git-subtrac: fix build on darwin --- .../version-management/git-and-tools/default.nix | 4 +++- .../git-and-tools/git-subtrac/default.nix | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 5d13fd38584..a8bf85d104e 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -136,7 +136,9 @@ let git-subrepo = callPackage ./git-subrepo { }; - git-subtrac = callPackage ./git-subtrac { }; + git-subtrac = callPackage ./git-subtrac { + inherit (darwin.apple_sdk.frameworks) Security; + }; git-sync = callPackage ./git-sync { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index 07c63ea0119..9ccf3c606a2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "git-subtrac"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Keep the content for your git submodules all in one place: the parent repo"; homepage = "https://github.com/apenwarr/git-subtrac"; license = licenses.asl20; From 02d54a88b628b929f83a193553808b88c8836f70 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:24:00 -0500 Subject: [PATCH 065/129] gitAndTools.git-bug: fix build on darwin --- .../applications/version-management/git-and-tools/default.nix | 4 +++- .../version-management/git-and-tools/git-bug/default.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a8bf85d104e..0bc60082dc1 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -65,7 +65,9 @@ let git-appraise = callPackage ./git-appraise {}; - git-bug = callPackage ./git-bug { }; + git-bug = callPackage ./git-bug { + inherit (darwin.apple_sdk.frameworks) Security; + }; # support for bugzilla git-bz = callPackage ./git-bz { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index ed0c8680d75..fdb5a6c53fd 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "git-bug"; @@ -15,6 +15,8 @@ buildGoModule rec { modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = '' -ldflags= -X ${goPackagePath}/commands.GitCommit=${rev} From b149f2ee80818be501684e1ea094bbf48b4654cd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:25:00 -0500 Subject: [PATCH 066/129] gitAndTools.ghq: fix build on darwin --- .../applications/version-management/git-and-tools/default.nix | 4 +++- .../version-management/git-and-tools/ghq/default.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 0bc60082dc1..c4a99cf1858 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -34,7 +34,9 @@ let inherit (darwin.apple_sdk.frameworks) Security; }; - ghq = callPackage ./ghq { }; + ghq = callPackage ./ghq { + inherit (darwin.apple_sdk.frameworks) Security; + }; git = appendToName "minimal" gitBase; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index d0c468ab68e..34829c14b7b 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "ghq"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = '' -ldflags= -X=main.Version=${version} From ed310da7370474e65c1ced5037189be91ed06755 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:26:00 -0500 Subject: [PATCH 067/129] imgproxy: fix build on darwin --- pkgs/servers/imgproxy/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 4cdfddcff6f..c7d0d910ac1 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection }: +{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection, Security }: buildGoModule rec { pname = "imgproxy"; @@ -15,13 +15,14 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gobject-introspection vips ]; + buildInputs = [ gobject-introspection vips ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; preBuild = '' export CGO_LDFLAGS_ALLOW='-(s|w)' ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Fast and secure on-the-fly image processing server written in Go"; homepage = "https://imgproxy.net"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd59172bbda..dc004103a87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15566,7 +15566,9 @@ in theme-spring = callPackage ../servers/icingaweb2/theme-spring { }; }; - imgproxy = callPackage ../servers/imgproxy { }; + imgproxy = callPackage ../servers/imgproxy { + inherit (darwin.apple_sdk.frameworks) Security; + }; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; From 6852ecdcf5448bae3c5a10e760a862dda1e5ce3b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:27:00 -0500 Subject: [PATCH 068/129] ipfs-cluster: fix build on darwin --- pkgs/applications/networking/ipfs-cluster/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index a214f222d56..9bf7faf51f3 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchgx, gx-go }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "ipfs-cluster"; @@ -14,6 +14,8 @@ buildGoModule rec { sha256 = "1jh6ynj50jd4w79widaqrgm3h3yz5h03vq0lbsx717a8d9073blh"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons"; homepage = https://cluster.ipfs.io/; @@ -22,4 +24,3 @@ buildGoModule rec { maintainers = with maintainers; [ jglukasik ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc004103a87..dc6aafba5ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4351,7 +4351,9 @@ in buildGoModule = buildGo112Module; }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { + inherit (darwin.apple_sdk.frameworks) Security; + }; ipget = callPackage ../applications/networking/ipget { }; From 92da50afa856920842a353264b68673fe0dd2c8c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:28:00 -0500 Subject: [PATCH 069/129] ipfs: fix build on darwin --- pkgs/applications/networking/ipfs/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 4f71fcf3b74..c3a31f4e290 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "ipfs"; @@ -18,6 +18,8 @@ buildGoModule rec { modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; homepage = https://ipfs.io/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc6aafba5ff..abddc4ec728 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4349,6 +4349,7 @@ in # go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z) # This is fixed in master, but release containing the fix does not exist yet. buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { From 618075428b25837beaf4c3711aca1d40b5de29bf Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:29:00 -0500 Subject: [PATCH 070/129] joker: fix build on darwin --- pkgs/development/interpreters/joker/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index ed82f76eec2..1db2dd60197 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "joker"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + preBuild = '' go generate ./... ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abddc4ec728..49f408b7e1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9296,7 +9296,9 @@ in jmeter = callPackage ../applications/networking/jmeter {}; - joker = callPackage ../development/interpreters/joker {}; + joker = callPackage ../development/interpreters/joker { + inherit (darwin.apple_sdk.frameworks) Security; + }; davmail = callPackage ../applications/networking/davmail {}; From a39d49e9905cc717727afc6e8ec716c70848a447 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:30:00 -0500 Subject: [PATCH 071/129] kcli: fix build on darwin --- pkgs/development/tools/kcli/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index bbcb10a354c..0d42df3b5e4 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "kcli"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49f408b7e1c..b44b207e50d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26375,7 +26375,9 @@ in sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli {}; + kcli = callPackage ../development/tools/kcli { + inherit (darwin.apple_sdk.frameworks) Security; + }; unstick = callPackage ../os-specific/linux/unstick {}; From c47833f3791a163d505ec075086e05dc7ca71ea6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:31:00 -0500 Subject: [PATCH 072/129] k9s: fix build on darwin --- pkgs/applications/networking/cluster/k9s/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 99326a20bfa..956d7b106b9 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "k9s"; @@ -22,6 +22,8 @@ buildGoModule rec { modSha256 = "06m4xgl29zx6zpqx630m9cm52wmljms9cvly5f4pqdb4zicq7n86"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; homepage = "https://github.com/derailed/k9s"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b44b207e50d..0eae8d95cc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20302,7 +20302,9 @@ in kubeless = callPackage ../applications/networking/cluster/kubeless { }; - k9s = callPackage ../applications/networking/cluster/k9s { }; + k9s = callPackage ../applications/networking/cluster/k9s { + inherit (darwin.apple_sdk.frameworks) Security; + }; fluxctl = callPackage ../applications/networking/cluster/fluxctl { inherit (darwin.apple_sdk.frameworks) Security; From 6e26c88a24a09e04ee30ef5d7d1865b529bff5d0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:32:00 -0500 Subject: [PATCH 073/129] kubeprompt: fix build on darwin --- pkgs/development/tools/kubeprompt/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index 7c6f3f3396c..0910c061ee5 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "kubeprompt"; @@ -21,6 +21,8 @@ buildGoModule rec { goPackagePath = "github.com/jlesquembre/kubeprompt"; modSha256 = "0rbpdk2dixywn3wcdgz48f3xw3b7fk8xh7mrlx27wz7fq5wj9v8f"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Kubernetes prompt"; homepage = "https://github.com/jlesquembre/kubeprompt"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0eae8d95cc7..6525f7fae09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10500,7 +10500,9 @@ in kube-prompt = callPackage ../development/tools/kube-prompt { }; - kubeprompt = callPackage ../development/tools/kubeprompt { }; + kubeprompt = callPackage ../development/tools/kubeprompt { + inherit (darwin.apple_sdk.frameworks) Security; + }; kubicorn = callPackage ../development/tools/kubicorn { }; From dabed704c5fdcafc4deb040f3c4d80f7aeca064d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:33:00 -0500 Subject: [PATCH 074/129] kubeval: fix build on darwin --- pkgs/applications/networking/cluster/kubeval/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 54be5956040..046052f78be 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "kubeval"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Validate your Kubernetes configuration files"; homepage = https://github.com/instrumenta/kubeval; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6525f7fae09..fcb0e12c63e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20290,7 +20290,9 @@ in kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; - kubeval = callPackage ../applications/networking/cluster/kubeval { }; + kubeval = callPackage ../applications/networking/cluster/kubeval { + inherit (darwin.apple_sdk.frameworks) Security; + }; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; From 378de230c169a3379223bd8ac21b63711829e463 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:34:00 -0500 Subject: [PATCH 075/129] kepubify: fix build on darwin --- pkgs/tools/misc/kepubify/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 207492a8944..a7b7da451fb 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "kepubify"; @@ -15,9 +15,11 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." "covergen" "seriesmeta" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "EPUB to KEPUB converter"; homepage = "https://pgaskin.net/kepubify"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcb0e12c63e..53677e2b77c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20229,7 +20229,9 @@ in kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; - kepubify = callPackage ../tools/misc/kepubify { }; + kepubify = callPackage ../tools/misc/kepubify { + inherit (darwin.apple_sdk.frameworks) Security; + }; kermit = callPackage ../tools/misc/kermit { }; From 8e2dd1164f38b67847d5e56a496fb1a2f302aacc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:35:00 -0500 Subject: [PATCH 076/129] kubernetes-helm: fix build on darwin --- pkgs/applications/networking/cluster/helm/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 88ca9b3da94..822df765655 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }: buildGoModule rec { pname = "helm"; @@ -16,6 +16,9 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' $out/bin/helm completion bash > helm.bash $out/bin/helm completion zsh > helm.zsh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53677e2b77c..cdf85a8e8cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20318,7 +20318,9 @@ in linkerd = callPackage ../applications/networking/cluster/linkerd { }; - kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; + kubernetes-helm = callPackage ../applications/networking/cluster/helm { + inherit (darwin.apple_sdk.frameworks) Security; + }; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; From 3772f50fc63519cdb4a02e6f08cbf6c5d7defea7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:36:00 -0500 Subject: [PATCH 077/129] kubeseal: fix build on darwin --- pkgs/applications/networking/cluster/kubeseal/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 6d35d233d4f..092cee5f7a2 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "kubeseal"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "04dmjyz3vi2l0dfpyy42lkp2fv1vlfkvblrxh1dvb37phrkd5lbd"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/kubeseal" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "A Kubernetes controller and tool for one-way encrypted Secrets"; homepage = "https://github.com/bitnami-labs/sealed-secrets"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdf85a8e8cf..062fc84824f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20302,7 +20302,9 @@ in go = buildPackages.go_1_13; }; - kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; + kubeseal = callPackage ../applications/networking/cluster/kubeseal { + inherit (darwin.apple_sdk.frameworks) Security; + }; kubectl = callPackage ../applications/networking/cluster/kubectl { }; From cd50659071732ec6217a7c678784965f176c9c73 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:37:00 -0500 Subject: [PATCH 078/129] lego: fix build on darwin --- pkgs/tools/admin/lego/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 72c61ceecaf..0cb614c12d1 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "lego"; @@ -14,11 +14,13 @@ buildGoModule rec { modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii"; subPackages = [ "cmd/lego" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Let's Encrypt client and ACME library written in Go"; license = licenses.mit; homepage = "https://go-acme.github.io/lego/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 062fc84824f..e4bab6943ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4596,7 +4596,9 @@ in lefthook = gitAndTools.lefthook; - lego = callPackage ../tools/admin/lego { }; + lego = callPackage ../tools/admin/lego { + inherit (darwin.apple_sdk.frameworks) Security; + }; leocad = callPackage ../applications/graphics/leocad { }; From e52210e014d1dbc0d4b4052308818085904cfabb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:38:00 -0500 Subject: [PATCH 079/129] kustomize: fix build on darwin --- pkgs/development/tools/kustomize/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index e60181e9bc4..ce173e89a2c 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, tree }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "kustomize"; @@ -25,7 +25,9 @@ buildGoModule rec { modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Customization of kubernetes YAML configurations"; longDescription = '' kustomize lets you customize raw, template-free YAML files for diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4bab6943ad..bedd21d2dd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10510,7 +10510,9 @@ in kubie = callPackage ../development/tools/kubie { }; - kustomize = callPackage ../development/tools/kustomize { }; + kustomize = callPackage ../development/tools/kustomize { + inherit (darwin.apple_sdk.frameworks) Security; + }; ktlint = callPackage ../development/tools/ktlint { }; From 55fa7fd5856ab36332b0cc2d46e367a73b447fe8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:39:00 -0500 Subject: [PATCH 080/129] linkerd: fix build on darwin --- pkgs/applications/networking/cluster/linkerd/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 8c0265d1491..d52b25c2e01 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule { pname = "linkerd-unstablle"; @@ -13,6 +13,8 @@ buildGoModule { modSha256 = "0gahhywpcj16ww4l8s3wjwvavq24fpy258snhyf94ipy6lb797sl"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cli/cmd" ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bedd21d2dd4..719b7882539 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20322,7 +20322,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - linkerd = callPackage ../applications/networking/cluster/linkerd { }; + linkerd = callPackage ../applications/networking/cluster/linkerd { + inherit (darwin.apple_sdk.frameworks) Security; + }; kubernetes-helm = callPackage ../applications/networking/cluster/helm { inherit (darwin.apple_sdk.frameworks) Security; From d6950431b7c878af009b8c47eceb2da507a64487 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:40:00 -0500 Subject: [PATCH 081/129] lnd: fix build on darwin --- pkgs/applications/blockchains/lnd.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index dd45746c8df..4be19beedc3 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "lnd"; @@ -13,10 +13,12 @@ buildGoModule rec { modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Lightning Network Daemon"; homepage = "https://github.com/lightningnetwork/lnd"; - license = lib.licenses.mit; + license = licenses.mit; maintainers = with maintainers; [ cypherpunk2140 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 719b7882539..be3efb38468 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23099,6 +23099,7 @@ in lnd = callPackage ../applications/blockchains/lnd.nix { buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; monero = callPackage ../applications/blockchains/monero { From b85ea945043d903bc125b01face450b426f23dd2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:41:00 -0500 Subject: [PATCH 082/129] mautrix-whatsapp: fix build on darwin --- pkgs/servers/mautrix-whatsapp/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 578f125ee2b..b94eb00547a 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule { pname = "mautrix-whatsapp-unstable"; @@ -13,6 +13,8 @@ buildGoModule { modSha256 = "0ypj79rjwj5bls6aq2cz0d034dnv1sddl43iz51b4fl2bfv0drm9"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { homepage = https://github.com/tulir/mautrix-whatsapp; description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be3efb38468..c36d9404b9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4691,7 +4691,9 @@ in mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); - mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; + mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { + inherit (darwin.apple_sdk.frameworks) Security; + }; mcfly = callPackage ../tools/misc/mcfly { inherit (darwin.apple_sdk.frameworks) Security; From 6e973c66a0cfb9257cdc45cc935a1ab18f799107 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:42:00 -0500 Subject: [PATCH 083/129] minify: fix build on darwin --- pkgs/development/web/minify/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 3752519d060..cd602317c70 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "minify"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "09jk3mxf7n9wf1cgyiw9mhsr55fb12k399dmzhnib3vhd9xav15i"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Minifiers for web formats"; license = licenses.mit; homepage = "https://go.tacodewolff.nl/minify"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c36d9404b9c..912c0126f8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10571,7 +10571,9 @@ in mdl = callPackage ../development/tools/misc/mdl { }; - minify = callPackage ../development/web/minify { }; + minify = callPackage ../development/web/minify { + inherit (darwin.apple_sdk.frameworks) Security; + }; minizinc = callPackage ../development/tools/minizinc { }; minizincide = qt5.callPackage ../development/tools/minizinc/ide.nix { }; From 1bd77eb9b05d4c524c2ff57293d5bee6b9061c84 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:43:00 -0500 Subject: [PATCH 084/129] matterbridge: fix build on darwin --- pkgs/servers/matterbridge/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 556625016f2..2eec5d52bb9 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchurl }: +{ stdenv, buildGoModule, fetchurl, Security }: buildGoModule rec { pname = "matterbridge"; @@ -12,6 +12,8 @@ buildGoModule rec { sha256 = "15wgjzy9l3xlgih2zb56l4jmval4nhcs42wn9axvz2h7kqfbmw3d"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam"; homepage = "https://github.com/42wim/matterbridge"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 912c0126f8b..3135700abb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15622,7 +15622,9 @@ in mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { }; + matterbridge = callPackage ../servers/matterbridge { + inherit (darwin.apple_sdk.frameworks) Security; + }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; From 5b83d95f2f353b77ced97351d4b3e5324f055007 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:44:00 -0500 Subject: [PATCH 085/129] minio-client: fix build on darwin --- pkgs/tools/networking/minio-client/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 885ffbe9157..b8cf93bc2d3 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: buildGoModule rec { pname = "minio-client"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + subPackages = [ "." ]; preBuild = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3135700abb0..7a1dd558b4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5177,7 +5177,9 @@ in minetime = callPackage ../applications/office/minetime { }; - minio-client = callPackage ../tools/networking/minio-client { }; + minio-client = callPackage ../tools/networking/minio-client { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; minissdpd = callPackage ../tools/networking/minissdpd { }; From 3c1c304c7a035aa2321577b4ea267107f0bb0fee Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:45:00 -0500 Subject: [PATCH 086/129] minio: fix build on darwin --- pkgs/servers/minio/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 858f8899501..1fae973066a 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: buildGoModule rec { pname = "minio"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0ikid628v673f7lvp3psk05s3liqlyc3arppg33lfi2cmbaf8hmr"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + subPackages = [ "." ]; buildFlagsArray = [''-ldflags= diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a1dd558b4c..f2df1d4ef99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15640,7 +15640,9 @@ in micronaut = callPackage ../development/tools/micronaut {}; - minio = callPackage ../servers/minio { }; + minio = callPackage ../servers/minio { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + }; # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; From e0757cf88a19c01cd9ac65190ab1c8628a02e70a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:46:00 -0500 Subject: [PATCH 087/129] mkcert: fix build on darwin --- pkgs/development/tools/misc/mkcert/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index ae0a4a6dfe2..6a114a8de8b 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "mkcert"; @@ -19,7 +19,9 @@ buildGoModule rec { -X ${goPackagePath}/main.Version=${version} ''; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { homepage = https://github.com/FiloSottile/mkcert; description = "A simple tool for making locally-trusted development certificates"; license = licenses.bsd3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2df1d4ef99..9e9794b8914 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10582,7 +10582,9 @@ in mk = callPackage ../development/tools/build-managers/mk { }; - mkcert = callPackage ../development/tools/misc/mkcert { }; + mkcert = callPackage ../development/tools/misc/mkcert { + inherit (darwin.apple_sdk.frameworks) Security; + }; mkdocs = callPackage ../development/tools/documentation/mkdocs { }; From ee2bda21197134febf9dfaa8eb1d0595ff50a879 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:47:00 -0500 Subject: [PATCH 088/129] mod: fix build on darwin --- pkgs/development/tools/mod/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 67b829877b0..cc94692c023 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "mod"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "0x7bdhvam9l23cbdqpna8kwg0v6yhgmw0hlbm48bbhjl27lg7svc"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/mod" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Automated Semantic Import Versioning Upgrades for Go"; longDescription = '' Command line tool to upgrade/downgrade Semantic Import Versioning in Go diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e9794b8914..2f772ab3ebb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -301,7 +301,9 @@ in run = callPackage ../development/tools/run { }; - mod = callPackage ../development/tools/mod { }; + mod = callPackage ../development/tools/mod { + inherit (darwin.apple_sdk.frameworks) Security; + }; broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; From 7d3eb98d6226cf2209691e3e1f45e7c1130e56ef Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:48:00 -0500 Subject: [PATCH 089/129] mtail: fix build on darwin --- pkgs/servers/monitoring/mtail/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 64966e183fe..75b58b65a9c 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "mtail"; @@ -14,6 +14,8 @@ buildGoModule rec { modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi"; subPackages = [ "cmd/mtail" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + preBuild = '' go generate -x ./internal/vm/ ''; @@ -22,7 +24,7 @@ buildGoModule rec { "-ldflags=-X main.Version=${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { license = licenses.asl20; homepage = "https://github.com/google/mtail"; description = "Tool for extracting metrics from application logs"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f772ab3ebb..86bee3c57d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4732,7 +4732,9 @@ in motion = callPackage ../applications/video/motion { }; - mtail = callPackage ../servers/monitoring/mtail { }; + mtail = callPackage ../servers/monitoring/mtail { + inherit (darwin.apple_sdk.frameworks) Security; + }; multitail = callPackage ../tools/misc/multitail { }; From b6b516f7cfcdea860e8d09c53c40de5667ecb921 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:49:00 -0500 Subject: [PATCH 090/129] todoist: fix build on darwin --- pkgs/applications/misc/todoist/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index 74b2b770215..a625c834055 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "todoist"; @@ -13,10 +13,12 @@ buildGoModule rec { modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp"; - meta = { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { homepage = https://github.com/sachaos/todoist; description = "Todoist CLI Client"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86bee3c57d5..1f99bdd8f54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10935,7 +10935,9 @@ in tfsec = callPackage ../development/tools/analysis/tfsec { }; - todoist = callPackage ../applications/misc/todoist { }; + todoist = callPackage ../applications/misc/todoist { + inherit (darwin.apple_sdk.frameworks) Security; + }; todoist-electron = callPackage ../applications/misc/todoist-electron { }; From dba5b006e205f89dfeff7a884906524edbf63ce2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:50:00 -0500 Subject: [PATCH 091/129] proto-contrib: fix build on darwin --- pkgs/development/tools/proto-contrib/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix index 83668389556..adb0df28ce1 100644 --- a/pkgs/development/tools/proto-contrib/default.nix +++ b/pkgs/development/tools/proto-contrib/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "proto-contrib"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "19cqz13jd95d5vibd10420gg69ldgf6afc51mkglhafgmmif56b0"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Contributed tools and other packages on top of the Go proto package"; homepage = https://github.com/emicklei/proto-contrib; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f99bdd8f54..ba42d16c928 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -177,7 +177,9 @@ in hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M. - proto-contrib = callPackage ../development/tools/proto-contrib {}; + proto-contrib = callPackage ../development/tools/proto-contrib { + inherit (darwin.apple_sdk.frameworks) Security; + }; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; From ce9ac410171bb99c2a951fac264d2c06551cf6c8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:51:00 -0500 Subject: [PATCH 092/129] protoc-gen-doc: fix build on darwin --- pkgs/development/tools/protoc-gen-doc/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix index 77c1df6f43e..c25b2d56fe6 100644 --- a/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/pkgs/development/tools/protoc-gen-doc/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule { pname = "protoc-gen-doc-unstable"; @@ -13,7 +13,9 @@ buildGoModule { modSha256 = "1952ycdkgl00q2s3qmhislhhim15nn6nmlkwbfdvrsfzznqj47rd"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Documentation generator plugin for Google Protocol Buffers"; longDescription = '' This is a documentation generator plugin for the Google Protocol Buffers diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba42d16c928..0e6aaa5292b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -181,7 +181,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; + protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { + inherit (darwin.apple_sdk.frameworks) Security; + }; demoit = callPackage ../servers/demoit { }; From 0acc5e11b2bf0550261b11555ded92f7c7171f0c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:52:00 -0500 Subject: [PATCH 093/129] wtf: fix build on darwin --- pkgs/applications/misc/wtf/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index f12f96871c0..8c34baba582 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -1,8 +1,9 @@ { buildGoModule , fetchFromGitHub -, lib +, stdenv , makeWrapper , ncurses +, Security }: buildGoModule rec { @@ -24,12 +25,14 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' mv "$out/bin/wtf" "$out/bin/wtfutil" wrapProgram "$out/bin/wtfutil" --prefix PATH : "${ncurses.dev}/bin" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "The personal information dashboard for your terminal"; homepage = "https://wtfutil.com/"; license = licenses.mpl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e6aaa5292b..5d17c9b3b68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26246,7 +26246,9 @@ in zimg = callPackage ../development/libraries/zimg { }; - wtf = callPackage ../applications/misc/wtf { }; + wtf = callPackage ../applications/misc/wtf { + inherit (darwin.apple_sdk.frameworks) Security; + }; zk-shell = callPackage ../applications/misc/zk-shell { }; From fda0e24e5879b0cf4fb4ce54dda615f474a1c52f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:53:00 -0500 Subject: [PATCH 094/129] websocketd: fix build on darwin --- pkgs/applications/networking/websocketd/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix index 4160e70b9c4..8d0e92488db 100644 --- a/pkgs/applications/networking/websocketd/default.nix +++ b/pkgs/applications/networking/websocketd/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "websocketd"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Turn any program that uses STDIN/STDOUT into a WebSocket server"; homepage = "http://websocketd.com/"; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d17c9b3b68..80ac7745bb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26026,7 +26026,9 @@ in webfs = callPackage ../servers/http/webfs { }; - websocketd = callPackage ../applications/networking/websocketd { }; + websocketd = callPackage ../applications/networking/websocketd { + inherit (darwin.apple_sdk.frameworks) Security; + }; wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; From 42b14764abe9f68ad318657741cadb42a3db4bd9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:54:00 -0500 Subject: [PATCH 095/129] pet: fix build on darwin --- pkgs/development/tools/pet/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index e7f4fce3c4d..f1096e479a7 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "pet"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Simple command-line snippet manager, written in Go"; homepage = https://github.com/knqyf263/pet; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80ac7745bb4..0b5fe53b838 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -301,7 +301,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - pet = callPackage ../development/tools/pet { }; + pet = callPackage ../development/tools/pet { + inherit (darwin.apple_sdk.frameworks) Security; + }; run = callPackage ../development/tools/run { }; From f3c3ecae33c4c4914e91c6df1170de58c7968a47 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:55:00 -0500 Subject: [PATCH 096/129] prototol: fix build on darwin --- pkgs/development/tools/prototool/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix index 37b0f1fdf8d..15a854e4d86 100644 --- a/pkgs/development/tools/prototool/default.nix +++ b/pkgs/development/tools/prototool/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, protobuf }: +{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, protobuf, Security }: buildGoModule rec { pname = "prototool"; @@ -13,6 +13,8 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "1gc8kc9mbi3mlh48zx4lcgpsrf8z879f1qj9wfyr66s7wd1ljazg"; postInstall = '' @@ -23,7 +25,7 @@ buildGoModule rec { subPackages = [ "cmd/prototool" ]; - meta = with lib; { + meta = with stdenv.lib; { homepage = "https://github.com/uber/prototool"; description = "Your Swiss Army Knife for Protocol Buffers"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b5fe53b838..5ce565c0081 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17359,7 +17359,9 @@ in procdump = callPackage ../os-specific/linux/procdump { }; - prototool = callPackage ../development/tools/prototool { }; + prototool = callPackage ../development/tools/prototool { + inherit (darwin.apple_sdk.frameworks) Security; + }; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); From 0c25c3fd13ae8c35068e64d191db4f0d6e7a474c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:56:00 -0500 Subject: [PATCH 097/129] mutagen: fix build on darwin --- pkgs/tools/misc/mutagen/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 8940fef2a0d..c029f38acb2 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: buildGoModule rec { pname = "mutagen"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Make remote development work with your local tools"; homepage = "https://mutagen.io/"; changelog = "https://github.com/mutagen-io/mutagen/releases/tag/v${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ce565c0081..f4a8ee9b1a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5308,7 +5308,9 @@ in munt = libsForQt5.callPackage ../applications/audio/munt { }; - mutagen = callPackage ../tools/misc/mutagen { }; + mutagen = callPackage ../tools/misc/mutagen { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + }; mycli = callPackage ../tools/admin/mycli { }; From 4bf3a0de2e6c6f5bf44119a27a1e67b8f92514e3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:57:00 -0500 Subject: [PATCH 098/129] pgcenter: fix build on darwin --- pkgs/tools/misc/pgcenter/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index 7cb810b2fe2..9eed1aaffd8 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "pgcenter"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { homepage = https://pgcenter.org/; description = "Command-line admin tool for observing and troubleshooting PostgreSQL"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4a8ee9b1a7..e111be6f045 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5911,7 +5911,9 @@ in pg_top = callPackage ../tools/misc/pg_top { }; - pgcenter = callPackage ../tools/misc/pgcenter { }; + pgcenter = callPackage ../tools/misc/pgcenter { + inherit (darwin.apple_sdk.frameworks) Security; + }; pgmetrics = callPackage ../tools/misc/pgmetrics { }; From b11d54582d467072ff911ee3ceb36672f3c4aae5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:58:00 -0500 Subject: [PATCH 099/129] pgmetrics: fix build on darwin --- pkgs/tools/misc/pgmetrics/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index b702ffc1703..04e106ca552 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "pgmetrics"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0h375zk0ik06g0b5vmi00b1wn5q2c0r137f7qf6l8k8p886x41h6"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e111be6f045..54a0fd586bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5915,7 +5915,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - pgmetrics = callPackage ../tools/misc/pgmetrics { }; + pgmetrics = callPackage ../tools/misc/pgmetrics { + inherit (darwin.apple_sdk.frameworks) Security; + }; pdsh = callPackage ../tools/networking/pdsh { rsh = true; # enable internal rsh implementation From 7a84da8ac8a1931d9f2e59dec8dc09ef3f302759 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 05:59:00 -0500 Subject: [PATCH 100/129] shiori: fix build on darwin --- pkgs/servers/web-apps/shiori/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index dd4cdc08287..bd17f2f267c 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "shiori"; @@ -13,6 +13,8 @@ buildGoModule rec { sha256 = "13and7gh2882khqppwz3wwq44p7az4bfdfjvlnqcpqyi8xa28pmq"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Simple bookmark manager built with Go"; homepage = "https://github.com/go-shiori/shiori"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54a0fd586bb..6694cdee6fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16210,7 +16210,9 @@ in shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; - shiori = callPackage ../servers/web-apps/shiori { }; + shiori = callPackage ../servers/web-apps/shiori { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (callPackages ../servers/web-apps/matomo {}) matomo From 622494d85d9e309e9e65ff62d5c48221f1e92f59 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:00:00 -0500 Subject: [PATCH 101/129] helmfile: fix build on darwin --- .../networking/cluster/helmfile/default.nix | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index ee7c4ab9cbd..2de07e9fdc7 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,10 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: +{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, Security }: -let version = "0.102.0"; in - -buildGoModule { +buildGoModule rec { pname = "helmfile"; - inherit version; + version = "0.102.0"; src = fetchFromGitHub { owner = "roboll"; @@ -13,12 +11,12 @@ buildGoModule { sha256 = "0v7mhsnhswiqd62wrmkcpzsg9nfi6wvkh9danngs5rqjiz1zffhy"; }; - goPackagePath = "github.com/roboll/helmfile"; - modSha256 = "0s7j7jbgr8gdc0s9dnl6zjwkpywqj05xyb7mkcank54kgrz0g5vq"; nativeBuildInputs = [ makeWrapper ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = '' -ldflags= -X main.Version=${version} @@ -26,14 +24,14 @@ buildGoModule { postInstall = '' wrapProgram $out/bin/helmfile \ - --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ kubernetes-helm ]} ''; - meta = { + meta = with stdenv.lib; { description = "Deploy Kubernetes Helm charts"; homepage = "https://github.com/roboll/helmfile"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ pneumaticat yurrriq ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6694cdee6fb..d31e25ba1d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25323,7 +25323,9 @@ in stdenv = gcc8Stdenv; }; - helmfile = callPackage ../applications/networking/cluster/helmfile { }; + helmfile = callPackage ../applications/networking/cluster/helmfile { + inherit (darwin.apple_sdk.frameworks) Security; + }; heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; From 37087c1550d7afdfdf37b212ad59dc4481b6fef7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:01:00 -0500 Subject: [PATCH 102/129] prow: fix build on darwin --- pkgs/applications/networking/cluster/prow/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index 1c802802c09..e3eb24b2374 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "prow-unstable"; @@ -20,6 +20,8 @@ buildGoModule rec { modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "./prow/cmd/admission" "./prow/cmd/artifact-uploader" @@ -54,7 +56,7 @@ buildGoModule rec { "./prow/cmd/tot" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Prow is a Kubernetes based CI/CD system"; longDescription = '' Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d31e25ba1d2..3b1c426d659 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25901,6 +25901,7 @@ in # Version 2019-08-14 fails to build with go 1.13 due to dependencies: # go: golang.org/x/lint@v0.0.0-20190301231843-5614ed5bae6f used for two different module paths (github.com/golang/lint and golang.org/x/lint) buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; inherit (callPackage ../applications/networking/cluster/terraform { From 771cf05ac6d8373c4246b197a76c8d366207b901 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:02:00 -0500 Subject: [PATCH 103/129] qbec: fix build on darwin --- pkgs/applications/networking/cluster/qbec/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 4a8b2a2e664..4e475320a61 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "qbec"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "165zqmannlylkzaz9gkmcrlyx8rfhz70ahzhiks4ycgq1qxr0av9"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; homepage = "https://github.com/splunk/qbec"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b1c426d659..02d28e969ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20950,7 +20950,9 @@ in ptex = callPackage ../development/libraries/ptex {}; - qbec = callPackage ../applications/networking/cluster/qbec { }; + qbec = callPackage ../applications/networking/cluster/qbec { + inherit (darwin.apple_sdk.frameworks) Security; + }; rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; From 83b6e5b565f1ca3502ef7258a76d325539a45e13 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:03:00 -0500 Subject: [PATCH 104/129] shadowfox: fix build on darwin --- pkgs/tools/networking/shadowfox/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index f2ae143e1b9..37d5edaec45 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "shadowfox"; @@ -11,10 +11,10 @@ buildGoModule rec { sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; - goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlags = [ "--tags" "release" ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02d28e969ac..8146516d4ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21741,7 +21741,9 @@ in sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { }; + shadowfox = callPackage ../tools/networking/shadowfox { + inherit (darwin.apple_sdk.frameworks) Security; + }; shfmt = callPackage ../tools/text/shfmt { }; From 1565aabb5e18e8c6558f1b863ac3f22598e7e7d2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:04:00 -0500 Subject: [PATCH 105/129] nebula: fix build on darwin --- pkgs/tools/networking/nebula/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 3411aca5551..f78d7129c34 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "nebula"; @@ -13,11 +13,13 @@ buildGoModule rec { modSha256 = "1sy5mnwn9fxjf3y41lm8gsggid2c0y08iw88m9ng8psaf4qid8ij"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; buildFlagsArray = [ "-ldflags='-X main.Build=${version}'" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; longDescription = '' Nebula is a scalable overlay networking tool with a focus on performance, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8146516d4ea..9b6aa9636ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5348,7 +5348,9 @@ in ndppd = callPackage ../applications/networking/ndppd { }; - nebula = callPackage ../tools/networking/nebula { }; + nebula = callPackage ../tools/networking/nebula { + inherit (darwin.apple_sdk.frameworks) Security; + }; nemiver = callPackage ../development/tools/nemiver { }; From dc689861429aeeab9c0757c29971c4eeb92aefce Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:05:00 -0500 Subject: [PATCH 106/129] obfs4: fix build on darwin --- pkgs/tools/networking/obfs4/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 005abb0968b..93ebdeb0720 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, buildGoModule }: +{ stdenv, fetchgit, buildGoModule, Security }: buildGoModule rec { pname = "obfs4"; @@ -12,7 +12,9 @@ buildGoModule rec { modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "A pluggable transport proxy"; homepage = https://www.torproject.org/projects/obfsproxy; repositories.git = https://git.torproject.org/pluggable-transports/obfs4.git; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b6aa9636ef..7200320ff7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5575,7 +5575,9 @@ in obexd = callPackage ../tools/bluetooth/obexd { }; - obfs4 = callPackage ../tools/networking/obfs4 { }; + obfs4 = callPackage ../tools/networking/obfs4 { + inherit (darwin.apple_sdk.frameworks) Security; + }; oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; From 4340337ea522786c5f9468e093beb3fac0777d83 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:06:00 -0500 Subject: [PATCH 107/129] saml2aws: fix build on darwin --- pkgs/tools/security/saml2aws/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 01174789081..811b95d2524 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, libobjc, Foundation, IOKit }: buildGoModule rec { pname = "saml2aws"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0qxf2i06spjig3ynixh3xmbxpghh222jhfqcg71i4i79x4ycp5wx"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Foundation IOKit ]; + subPackages = [ "." "cmd/saml2aws" ]; buildFlagsArray = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7200320ff7d..6ec2b754743 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6457,7 +6457,10 @@ in samim-fonts = callPackage ../data/fonts/samim-fonts {}; - saml2aws = callPackage ../tools/security/saml2aws {}; + saml2aws = callPackage ../tools/security/saml2aws { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation IOKit; + }; samplicator = callPackage ../tools/networking/samplicator { }; From f729bd752f1c4e493fa60d5f035d0c3072ca7e61 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:07:00 -0500 Subject: [PATCH 108/129] tendermint: fix build on darwin --- pkgs/tools/networking/tendermint/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 0b9c254deeb..91378757af1 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "tendermint"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "1h51zgvjq3bm09yhm54rk8a86cqa1zma3mx6pb0kq7k72xvhpx0a"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; homepage = https://tendermint.com/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ec2b754743..409df09a56b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22127,6 +22127,7 @@ in tendermint = callPackage ../tools/networking/tendermint { buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; termdown = (newScope pythonPackages) ../applications/misc/termdown { }; From 2d271bdd4cc8767304111a5a5a1b626d37292681 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:08:00 -0500 Subject: [PATCH 109/129] sops: fix build on darwin --- pkgs/tools/security/sops/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 8aa2e219e7d..d028b9787db 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: buildGoModule rec { pname = "sops"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "0vhxd3dschj5i9sig6vpxzbl59cas1qa843akzmjnfjrrafb916y"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + meta = with stdenv.lib; { homepage = "https://github.com/mozilla/sops"; description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 409df09a56b..406587f7fec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21782,7 +21782,9 @@ in sooperlooper = callPackage ../applications/audio/sooperlooper { }; - sops = callPackage ../tools/security/sops { }; + sops = callPackage ../tools/security/sops { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; sorcer = callPackage ../applications/audio/sorcer { }; From 28a71c8f5974314b976c4699a3c6c7a933fb3ca9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:09:00 -0500 Subject: [PATCH 110/129] yggdrasil: fix build on darwin --- pkgs/tools/networking/yggdrasil/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 3bf3b97c235..605801b6ab7 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Foundation }: buildGoModule rec { pname = "yggdrasil"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Foundation ]; + # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to # be granted write permission to /run. @@ -27,7 +29,7 @@ buildGoModule rec { -s -w ''; - meta = with lib; { + meta = with stdenv.lib; { description = "An experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 406587f7fec..1246ee88846 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7757,7 +7757,9 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - yggdrasil = callPackage ../tools/networking/yggdrasil { }; + yggdrasil = callPackage ../tools/networking/yggdrasil { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; From 17eed5e575b6273c8b0a1f69dbe9378ce03436f5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:10:00 -0500 Subject: [PATCH 111/129] flyctl: fix build on darwin --- pkgs/development/web/flyctl/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 85165d501d9..05f07fd0260 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "flyctl"; @@ -11,6 +11,8 @@ buildGoModule rec { sha256 = "181j248i8j9g7kz5krg0bkbxkvmcwpz2vlknii5q3dy7yhgg19h3"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + preBuild = '' go generate ./... ''; @@ -22,7 +24,7 @@ buildGoModule rec { modSha256 = "1mqkc7hnavvpbqar9f1d2vnm47p4car9abnk2ikyf27jr5glwmsd"; - meta = with lib; { + meta = with stdenv.lib; { description = "Command line tools for fly.io services"; homepage = "https://fly.io/"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1246ee88846..010557e8b8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8156,7 +8156,9 @@ in }; fasm-bin = callPackage ../development/compilers/fasm/bin.nix { }; - flyctl = callPackage ../development/web/flyctl { }; + flyctl = callPackage ../development/web/flyctl { + inherit (darwin.apple_sdk.frameworks) Security; + }; fpc = callPackage ../development/compilers/fpc { }; From 306bc84748639db0b87694b54475a15647093c24 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:11:00 -0500 Subject: [PATCH 112/129] gotify-server: fix build on darwin --- pkgs/servers/gotify/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index f2014aac9fd..275aaa5d68b 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -1,11 +1,11 @@ { stdenv , buildGoPackage -, lib , fetchFromGitHub , buildGoModule , packr , sqlite , callPackage +, Security }: buildGoModule rec { @@ -28,7 +28,8 @@ buildGoModule rec { --replace 'Version = "unknown"' 'Version = "${version}"' ''; - buildInputs = [ sqlite ]; + buildInputs = [ sqlite ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ packr ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 010557e8b8d..c9c21acfac4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10405,7 +10405,9 @@ in gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { }; - gotify-server = callPackage ../servers/gotify { }; + gotify-server = callPackage ../servers/gotify { + inherit (darwin.apple_sdk.frameworks) Security; + }; gotty = callPackage ../servers/gotty { }; From d7d95111bd41a2501650134ce8f4404f8f34cde5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:12:00 -0500 Subject: [PATCH 113/129] zsh-history: fix build on darwin --- pkgs/shells/zsh/zsh-history/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index ece3c87cb66..382b76916d3 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests }: +{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests, Security }: buildGoModule rec { pname = "zsh-history"; @@ -13,6 +13,8 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42"; goPackagePath = "github.com/b4b4r07/history"; @@ -22,7 +24,7 @@ buildGoModule rec { installShellCompletion --zsh --name _history $out/share/zsh/completions/_history ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A CLI to provide enhanced history for your ZSH shell"; license = licenses.mit; homepage = https://github.com/b4b4r07/history; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9c21acfac4..2edf6d60611 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7810,7 +7810,9 @@ in zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; - zsh-history = callPackage ../shells/zsh/zsh-history { }; + zsh-history = callPackage ../shells/zsh/zsh-history { + inherit (darwin.apple_sdk.frameworks) Security; + }; zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { }; From 5ba00362714be0b22a21f08ba182fb7f6d8bc427 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:13:00 -0500 Subject: [PATCH 114/129] reviewdog: fix build on darwin --- pkgs/development/tools/misc/reviewdog/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 9af294716ff..aecd373f09e 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "reviewdog"; @@ -13,11 +13,13 @@ buildGoModule rec { modSha256 = "1jf08g0xr4wknh9x15igq73y02cy2faqjdjs2v842ii4p3n4p9dw"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/reviewdog" ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Automated code review tool integrated with any code analysis tools regardless of programming language"; homepage = "https://github.com/reviewdog/reviewdog"; changelog = "https://github.com/reviewdog/reviewdog/releases/tag/v${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2edf6d60611..f914e853854 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10795,7 +10795,9 @@ in withPEPatterns = true; }; - reviewdog = callPackage ../development/tools/misc/reviewdog { }; + reviewdog = callPackage ../development/tools/misc/reviewdog { + inherit (darwin.apple_sdk.frameworks) Security; + }; rman = callPackage ../development/tools/misc/rman { }; From 8b8dff4cc92fa3f3999e2f1fc70f1404d4208516 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:14:00 -0500 Subject: [PATCH 115/129] jx: fix build on darwin --- pkgs/applications/networking/cluster/jx/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 88aa8777ee5..f817a68ced1 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { name = "jx"; @@ -16,6 +16,8 @@ buildGoModule rec { ./3321-fix-location-of-thrift.patch ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac"; subPackages = [ "cmd/jx" ]; @@ -26,7 +28,7 @@ buildGoModule rec { -X github.com/jenkins-x/jx/pkg/version.Revision=${version} ''; - meta = with lib; { + meta = with stdenv.lib; { description = "JX is a command line tool for installing and using Jenkins X."; homepage = https://jenkins-x.io; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f914e853854..fbd343be6dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25919,7 +25919,9 @@ in sqsh = callPackage ../development/tools/sqsh { }; - jx = callPackage ../applications/networking/cluster/jx {}; + jx = callPackage ../applications/networking/cluster/jx { + inherit (darwin.apple_sdk.frameworks) Security; + }; prow = callPackage ../applications/networking/cluster/prow { # Version 2019-08-14 fails to build with go 1.13 due to dependencies: From e55240ee9acae1afd315149f42fc7217eddd0777 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:15:00 -0500 Subject: [PATCH 116/129] terracognita: fix build on darwin --- pkgs/development/tools/misc/terracognita/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 26aa50f7f7a..67e8df9561f 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "terracognita"; @@ -13,11 +13,13 @@ buildGoModule rec { modSha256 = "0xlhp8pa5g6an10m56g237pixc4h6ay89hkp1ijdz45iyfn9fk91"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; homepage = "https://github.com/cycloidio/terracognita"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbd343be6dd..c15abe9e7bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10939,7 +10939,9 @@ in teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; - terracognita = callPackage ../development/tools/misc/terracognita { }; + terracognita = callPackage ../development/tools/misc/terracognita { + inherit (darwin.apple_sdk.frameworks) Security; + }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; From 074703a553289cd0f9ec414bdd645e61ab64b670 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:16:00 -0500 Subject: [PATCH 117/129] tflint: fix build on darwin --- pkgs/development/tools/analysis/tflint/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 8f370d2e0aa..475ff662b85 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "tflint"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "1jbnsqa0ga372lhbgfnqvx8pdzrm0b2phzzwll4sgd0k1hzv2aqv"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Terraform linter focused on possible errors, best practices, and so on"; homepage = "https://github.com/terraform-linters/tflint"; changelog = "https://github.com/terraform-linters/tflint/releases/tag/v${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c15abe9e7bc..c3ee99f15a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10962,7 +10962,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - tflint = callPackage ../development/tools/analysis/tflint { }; + tflint = callPackage ../development/tools/analysis/tflint { + inherit (darwin.apple_sdk.frameworks) Security; + }; tfsec = callPackage ../development/tools/analysis/tfsec { }; From 4e9e877ca3a3abac92f63ede7f8d91ad547f007e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:17:00 -0500 Subject: [PATCH 118/129] minikube: fix build on darwin --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index f49f1768ced..ebd78424f4a 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -6,6 +6,10 @@ , go-bindata , libvirt , vmnet +, xpc +, libobjc +, Foundation +, IOKit }: buildGoModule rec { @@ -27,7 +31,7 @@ buildGoModule rec { nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ] - ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet xpc libobjc IOKit Foundation ]; preBuild = '' go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3ee99f15a2..a13eafe10a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20680,7 +20680,9 @@ in minidjvu = callPackage ../applications/graphics/minidjvu { }; minikube = callPackage ../applications/networking/cluster/minikube { - inherit (darwin.apple_sdk.frameworks) vmnet; + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) vmnet Foundation IOKit; }; minishift = callPackage ../applications/networking/cluster/minishift { }; From 7c096126c7228232f31b4333720a5e10f74c0e05 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:18:00 -0500 Subject: [PATCH 119/129] termshark: fix build on darwin --- pkgs/tools/networking/termshark/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 35b92e0f653..a24ff25ef2b 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: +{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli, Security }: buildGoModule rec { pname = "termshark"; @@ -12,7 +12,8 @@ buildGoModule rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wireshark-cli ]; + buildInputs = [ wireshark-cli ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a13eafe10a9..b78936af0f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19527,7 +19527,9 @@ in sngrep = callPackage ../applications/networking/sniffers/sngrep {}; - termshark = callPackage ../tools/networking/termshark { }; + termshark = callPackage ../tools/networking/termshark { + inherit (darwin.apple_sdk.frameworks) Security; + }; fbida = callPackage ../applications/graphics/fbida { }; From c70cc016d7d4c52be1f401bad876cc773a0d6470 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:19:00 -0500 Subject: [PATCH 120/129] mynewt-newt: fix build on darwin --- pkgs/tools/package-management/mynewt-newt/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index b40257d42f4..6afba001e08 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }: buildGoModule rec { pname = "mynewt-newt"; @@ -24,6 +24,8 @@ buildGoModule rec { modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { homepage = https://mynewt.apache.org/; description = "Build and package management tool for embedded development."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b78936af0f1..0cd55f652f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25460,7 +25460,9 @@ in musly = callPackage ../applications/audio/musly { }; - mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + mynewt-newt = callPackage ../tools/package-management/mynewt-newt { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; From 3ee3f9a535d2e7fcc4e695000e550a8981983ced Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:20:00 -0500 Subject: [PATCH 121/129] thanos: fix build on darwin --- pkgs/servers/monitoring/thanos/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index f307032f414..a246249d7d7 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "thanos"; version = "0.11.0"; @@ -12,6 +12,8 @@ buildGoModule rec { modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = "cmd/thanos"; buildFlagsArray = let t = "github.com/prometheus/common/version"; in '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cd55f652f7..d3ec1506417 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16206,7 +16206,9 @@ in tailscale = callPackage ../servers/tailscale { }; - thanos = callPackage ../servers/monitoring/thanos { }; + thanos = callPackage ../servers/monitoring/thanos { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (callPackages ../servers/http/tomcat { }) tomcat7 From dba7b8e394ce9f4b28b59d4d8fe1e3fcfdef3bca Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:21:00 -0500 Subject: [PATCH 122/129] victoriametrics: fix build on darwin --- pkgs/servers/nosql/victoriametrics/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 2d357712096..f85c4aebd51 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "VictoriaMetrics"; @@ -12,7 +12,10 @@ buildGoModule rec { }; modSha256 = "0qzh3jmj7ps6xmnnmfr8bnq97kdkn58p6dxppmlypanar3zsn7vk"; - meta = with lib; { + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { homepage = "https://victoriametrics.com/"; description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; license = licenses.asl20; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3ec1506417..199a8f9f30d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16248,7 +16248,9 @@ in unifiStable; unifi = unifiStable; - victoriametrics = callPackage ../servers/nosql/victoriametrics { }; + victoriametrics = callPackage ../servers/nosql/victoriametrics { + inherit (darwin.apple_sdk.frameworks) Security; + }; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; From 78f00558e2aba056009b6d13d3d89aeb49f2bf14 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:22:00 -0500 Subject: [PATCH 123/129] smimesign: fix build on darwin --- pkgs/os-specific/darwin/smimesign/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix index 9efa230d3b7..6e799f1caaa 100644 --- a/pkgs/os-specific/darwin/smimesign/default.nix +++ b/pkgs/os-specific/darwin/smimesign/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, libobjc, Security }: buildGoModule rec { pname = "smimesign"; @@ -13,9 +13,11 @@ buildGoModule rec { modSha256 = "1k3gnjzblfk14y19zhlvwysx045nbw0xr5nngh7zj1wcqxhhm206"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Security ]; + buildFlagsArray = "-ldflags=-X main.versionString=${version}"; - meta = with lib; { + meta = with stdenv.lib; { description = "An S/MIME signing utility for macOS and Windows that is compatible with Git."; homepage = https://github.com/github/smimesign; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 199a8f9f30d..498567a3b55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17471,7 +17471,10 @@ in smem = callPackage ../os-specific/linux/smem { }; - smimesign = callPackage ../os-specific/darwin/smimesign { }; + smimesign = callPackage ../os-specific/darwin/smimesign { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Security; + }; speedometer = callPackage ../os-specific/linux/speedometer { }; From 428bb7d2b8bb7e22e3f41be2b0c05c42a0581669 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:23:00 -0500 Subject: [PATCH 124/129] sensu-go-agent: fix build on darwin --- pkgs/servers/monitoring/sensu-go/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index f109b08d1a6..adba0277bf7 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: let generic = { subPackages, pname, postInstall ? "" }: @@ -20,6 +20,8 @@ let modSha256 = "02h4cav6ivzs3z0qakwxzf5lfy6hzax5c0i2icp0qymqc2789npw"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlagsArray = let versionPkg = "github.com/sensu/sensu-go/version"; in '' @@ -28,11 +30,11 @@ let -X ${versionPkg}.BuildSHA=${shortRev} ''; - meta = { + meta = with stdenv.lib; { homepage = "https://sensu.io"; description = "Open source monitoring tool for ephemeral infrastructure & distributed applications"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ thefloweringash ]; + license = licenses.mit; + maintainers = with maintainers; [ thefloweringash ]; }; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 498567a3b55..03bb393a870 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16158,7 +16158,9 @@ in sensu = callPackage ../servers/monitoring/sensu { }; - inherit (callPackages ../servers/monitoring/sensu-go { }) + inherit (callPackages ../servers/monitoring/sensu-go { + inherit (darwin.apple_sdk.frameworks) Security; + }) sensu-go-agent sensu-go-backend sensu-go-cli; From d77fc69768c7b96311a20d2edffe187ebe97dc68 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:24:00 -0500 Subject: [PATCH 125/129] syncthing: fix build on darwin --- pkgs/applications/networking/syncthing/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 516acab10f8..0fd3a5ca280 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, stdenv, lib, procps, fetchFromGitHub }: +{ buildGoModule, stdenv, lib, procps, fetchFromGitHub, libobjc, CoreServices, Foundation }: let common = { stname, target, postInstall ? "" }: @@ -15,6 +15,8 @@ let modSha256 = "1qq0979cm42wd3scy3blyi0hg67mkghis9r5rn2x1lqi2b982wfh"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc CoreServices Foundation ]; + patches = [ ./add-stcli-target.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03bb393a870..aa5a3ad048c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22069,7 +22069,10 @@ in syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; - inherit (callPackages ../applications/networking/syncthing { }) + inherit (callPackages ../applications/networking/syncthing { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + }) syncthing syncthing-cli syncthing-discovery From 8a51989af0fe02f0b37e75bed29dd4b95f0d3607 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:25:00 -0500 Subject: [PATCH 126/129] terraform-providers.elasticsearch: fix build on darwin --- .../networking/cluster/terraform-providers/default.nix | 2 ++ .../cluster/terraform-providers/elasticsearch/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 6a285d8b38b..5112277a8c4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , callPackage , buildGo112Module +, Security }: let list = import ./data.nix; @@ -29,6 +30,7 @@ in # verifying git.apache.org/thrift.git@v0.12.0/go.mod: git.apache.org/thrift.git@v0.12.0/go.mod: Get https://sum.golang.org/lookup/git.apache.org/thrift.git@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused # verifying github.com/hashicorp/terraform@v0.12.0/go.mod: github.com/hashicorp/terraform@v0.12.0/go.mod: Get https://sum.golang.org/lookup/github.com/hashicorp/terraform@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused buildGoModule = buildGo112Module; + inherit Security; }; gandi = callPackage ./gandi {}; ibm = callPackage ./ibm {}; diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index 1aadbbc5ccd..2f13000c0cd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "terraform-provider-elasticsearch"; version = "0.7.0"; @@ -12,6 +12,8 @@ buildGoModule rec { modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; # Terraform allow checking the provider versions, but this breaks diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa5a3ad048c..75f1a82ba3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25969,6 +25969,7 @@ in terraform-providers = recurseIntoAttrs ( callPackage ../applications/networking/cluster/terraform-providers { inherit buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; } ); From 47e436793b460e932d02b8ae3b7c7a74867b1e18 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:26:00 -0500 Subject: [PATCH 127/129] prometheus-varnish-exporter: fix build on darwin --- .../servers/monitoring/prometheus/varnish-exporter.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index d7767567195..a0e3c6b1783 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish }: +{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, varnish, Security }: buildGoModule rec { pname = "prometheus_varnish_exporter"; @@ -15,6 +15,8 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' wrapProgram $out/bin/prometheus_varnish_exporter \ --prefix PATH : "${varnish}/bin" @@ -22,10 +24,10 @@ buildGoModule rec { doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter"; description = "Varnish exporter for Prometheus"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ]; + license = licenses.mit; + maintainers = with maintainers; [ MostAwesomeDude willibutz ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75f1a82ba3a..d16d69356c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16042,6 +16042,7 @@ in # Version 1.5.1 fails to build with go 1.13 due to test failure # FAIL github.com/jonnenauha/prometheus_varnish_exporter 0.041s buildGoModule = buildGo112Module; + inherit (darwin.apple_sdk.frameworks) Security; }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { From f34fd0c37a099bcda4b7c1b3b87b5aff94d66f6d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:27:00 -0500 Subject: [PATCH 128/129] prometheus-dnsmasq-exporter: fix build on darwin --- pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index c8013e6bc15..773fddd311b 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "dnsmasq_exporter"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "1ag1k0z35zkazaxj8hh2wxfj73xg63xdybfm1565il2vxs5986dh"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A dnsmasq exporter for Prometheus"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d16d69356c1..5dc2d9c15c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16012,7 +16012,9 @@ in prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { }; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; - prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; + prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; From 7eb35cd1447a7c076bd4869c0e2e5f1ee428d70d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Mar 2020 06:28:00 -0500 Subject: [PATCH 129/129] prometheus-mikrotik-exporter: fix build on darwin --- pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 12341eee911..96526d246a6 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "mikrotik-exporter-unstable"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Prometheus MikroTik device(s) exporter"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5dc2d9c15c2..6b5e2653347 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16022,7 +16022,9 @@ in prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; - prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; + prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { };