Reusing go libs in deis build

1 files changed, 33 insertions, 7 deletions

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 89258062f26..4f4fa327517 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,4 +1,4 @@
-{ go, govers, parallel, lib }:
+{ go, govers, parallel, lib, fetchgit }:
 
 { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
 
@@ -17,6 +17,9 @@
 # Extra sources to include in the gopath
 , extraSrcs ? [ ]
 
+# go2nix dependency file
+, goDeps ? null
+
 , dontRenameImports ? false
 
 # Do not enable this without good reason
@@ -27,6 +30,8 @@
 
 if disabled then throw "${name} not supported for go ${go.meta.branch}" else
 
+with builtins;
+
 let
   args = lib.filterAttrs (name: _: name != "extraSrcs") args';
 
@@ -35,6 +40,27 @@ let
   removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: ''
     | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \
   '');
+
+  dep2src = goDep:
+    {
+      inherit (goDep) goPackagePath;
+      src = if goDep.fetch.type == "git" then
+        fetchgit {
+          inherit (goDep.fetch) url rev sha256;
+        }
+        else {};
+    };
+
+  importGodeps = { depsFile, filterPackages ? [] }:
+  let
+    deps = lib.importJSON depsFile;
+    external = filter (d: d ? include) deps;
+    direct = filter (d: d ? goPackagePath && (length filterPackages == 0 || elem d.goPackagePath filterPackages)) deps;
+  in
+    concatLists (map importGodeps (map (d: { depsFile = ./. + d.include; filterPackages = d.packages; }) external)) ++ (map dep2src direct);
+
+  goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs
+                             else extraSrcs;
 in
 
 go.stdenv.mkDerivation (
@@ -53,13 +79,13 @@ go.stdenv.mkDerivation (
     mkdir -p "go/src/$(dirname "$goPackagePath")"
     mv "$sourceRoot" "go/src/$goPackagePath"
 
-  '' + lib.flip lib.concatMapStrings extraSrcs ({ src, goPackagePath }: ''
-    mkdir extraSrc
-    (cd extraSrc; unpackFile "${src}")
+  '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: ''
+    mkdir goPath
+    (cd goPath; unpackFile "${src}")
     mkdir -p "go/src/$(dirname "${goPackagePath}")"
-    chmod -R u+w extraSrc/*
-    mv extraSrc/* "go/src/${goPackagePath}"
-    rmdir extraSrc
+    chmod -R u+w goPath/*
+    mv goPath/* "go/src/${goPackagePath}"
+    rmdir goPath
 
   '') + ''
     export GOPATH=$NIX_BUILD_TOP/go:$GOPATH