From a0d835e95d3e99d57e14adc6116e2b498f32f323 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Fri, 8 Mar 2019 08:08:32 -0800 Subject: [PATCH] buildGoPackage: move it under a different path This change moves buildGoPackage from pkgs/development/go-modules to pkgs/development/go-packages, so we can have buildGoModule at pkgs/development/go-modules. --- .../{go-modules => go-packages}/generic/default.nix | 0 .../{go-modules => go-packages}/tools/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/{go-modules => go-packages}/generic/default.nix (100%) rename pkgs/development/{go-modules => go-packages}/tools/setup-hook.sh (100%) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-packages/generic/default.nix similarity index 100% rename from pkgs/development/go-modules/generic/default.nix rename to pkgs/development/go-packages/generic/default.nix diff --git a/pkgs/development/go-modules/tools/setup-hook.sh b/pkgs/development/go-packages/tools/setup-hook.sh similarity index 100% rename from pkgs/development/go-modules/tools/setup-hook.sh rename to pkgs/development/go-packages/tools/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8cf2cf8db9..2d9d4185bb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13342,10 +13342,10 @@ in ### DEVELOPMENT / GO MODULES - buildGo110Package = callPackage ../development/go-modules/generic { + buildGo110Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_10; }; - buildGo111Package = callPackage ../development/go-modules/generic { + buildGo111Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_11; };