From 0066d89b0ce4b0e40bf5393861fac21124d5c288 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Fri, 3 Jun 2016 19:11:31 +0200 Subject: [PATCH] go-repo-root: extracted from goPackages --- .../tools/go-repo-root/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 9 --------- 3 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/tools/go-repo-root/default.nix 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";