diff --git a/pkgs/development/tools/misc/go-repo-root/default.nix b/pkgs/development/tools/misc/go-repo-root/default.nix deleted file mode 100644 index 16520ee0457..00000000000 --- a/pkgs/development/tools/misc/go-repo-root/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -let - version = "0.0.1"; -in - -with lib; with goPackages; -buildGoPackage rec { - name = "go-repo-root-${version}"; - goPackagePath = "github.com/cstrahan/go-repo-root"; - src = fetchFromGitHub { - owner = "cstrahan"; - repo = "go-repo-root"; - rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; - sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; - }; - - buildInputs = [ tools ]; - - meta = with lib; { - homepage = "https://github.com/cstrahan/go-repo-root"; - maintainers = with maintainers; [ cstrahan ]; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65fbeb55b8d..8d91b59c959 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4092,7 +4092,7 @@ let then go_1_4 # missing DWARF files during go-1.5 build else go_1_5; - go-repo-root = callPackage ../development/tools/misc/go-repo-root { }; + go-repo-root = goPackages.go-repo-root.bin // { outputs = [ "bin" ]; }; gox = goPackages.gox.bin // { outputs = [ "bin" ]; }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index d9c15174836..6f625eb6dec 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1272,6 +1272,15 @@ let sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x"; }; + go-repo-root = buildFromGitHub { + rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; + date = "2014-09-11"; + owner = "cstrahan"; + repo = "go-repo-root"; + sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; + buildInputs = [ tools ]; + }; + go-runit = buildFromGitHub { rev = "a9148323a615e2e1c93b7a9893914a360b4945c8"; owner = "soundcloud";