about summary refs log tree commit diff
diff options
context:
space:
mode:
authorKamil Chmielewski <kamil.chm@gmail.com>2016-06-03 19:11:31 +0200
committerKamil Chmielewski <kamil.chm@gmail.com>2016-06-09 11:21:30 +0200
commit0066d89b0ce4b0e40bf5393861fac21124d5c288 (patch)
treec3faeee6adfe83f3defecf3d4b42c497d586130a
parentc7bf8afbfc02dbed6957d095d00f6e9a1a4f5279 (diff)
downloadnixlib-0066d89b0ce4b0e40bf5393861fac21124d5c288.tar
nixlib-0066d89b0ce4b0e40bf5393861fac21124d5c288.tar.gz
nixlib-0066d89b0ce4b0e40bf5393861fac21124d5c288.tar.bz2
nixlib-0066d89b0ce4b0e40bf5393861fac21124d5c288.tar.lz
nixlib-0066d89b0ce4b0e40bf5393861fac21124d5c288.tar.xz
nixlib-0066d89b0ce4b0e40bf5393861fac21124d5c288.tar.zst
nixlib-0066d89b0ce4b0e40bf5393861fac21124d5c288.zip
go-repo-root: extracted from goPackages
-rw-r--r--pkgs/development/tools/go-repo-root/default.nix20
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/go-packages.nix9
3 files changed, 21 insertions, 10 deletions
diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix
new file mode 100644
index 000000000000..15aa1504d93c
--- /dev/null
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "go-repo-root-${version}";
+  version = "20140911-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
+  
+  goPackagePath = "github.com/cstrahan/go-repo-root";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/cstrahan/go-repo-root";
+    sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4";
+  };
+
+  buildInputs = [ tools ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62c8316ccb0d..36a20ff3ac6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4551,7 +4551,7 @@ in
 
   go = self.go_1_5;
 
-  go-repo-root = goPackages.go-repo-root.bin // { outputs = [ "bin" ]; };
+  go-repo-root = (callPackage ../development/tools/go-repo-root { }).bin;
 
   gox = goPackages.gox.bin // { outputs = [ "bin" ]; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 65a0e065cadc..1d19bb945da4 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1804,15 +1804,6 @@ let
     sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x";
   };
 
-  go-repo-root = buildFromGitHub {
-    rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
-    version = "2014-09-11";
-    owner = "cstrahan";
-    repo = "go-repo-root";
-    sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4";
-    buildInputs = [ tools ];
-  };
-
   go-rice = buildFromGitHub {
     rev    = "4f3c5af2322e393f305d9674845bc36cd1dea589";
     version = "2016-01-04";