public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packer: fix compilation

Browse Source 
* Remove duplicate "packer" source
* Use the same version of go everywhere
This commit is contained in:
zimbatm 2016-06-09 14:47:51 +01:00 committed by Kamil Chmielewski
parent f870d6aeb6
commit 943d59268a
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/packer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, go, gox, gotools, buildGoPackage, fetchFromGitHub { stdenv, lib, gox, gotools, buildGoPackage, fetchFromGitHub
, fetchgit, fetchhg, fetchbzr, fetchsvn }: , fetchgit, fetchhg, fetchbzr, fetchsvn }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -6,10 +6,10 @@ stdenv.mkDerivation rec {
version = "0.10.1"; version = "0.10.1";
src = import ./deps.nix { 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 = '' configurePhase = ''
export GOPATH=$PWD/share/go export GOPATH=$PWD/share/go

13
pkgs/development/tools/packer/deps.nix
View File

@ -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 { buildGoPackage rec {
name = "packer-${version}"; name = "packer-${version}";
version = "20160507-${stdenv.lib.strings.substring 0 7 rev}"; version = "20160507-${stdenv.lib.strings.substring 0 7 rev}";
rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0"; rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0";
buildInputs = [ go gox gotools ]; buildInputs = [ gox gotools ];
goPackagePath = "github.com/mitchellh/packer"; goPackagePath = "github.com/mitchellh/packer";
@ -376,15 +376,6 @@ buildGoPackage rec {
sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3"; sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";
}; };
} }
{
goPackagePath = "github.com/mitchellh/packer";
src = fetchgit {
url = "https://github.com/mitchellh/packer";
rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0";
sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10";
};
}
{ {
goPackagePath = "github.com/mitchellh/panicwrap"; goPackagePath = "github.com/mitchellh/panicwrap";