From fa7d863af03bff47fefb2be0d30d91f16864e87b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 5 Nov 2015 16:07:24 +0100 Subject: [PATCH] goPackages: include buildFromGithub to fix #10805 --- pkgs/top-level/go-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 1ff61a6041a2..0cb03b3cbfb0 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -6,16 +6,16 @@ let isGo14 = go.meta.branch == "1.4"; + self = _self // overrides; _self = with self; { + + inherit go buildGoPackage; + buildFromGitHub = { rev, date ? null, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // { inherit rev goPackagePath; name = "${name}-${if date != null then date else if builtins.stringLength rev != 40 then rev else stdenv.lib.strings.substring 0 7 rev}"; src = fetchFromGitHub { inherit rev owner repo sha256; }; }); - self = _self // overrides; _self = with self; { - - inherit go buildGoPackage; - ## OFFICIAL GO PACKAGES crypto = buildFromGitHub {