Merge pull request #83472 from Mic92/propragate-darwin-go

Propragate darwin go
This commit is contained in:
Jörg Thalheim
2020-03-28 06:57:59 +00:00
committed by GitHub
137 changed files with 446 additions and 867 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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