From 89da25fecbd7760eebad7ee87391d945db2a45db Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 16:08:58 -0800 Subject: [PATCH 01/11] buildGoPackage: update Go to version 1.12 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91f9aaf23b3..b71d7cad4ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13327,8 +13327,11 @@ in buildGo111Package = callPackage ../development/go-modules/generic { go = buildPackages.go_1_11; }; + buildGo112Package = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_12; + }; - buildGoPackage = buildGo111Package; + buildGoPackage = buildGo112Package; go2nix = callPackage ../development/tools/go2nix { }; From 2e86ada82388a0f819a748c7fcdce18328dc052b Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 17:09:05 -0800 Subject: [PATCH 02/11] bettercap: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b71d7cad4ce..0e478aba8b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1790,7 +1790,11 @@ in bepasty = callPackage ../tools/misc/bepasty { }; - bettercap = callPackage ../tools/security/bettercap { }; + bettercap = callPackage ../tools/security/bettercap { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; From 3a6ba8959eef78d1ea80ea6724a56b92bb81d4d1 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 17:23:11 -0800 Subject: [PATCH 03/11] deepin: remove the temporary go_1_11 assignment to go --- pkgs/desktops/deepin/default.nix | 12 +++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4c0e44f6b72..4fe787bc5d4 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,19 +1,13 @@ -{ pkgs, makeScope, libsForQt5, go_1_11 }: +{ pkgs, makeScope, libsForQt5 }: let packages = self: with self; { updateScript = callPackage ./update.nix { }; dbus-factory = callPackage ./dbus-factory { }; - dde-api = callPackage ./dde-api { - # XXX: the build is finding references to Go when compiled with go v1.12 - go = go_1_11; - }; + dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; - dde-daemon = callPackage ./dde-daemon { - # XXX: the build is finding references to Go when compiled with go v1.12 - go = go_1_11; - }; + dde-daemon = callPackage ./dde-daemon { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-session-ui = callPackage ./dde-session-ui { }; deepin-desktop-base = callPackage ./deepin-desktop-base { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e478aba8b8..fe6d51b09c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21313,7 +21313,7 @@ in clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; deepin = recurseIntoAttrs (import ../desktops/deepin { - inherit pkgs libsForQt5 go_1_11; + inherit pkgs libsForQt5; inherit (lib) makeScope; }); From c64eda961acb99fba2cb8fee2c6b78d7df0d438e Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 17:30:01 -0800 Subject: [PATCH 04/11] singularity: remove the temporary go_1_11 assignment to go --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe6d51b09c0..c304d8443d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17684,10 +17684,7 @@ in slack-term = callPackage ../applications/networking/instant-messengers/slack-term { }; - singularity = callPackage ../applications/virtualization/singularity { - # XXX: the build is finding references to Go when compiled with go v1.12 - go = go_1_11; - }; + singularity = callPackage ../applications/virtualization/singularity { }; spectmorph = callPackage ../applications/audio/spectmorph { }; From ee81ceb5cfc2346f75d88dd0820eadd52cf9df66 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 18:38:19 -0800 Subject: [PATCH 05/11] mirrorbits: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c304d8443d1..c5888e53f31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4261,7 +4261,11 @@ in miredo = callPackage ../tools/networking/miredo { }; - mirrorbits = callPackage ../servers/mirrorbits { }; + mirrorbits = callPackage ../servers/mirrorbits { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; mitmproxy = callPackage ../tools/networking/mitmproxy { }; From 340a3dbd6584947a4f937f2c5b0db9dd2c9b78cb Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 18:50:14 -0800 Subject: [PATCH 06/11] miniflux: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5888e53f31..51033dc7f2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13910,7 +13910,10 @@ in mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; - miniflux = callPackage ../servers/miniflux { }; + miniflux = callPackage ../servers/miniflux { + # XXX: bettercap is failing with Go 1.12. + buildGoPackage = buildGo111Package; + }; nagios = callPackage ../servers/monitoring/nagios { }; From 889f2fc990ff3fdcb808f7a1f29b59d4fa96f35b Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 18:57:54 -0800 Subject: [PATCH 07/11] mongodb-tools: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51033dc7f2e..760e7a15373 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1711,7 +1711,11 @@ in mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; - mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; + mongodb-tools = callPackage ../tools/misc/mongodb-tools { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; mozlz4a = callPackage ../tools/compression/mozlz4a { }; From 985ce237342239034623ce7a0ff8b8d2e6c45be5 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 19:08:31 -0800 Subject: [PATCH 08/11] packetbeat5: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 760e7a15373..c324d5ca1d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -936,7 +936,11 @@ in metricbeat = metricbeat6; packetbeat = packetbeat6; - inherit (callPackages ../misc/logging/beats/5.x.nix { }) + inherit (callPackages ../misc/logging/beats/5.x.nix { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }) filebeat5 heartbeat5 metricbeat5 From 3c8caeb64e93f920566288042baa9304618c92f7 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 22:27:29 -0800 Subject: [PATCH 09/11] packetbeat6: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c324d5ca1d9..972592b829a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -924,7 +924,11 @@ in bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats/6.x.nix { }) + inherit (callPackages ../misc/logging/beats/6.x.nix { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }) filebeat6 heartbeat6 metricbeat6 From 205ccb42a79b437c551ad965f0610facbf622cdc Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 22:30:38 -0800 Subject: [PATCH 10/11] coackroachdb: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 972592b829a..9893571611c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14389,7 +14389,11 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { }; + cockroachdb = callPackage ../servers/sql/cockroachdb { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; From c2194113908fdfa30e4618990e6392663015457b Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Wed, 6 Mar 2019 10:03:04 -0800 Subject: [PATCH 11/11] skydive: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9893571611c..4d0cea1c020 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12611,7 +12611,11 @@ in sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { }; }; - skydive = callPackage ../tools/networking/skydive { }; + skydive = callPackage ../tools/networking/skydive { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; slang = callPackage ../development/libraries/slang { };