From 066db11215a2287a88a80ec71595cd8764563444 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Fri, 27 Mar 2020 07:33:21 +0000 Subject: Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin" This reverts commit 4e6bf03504c9e09f067cc6dee6b5aeec43a1405c, reversing changes made to afd997aab6e9b7a322198092c7828d6c560ac06f. Instead we propagate those frameworks from the compiler again --- .../version-management/git-and-tools/default.nix | 20 +++++--------------- .../version-management/git-and-tools/ghq/default.nix | 4 +--- .../git-and-tools/git-bug/default.nix | 4 +--- .../git-and-tools/git-subtrac/default.nix | 6 ++---- .../version-management/git-and-tools/lab/default.nix | 4 +--- .../git-and-tools/lefthook/default.nix | 4 +--- 6 files changed, 11 insertions(+), 31 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index c4a99cf18584..a4b3ac1a65aa 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -34,9 +34,7 @@ let inherit (darwin.apple_sdk.frameworks) Security; }; - ghq = callPackage ./ghq { - inherit (darwin.apple_sdk.frameworks) Security; - }; + ghq = callPackage ./ghq { }; git = appendToName "minimal" gitBase; @@ -67,9 +65,7 @@ let git-appraise = callPackage ./git-appraise {}; - git-bug = callPackage ./git-bug { - inherit (darwin.apple_sdk.frameworks) Security; - }; + git-bug = callPackage ./git-bug { }; # support for bugzilla git-bz = callPackage ./git-bz { }; @@ -140,9 +136,7 @@ let git-subrepo = callPackage ./git-subrepo { }; - git-subtrac = callPackage ./git-subtrac { - inherit (darwin.apple_sdk.frameworks) Security; - }; + git-subtrac = callPackage ./git-subtrac { }; git-sync = callPackage ./git-sync { }; @@ -183,13 +177,9 @@ let inherit (darwin) Security; }; - lab = callPackage ./lab { - inherit (darwin.apple_sdk.frameworks) Security; - }; + lab = callPackage ./lab { }; - lefthook = callPackage ./lefthook { - inherit (darwin.apple_sdk.frameworks) Security; - }; + lefthook = callPackage ./lefthook { }; pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 34829c14b7bb..d0c468ab68ea 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghq"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = '' -ldflags= -X=main.Version=${version} diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index fdb5a6c53fdf..ed0c8680d753 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "git-bug"; @@ -15,8 +15,6 @@ buildGoModule rec { modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = '' -ldflags= -X ${goPackagePath}/commands.GitCommit=${rev} diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index 9ccf3c606a2a..07c63ea0119b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "git-subtrac"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Keep the content for your git submodules all in one place: the parent repo"; homepage = "https://github.com/apenwarr/git-subtrac"; license = licenses.asl20; diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index 8780ce4a2205..3e47631caf69 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "lab"; @@ -15,8 +15,6 @@ buildGoModule rec { modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index c80cff15265e..9fc89d520ae9 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "lefthook"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Fast and powerful Git hooks manager for any type of projects"; homepage = "https://github.com/Arkweid/lefthook"; -- cgit 1.4.1