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] 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 e5ed04bb4a1c..ad67f7ce880d 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 5a2972847d62..3e934f9707bf 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 { };