Merge pull request #15426 from zimbatm/packer-0.10.1

packer: 0.8.6 -> 0.10.1

2 files changed, 428 insertions, 345 deletions

diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 716b489d3d7..fc8ef5ff964 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,35 +1,53 @@
-{ stdenv, lib, go, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
+{ stdenv, lib, go, gox, goPackages, fetchFromGitHub
+, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 stdenv.mkDerivation rec {
-  name = "packer-0.8.6";
+  name = "packer-${version}";
+  version = "0.10.1";
 
   src = import ./deps.nix {
-    inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
+    inherit stdenv lib go gox goPackages fetchgit fetchhg fetchbzr fetchsvn;
   };
 
-  buildInputs = [ go gox ];
+  buildInputs = [ go gox goPackages.tools ];
 
-  installPhase = ''
-    export GOPATH=$src
-    XC_ARCH=$(go env GOARCH)
-    XC_OS=$(go env GOOS)
+  configurePhase = ''
+    export GOPATH=$PWD/share/go
+    export XC_ARCH=$(go env GOARCH)
+    export XC_OS=$(go env GOOS)
 
-    mkdir -p $out/bin
+    mkdir $GOPATH/bin
+
+    cd $GOPATH/src/github.com/mitchellh/packer
+
+    # Don't fetch the deps
+    substituteInPlace "Makefile" --replace ': deps' ':'
+
+    # Avoid using git
+    sed \
+      -e "s|GITBRANCH:=.*||" \
+      -e "s|GITSHA:=.*|GITSHA=${src.rev}|" \
+      -i Makefile
+    sed \
+      -e "s|GIT_COMMIT=.*|GIT_COMMIT=${src.rev}|" \
+      -e "s|GIT_DIRTY=.*|GIT_DIRTY=|" \
+      -i "scripts/build.sh"
+  '';
+
+  buildPhase = ''
+    make generate releasebin
+  '';
 
-    cd $src/src/github.com/mitchellh/packer
-    gox \
-        -os="''${XC_OS}" \
-        -arch="''${XC_ARCH}" \
-        -output "$out/bin/packer-{{.Dir}}" \
-        ./...
-    mv $out/bin/packer{*packer*,}
+  installPhase = ''
+    mkdir -p $out/bin
+    mv bin/* $out/bin
   '';
 
   meta = with stdenv.lib; {
     description = "A tool for creating identical machine images for multiple platforms from a single source configuration";
-    homepage    = "http://www.packer.io";
+    homepage    = http://www.packer.io;
     license     = licenses.mpl20;
-    maintainers = with maintainers; [ cstrahan ];
+    maintainers = with maintainers; [ cstrahan zimbatm ];
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix
index 5f8e69679c1..2be1911cf91 100644
--- a/pkgs/development/tools/packer/deps.nix
+++ b/pkgs/development/tools/packer/deps.nix
@@ -1,507 +1,572 @@
 # This file was generated by go2nix.
-{ stdenv, lib, fetchFromGitHub, fetchgit, fetchhg, fetchbzr }:
+{ stdenv, lib, go, gox, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
-let
-  goDeps = [
-    {
-      root = "github.com/mitchellh/packer";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "packer";
-        rev = "f8f7b7a34c1be06058f5aca23a51247db12cdbc5";
-        sha256 = "162ja4klyb3nv44rhdg2gd3xrr4n0l0gi49cn1mr1s2h9yznphyp";
-      };
-    }
+with goPackages;
+
+buildGoPackage rec {
+  name = "packer-${version}";
+  version = "20160507-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0";
+
+  buildInputs = [ go gox goPackages.tools ];
+  
+  goPackagePath = "github.com/mitchellh/packer";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/mitchellh/packer";
+    sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10";
+  };
+
+  extraSrcs = [
     {
-      root = "github.com/mitchellh/gox";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "gox";
-        rev = "ef1967b9f538fe467e6a82fc42ec5dff966ad4ea";
-        sha256 = "0i9s8fp6m2igx93ffv3rf5v5hz7cwrx7pbxrz4cg94hba3sy3nfj";
+      goPackagePath = "github.com/ActiveState/tail";
+
+      src = fetchgit {
+        url = "https://github.com/ActiveState/tail";
+        rev = "1a0242e795eeefe54261ff308dc685f7d29cc58c";
+        sha256 = "0hhr2962xmbqzbf2p79xfrzbmjm33h61fj5zlazj7a55bwxn688d";
       };
     }
     {
-      root = "github.com/mitchellh/iochan";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "iochan";
-        rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7";
-        sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx";
+      goPackagePath = "github.com/Azure/azure-sdk-for-go";
+
+      src = fetchgit {
+        url = "https://github.com/Azure/azure-sdk-for-go";
+        rev = "a1883f7b98346e4908a6c25230c95a8a3026a10c";
+        sha256 = "0pxqi0b8qwcc687si3zh6w1d594rxd6kn2wzx23clbp2nc5w3wf4";
       };
     }
     {
-      root = "github.com/hashicorp/atlas-go";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "atlas-go";
-        rev = "d1d08e8e25f0659388ede7bb8157aaa4895f5347";
-        sha256 = "0bbqh94i8qllp51ln1mmcjy5srny7s4xg0l353kccvk3c7s68m03";
+      goPackagePath = "github.com/Azure/go-autorest";
+
+      src = fetchgit {
+        url = "https://github.com/Azure/go-autorest";
+        rev = "b01ec2b60f95678fa759f796bac3c6b9bceaead4";
+        sha256 = "1vqwy4m26ps5lmp066zgiz04s7r2dwa832zjlfmpgha7id16pa0c";
       };
     }
     {
-      root = "github.com/hashicorp/go-checkpoint";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "go-checkpoint";
-        rev = "88326f6851319068e7b34981032128c0b1a6524d";
-        sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4";
+      goPackagePath = "github.com/Azure/go-ntlmssp";
+
+      src = fetchgit {
+        url = "https://github.com/Azure/go-ntlmssp";
+        rev = "e0b63eb299a769ea4b04dadfe530f6074b277afb";
+        sha256 = "19bn9ds12cyf8y3w5brnxwg8lwdkg16ww9hmnq14y2kmli42l14m";
       };
     }
     {
-      root = "github.com/hashicorp/go-msgpack";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "go-msgpack";
-        rev = "fa3f63826f7c23912c15263591e65d54d080b458";
-        sha256 = "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k";
+      goPackagePath = "github.com/armon/go-radix";
+
+      src = fetchgit {
+        url = "https://github.com/armon/go-radix";
+        rev = "4239b77079c7b5d1243b7b4736304ce8ddb6f0f2";
+        sha256 = "0md8li1gv4ji4vr63cfa2bcmslba94dzw6awzn5ndnpmdb7np6vh";
       };
     }
     {
-      root = "github.com/hashicorp/go-multierror";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "go-multierror";
-        rev = "56912fb08d85084aa318edcf2bba735b97cf35c5";
-        sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r";
+      goPackagePath = "github.com/aws/aws-sdk-go";
+
+      src = fetchgit {
+        url = "https://github.com/aws/aws-sdk-go";
+        rev = "8041be5461786460d86b4358305fbdf32d37cfb2";
+        sha256 = "06ilyl1z5mn6i0afd8ila4lr2vwqdgq5zby8v4v2g3dd39qi6jq2";
       };
     }
     {
-      root = "github.com/hashicorp/go-version";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "go-version";
-        rev = "999359b6b7a041ce16e695d51e92145b83f01087";
-        sha256 = "0z2bzphrdkaxh5vnvjh3g25d6cykchshwwbyqgji91mpgjd30pbm";
+      goPackagePath = "github.com/bgentry/speakeasy";
+
+      src = fetchgit {
+        url = "https://github.com/bgentry/speakeasy";
+        rev = "36e9cfdd690967f4f690c6edcc9ffacd006014a0";
+        sha256 = "0grr82p10dk51l082xaqkpq3izj5bhby3l15gj866kngybfb4nzr";
       };
     }
     {
-      root = "github.com/hashicorp/yamux";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "yamux";
-        rev = "ae139c4ae7fe21e9d99459d2acc57967cebb6918";
-        sha256 = "1p5h2wklj8lb1vnjnd5kw7cshfmiw7jmzw9radln955hzd5xzbnl";
+      goPackagePath = "github.com/dgrijalva/jwt-go";
+
+      src = fetchgit {
+        url = "https://github.com/dgrijalva/jwt-go";
+        rev = "f2193411bd642f7db03249fd79d5292c9b34916a";
+        sha256 = "0nkzn8i5f7x3wyi7mhhj9vpdbkdjvrb9hhrw0fqy6vcghia6dhrj";
       };
     }
     {
-      root = "github.com/mitchellh/cli";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "cli";
-        rev = "8102d0ed5ea2709ade1243798785888175f6e415";
-        sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2";
+      goPackagePath = "github.com/digitalocean/godo";
+
+      src = fetchgit {
+        url = "https://github.com/digitalocean/godo";
+        rev = "6ca5b770f203b82a0fca68d0941736458efa8a4f";
+        sha256 = "00di15gdv47jfdr1l8cqphmlv5bzalxk7dk53g3mif7vwhs8749j";
       };
     }
     {
-      root = "github.com/mitchellh/mapstructure";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "mapstructure";
-        rev = "281073eb9eb092240d33ef253c404f1cca550309";
-        sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
+      goPackagePath = "github.com/dylanmei/iso8601";
+
+      src = fetchgit {
+        url = "https://github.com/dylanmei/iso8601";
+        rev = "2075bf119b58e5576c6ed9f867b8f3d17f2e54d4";
+        sha256 = "0px5aq4w96yyjii586h3049xm7rvw5r8w7ph3axhyismrqddqgx1";
       };
     }
     {
-      root = "github.com/mitchellh/osext";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "osext";
-        rev = "0dd3f918b21bec95ace9dc86c7e70266cfc5c702";
-        sha256 = "02pczqml6p1mnfdrygm3rs02g0r65qx8v1bi3x24dx8wv9dr5y23";
+      goPackagePath = "github.com/dylanmei/winrmtest";
+
+      src = fetchgit {
+        url = "https://github.com/dylanmei/winrmtest";
+        rev = "025617847eb2cf9bd1d851bc3b22ed28e6245ce5";
+        sha256 = "1i0wq6r1vm3nhnia3ycm5l590gyia7cwh6971ppnn4rrdmvsw2qh";
       };
     }
     {
-      root = "github.com/mitchellh/panicwrap";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "panicwrap";
-        rev = "45cbfd3bae250c7676c077fb275be1a2968e066a";
-        sha256 = "0mbha0nz6zcgp2pny2x03chq1igf9ylpz55xxq8z8g2jl6cxaghn";
+      goPackagePath = "github.com/go-ini/ini";
+
+      src = fetchgit {
+        url = "https://github.com/go-ini/ini";
+        rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3";
+        sha256 = "0dl5ibrrq2i887i0bf8a9m887rhnpgv6wmwyc1sj8a75c0yd02da";
       };
     }
     {
-      root = "github.com/mitchellh/prefixedio";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "prefixedio";
-        rev = "89d9b535996bf0a185f85b59578f2e245f9e1724";
-        sha256 = "0lc64rlizb412msd32am2fixkh0536pjv7czvgyw5fskn9kgk3y2";
+      goPackagePath = "github.com/google/go-querystring";
+
+      src = fetchgit {
+        url = "https://github.com/google/go-querystring";
+        rev = "2a60fc2ba6c19de80291203597d752e9ba58e4c0";
+        sha256 = "117211606pv0p3p4cblpnirrrassprrvvcq2svwpplsq5vff1rka";
       };
     }
     {
-      root = "github.com/mitchellh/reflectwalk";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "reflectwalk";
-        rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6";
-        sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq";
+      goPackagePath = "github.com/hashicorp/atlas-go";
+
+      src = fetchgit {
+        url = "https://github.com/hashicorp/atlas-go";
+        rev = "95fa852edca41c06c4ce526af4bb7dec4eaad434";
+        sha256 = "002lpvxi6my8dk4d4ks091ad66bj6rnz4xchbzpqwvp7n8097aqz";
       };
     }
     {
-      root = "github.com/mitchellh/go-fs";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "go-fs";
-        rev = "a34c1b9334e86165685a9449b782f20465eb8c69";
-        sha256 = "11sy85p77ffmavpiichzybrfvjm1ilsi4clx98n3363arksavs5i";
+      goPackagePath = "github.com/hashicorp/errwrap";
+
+      src = fetchgit {
+        url = "https://github.com/hashicorp/errwrap";
+        rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55";
+        sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
       };
     }
     {
-      root = "github.com/mitchellh/goamz";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "goamz";
-        rev = "caaaea8b30ee15616494ee68abd5d8ebbbef05cf";
-        sha256 = "0bshq69ir9h2nszbr74yvcg5wnd9a5skfmr9bgk014k9wwk7dc72";
+      goPackagePath = "github.com/hashicorp/go-checkpoint";
+
+      src = fetchgit {
+        url = "https://github.com/hashicorp/go-checkpoint";
+        rev = "e4b2dc34c0f698ee04750bf2035d8b9384233e1b";
+        sha256 = "0qjfk1fh5zmn04yzxn98zam8j4ay5mzd5kryazqj01hh7szd0sh5";
       };
     }
     {
-      root = "github.com/mitchellh/multistep";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "multistep";
-        rev = "162146fc57112954184d90266f4733e900ed05a5";
-        sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";
+      goPackagePath = "github.com/hashicorp/go-cleanhttp";
+
+      src = fetchgit {
+        url = "https://github.com/hashicorp/go-cleanhttp";
+        rev = "875fb671b3ddc66f8e2f0acc33829c8cb989a38d";
+        sha256 = "0ammv6gn9cmh6padaaw76wa6xvg22a9b3sw078v9chcvfk2bggha";
       };
     }
     {
-      root = "github.com/ActiveState/tail";
-      src = fetchFromGitHub {
-        owner = "ActiveState";
-        repo = "tail";
-        rev = "4b368d1590196ade29993d6a0896591403180bbd";
-        sha256 = "183y44skn75lkpsjd3zlbx8vc3b930p3nkpc1ybq3k50s4bzhsll";
+      goPackagePath = "github.com/hashicorp/go-multierror";
+
+      src = fetchgit {
+        url = "https://github.com/hashicorp/go-multierror";
+        rev = "d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5";
+        sha256 = "0dc02mvv11hvanh12nhw8jsislnxf6i4gkh6vcil0x23kj00z3iz";
       };
     }
     {
-      root = "google.golang.org/api";
+      goPackagePath = "github.com/hashicorp/go-rootcerts";
+
       src = fetchgit {
-        url = "https://github.com/google/google-api-go-client.git";
-        rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80";
-        sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8";
+        url = "https://github.com/hashicorp/go-rootcerts";
+        rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00";
+        sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9";
       };
     }
     {
-      root = "golang.org/x/crypto";
+      goPackagePath = "github.com/hashicorp/go-version";
+
       src = fetchgit {
-        url = "https://go.googlesource.com/crypto.git";
-        rev = "81bf7719a6b7ce9b665598222362b50122dfc13b";
-        sha256 = "0rwzc2ls842d0g588b5xik59srwzawch3nb1dlcqwm4a1132mvmr";
+        url = "https://github.com/hashicorp/go-version";
+        rev = "7e3c02b30806fa5779d3bdfc152ce4c6f40e7b38";
+        sha256 = "0ibqaq6z02himzci4krbfhqdi8fw2gzj9a8z375nl3qbzdgzqnm7";
       };
     }
     {
-      root = "golang.org/x/oauth2";
+      goPackagePath = "github.com/hashicorp/yamux";
+
       src = fetchgit {
-        url = "https://go.googlesource.com/oauth2.git";
-        rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a";
-        sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8";
+        url = "https://github.com/hashicorp/yamux";
+        rev = "df949784da9ed028ee76df44652e42d37a09d7e4";
+        sha256 = "080bmbdaq88ri2pn63mcjc4kq2y2sy1742ypqfgrvwssa1ynvnhy";
       };
     }
     {
-      root = "golang.org/x/net";
+      goPackagePath = "github.com/hpcloud/tail";
+
       src = fetchgit {
-        url = "https://go.googlesource.com/net.git";
-        rev = "7654728e381988afd88e58cabfd6363a5ea91810";
-        sha256 = "08i6kkzbckbc5k15bdlqkbird48zmc24qr505hlxlb11djjgdiml";
+        url = "https://github.com/hpcloud/tail";
+        rev = "1a0242e795eeefe54261ff308dc685f7d29cc58c";
+        sha256 = "0hhr2962xmbqzbf2p79xfrzbmjm33h61fj5zlazj7a55bwxn688d";
       };
     }
     {
-      root = "google.golang.org/appengine";
+      goPackagePath = "github.com/jmespath/go-jmespath";
+
       src = fetchgit {
-        url = "https://github.com/golang/appengine.git";
-        rev = "cdd515334b113fdc9b35cb1e7a3b457eeb5ad5cf";
-        sha256 = "0l0rddpfbddbi8kizg2n25w7bdhf99f0iz7ghwz7fq6k4rmq44ws";
+        url = "https://github.com/jmespath/go-jmespath";
+        rev = "c01cf91b011868172fdcd9f41838e80c9d716264";
+        sha256 = "0lp2m33a6x2pjbv5xlbbcr48qri32s84hcgm3xmgvmrx6zyi74zg";
       };
     }
     {
-      root = "google.golang.org/cloud";
+      goPackagePath = "github.com/kardianos/osext";
+
       src = fetchgit {
-        url = "https://github.com/GoogleCloudPlatform/gcloud-golang.git";
-        rev = "e34a32f9b0ecbc0784865fb2d47f3818c09521d4";
-        sha256 = "1rzac44kzhd7r6abdy5qyj69y64wy9r73vnxsdalfr5m0i55fqk4";
+        url = "https://github.com/kardianos/osext";
+        rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc";
+        sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a";
       };
     }
     {
-      root = "github.com/golang/protobuf";
-      src = fetchFromGitHub {
-        owner = "golang";
-        repo = "protobuf";
-        rev = "59b73b37c1e45995477aae817e4a653c89a858db";
-        sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
+      goPackagePath = "github.com/klauspost/compress";
+
+      src = fetchgit {
+        url = "https://github.com/klauspost/compress";
+        rev = "f86d2e6d8a77c6a2c4e42a87ded21c6422f7557e";
+        sha256 = "17f9zxrs2k8q5kghppjnbn0xzl3i4fgl4852kj8cg94b51s5ll9f";
       };
     }
     {
-      root = "github.com/mitchellh/gophercloud-fork-40444fb";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "gophercloud-fork-40444fb";
-        rev = "40444fbc2b10960682b34e6822eb9179216e1ae1";
-        sha256 = "06bm7hfi03c75npzy51wbl9qyln35c3kzj9yn2w4fhn0k9dia9s3";
+      goPackagePath = "github.com/klauspost/cpuid";
+
+      src = fetchgit {
+        url = "https://github.com/klauspost/cpuid";
+        rev = "349c675778172472f5e8f3a3e0fe187e302e5a10";
+        sha256 = "1y7gqpcpcb29ws77328vfm30s8nsrbxyylfpb8ksb8wwg062yv6v";
       };
     }
     {
-      root = "github.com/racker/perigee";
-      src = fetchFromGitHub {
-        owner = "racker";
-        repo = "perigee";
-        rev = "44a7879d89b7040bcdb51164a83292ef5bf9deec";
-        sha256 = "04wscffagpbcfjs6br96n46aqy43cq6ndq16nlpvank0m98jaax0";
+      goPackagePath = "github.com/klauspost/crc32";
+
+      src = fetchgit {
+        url = "https://github.com/klauspost/crc32";
+        rev = "999f3125931f6557b991b2f8472172bdfa578d38";
+        sha256 = "1sxnq3i7wvcdqx0l91jc04nf5584ym8dxzkz3xvivm8p7kz2xjns";
       };
     }
     {
-      root = "github.com/going/toolkit";
-      src = fetchFromGitHub {
-        owner = "going";
-        repo = "toolkit";
-        rev = "5bff591dc40da25dcc875d3fa1a3373d74d45411";
-        sha256 = "15gnlqignm7xcp2chrz7d7qqlibkbfrrsvbcysk8lrj9l7md8vjf";
+      goPackagePath = "github.com/klauspost/pgzip";
+
+      src = fetchgit {
+        url = "https://github.com/klauspost/pgzip";
+        rev = "47f36e165cecae5382ecf1ec28ebf7d4679e307d";
+        sha256 = "00jcx3pdwxi4r2l3m4b8jb17b2srckz488cmjvd1vqkr85a0jp2x";
       };
     }
     {
-      root = "github.com/mitchellh/go-vnc";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "go-vnc";
-        rev = "723ed9867aed0f3209a81151e52ddc61681f0b01";
-        sha256 = "0nlya2rbmwb3jycqsyah1pn4386712mfrfiprprkbzcna9q7lp1h";
+      goPackagePath = "github.com/kr/fs";
+
+      src = fetchgit {
+        url = "https://github.com/kr/fs";
+        rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
+        sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
       };
     }
     {
-      root = "github.com/howeyc/fsnotify";
-      src = fetchFromGitHub {
-        owner = "howeyc";
-        repo = "fsnotify";
-        rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2";
-        sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn";
+      goPackagePath = "github.com/masterzen/simplexml";
+
+      src = fetchgit {
+        url = "https://github.com/masterzen/simplexml";
+        rev = "95ba30457eb1121fa27753627c774c7cd4e90083";
+        sha256 = "0pwsis1f5n4is0nmn6dnggymj32mldhbvihv8ikn3nglgxclz4kz";
       };
     }
     {
-      root = "gopkg.in/tomb.v1";
+      goPackagePath = "github.com/masterzen/winrm";
+
       src = fetchgit {
-        url = "https://gopkg.in/tomb.v1.git";
-        rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
-        sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+        url = "https://github.com/masterzen/winrm";
+        rev = "54ea5d01478cfc2afccec1504bd0dfcd8c260cfa";
+        sha256 = "1d4khg7c4vw645id0x301zkgidm4ah6nkmiq52j8wsivi85yhn66";
       };
     }
     {
-      root = "github.com/vaughan0/go-ini";
-      src = fetchFromGitHub {
-        owner = "vaughan0";
-        repo = "go-ini";
-        rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
-        sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
+      goPackagePath = "github.com/masterzen/xmlpath";
+
+      src = fetchgit {
+        url = "https://github.com/masterzen/xmlpath";
+        rev = "13f4951698adc0fa9c1dda3e275d489a24201161";
+        sha256 = "1y81h7ymk3dp3w3a2iy6qd1dkm323rkxa27dzxw8vwy888j5z8bk";
       };
     }
     {
-      root = "github.com/aws/aws-sdk-go";
-      src = fetchFromGitHub {
-        owner = "aws";
-        repo = "aws-sdk-go";
-        rev = "f096b7d61df3d7d6d97f0e701f92616d1ea5420d";
-        sha256 = "0z2fknqxdyb5vw4am46cn60m15p9fjsqzpzaj2pamp436l0cpjkw";
+      goPackagePath = "github.com/mattn/go-isatty";
+
+      src = fetchgit {
+        url = "https://github.com/mattn/go-isatty";
+        rev = "56b76bdf51f7708750eac80fa38b952bb9f32639";
+        sha256 = "0l8lcp8gcqgy0g1cd89r8vk96nami6sp9cnkx60ms1dn6cqwf5n3";
       };
     }
     {
-      root = "github.com/digitalocean/godo";
-      src = fetchFromGitHub {
-        owner = "digitalocean";
-        repo = "godo";
-        rev = "2a0d64a42bb60a95677748a4d5729af6184330b4";
-        sha256 = "0854577b08fw9bjflk044ph16p15agxhh6xbzn71rhfvxg5yg5mi";
+      goPackagePath = "github.com/mitchellh/cli";
+
+      src = fetchgit {
+        url = "https://github.com/mitchellh/cli";
+        rev = "5c87c51cedf76a1737bf5ca3979e8644871598a6";
+        sha256 = "1ajxzh3winjnmqhd4yn6b6f155vfzi0dszhzl4a00zb5pdppp1rd";
       };
     }
     {
-      root = "github.com/dylanmei/winrmtest";
-      src = fetchFromGitHub {
-        owner = "dylanmei";
-        repo = "winrmtest";
-        rev = "025617847eb2cf9bd1d851bc3b22ed28e6245ce5";
-        sha256 = "1i0wq6r1vm3nhnia3ycm5l590gyia7cwh6971ppnn4rrdmvsw2qh";
+      goPackagePath = "github.com/mitchellh/go-fs";
+
+      src = fetchgit {
+        url = "https://github.com/mitchellh/go-fs";
+        rev = "a34c1b9334e86165685a9449b782f20465eb8c69";
+        sha256 = "11sy85p77ffmavpiichzybrfvjm1ilsi4clx98n3363arksavs5i";
       };
     }
     {
-      root = "github.com/klauspost/pgzip";
-      src = fetchFromGitHub {
-        owner = "klauspost";
-        repo = "pgzip";
-        rev = "47f36e165cecae5382ecf1ec28ebf7d4679e307d";
-        sha256 = "1bfka02xrhp4fg9pz2v4ppxa46b59bwy5n88c7hbbxqxm8z30yca";
+      goPackagePath = "github.com/mitchellh/go-homedir";
+
+      src = fetchgit {
+        url = "https://github.com/mitchellh/go-homedir";
+        rev = "d682a8f0cf139663a984ff12528da460ca963de9";
+        sha256 = "0vsiby9fbkaz7q067wmc6s5pzgpq4gdfx66cj2a1lbdarf7j1kbs";
       };
     }
     {
-      root = "github.com/masterzen/winrm";
-      src = fetchFromGitHub {
-        owner = "masterzen";
-        repo = "winrm";
-        rev = "54ea5d01478cfc2afccec1504bd0dfcd8c260cfa";
-        sha256 = "0qzdmsjgcf5n0jzjf4gd22lhqwn9yagynk1izjz3978gr025p2zm";
+      goPackagePath = "github.com/mitchellh/go-vnc";
+
+      src = fetchgit {
+        url = "https://github.com/mitchellh/go-vnc";
+        rev = "723ed9867aed0f3209a81151e52ddc61681f0b01";
+        sha256 = "0nlya2rbmwb3jycqsyah1pn4386712mfrfiprprkbzcna9q7lp1h";
       };
     }
     {
-      root = "github.com/google/go-querystring";
-      src = fetchFromGitHub {
-        owner = "google";
-        repo = "go-querystring";
-        rev = "2a60fc2ba6c19de80291203597d752e9ba58e4c0";
-        sha256 = "0raf6r3dd8rxxppzrbhp1y6k5csgfkfs7b0jylj65sbg0hbzxvbr";
+      goPackagePath = "github.com/mitchellh/iochan";
+
+      src = fetchgit {
+        url = "https://github.com/mitchellh/iochan";
+        rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7";
+        sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx";
       };
     }
     {
-      root = "github.com/go-ini/ini";
-      src = fetchFromGitHub {
-        owner = "go-ini";
-        repo = "ini";
-        rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3";
-        sha256 = "0xi8zr9qw38sdbv95c2ip31yczbm4axdvmj3ljyivn9xh2nbxfia";
+      goPackagePath = "github.com/mitchellh/mapstructure";
+
+      src = fetchgit {
+        url = "https://github.com/mitchellh/mapstructure";
+        rev = "281073eb9eb092240d33ef253c404f1cca550309";
+        sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
       };
     }
     {
-      root = "github.com/klauspost/compress";
-      src = fetchFromGitHub {
-        owner = "klauspost";
-        repo = "compress";
-        rev = "112706bf3743c241303219f9c5ce2e6635f69221";
-        sha256 = "1gyf5hf8wivbx6s99x2rxq2a335b49av2xb43nikgbzm4qn7win7";
+      goPackagePath = "github.com/mitchellh/multistep";
+
+      src = fetchgit {
+        url = "https://github.com/mitchellh/multistep";
+        rev = "162146fc57112954184d90266f4733e900ed05a5";
+        sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";
       };
     }
     {
-      root = "github.com/masterzen/simplexml";
-      src = fetchFromGitHub {
-        owner = "masterzen";
-        repo = "simplexml";
-        rev = "95ba30457eb1121fa27753627c774c7cd4e90083";
-        sha256 = "0pwsis1f5n4is0nmn6dnggymj32mldhbvihv8ikn3nglgxclz4kz";
+      goPackagePath = "github.com/mitchellh/packer";
+
+      src = fetchgit {
+        url = "https://github.com/mitchellh/packer";
+        rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0";
+        sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10";
       };
     }
     {
-      root = "github.com/masterzen/xmlpath";
-      src = fetchFromGitHub {
-        owner = "masterzen";
-        repo = "xmlpath";
-        rev = "13f4951698adc0fa9c1dda3e275d489a24201161";
-        sha256 = "1y81h7ymk3dp3w3a2iy6qd1dkm323rkxa27dzxw8vwy888j5z8bk";
+      goPackagePath = "github.com/mitchellh/panicwrap";
+
+      src = fetchgit {
+        url = "https://github.com/mitchellh/panicwrap";
+        rev = "a1e50bc201f387747a45ffff020f1af2d8759e88";
+        sha256 = "0w5y21psgrl1afsap613c3qw84ik7zhnalnv3bf6r51hyv187y69";
       };
     }
     {
-      root = "github.com/jmespath/go-jmespath";
-      src = fetchFromGitHub {
-        owner = "jmespath";
-        repo = "go-jmespath";
-        rev = "c01cf91b011868172fdcd9f41838e80c9d716264";
-        sha256 = "0gfrqwl648qngp77g8m1g9g7difggq2cac4ydjw9bpx4bd7mw1rw";
+      goPackagePath = "github.com/mitchellh/prefixedio";
+
+      src = fetchgit {
+        url = "https://github.com/mitchellh/prefixedio";
+        rev = "6e6954073784f7ee67b28f2d22749d6479151ed7";
+        sha256 = "0an2pnnda33ns94v7x0sv9kmsnk62r8xm0cj4d69f2p63r85fdp6";
       };
     }
     {
-      root = "github.com/klauspost/cpuid";
-      src = fetchFromGitHub {
-        owner = "klauspost";
-        repo = "cpuid";
-        rev = "349c675778172472f5e8f3a3e0fe187e302e5a10";
-        sha256 = "1s8baj42k66ny77qkm3n06kwayk4srwf4b9ss42612f3h86ka5i2";
+      goPackagePath = "github.com/mitchellh/reflectwalk";
+
+      src = fetchgit {
+        url = "https://github.com/mitchellh/reflectwalk";
+        rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6";
+        sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq";
       };
     }
     {
-      root = "github.com/nu7hatch/gouuid";
-      src = fetchFromGitHub {
-        owner = "nu7hatch";
-        repo = "gouuid";
+      goPackagePath = "github.com/nu7hatch/gouuid";
+
+      src = fetchgit {
+        url = "https://github.com/nu7hatch/gouuid";
         rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3";
-        sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj";
+        sha256 = "175alsrjb2a1qzwp1l323vwwpirzaj95yfqqfi780698myhpb52k";
       };
     }
     {
-      root = "github.com/klauspost/crc32";
-      src = fetchFromGitHub {
-        owner = "klauspost";
-        repo = "crc32";
-        rev = "999f3125931f6557b991b2f8472172bdfa578d38";
-        sha256 = "00ws3hrszxdnyj0cjk9b8b44xc8x5hizm0h22x6m3bb4c5b487wv";
+      goPackagePath = "github.com/packer-community/winrmcp";
+
+      src = fetchgit {
+        url = "https://github.com/packer-community/winrmcp";
+        rev = "f1bcf36a69fa2945e65dd099eee11b560fbd3346";
+        sha256 = "0pj5gfbmx507lp1w3gfn23x0rn0x5rih9nqij9g8d9c4m1sx3275";
       };
     }
     {
-      root = "github.com/pierrec/lz4";
-      src = fetchFromGitHub {
-        owner = "pierrec";
-        repo = "lz4";
+      goPackagePath = "github.com/pierrec/lz4";
+
+      src = fetchgit {
+        url = "https://github.com/pierrec/lz4";
         rev = "383c0d87b5dd7c090d3cddefe6ff0c2ffbb88470";
         sha256 = "0l23bmzqfvgh61zlikj6iakg0kz7lybs8zf0nscylskl2hlr09rp";
       };
     }
     {
-      root = "github.com/packer-community/winrmcp";
-      src = fetchFromGitHub {
-        owner = "packer-community";
-        repo = "winrmcp";
-        rev = "3d184cea22ee1c41ec1697e0d830ff0c78f7ea97";
-        sha256 = "0g2rwwhykm1z099gwkg1nmb1ggnizqlm2pbmy3qsdvjnl5246ca4";
+      goPackagePath = "github.com/pierrec/xxHash";
+
+      src = fetchgit {
+        url = "https://github.com/pierrec/xxHash";
+        rev = "5a004441f897722c627870a981d02b29924215fa";
+        sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja";
       };
     }
     {
-      root = "github.com/dylanmei/iso8601";
-      src = fetchFromGitHub {
-        owner = "dylanmei";
-        repo = "iso8601";
-        rev = "2075bf119b58e5576c6ed9f867b8f3d17f2e54d4";
-        sha256 = "0px5aq4w96yyjii586h3049xm7rvw5r8w7ph3axhyismrqddqgx1";
+      goPackagePath = "github.com/pkg/sftp";
+
+      src = fetchgit {
+        url = "https://github.com/pkg/sftp";
+        rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5";
+        sha256 = "0v6g9j9pnkqz72x5409y8gd8ycniziydvsjb4298dkd21d3b94dg";
       };
     }
     {
-      root = "github.com/pierrec/xxHash";
-      src = fetchFromGitHub {
-        owner = "pierrec";
-        repo = "xxHash";
-        rev = "5a004441f897722c627870a981d02b29924215fa";
-        sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja";
+      goPackagePath = "github.com/rackspace/gophercloud";
+
+      src = fetchgit {
+        url = "https://github.com/rackspace/gophercloud";
+        rev = "53d1dc4400e1ebcd37a0e01d8c1fe2f4db3b99d2";
+        sha256 = "0rdyljj395k1w7xnxw1i76w29fgl517mvs7bsqll35lss2gbhan2";
       };
     }
     {
-      root = "github.com/satori/go.uuid";
-      src = fetchFromGitHub {
-        owner = "satori";
-        repo = "go.uuid";
+      goPackagePath = "github.com/satori/go.uuid";
+
+      src = fetchgit {
+        url = "https://github.com/satori/go.uuid";
         rev = "d41af8bb6a7704f00bc3b7cba9355ae6a5a80048";
         sha256 = "0lw8k39s7hab737rn4nngpbsganrniiv7px6g41l6f6vci1skyn2";
       };
     }
     {
-      root = "github.com/rackspace/gophercloud";
-      src = fetchFromGitHub {
-        owner = "rackspace";
-        repo = "gophercloud";
-        rev = "680aa02616313d8399abc91f17a444cf9292f0e1";
-        sha256 = "0pxzvhh6l1gfn31k6g8fz3x4b6mz88cx2rgpims0ys5cl212zrp1";
+      goPackagePath = "github.com/tent/http-link-go";
+
+      src = fetchgit {
+        url = "https://github.com/tent/http-link-go";
+        rev = "ac974c61c2f990f4115b119354b5e0b47550e888";
+        sha256 = "0iwq842pvp5y77cr25yanj1cgqzmkz1aw6jzgjrrmlqqkdad5z8c";
       };
     }
     {
-      root = "gopkg.in/fsnotify.v0";
-      src = fetchFromGitHub {
-        owner = "go-fsnotify";
-        repo = "fsnotify";
-        rev = "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6";
-        sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9";
+      goPackagePath = "github.com/ugorji/go";
+
+      src = fetchgit {
+        url = "https://github.com/ugorji/go";
+        rev = "646ae4a518c1c3be0739df898118d9bccf993858";
+        sha256 = "0njncpdbh115l5mxyks08jh91kdmy0mvbmxj9mr1psv5k97gf0pn";
       };
     }
     {
-      root = "github.com/tent/http-link-go";
-      src = fetchFromGitHub {
-        owner = "tent";
-        repo = "http-link-go";
-        rev = "ac974c61c2f990f4115b119354b5e0b47550e888";
-        sha256 = "1fph21b6vp4cm73fkkykffggi57m656x9fd1k369fr6jbvq5fffj";
+      goPackagePath = "golang.org/x/crypto";
+
+      src = fetchgit {
+        url = "https://go.googlesource.com/crypto";
+        rev = "1f22c0103821b9390939b6776727195525381532";
+        sha256 = "05ahvn9g9cj7797n8ryfxv2g26v3lx1pza9d9pg97iw0rvar9i1h";
       };
     }
-  ];
+    {
+      goPackagePath = "golang.org/x/net";
 
-in
+      src = fetchgit {
+        url = "https://go.googlesource.com/net";
+        rev = "6ccd6698c634f5d835c40c1c31848729e0cecda1";
+        sha256 = "05c7kdjkvf7hrdiv1k12nyss6s8chhakqn1adxbrrahr6rl1nhpj";
+      };
+    }
+    {
+      goPackagePath = "golang.org/x/oauth2";
 
-stdenv.mkDerivation rec {
-  name = "go-deps";
+      src = fetchgit {
+        url = "https://go.googlesource.com/oauth2";
+        rev = "8a57ed94ffd43444c0879fe75701732a38afc985";
+        sha256 = "10pxnbsy1lnx7a1x6g3cna5gdm11aal1r446dpmpgj94xiw96mxv";
+      };
+    }
+    {
+      goPackagePath = "google.golang.org/api";
 
-  buildCommand =
-    lib.concatStrings
-      (map (dep: ''
-              mkdir -p $out/src/`dirname ${dep.root}`
-              ln -s ${dep.src} $out/src/${dep.root}
-            '') goDeps);
+      src = fetchgit {
+        url = "https://code.googlesource.com/google-api-go-client";
+        rev = "ddff2aff599105a55549cf173852507dfa094b7f";
+        sha256 = "03058zh0v997fxmlvd8r4m63r3z0fzg6fval6wnxw3wq22m7h3yx";
+      };
+    }
+    {
+      goPackagePath = "google.golang.org/cloud";
+
+      src = fetchgit {
+        url = "https://code.googlesource.com/gocloud";
+        rev = "5a3b06f8b5da3b7c3a93da43163b872c86c509ef";
+        sha256 = "03zrw3mgh82gvfgz17k97n8hivnvvplc42c7vyr76i90n1mv29g7";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/fsnotify.v1";
+
+      src = fetchgit {
+        url = "https://gopkg.in/fsnotify.v1";
+        rev = "8611c35ab31c1c28aa903d33cf8b6e44a399b09e";
+        sha256 = "17a7z88860hhmbgmpc2si1n67s8zk3vzwv5r4wyhrsljcq0bcv9q";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/tomb.v1";
+
+      src = fetchgit {
+        url = "https://gopkg.in/tomb.v1";
+        rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
+        sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+      };
+    }
+    {
+      goPackagePath = "gopkg.in/xmlpath.v2";
+
+      src = fetchgit {
+        url = "https://gopkg.in/xmlpath.v2";
+        rev = "860cbeca3ebcc600db0b213c0e83ad6ce91f5739";
+        sha256 = "0jgvd0y78fir4vkcj8acs0pdvlc0xr7i7cspbkm2yjm8wv23p63h";
+      };
+    }
+  ];
 }