diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 76 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 25 insertions, 56 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ddd6c1d270b2..abdbdc116793 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -435,6 +435,9 @@ mapAliases ({ # added 2019-08-01 mumble_git = pkgs.mumble_rc; murmur_git = pkgs.murmur_rc; + + # added 2019-09-06 + zeroc_ice = pkgs.zeroc-ice; } // (with ocaml-ng; { # added 2016-09-14 ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0ade7af6144..4ac7927bf8a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; @@ -5093,9 +5085,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 { }; @@ -6519,9 +6509,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 { }; @@ -7913,10 +7901,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; }; @@ -13220,7 +13204,8 @@ in libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); - qt5 = qt512; + # TODO bump to 5.12 on darwin once it's not broken + qt5 = if stdenv.isDarwin then qt511 else qt512; libsForQt5 = if stdenv.isDarwin then libsForQt511 else libsForQt512; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -14365,9 +14350,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; }; @@ -14748,9 +14730,7 @@ in mediatomb = callPackage ../servers/mediatomb { }; - meguca = callPackage ../servers/meguca { - buildGoPackage = buildGo110Package; - }; + meguca = callPackage ../servers/meguca { }; memcached = callPackage ../servers/memcached {}; @@ -15039,15 +15019,8 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; - inherit (callPackage ../servers/monitoring/prometheus { - buildGoPackage = buildGo110Package; - }) prometheus_1; - - inherit (callPackage ../servers/monitoring/prometheus { }) - prometheus_2; - prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = prometheus_1; + prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; @@ -15073,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 { }; @@ -15519,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 { }; @@ -19557,15 +19526,7 @@ in speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - }) mumble mumble_rc murmur; - - inherit (callPackages ../applications/networking/mumble { - avahi = avahi-compat; - jackSupport = config.mumble.jackSupport or false; - speechdSupport = config.mumble.speechdSupport or false; - pulseSupport = config.pulseaudio or false; - iceSupport = false; - }) murmur_rc; + }) mumble mumble_rc murmur murmur_rc; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { mumble_i686 = if stdenv.hostPlatform.system == "x86_64-linux" @@ -21639,7 +21600,13 @@ in zathura = callPackage ../applications/misc/zathura { }; - zeroc_ice = callPackage ../development/libraries/zeroc-ice { + zeroc-ice = callPackage ../development/libraries/zeroc-ice { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; + + zeroc-ice-36 = callPackage ../development/libraries/zeroc-ice/3.6.nix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -21720,9 +21687,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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b9a4a46f1f1..aa4d6521c005 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6194,6 +6194,8 @@ in { inherit python; })).python; + zeroc-ice = callPackage ../development/python-modules/zeroc-ice { }; + zm-py = callPackage ../development/python-modules/zm-py { }; rfc7464 = callPackage ../development/python-modules/rfc7464 { }; |