Rework goPackages

pkgs/applications/misc/wego/default.nix

@@ -0,0 +1,17 @@
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "wego-${version}";
+  version = "20160407-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "81d72ffd761f032fbd73dba4f94bd94c8c2d53d5";
+
+  goPackagePath = "github.com/schachmat/wego";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/schachmat/wego";
+    sha256 = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck";
+  };
+
+  goDeps = ./deps.json;
+}

pkgs/applications/misc/wego/deps.json

@@ -0,0 +1,10 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/mattn/go-colorable",
+      "github.com/mattn/go-runewidth",
+      "github.com/schachmat/ingo"
+    ]
+  }
+]

pkgs/applications/networking/cluster/nomad/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "nomad-${version}";
+  version = "0.3.2";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/hashicorp/nomad";
+  subPackages = [ "." ];
+
+  src = fetchFromGitHub {
+    owner = "hashicorp";
+    repo = "nomad";
+    inherit rev;
+    sha256 = "1m2pdragpzrq0xbmnba039iiyhb16wirj3n1s52z5r8r0mr7drai";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://www.nomadproject.io/;
+    license = licenses.mpl20;
+    description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ rushmorem ];
+  };
+}

pkgs/applications/networking/cluster/terraform/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "terraform-${version}";
+  version = "0.6.15";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/hashicorp/terraform";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "hashicorp";
+    repo = "terraform";
+    sha256 = "1mf98hagb0yp40g2mbar7aw7hmpq01clnil6y9khvykrb33vy0nb";
+  };
+
+  postInstall = ''
+    # prefix all the plugins with "terraform-"
+    for i in $bin/bin/*; do
+      if [[ ! $(basename $i) =~ terraform* ]]; then
+        mv -v $i $bin/bin/terraform-$(basename $i);
+      fi
+    done
+  '';
+}

pkgs/applications/networking/drive/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "drive-${version}";
+  version = "20151025-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "6dc2f1e83032ea3911fa6147b846ee93f18dc544";
+
+  goPackagePath = "github.com/odeke-em/drive";
+  subPackages = [ "cmd/drive" ];
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/odeke-em/drive";
+    sha256 = "07s4nhfcr6vznf1amvl3a4wq2hn9zq871rcppfi4i6zs7iw2ay1v";
+  };
+
+  goDeps = ./deps.json;
+}

pkgs/applications/networking/drive/deps.json

@@ -0,0 +1,26 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/boltdb/bolt",
+      "github.com/cheggaaa/pb",
+      "github.com/odeke-em/cli-spinner",
+      "github.com/odeke-em/statos",
+      "golang.org/x/oauth2",
+      "github.com/odeke-em/exponential-backoff",
+      "github.com/odeke-em/extractor",
+      "github.com/odeke-em/meddler",
+      "github.com/odeke-em/xon",
+      "github.com/odeke-em/cache",
+      "github.com/odeke-em/drive",
+      "github.com/odeke-em/command",
+      "github.com/odeke-em/log",
+      "github.com/odeke-em/pretty-words",
+      "github.com/skratchdot/open-golang",
+      "google.golang.org/cloud",
+      "google.golang.org/api",
+      "github.com/mattn/go-isatty",
+      "golang.org/x/net"
+    ]
+  }
+]

pkgs/applications/networking/instant-messengers/pond/default.nix

@@ -0,0 +1,33 @@
+{ stdenv, lib, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3,
+  fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+let
+  isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64;
+  gui = true; # Might be implemented with nixpkgs config.
+in
+buildGoPackage rec {
+  name = "pond-${version}";
+  version = "20150830-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
+
+  goPackagePath = "github.com/agl/pond";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/agl/pond";
+    sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4";
+  };
+
+  goDeps = ./deps.json;
+
+  buildInputs = [ trousers pkgconfig gtk3 gtkspell3 ]
+    ++ stdenv.lib.optional isx86_64 dclxvi
+    ++ stdenv.lib.optionals gui [ wrapGAppsHook ];
+  buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui";
+  excludedPackages = "\\(appengine\\|bn256cgo\\)";
+  postPatch = stdenv.lib.optionalString isx86_64 ''
+    grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \
+      -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \
+      -e "s,bn256\.,bn256cgo.,g"
+  '';
+}

pkgs/applications/networking/instant-messengers/pond/deps.json

@@ -0,0 +1,12 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "golang.org/x/net",
+      "github.com/golang/protobuf",
+      "github.com/agl/ed25519",
+      "golang.org/x/crypto",
+      "github.com/agl/go-gtk"
+    ]
+  }
+]

pkgs/applications/networking/instant-messengers/xmpp-client/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "xmpp-client-${version}";
+  version = "20160110-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "525bd26cf5f56ec5aee99464714fd1d019c119ff";
+
+  goPackagePath = "github.com/agl/xmpp-client";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/agl/xmpp-client";
+    sha256 = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253";
+  };
+
+  goDeps = ./deps.json;
+
+  meta = with stdenv.lib; {
+    description = "An XMPP client with OTR support";
+    homepage = https://github.com/agl/xmpp-client;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ codsl ];
+  };
+}

pkgs/applications/networking/instant-messengers/xmpp-client/deps.json

@@ -0,0 +1,9 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "golang.org/x/crypto",
+      "golang.org/x/net"
+    ]
+  }
+]

pkgs/applications/networking/ipfs/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, buildGo15Package, fetchFromGitHub }:
+
+buildGo15Package rec {
+  name = "ipfs-${version}";
+  version = "i20160112--${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "7070b4d878baad57dcc8da80080dd293aa46cabd";
+
+  goPackagePath = "github.com/ipfs/go-ipfs";
+
+  src = fetchFromGitHub {
+    owner = "ipfs";
+    repo = "go-ipfs";
+    inherit rev;
+    sha256 = "1b7aimnbz287fy7p27v3qdxnz514r5142v3jihqxanbk9g384gcd";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A global, versioned, peer-to-peer filesystem";
+    license = licenses.mit;
+  };
+}

pkgs/applications/networking/syncthing/default.nix

@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
     mkdir -p src/github.com/syncthing
     ln -s $(pwd) src/github.com/syncthing/syncthing
     export GOPATH=$(pwd)
-    # Required for Go 1.5, can be removed for Go 1.6+
-    export GO15VENDOREXPERIMENT=1
 
     # Syncthing's build.go script expects this working directory
     cd src/github.com/syncthing/syncthing

pkgs/applications/networking/syncthing012/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "syncthing-${version}";
+  version = "0.12.15";
+  rev = "v${version}";
+
+  buildFlags = "--tags noupgrade,release";
+
+  goPackagePath = "github.com/syncthing/syncthing";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "syncthing";
+    repo = "syncthing";
+    sha256 = "0g4sj509h45iq6g7b0pl88rbbn7c7s01774yjc6bl376x1xrl6a1";
+  };
+
+  goDeps = ./deps.json;
+
+  postPatch = ''
+    # Mostly a cosmetic change
+    sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go
+  '';
+}

pkgs/applications/networking/syncthing012/deps.json

@@ -0,0 +1,21 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/bkaradzic/go-lz4",
+      "github.com/calmh/luhn",
+      "golang.org/x/text",
+      "github.com/kardianos/osext",
+      "github.com/vitrun/qart",
+      "github.com/calmh/du",
+      "github.com/calmh/xdr",
+      "github.com/juju/ratelimit",
+      "github.com/thejerf/suture",
+      "github.com/golang/snappy",
+      "github.com/rcrowley/go-metrics",
+      "github.com/syndtr/goleveldb",
+      "golang.org/x/crypto",
+      "golang.org/x/net"
+    ]
+  }
+]

pkgs/applications/version-management/git-and-tools/default.nix

@@ -40,7 +40,7 @@ rec {
   git-annex = pkgs.haskell.packages.lts.git-annex-with-assistant;
   gitAnnex = git-annex;
 
-  git-annex-remote-b2 = pkgs.goPackages.git-annex-remote-b2;
+  git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { };
 
   # support for bugzilla
   git-bz = callPackage ./git-bz { };

pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix

@@ -0,0 +1,17 @@
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "git-annex-remote-b2-${version}";
+  version = "20151212-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
+
+  goPackagePath = "github.com/encryptio/git-annex-remote-b2";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/encryptio/git-annex-remote-b2";
+    sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2";
+  };
+
+  goDeps = ./deps.json;
+}

pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json

@@ -0,0 +1,9 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/pquerna/ffjson",
+      "gopkg.in/kothar/go-backblaze.v0"
+    ]
+  }
+]

pkgs/applications/version-management/git-lfs/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "git-lfs-${version}";
+  # NOTE: use versions after 1.2.1
+  version = "2016-06-07";
+  rev = "12fe249f2eebb56608a825fdb4a68c00f090bc91";
+
+  goPackagePath = "github.com/github/git-lfs";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "github";
+    repo = "git-lfs";
+    sha256 = "0cj7xbgvj706r1cyxqlcwfvy5zg2d19al04d441sxa6spr6xa4v6";
+  };
+
+  # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'
+  excludedPackages = [ "test" ];
+
+  preBuild = ''
+    pushd go/src/github.com/github/git-lfs
+      go generate ./commands
+    popd
+  '';
+
+  postInstall = ''
+    rm -v $bin/bin/{man,script}
+  '';
+}

pkgs/build-support/docker/default.nix

@@ -1,5 +1,5 @@
 { stdenv, lib, callPackage, runCommand, writeReferencesToFile, writeText, vmTools, writeScript
-, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, goPackages, pigz }:
+, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, go, pigz }:
 
 # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future.
 
@@ -10,7 +10,7 @@ rec {
   # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
   # And we cannot untar it, because then we cannot preserve permissions ecc.
   tarsum = runCommand "tarsum" {
-    buildInputs = [ goPackages.go ];
+    buildInputs = [ go ];
   } ''
     mkdir tarsum
     cd tarsum