From 1f460d05c12503593611e732e133e4ed0f93b175 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Thu, 21 Mar 2019 22:33:16 -0700 Subject: [PATCH] miniflux: do not send buildGoPackage, it is using buildGoModule now (#58110) --- pkgs/top-level/all-packages.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9a9699af00..1326f92c3cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -937,7 +937,7 @@ in bchunk = callPackage ../tools/cd-dvd/bchunk { }; inherit (callPackages ../misc/logging/beats/6.x.nix { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }) @@ -953,7 +953,7 @@ in packetbeat = packetbeat6; inherit (callPackages ../misc/logging/beats/5.x.nix { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }) @@ -1742,7 +1742,7 @@ in mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; mongodb-tools = callPackage ../tools/misc/mongodb-tools { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }; @@ -1829,7 +1829,7 @@ in bepasty = callPackage ../tools/misc/bepasty { }; bettercap = callPackage ../tools/security/bettercap { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }; @@ -4319,7 +4319,7 @@ in miredo = callPackage ../tools/networking/miredo { }; mirrorbits = callPackage ../servers/mirrorbits { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }; @@ -12678,7 +12678,7 @@ in }; skydive = callPackage ../tools/networking/skydive { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }; @@ -14002,10 +14002,7 @@ in mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; - miniflux = callPackage ../servers/miniflux { - # XXX: bettercap is failing with Go 1.12. - buildGoPackage = buildGo111Package; - }; + miniflux = callPackage ../servers/miniflux { }; nagios = callPackage ../servers/monitoring/nagios { }; @@ -14471,7 +14468,7 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; cockroachdb = callPackage ../servers/sql/cockroachdb { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; };