diff options
| author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-06 02:28:52 +0200 |
|---|---|---|
| committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-09 13:08:00 +0200 |
| commit | 7eb671ebcdd41d86980aa4826fa7b06f31a2ea0a (patch) | |
| tree | ff6325981b48656c69651975ce00f7370fa26a37 /pkgs/development/tools/packer | |
| parent | 6f51fdd81c4983574644ca1c86333cdf0d0dc467 (diff) | |
| download | nixpkgs-7eb671ebcdd41d86980aa4826fa7b06f31a2ea0a.tar nixpkgs-7eb671ebcdd41d86980aa4826fa7b06f31a2ea0a.tar.gz nixpkgs-7eb671ebcdd41d86980aa4826fa7b06f31a2ea0a.tar.bz2 nixpkgs-7eb671ebcdd41d86980aa4826fa7b06f31a2ea0a.tar.lz nixpkgs-7eb671ebcdd41d86980aa4826fa7b06f31a2ea0a.tar.xz nixpkgs-7eb671ebcdd41d86980aa4826fa7b06f31a2ea0a.tar.zst nixpkgs-7eb671ebcdd41d86980aa4826fa7b06f31a2ea0a.zip | |
no more goPackages
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 | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index fc8ef5ff964..7d566254633 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -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 diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix index 2be1911cf91..5ed606ad6c6 100644 --- a/pkgs/development/tools/packer/deps.nix +++ b/pkgs/development/tools/packer/deps.nix @@ -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"; |