From 23a92ba43c92fa73f885cc8fb6743f4adb221d13 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 16 Apr 2015 18:43:09 +0200 Subject: pond: fix build by renaming imports, also add renameImports to goBuildPackage --- pkgs/top-level/all-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 904347586876..8f8855e23ff3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8000,7 +8000,9 @@ let go = go_1_3; buildGoPackage = import ../development/go-modules/generic { go = go_1_3; - }; + govers = go13Packages.govers; + inherit lib; + }; overrides = (config.goPackageOverrides or (p: {})) pkgs; }); @@ -8008,6 +8010,8 @@ let go = go_1_4; buildGoPackage = import ../development/go-modules/generic { go = go_1_4; + govers = go14Packages.govers; + inherit lib; }; overrides = (config.goPackageOverrides or (p: {})) pkgs; }); @@ -11605,7 +11609,7 @@ let inherit (xorg) libXpm; }; - pond = callPackage ../applications/networking/pond { goPackages = go13Packages; }; + pond = callPackage ../applications/networking/pond { goPackages = go14Packages; }; potrace = callPackage ../applications/graphics/potrace {}; -- cgit 1.4.1