summary refs log tree commit diff
diff options
context:
space:
mode:
authorobadz <dav-github@odav.org>2015-11-27 02:51:31 +0000
committerobadz <dav-github@odav.org>2015-12-15 07:37:35 -0600
commit074dfbe5165f7709de863ca152464fcfc762ebcd (patch)
treef3b598f3d9479d4af3aec944ef8fb660b01cf52e
parent93d8671e2c6d1d25f126ed30e5e6f16764330119 (diff)
downloadnixlib-074dfbe5165f7709de863ca152464fcfc762ebcd.tar
nixlib-074dfbe5165f7709de863ca152464fcfc762ebcd.tar.gz
nixlib-074dfbe5165f7709de863ca152464fcfc762ebcd.tar.bz2
nixlib-074dfbe5165f7709de863ca152464fcfc762ebcd.tar.lz
nixlib-074dfbe5165f7709de863ca152464fcfc762ebcd.tar.xz
nixlib-074dfbe5165f7709de863ca152464fcfc762ebcd.tar.zst
nixlib-074dfbe5165f7709de863ca152464fcfc762ebcd.zip
go/pup: init at 0.3.9
(also required go/color: init at 9aae6aa)
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/go-packages.nix23
2 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 986004c56422..792e66ee6e66 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 70dda19bc8ee..d631a7b4950d 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