diff options
author | zimbatm <zimbatm@zimbatm.com> | 2016-06-09 14:47:51 +0100 |
---|---|---|
committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-09 16:11:25 +0200 |
commit | 943d59268a384f7bec2ac4ecbd837932a109c65a (patch) | |
tree | 3c48220a6e17b086c37c6ee83eb0b254536f5113 /pkgs/development/tools/packer | |
parent | f870d6aeb6cf14e4af9c7e77a1340ec68d882933 (diff) |
packer: fix compilation
* Remove duplicate "packer" source * Use the same version of go everywhere
Diffstat (limited to 'pkgs/development/tools/packer')
-rw-r--r-- | pkgs/development/tools/packer/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/packer/deps.nix | 13 |
2 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 7d566254633b3..5b8c13e3baf97 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, gox, gotools, buildGoPackage, fetchFromGitHub +{ stdenv, lib, gox, gotools, buildGoPackage, fetchFromGitHub , fetchgit, fetchhg, fetchbzr, fetchsvn }: stdenv.mkDerivation rec { @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { version = "0.10.1"; src = import ./deps.nix { - inherit stdenv lib go gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn; + inherit stdenv lib gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn; }; - buildInputs = [ go gox gotools ]; + buildInputs = [ src.go gox gotools ]; configurePhase = '' export GOPATH=$PWD/share/go diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix index 5ed606ad6c6b1..25098219ea280 100644 --- a/pkgs/development/tools/packer/deps.nix +++ b/pkgs/development/tools/packer/deps.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, go, gox, gotools, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, gox, gotools, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "packer-${version}"; version = "20160507-${stdenv.lib.strings.substring 0 7 rev}"; rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0"; - buildInputs = [ go gox gotools ]; + buildInputs = [ gox gotools ]; goPackagePath = "github.com/mitchellh/packer"; @@ -377,15 +377,6 @@ buildGoPackage rec { }; } { - goPackagePath = "github.com/mitchellh/packer"; - - src = fetchgit { - url = "https://github.com/mitchellh/packer"; - rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0"; - sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10"; - }; - } - { goPackagePath = "github.com/mitchellh/panicwrap"; src = fetchgit { |