summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorWael M. Nasreddine <wael.nasreddine@gmail.com>2019-03-08 08:08:32 -0800
committerWael M. Nasreddine <wael.nasreddine@gmail.com>2019-03-13 18:40:24 -0700
commita0d835e95d3e99d57e14adc6116e2b498f32f323 (patch)
tree8a2a15b1ba4855cb1686386c860f02662af7592b /pkgs
parent44298e76d5f5badef4b1026412049314eacf2949 (diff)
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.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/go-packages/generic/default.nix (renamed from pkgs/development/go-modules/generic/default.nix)0
-rw-r--r--pkgs/development/go-packages/tools/setup-hook.sh (renamed from pkgs/development/go-modules/tools/setup-hook.sh)0
-rw-r--r--pkgs/top-level/all-packages.nix4
3 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index eb45f446dc9d..eb45f446dc9d 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/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
index e354e50c35aa..e354e50c35aa 100644
--- a/pkgs/development/go-modules/tools/setup-hook.sh
+++ b/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 e8cf2cf8db96..2d9d4185bb40 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;
};