Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b7d362ab9137
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fd0055b2e260
Choose a head ref
  • 5 commits
  • 6 files changed
  • 2 contributors

Commits on Apr 13, 2020

  1. Revert "gotools: fix darwin build" 

    This reverts commit cb75c0f.

Not needed now that Security is propagated via go 0bba747
    @zowoq
    zowoq committed Apr 13, 2020
    Copy the full SHA
    b3ef62b View commit details

  2. Revert "amass: enable on darwin" 

    This reverts commit 692b890.

Not needed now that Security is propagated via go 0bba747
    @zowoq
    zowoq committed Apr 13, 2020
    Copy the full SHA
    8660728 View commit details

  3. gitAndTools.hub: remove Security 

    Not needed now that Security is propagated via go 0bba747
    @zowoq
    zowoq committed Apr 13, 2020
    Copy the full SHA
    56480fe View commit details

  4. wal-g: remove Security 

    Not needed now that Security is propagated via go 0bba747
    @zowoq
    zowoq committed Apr 13, 2020
    Copy the full SHA
    c217a1a View commit details

  5. Merge pull request #85122 from zowoq/go-security 

    go packages: remove darwin security
    @Mic92
    Mic92 authored Apr 13, 2020
    Copy the full SHA
    fd0055b View commit details
4 changes: 1 addition & 3 deletions pkgs/applications/version-management/git-and-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -173,9 +173,7 @@ let

grv = callPackage ./grv { };

hub = callPackage ./hub {
inherit (darwin) Security;
};
hub = callPackage ./hub { };

lab = callPackage ./lab { };

3 changes: 1 addition & 2 deletions pkgs/applications/version-management/git-and-tools/hub/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 3 deletions pkgs/development/tools/gotools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions pkgs/tools/backup/wal-g/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 5 deletions pkgs/tools/networking/amass/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 4 additions & 10 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };