From 52dae14f0c763dd48572058f0f0906166da14c31 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Thu, 21 Mar 2019 20:40:07 -0700 Subject: [PATCH] buildGoModule: use go_1_12 instead of go_1_11 (#58103) --- pkgs/applications/misc/hugo/default.nix | 2 +- pkgs/applications/misc/terminal-parrot/default.nix | 2 +- pkgs/applications/misc/todoist/default.nix | 2 +- .../networking/cluster/hetzner-kube/default.nix | 2 +- pkgs/applications/networking/cluster/jx/default.nix | 2 +- .../version-management/git-and-tools/lab/default.nix | 2 +- pkgs/development/tools/gotools/default.nix | 4 ++-- pkgs/development/tools/mod/default.nix | 2 +- pkgs/development/tools/pet/default.nix | 2 +- pkgs/servers/miniflux/default.nix | 2 +- pkgs/shells/zsh/antibody/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 +++++- 12 files changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 9adb1f60b334..0aed767675e1 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "01grfbr3kpd4qf5cbcmzc6yfq34cm0nkak4pqzgrn46r254y0ymv"; }; - modSha256 = "0fqmxmhbzkd5617gch836l7clqbxx8b1mxx09v3v2c4jjxcm85cm"; + modSha256 = "01gni3ksw9whf388c6cj0vcbpsyhdrwfl8cyw85kjx8r56dv88y5"; buildFlags = "-tags extended"; diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index 2ae86c5d5102..bdbea571790e 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; }; - modSha256 = "0ymqhrkgk94z4f2p3c6v75g2h8qlqzdi7byivqzxzmdczmq9zq2s"; + modSha256 = "01i8fim9z2l8rpdgfaih9ldvbap7gcx5767a15miv8q7sxpr90cp"; meta = with stdenv.lib; { description = "Shows colorful, animated party parrot in your terminial"; diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index 31901bf5616b..d4735c0baf5f 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1kwvlsjr2a7wdhlwpxxpdh87wz8k9yjwl59vl2g7ya6m0rvhd3mc"; }; - modSha256 = "0ng1paw2mizhs4g28ypxz0ryh43l90qw8qsq46sshsiiswvrpl0k"; + modSha256 = "09n6abyaqwz4zcdz8934rvpbxhp4v2nmm5v739kkcc98c3h93i64"; meta = { homepage = https://github.com/sachaos/todoist; diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 259f7982a6b8..5eaf1d13d618 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "11202i3340vaz8xh59gwj5x0djcgbzq9jfy2214lcpml71qc85f0"; }; - modSha256 = "1mx74nci7j7h44pw1qf5fxkvfnhppj46898f8895ay8hhxd28lbm"; + modSha256 = "1j04xyjkz7jcqrs5p5z94jqagrzcxjr9m3lyp8i91c0ymxf5m2g3"; buildFlagsArray = '' -ldflags= diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 7fd3e6b9cd91..88aa8777ee5e 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { ./3321-fix-location-of-thrift.patch ]; - modSha256 = "0l6ccxzfxl918hzbky5ivlw413hiwagwc2cbp3f05i21qdi5mw5p"; + modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac"; subPackages = [ "cmd/jx" ]; diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index d92175db91fe..347d4469f063 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { subPackages = [ "." ]; - modSha256 = "1g72fnkibmdd9i20wgp5fjf556xp2xwan06dmn3f5rkmnicy3ccl"; + modSha256 = "0bw47dd1b46ywsian2b957a4ipm77ncidipzri9ra39paqlv7abb"; postInstall = '' mkdir -p $out/share/zsh/site-functions diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 44d45e480b3a..3ba6deef26f7 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { sha256 = "04rpdi52j26szx5kiyfmwad1sg7lfplxrkbwkr3b1kfafh1whgw5"; }; - modSha256 = "12klgqm2px878lzh05yzj6lr83v7vg0vv2k69pmg6nv1wlsxdlzf"; + modSha256 = "00yjcs26cm5civ96sikbd3wjmhx153xbyd805s3shca1mg99y7mm"; - preConfigure = '' + postConfigure = '' # Make the builtin tools available here mkdir -p $out/bin eval $(go env | grep GOTOOLDIR) diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index cb5743745c1b..6390c1d7fd24 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1v7qy0q6fb9amcggwzdygl290zhr3w3zgmig2rm5zx91kw973sqc"; }; - modSha256 = "0j0c5idgwclszsmay7av9y3lcwfk72ml06nwll3fz404hx8vla6y"; + modSha256 = "1s33i4kp1vzfp97909pyzdlvi69siw1i2lbi2kbp9yrn163w6928"; subPackages = [ "cmd/mod" ]; diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index a2b6a8cf25a9..93eea81d0438 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s"; }; - modSha256 = "04zizcq6x1sshnkbvcy197k6axmjnazi9r7cfvcq7g2ng818y2yb"; + modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf"; subPackages = [ "." ]; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 3e55ddaf7c55..b7770019f859 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1k53dkmd41x5h81arb2fs5s9yb6sy6113nbbzls6dc179slfg9zj"; }; - modSha256 = "1i3xzl6kkpl4v1229rhg61j1952qxzbhav7fb2hv85903rkz51x1"; + modSha256 = "0n5j4rns2w1klgrf5jz0bng9cih9aifjx55hhkf4dfj1x4wsxjdj"; doCheck = true; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index abddc78dd8b3..fb8a1802e950 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "1qfic9prdbldvjw0n15jfc9qr4p5h87mjripq2pc4c6x8244phfw"; }; - modSha256 = "017ybvyfk9bhmp8xwn484gmz4dl03gllv780ssi2arpmcyrwlymw"; + modSha256 = "1p9cw92ivwgpkvjxvwd9anbd1vzhpicm9il4pg37z2kgr2ihhnyh"; meta = with lib; { description = "The fastest shell plugin manager"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d8f4312c244..eb009c96a170 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13391,7 +13391,11 @@ in go = buildPackages.go_1_11; }; - buildGoModule = buildGo111Module; + buildGo112Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_12; + }; + + buildGoModule = buildGo112Module; go2nix = callPackage ../development/tools/go2nix { };