Merge pull request #85122 from zowoq/go-security

go packages: remove darwin security
This commit is contained in:
Jörg Thalheim 2020-04-13 08:10:31 +01:00 committed by GitHub
commit fd0055b2e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 25 deletions

View file

@ -173,9 +173,7 @@ let
grv = callPackage ./grv { }; grv = callPackage ./grv { };
hub = callPackage ./hub { hub = callPackage ./hub { };
inherit (darwin) Security;
};
lab = callPackage ./lab { }; lab = callPackage ./lab { };

View file

@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchFromGitHub, groff, Security, utillinux }: { stdenv, buildGoPackage, fetchFromGitHub, groff, utillinux }:
buildGoPackage rec { buildGoPackage rec {
pname = "hub"; pname = "hub";
@ -17,7 +17,6 @@ buildGoPackage rec {
}; };
nativeBuildInputs = [ groff utillinux ]; nativeBuildInputs = [ groff utillinux ];
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .

View file

@ -1,4 +1,4 @@
{ stdenv, go, buildGoModule, fetchgit, Security }: { stdenv, go, buildGoModule, fetchgit }:
buildGoModule rec { buildGoModule rec {
pname = "gotools-unstable"; pname = "gotools-unstable";
@ -11,8 +11,6 @@ buildGoModule rec {
sha256 = "16m62m303j4wqfjr1401xpqpb9m11bs6qc2dhf6x2za2d9pycish"; sha256 = "16m62m303j4wqfjr1401xpqpb9m11bs6qc2dhf6x2za2d9pycish";
}; };
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
# Build of golang.org/x/tools/gopls fails with: # 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 # 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. # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module.

View file

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, brotli, Security }: { stdenv, buildGoModule, fetchFromGitHub, brotli }:
buildGoModule rec { buildGoModule rec {
pname = "wal-g"; pname = "wal-g";
@ -13,7 +13,7 @@ buildGoModule rec {
modSha256 = "0kwl5gwc5gc0cq2gldg13nvswp9wd90xiv1qb3g8yxcczywkpmrm"; modSha256 = "0kwl5gwc5gc0cq2gldg13nvswp9wd90xiv1qb3g8yxcczywkpmrm";
buildInputs = [ brotli ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; buildInputs = [ brotli ];
doCheck = true; doCheck = true;

View file

@ -1,7 +1,6 @@
{ buildGoModule { buildGoModule
, fetchFromGitHub , fetchFromGitHub
, stdenv , lib
, Security
}: }:
buildGoModule rec { buildGoModule rec {
@ -19,15 +18,13 @@ buildGoModule rec {
outputs = [ "out" "wordlists" ]; outputs = [ "out" "wordlists" ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
postInstall = '' postInstall = ''
mkdir -p $wordlists mkdir -p $wordlists
cp -R $src/examples/wordlists/*.txt $wordlists cp -R $src/examples/wordlists/*.txt $wordlists
gzip $wordlists/*.txt gzip $wordlists/*.txt
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "In-Depth DNS Enumeration and Network Mapping"; description = "In-Depth DNS Enumeration and Network Mapping";
longDescription = '' longDescription = ''
The OWASP Amass tool suite obtains subdomain names by scraping data The OWASP Amass tool suite obtains subdomain names by scraping data

View file

@ -567,9 +567,7 @@ in
acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; }; acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; };
amass = callPackage ../tools/networking/amass { amass = callPackage ../tools/networking/amass { };
inherit (darwin.apple_sdk.frameworks) Security;
};
afew = callPackage ../applications/networking/mailreaders/afew { }; afew = callPackage ../applications/networking/mailreaders/afew { };
@ -5711,7 +5709,7 @@ in
padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { }; padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { };
page = callPackage ../tools/misc/page { }; page = callPackage ../tools/misc/page { };
pagmo2 = callPackage ../development/libraries/pagmo2 { }; pagmo2 = callPackage ../development/libraries/pagmo2 { };
pakcs = callPackage ../development/compilers/pakcs { }; pakcs = callPackage ../development/compilers/pakcs { };
@ -17160,9 +17158,7 @@ in
go-tools = callPackage ../development/tools/go-tools { }; go-tools = callPackage ../development/tools/go-tools { };
gotools = callPackage ../development/tools/gotools { gotools = callPackage ../development/tools/gotools { };
inherit (darwin.apple_sdk.frameworks) Security;
};
gotop = callPackage ../tools/system/gotop { }; gotop = callPackage ../tools/system/gotop { };
@ -26294,9 +26290,7 @@ in
dsniff = callPackage ../tools/networking/dsniff {}; dsniff = callPackage ../tools/networking/dsniff {};
wal-g = callPackage ../tools/backup/wal-g { wal-g = callPackage ../tools/backup/wal-g { };
inherit (darwin.apple_sdk.frameworks) Security;
};
tlwg = callPackage ../data/fonts/tlwg { }; tlwg = callPackage ../data/fonts/tlwg { };