diff options
| author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-05 16:41:51 +0200 |
|---|---|---|
| committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-09 11:22:02 +0200 |
| commit | fc88548b5d792c3ba4ac0cd2a127cdae52db0420 (patch) | |
| tree | ccbacca34dd3df6c28495bc1c0d126e824717018 /pkgs/top-level | |
| parent | 5d3f8fec7cfc732f8548ae4d27f88a19b58905b2 (diff) | |
| download | nixlib-fc88548b5d792c3ba4ac0cd2a127cdae52db0420.tar nixlib-fc88548b5d792c3ba4ac0cd2a127cdae52db0420.tar.gz nixlib-fc88548b5d792c3ba4ac0cd2a127cdae52db0420.tar.bz2 nixlib-fc88548b5d792c3ba4ac0cd2a127cdae52db0420.tar.lz nixlib-fc88548b5d792c3ba4ac0cd2a127cdae52db0420.tar.xz nixlib-fc88548b5d792c3ba4ac0cd2a127cdae52db0420.tar.zst nixlib-fc88548b5d792c3ba4ac0cd2a127cdae52db0420.zip | |
go2nix: extracted from goPackages
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 891472ae4c90..41a2534b4e67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9628,7 +9628,7 @@ in goPackages = go16Packages; - go2nix = goPackages.go2nix.bin // { outputs = [ "bin" ]; }; + go2nix = callPackage ../development/tools/go2nix { }; ### DEVELOPMENT / LISP MODULES diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 3602c68d908f..521452b55064 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3241,25 +3241,6 @@ let goPackageAliases = [ "gopkg.in/alecthomas/kingpin.v2" ]; }; - go2nix = buildFromGitHub rec { - rev = "4c552dadd855e3694ed3499feb46dca9cd855f60"; - owner = "kamilchm"; - repo = "go2nix"; - sha256 = "1pwnm1vrjxvgl17pk9n1k5chmhgwxkrwp2s1bzi64xf12anibj63"; - - buildInputs = [ pkgs.makeWrapper go-bindata.bin tools.bin vcs go-spew gls go-difflib assertions goconvey testify kingpin ]; - - preBuild = ''go generate ./...''; - - postInstall = '' - wrapProgram $bin/bin/go2nix \ - --prefix PATH : ${pkgs.nix-prefetch-git}/bin \ - --prefix PATH : ${pkgs.git}/bin - ''; - - allowGoReference = true; - }; - godotenv = buildFromGitHub rec { rev = "4ed13390c0acd2ff4e371e64d8b97c8954138243"; version = "2015-09-07"; |