summary refs log tree commit diff
diff options
context:
space:
mode:
authorKamil Chmielewski <kamil.chm@gmail.com>2016-06-05 10:53:30 +0200
committerKamil Chmielewski <kamil.chm@gmail.com>2016-06-09 11:22:02 +0200
commit826ff3efc2dc78da1d8be355b354ef2a0e59d183 (patch)
tree28594f268f744094e1d50c40920f46b1a20da764
parent4ce39be8ea25941df935322b514a8c67e7777f9f (diff)
downloadnixpkgs-826ff3efc2dc78da1d8be355b354ef2a0e59d183.tar
nixpkgs-826ff3efc2dc78da1d8be355b354ef2a0e59d183.tar.gz
nixpkgs-826ff3efc2dc78da1d8be355b354ef2a0e59d183.tar.bz2
nixpkgs-826ff3efc2dc78da1d8be355b354ef2a0e59d183.tar.lz
nixpkgs-826ff3efc2dc78da1d8be355b354ef2a0e59d183.tar.xz
nixpkgs-826ff3efc2dc78da1d8be355b354ef2a0e59d183.tar.zst
nixpkgs-826ff3efc2dc78da1d8be355b354ef2a0e59d183.zip
glide: extracted from goPackages
-rw-r--r--pkgs/development/tools/glide/default.nix18
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/go-packages.nix8
3 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
new file mode 100644
index 00000000000..cc63921976f
--- /dev/null
+++ b/pkgs/development/tools/glide/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with go16Packages;
+
+buildGoPackage rec {
+  name = "glide-${version}";
+  version = "0.10.2";
+  rev = "${version}";
+  
+  goPackagePath = "github.com/Masterminds/glide";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/Masterminds/glide";
+    sha256 = "1qb2n5i04gabb2snnwfr8wv4ypcp1pdzvgga62m9xkhk4p2w6pwl";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b281ac10a2d..23af18ea076 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -811,7 +811,7 @@ in
 
   gist = callPackage ../tools/text/gist { };
 
-  glide = goPackages.glide.bin // { outputs = [ "bin" ]; };
+  glide = callPackage ../development/tools/glide { };
 
   gmic = callPackage ../tools/graphics/gmic { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a2d3dc38ce3..0bd9f10f9dd 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -866,14 +866,6 @@ let
     sha256 = "124hci9whsvlcywsfz5y20kkj3nhy176a1d5s1lkvsga09yxq6wm";
   };
 
-  glide = buildFromGitHub {
-    rev    = "0.10.2";
-    owner  = "Masterminds";
-    repo   = "glide";
-    sha256 = "1qb2n5i04gabb2snnwfr8wv4ypcp1pdzvgga62m9xkhk4p2w6pwl";
-    buildInputs = [ cookoo cli-go go-gypsy vcs ];
-  };
-
   gls = buildFromGitHub {
     rev    = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690";
     owner  = "jtolds";