Merge remote-tracking branch 'gum/master'

This commit is contained in:
lassulus 2016-10-20 09:11:51 +02:00
commit 67a61b71fc

View File

@ -1,9 +1,9 @@
{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodePackages, nodejs }: { stdenv, makeWrapper, callPackage, lib, buildEnv, fetchgit, nodePackages, nodejs }:
with lib; with lib;
let let
np = nodePackages.override { np = (callPackage <nixpkgs/pkgs/top-level/node-packages.nix>) {
generated = ./packages.nix; generated = ./packages.nix;
self = np; self = np;
}; };
@ -18,7 +18,7 @@ let
ignoreCollisions = true; ignoreCollisions = true;
}; };
in nodePackages.buildNodePackage { in np.buildNodePackage {
name = "go"; name = "go";
src = fetchgit { src = fetchgit {