BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #56927: buildGoPackage: 1.11 -> 1.12 (into staging)

Browse source
This commit is contained in:
Vladimír Čunát 2019-03-10 08:05:39 +01:00
commit a2eb06a4d2
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 48 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/desktops/deepin/default.nix
View file

@ -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 { };

59
pkgs/top-level/all-packages.nix
View file

@ -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
@ -936,7 +940,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
@ -1711,7 +1719,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 { };
@ -1792,7 +1804,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;
@ -4263,7 +4279,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 { };
@ -12605,7 +12625,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 { };
@ -13341,8 +13365,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 { };
@ -13913,7 +13940,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 { };
@ -14379,7 +14409,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;
@ -17695,10 +17729,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 { };
@ -21328,7 +21359,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;
});