BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #85122 from zowoq/go-security

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/default.nix
View file

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

3
pkgs/applications/version-management/git-and-tools/hub/default.nix
View file

@ -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 .

4
pkgs/development/tools/gotools/default.nix
View file

@ -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.

4
pkgs/tools/backup/wal-g/default.nix
View file

@ -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;

7
pkgs/tools/networking/amass/default.nix
View file

@ -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

14
pkgs/top-level/all-packages.nix
View file

@ -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 { };
@ -5711,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 { };
@ -17160,9 +17158,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 { };
@ -26294,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 { };