From b3ef62bca280fcf43084a034da1ba45fc941a0d9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 13 Apr 2020 12:49:48 +1000 Subject: [PATCH 1/4] Revert "gotools: fix darwin build" This reverts commit cb75c0f90536d8aa5e970c6f4bedf78d635fe188. Not needed now that Security is propagated via go https://github.com/NixOS/nixpkgs/commit/0bba7474b3e6c8cef36960614446447d38ec04c9 --- pkgs/development/tools/gotools/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index d46c9a9fb31..430f17bfb5b 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, go, buildGoModule, fetchgit, Security }: +{ stdenv, go, buildGoModule, fetchgit }: buildGoModule rec { pname = "gotools-unstable"; @@ -11,8 +11,6 @@ buildGoModule rec { sha256 = "16m62m303j4wqfjr1401xpqpb9m11bs6qc2dhf6x2za2d9pycish"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - # Build of golang.org/x/tools/gopls fails with: # can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46e9dd3bee3..9a342f07280 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17160,9 +17160,7 @@ in go-tools = callPackage ../development/tools/go-tools { }; - gotools = callPackage ../development/tools/gotools { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gotools = callPackage ../development/tools/gotools { }; gotop = callPackage ../tools/system/gotop { }; From 86607280704bedd1534a50b1bf8c6b7330e96cbf Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 13 Apr 2020 12:50:09 +1000 Subject: [PATCH 2/4] Revert "amass: enable on darwin" This reverts commit 692b8900046f2c25a64472b56f0df62ff9004aba. Not needed now that Security is propagated via go https://github.com/NixOS/nixpkgs/commit/0bba7474b3e6c8cef36960614446447d38ec04c9 --- pkgs/tools/networking/amass/default.nix | 7 ++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 93b2aba5dbf..6398c4b91f1 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv -, Security +, lib }: buildGoModule rec { @@ -19,15 +18,13 @@ buildGoModule rec { outputs = [ "out" "wordlists" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - postInstall = '' mkdir -p $wordlists cp -R $src/examples/wordlists/*.txt $wordlists gzip $wordlists/*.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "In-Depth DNS Enumeration and Network Mapping"; longDescription = '' The OWASP Amass tool suite obtains subdomain names by scraping data diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a342f07280..5a2972847d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -567,9 +567,7 @@ in acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; }; - amass = callPackage ../tools/networking/amass { - inherit (darwin.apple_sdk.frameworks) Security; - }; + amass = callPackage ../tools/networking/amass { }; afew = callPackage ../applications/networking/mailreaders/afew { }; From 56480fe64c5622a3804673d64ba89b0dfb7db1b3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 13 Apr 2020 12:56:48 +1000 Subject: [PATCH 3/4] gitAndTools.hub: remove Security Not needed now that Security is propagated via go https://github.com/NixOS/nixpkgs/commit/0bba7474b3e6c8cef36960614446447d38ec04c9 --- .../applications/version-management/git-and-tools/default.nix | 4 +--- .../version-management/git-and-tools/hub/default.nix | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 8f46d9550f8..bdff64d5ae5 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -173,9 +173,7 @@ let grv = callPackage ./grv { }; - hub = callPackage ./hub { - inherit (darwin) Security; - }; + hub = callPackage ./hub { }; lab = callPackage ./lab { }; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 30c5ca8b770..8890cd5eb23 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, groff, Security, utillinux }: +{ stdenv, buildGoPackage, fetchFromGitHub, groff, utillinux }: buildGoPackage rec { pname = "hub"; @@ -17,7 +17,6 @@ buildGoPackage rec { }; nativeBuildInputs = [ groff utillinux ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; postPatch = '' patchShebangs . From c217a1a7e8371b0134a27af46b944204c81aaa66 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 13 Apr 2020 12:57:41 +1000 Subject: [PATCH 4/4] wal-g: remove Security Not needed now that Security is propagated via go https://github.com/NixOS/nixpkgs/commit/0bba7474b3e6c8cef36960614446447d38ec04c9 --- pkgs/tools/backup/wal-g/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index e5ed04bb4a1..ad67f7ce880 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, brotli, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, brotli }: buildGoModule rec { pname = "wal-g"; @@ -13,7 +13,7 @@ buildGoModule rec { modSha256 = "0kwl5gwc5gc0cq2gldg13nvswp9wd90xiv1qb3g8yxcczywkpmrm"; - buildInputs = [ brotli ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ brotli ]; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a2972847d6..3e934f9707b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5709,7 +5709,7 @@ in padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { }; page = callPackage ../tools/misc/page { }; - + pagmo2 = callPackage ../development/libraries/pagmo2 { }; pakcs = callPackage ../development/compilers/pakcs { }; @@ -26290,9 +26290,7 @@ in dsniff = callPackage ../tools/networking/dsniff {}; - wal-g = callPackage ../tools/backup/wal-g { - inherit (darwin.apple_sdk.frameworks) Security; - }; + wal-g = callPackage ../tools/backup/wal-g { }; tlwg = callPackage ../data/fonts/tlwg { };