no more goPackages
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, go, gox, goPackages, fetchFromGitHub
|
||||
{ stdenv, lib, go, 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 goPackages fetchgit fetchhg fetchbzr fetchsvn;
|
||||
inherit stdenv lib go gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn;
|
||||
};
|
||||
|
||||
buildInputs = [ go gox goPackages.tools ];
|
||||
buildInputs = [ go gox gotools ];
|
||||
|
||||
configurePhase = ''
|
||||
export GOPATH=$PWD/share/go
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
# This file was generated by go2nix.
|
||||
{ stdenv, lib, go, gox, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
|
||||
|
||||
with goPackages;
|
||||
{ stdenv, lib, go, 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 goPackages.tools ];
|
||||
buildInputs = [ go gox gotools ];
|
||||
|
||||
goPackagePath = "github.com/mitchellh/packer";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user