public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68194 from adisbladis/drop-go-1_10

Browse Source 
Drop unsupported go version 1.10
This commit is contained in:
Frederik Rietdijk
2019-09-06 19:14:02 +02:00
committed by GitHub
parent f1bf4ec1f1 b611485ad5
commit 9b92496429
11 changed files with 144 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
pkgs/top-level/all-packages.nix
View File

@@ -1704,9 +1704,7 @@ in
gmic_krita_qt = libsForQt5.callPackage ../tools/graphics/gmic_krita_qt { };
goa = callPackage ../development/tools/goa {
buildGoPackage = buildGo110Package;
};
goa = callPackage ../development/tools/goa { };
gohai = callPackage ../tools/system/gohai { };
@@ -2612,17 +2610,13 @@ in
dev86 = callPackage ../development/compilers/dev86 { };
diskrsync = callPackage ../tools/backup/diskrsync {
buildGoPackage = buildGo110Package;
};
diskrsync = callPackage ../tools/backup/diskrsync { };
djbdns = callPackage ../tools/networking/djbdns { };
dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy/1.x { };
dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x {
buildGoPackage = buildGo110Package;
};
dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { };
dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { };
@@ -4023,9 +4017,7 @@ in
ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
ipget = callPackage ../applications/networking/ipget {
buildGoPackage = buildGo110Package;
};
ipget = callPackage ../applications/networking/ipget { };
ipmitool = callPackage ../tools/system/ipmitool {
openssl = openssl_1_0_2;
@@ -5098,9 +5090,7 @@ in
nnn = callPackage ../applications/misc/nnn { };
notary = callPackage ../tools/security/notary {
buildGoPackage = buildGo110Package;
};
notary = callPackage ../tools/security/notary { };
notify-osd = callPackage ../applications/misc/notify-osd { };
@@ -6524,9 +6514,7 @@ in
tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });
tmsu = callPackage ../tools/filesystems/tmsu {
go = go_1_10;
};
tmsu = callPackage ../tools/filesystems/tmsu { };
toilet = callPackage ../tools/misc/toilet { };
@@ -7900,10 +7888,6 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
go_1_10 = callPackage ../development/compilers/go/1.10.nix {
inherit (darwin.apple_sdk.frameworks) Security Foundation;
};
go_1_11 = callPackage ../development/compilers/go/1.11.nix {
inherit (darwin.apple_sdk.frameworks) Security Foundation;
};
@@ -14361,9 +14345,6 @@ in
### DEVELOPMENT / GO MODULES
buildGo110Package = callPackage ../development/go-packages/generic {
go = buildPackages.go_1_10;
};
buildGo111Package = callPackage ../development/go-packages/generic {
go = buildPackages.go_1_11;
};
@@ -14744,9 +14725,7 @@ in
mediatomb = callPackage ../servers/mediatomb { };
meguca = callPackage ../servers/meguca {
buildGoPackage = buildGo110Package;
};
meguca = callPackage ../servers/meguca { };
memcached = callPackage ../servers/memcached {};
@@ -15035,9 +15014,7 @@ in
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
inherit (callPackage ../servers/monitoring/prometheus {
buildGoPackage = buildGo110Package;
}) prometheus_1;
inherit (callPackage ../servers/monitoring/prometheus { }) prometheus_1;
inherit (callPackage ../servers/monitoring/prometheus { })
prometheus_2;
@@ -15069,9 +15046,7 @@ in
prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { };
prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { };
prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { };
prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix {
buildGoPackage = buildGo110Package;
};
prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { };
prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { };
prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };
@@ -15515,9 +15490,7 @@ in
dstat = callPackage ../os-specific/linux/dstat { };
# unstable until the first 1.x release
fscrypt-experimental = callPackage ../os-specific/linux/fscrypt {
buildGoPackage = buildGo110Package;
};
fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { };
fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { };
fwupd = callPackage ../os-specific/linux/firmware/fwupd { };
@@ -21715,9 +21688,6 @@ in
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
go-ethereum-classic = callPackage ../applications/blockchains/go-ethereum-classic {
buildGoPackage = buildGo110Package;
};
jormungandr = callPackage ../applications/blockchains/jormungandr { };