From 074dfbe5165f7709de863ca152464fcfc762ebcd Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 27 Nov 2015 02:51:31 +0000 Subject: [PATCH] go/pup: init at 0.3.9 (also required go/color: init at 9aae6aa) --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/go-packages.nix | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 986004c5642..792e66ee6e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1671,6 +1671,8 @@ let go-mtpfs = goPackages.mtpfs.bin // { outputs = [ "bin" ]; }; + go-pup = goPackages.pup.bin // { outputs = [ "bin" ]; }; + googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 70dda19bc8e..d631a7b4950 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3230,4 +3230,27 @@ let ''; }; + color = buildFromGitHub { + rev = "9aae6aaa22315390f03959adca2c4d395b02fcef"; + owner = "fatih"; + repo = "color"; + sha256 = "1vjcgx4xc0h4870qzz4mrh1l0f07wr79jm8pnbp6a2yd41rm8wjp"; + propagatedBuildInputs = [ net go-isatty ]; + buildInputs = [ ansicolor go-colorable ]; + }; + + pup = buildFromGitHub { + rev = "9693b292601dd24dab3c04bc628f9ae3fa72f831"; + owner = "EricChiang"; + repo = "pup"; + sha256 = "04j3fy1vk6xap8ad7k3c05h9b5mg2n1vy9vcyg9rs02cb13d3sy0"; + propagatedBuildInputs = [ net ]; + buildInputs = [ go-colorable color ]; + postPatch = '' + grep -sr github.com/ericchiang/pup/Godeps/_workspace/src/ | + cut -f 1 -d : | + sort -u | + xargs -d '\n' sed -i -e s,github.com/ericchiang/pup/Godeps/_workspace/src/,,g + ''; + }; }; in self