diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-03-03 18:02:35 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-03-03 18:02:35 +0100 |
commit | b70c93f211819f5d4475569093f75d0c1e8857d6 (patch) | |
tree | b8514b9488e8bf739db9e5dbdf32cc270d27b127 /pkgs/top-level/all-packages.nix | |
parent | ceb0a28e8c2d3f3bd0f57dda74f185a570522ecf (diff) | |
parent | ac3b53707c7edf238b297ba4ce3799cecf2ee72d (diff) | |
download | nixlib-b70c93f211819f5d4475569093f75d0c1e8857d6.tar nixlib-b70c93f211819f5d4475569093f75d0c1e8857d6.tar.gz nixlib-b70c93f211819f5d4475569093f75d0c1e8857d6.tar.bz2 nixlib-b70c93f211819f5d4475569093f75d0c1e8857d6.tar.lz nixlib-b70c93f211819f5d4475569093f75d0c1e8857d6.tar.xz nixlib-b70c93f211819f5d4475569093f75d0c1e8857d6.tar.zst nixlib-b70c93f211819f5d4475569093f75d0c1e8857d6.zip |
Merge branch 'master' into nix-2.0
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 423 |
1 files changed, 256 insertions, 167 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b20aef04c41a..bd5560cfe3a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -121,7 +121,10 @@ with pkgs; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; - dockerTools = callPackage ../build-support/docker { }; + digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; + + # go 1.9 pin until https://github.com/moby/moby/pull/35739 + dockerTools = callPackage ../build-support/docker { go = go_1_9; }; docker_compose = pythonPackages.docker_compose; @@ -644,6 +647,8 @@ with pkgs; glyr = callPackage ../tools/audio/glyr { }; + imgpatchtools = callPackage ../development/mobile/imgpatchtools { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; pass = callPackage ../tools/security/pass { }; @@ -723,6 +728,8 @@ with pkgs; qt4Support = config.avahi.qt4Support or false; }; + avro-c = callPackage ../development/libraries/avro-c { }; + avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; }; aws = callPackage ../tools/virtualization/aws { }; @@ -1381,6 +1388,8 @@ with pkgs; arping = callPackage ../tools/networking/arping { }; + arpoison = callPackage ../tools/networking/arpoison { }; + asciidoc = callPackage ../tools/typesetting/asciidoc { inherit (python2Packages) matplotlib numpy aafigure recursivePthLoader; w3m = w3m-batch; @@ -1625,7 +1634,7 @@ with pkgs; libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { - inherit (gnome3) gnome_common libgee; + inherit (gnome3) gnome-common libgee; }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; @@ -1850,7 +1859,7 @@ with pkgs; pythonPackages = python2Packages; }; - desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; + desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { }; dfc = callPackage ../tools/system/dfc { }; @@ -2026,6 +2035,10 @@ with pkgs; uudeview = callPackage ../tools/misc/uudeview { }; + uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { + inherit (pythonPackages) sphinx; + }; + zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; ### DEVELOPMENT / EMSCRIPTEN @@ -2665,11 +2678,11 @@ with pkgs; inherit (gnome2) libsoup; }; - gupnp_av = callPackage ../development/libraries/gupnp-av {}; + gupnp-av = callPackage ../development/libraries/gupnp-av {}; - gupnp_dlna = callPackage ../development/libraries/gupnp-dlna {}; + gupnp-dlna = callPackage ../development/libraries/gupnp-dlna {}; - gupnp_igd = callPackage ../development/libraries/gupnp-igd {}; + gupnp-igd = callPackage ../development/libraries/gupnp-igd {}; gupnp-tools = callPackage ../tools/networking/gupnp-tools {}; @@ -2909,6 +2922,8 @@ with pkgs; inetutils = callPackage ../tools/networking/inetutils { }; + infiniband-diags = callPackage ../tools/networking/infiniband-diags { }; + inform7 = callPackage ../development/compilers/inform7 { }; infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; @@ -3061,7 +3076,9 @@ with pkgs; keepalived = callPackage ../tools/networking/keepalived { }; - kexectools = callPackage ../os-specific/linux/kexectools { }; + kexectools = if hostPlatform.isKexecable + then callPackage ../os-specific/linux/kexectools { } + else null; keybase = callPackage ../tools/security/keybase { }; @@ -3170,6 +3187,10 @@ with pkgs; matrix-synapse = callPackage ../servers/matrix-synapse { }; + mdbook = callPackage ../tools/text/mdbook { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + memtester = callPackage ../tools/system/memtester { }; minidlna = callPackage ../tools/networking/minidlna { }; @@ -3246,13 +3267,12 @@ with pkgs; ninka = callPackage ../development/tools/misc/ninka { }; + nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; + nodejs = hiPrio nodejs-6_x; nodejs-slim = nodejs-slim-6_x; - nodejs-4_x = callPackage ../development/web/nodejs/v4.nix {}; - nodejs-slim-4_x = callPackage ../development/web/nodejs/v4.nix { enableNpm = false; }; - nodejs-6_x = callPackage ../development/web/nodejs/v6.nix {}; nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix { enableNpm = false; }; @@ -3270,10 +3290,6 @@ with pkgs; nodejs = pkgs.nodejs-6_x; }; - nodePackages_4_x = callPackage ../development/node-packages/default-v4.nix { - nodejs = pkgs.nodejs-4_x; - }; - nodePackages = nodePackages_6_x; # Can be used as a user shell @@ -3287,6 +3303,8 @@ with pkgs; boost = boost165; }; + ispell = callPackage ../tools/text/ispell {}; + kindlegen = callPackage ../tools/typesetting/kindlegen { }; latex2html = callPackage ../tools/misc/latex2html { }; @@ -3692,9 +3710,11 @@ with pkgs; nbd = callPackage ../tools/networking/nbd { }; - nccl = callPackage ../development/libraries/science/math/nccl { - cudatoolkit = cudatoolkit8; - }; + inherit (callPackages ../development/libraries/science/math/nccl { }) + nccl_cudatoolkit8 + nccl_cudatoolkit9; + + nccl = nccl_cudatoolkit9; ndjbdns = callPackage ../tools/networking/ndjbdns { }; @@ -3751,19 +3771,19 @@ with pkgs; networkmanager = callPackage ../tools/networking/network-manager { }; - networkmanager_iodine = callPackage ../tools/networking/network-manager/iodine.nix { }; + networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine.nix { }; - networkmanager_openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { }; + networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { }; - networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; + networkmanager-pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; - networkmanager_l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; + networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; - networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; + networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; - networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; + networkmanager-openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; - networkmanager_fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { }; + networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { }; networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; @@ -3887,7 +3907,7 @@ with pkgs; nzbget = callPackage ../tools/networking/nzbget { }; - oathToolkit = callPackage ../tools/security/oath-toolkit { }; + oathToolkit = callPackage ../tools/security/oath-toolkit { inherit (gnome2) gtkdoc; }; obex_data_server = callPackage ../tools/bluetooth/obex-data-server { }; @@ -3960,6 +3980,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; + opensm = callPackage ../tools/networking/opensm { }; + openssh = callPackage ../tools/networking/openssh { hpnSupport = false; @@ -4029,6 +4051,8 @@ with pkgs; packetdrill = callPackage ../tools/networking/packetdrill { }; + pacman = callPackage ../tools/package-management/pacman { }; + padthv1 = callPackage ../applications/audio/padthv1 { }; pakcs = callPackage ../development/compilers/pakcs {}; @@ -4462,7 +4486,7 @@ with pkgs; remmina = callPackage ../applications/networking/remote/remmina { adwaita-icon-theme = gnome3.adwaita-icon-theme; - gsettings_desktop_schemas = gnome3.gsettings_desktop_schemas; + gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas; }; rename = callPackage ../tools/misc/rename { @@ -4606,10 +4630,16 @@ with pkgs; quazip = quazip_qt4; }; + screenkey = python2Packages.callPackage ../applications/video/screenkey { + inherit (gnome3) defaultIconTheme; + }; + quazip_qt4 = libsForQt5.quazip.override { qtbase = qt4; qmake = qmake4Hook; }; + scfbuild = python2.pkgs.callPackage ../tools/misc/scfbuild { }; + scrot = callPackage ../tools/graphics/scrot { }; scrypt = callPackage ../tools/security/scrypt { }; @@ -4618,6 +4648,8 @@ with pkgs; sdl-jstest = callPackage ../tools/misc/sdl-jstest { }; + skim = callPackage ../tools/misc/skim { }; + sec = callPackage ../tools/admin/sec { }; seccure = callPackage ../tools/security/seccure { }; @@ -4757,6 +4789,8 @@ with pkgs; storebrowse = callPackage ../tools/system/storebrowse { }; + stubby = callPackage ../tools/networking/stubby { }; + syntex = callPackage ../tools/graphics/syntex {}; fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; @@ -5112,6 +5146,8 @@ with pkgs; untex = callPackage ../tools/text/untex { }; + untrunc = callPackage ../tools/video/untrunc { }; + upx = callPackage ../tools/compression/upx { }; uqmi = callPackage ../tools/networking/uqmi { }; @@ -5460,7 +5496,7 @@ with pkgs; xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools rec { # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote - crossPrefix = "mips64el-unknown-linux-gnu"; + crossPrefix = "mipsel-unknown-linux-gnu"; gccCross = let pkgsCross = nixpkgsFun { @@ -6200,15 +6236,15 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_8 = callPackage ../development/compilers/go/1.8.nix { + go_1_9 = callPackage ../development/compilers/go/1.9.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - go_1_9 = callPackage ../development/compilers/go/1.9.nix { + go_1_10 = callPackage ../development/compilers/go/1.10.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - go = go_1_9; + go = go_1_10; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -6292,22 +6328,30 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk7.jre // { outputs = [ "jre" ]; })); - jdk8 = if stdenv.isArm then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; - jre8 = if stdenv.isArm then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" + jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; + jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk8.jre // { outputs = [ "jre" ]; })); jre8_headless = - if stdenv.isDarwin then jre8 else + if stdenv.isArm || stdenv.isAarch64 then + oraclejre8 + else if stdenv.isDarwin then + jre8 + else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk9 = openjdk9 // { outputs = [ "out" ]; }; - jre9 = lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" + jdk9 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; }; + jre9 = if stdenv.isArm || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk9.jre // { outputs = [ "jre" ]; })); jre9_headless = - if stdenv.isDarwin then jre9 else + if stdenv.isArm || stdenv.isAarch64 then + oraclejre9 + else if stdenv.isDarwin then + jre9 + else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}-headless" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); @@ -6316,6 +6360,8 @@ with pkgs; jre = jre8; jre_headless = jre8_headless; + inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8; + openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; oraclejdk = pkgs.jdkdistro true false; @@ -6570,7 +6616,6 @@ with pkgs; ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { - nodejs = nodejs-4_x; ocamlPackages = ocamlPackages_4_02; }; @@ -6638,7 +6683,6 @@ with pkgs; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; - scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { }; scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; }; @@ -6798,7 +6842,7 @@ with pkgs; clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - dhall = haskell.lib.justStaticExecutables haskellPackages.dhall; + dhall = callPackage ../development/interpreters/dhall { }; dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; @@ -7121,6 +7165,8 @@ with pkgs; red = callPackage ../development/interpreters/red { }; + regextester = callPackage ../applications/misc/regextester { }; + regina = callPackage ../development/interpreters/regina { }; inherit (ocamlPackages) reason; @@ -7687,7 +7733,7 @@ with pkgs; global = callPackage ../development/tools/misc/global { }; - gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; + gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {}; @@ -7723,7 +7769,7 @@ with pkgs; grail = callPackage ../development/libraries/grail { }; - gtk_doc = callPackage ../development/tools/documentation/gtk-doc { }; + gtk-doc = callPackage ../development/tools/documentation/gtk-doc { }; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; @@ -8266,9 +8312,9 @@ with pkgs; attr = callPackage ../development/libraries/attr { }; - at_spi2_core = callPackage ../development/libraries/at-spi2-core { }; + at-spi2-core = callPackage ../development/libraries/at-spi2-core { }; - at_spi2_atk = callPackage ../development/libraries/at-spi2-atk { }; + at-spi2-atk = callPackage ../development/libraries/at-spi2-atk { }; aqbanking = callPackage ../development/libraries/aqbanking { }; @@ -8304,6 +8350,10 @@ with pkgs; libopcodes = callPackage ../development/libraries/libopcodes { }; + # TODO(@Ericson2314): Build bionic libc from source + bionic = assert hostPlatform.useAndroidPrebuilt; + androidenv.androidndkPkgs.libraries; + bobcat = callPackage ../development/libraries/bobcat { }; boehmgc = callPackage ../development/libraries/boehm-gc { }; @@ -8408,7 +8458,7 @@ with pkgs; clutter-gst = callPackage ../development/libraries/clutter-gst { }; - clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; + clutter-gtk = callPackage ../development/libraries/clutter-gtk { }; cminpack = callPackage ../development/libraries/cminpack { }; @@ -8484,7 +8534,7 @@ with pkgs; dbus = callPackage ../development/libraries/dbus { }; dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; - dbus_glib = callPackage ../development/libraries/dbus-glib { }; + dbus-glib = callPackage ../development/libraries/dbus-glib { }; dbus_java = callPackage ../development/libraries/java/dbus-java { }; dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { }; @@ -8808,12 +8858,13 @@ with pkgs; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; - glibc = callPackage ../development/libraries/glibc { + glibc_2_26 = callPackage ../development/libraries/glibc { installLocales = config.glibc.locales or false; }; glibc_2_27 = callPackage ../development/libraries/glibc/2.27.nix { installLocales = config.glibc.locales or false; }; + glibc = if hostPlatform.isRiscV then glibc_2_27 else glibc_2_26; glibc_memusage = callPackage ../development/libraries/glibc { installLocales = false; @@ -8839,6 +8890,7 @@ with pkgs; # libc is hackily often used from the previous stage. This `or` # hack fixes the hack, *sigh*. /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross + else if name == "bionic" then targetPackages.bionic else if name == "uclibc" then uclibcCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 @@ -8856,10 +8908,7 @@ with pkgs; glibc32 = pkgsi686Linux.glibc; }; - glm = callPackage ../development/libraries/glm - (lib.optionalAttrs stdenv.cc.isGNU { stdenv = overrideCC stdenv gcc6;/*maybe a hack*/ }); - - glm_0954 = callPackage ../development/libraries/glm/0954.nix { }; + glm = callPackage ../development/libraries/glm { }; globalplatform = callPackage ../development/libraries/globalplatform { }; gppcscconnectionplugin = @@ -8912,6 +8961,7 @@ with pkgs; }; goocanvas = callPackage ../development/libraries/goocanvas { }; + goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; google-gflags = callPackage ../development/libraries/google-gflags { }; @@ -8981,7 +9031,9 @@ with pkgs; gnu-config = callPackage ../development/libraries/gnu-config { }; - gnu-efi = callPackage ../development/libraries/gnu-efi { }; + gnu-efi = if hostPlatform.isEfi + then callPackage ../development/libraries/gnu-efi { } + else null; gnutls = callPackage (if stdenv.isDarwin @@ -9036,7 +9088,7 @@ with pkgs; }; glibmm = callPackage ../development/libraries/glibmm { }; - glib_networking = callPackage ../development/libraries/glib-networking {}; + glib-networking = callPackage ../development/libraries/glib-networking {}; ace = callPackage ../development/libraries/ace { }; @@ -9073,6 +9125,7 @@ with pkgs; gnome-sharp = callPackage ../development/libraries/gnome-sharp {}; granite = callPackage ../development/libraries/granite { }; + elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { cupsSupport = config.gtk2.cups or stdenv.isLinux; @@ -9199,18 +9252,22 @@ with pkgs; hyena = callPackage ../development/libraries/hyena { }; - icu58 = callPackage ../development/libraries/icu/58.nix + icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ + nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); - icu59 = callPackage ../development/libraries/icu/59.nix - (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + })); + icu59 = callPackage ../development/libraries/icu/59.nix ({ + nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); - icu60 = callPackage ../development/libraries/icu/60.nix - (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + })); + icu60 = callPackage ../development/libraries/icu/60.nix ({ + nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); + })); icu = icu59; @@ -9279,7 +9336,7 @@ with pkgs; jshon = callPackage ../development/tools/parsing/jshon { }; - json_glib = callPackage ../development/libraries/json-glib { }; + json-glib = callPackage ../development/libraries/json-glib { }; json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable json_c = callPackage ../development/libraries/json-c { }; @@ -9405,7 +9462,7 @@ with pkgs; libb2 = callPackage ../development/libraries/libb2 { }; libbap = callPackage ../development/libraries/libbap { - inherit (ocamlPackages_4_02) bap ocaml findlib ctypes; + inherit (ocamlPackages) bap ocaml findlib ctypes; }; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; @@ -9430,12 +9487,12 @@ with pkgs; }; libcanberra = callPackage ../development/libraries/libcanberra { }; - libcanberra_gtk3 = pkgs.libcanberra.override { gtk = pkgs.gtk3; }; - libcanberra_gtk2 = pkgs.libcanberra_gtk3.override { gtk = pkgs.gtk2; }; + libcanberra-gtk3 = pkgs.libcanberra.override { gtk = pkgs.gtk3; }; + libcanberra-gtk2 = pkgs.libcanberra-gtk3.override { gtk = pkgs.gtk2; }; libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) then pkgs.libcanberra - else pkgs.libcanberra_gtk2; + else pkgs.libcanberra-gtk2; libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; @@ -9607,14 +9664,10 @@ with pkgs; libgdata = gnome3.libgdata; - libgee_0_6 = callPackage ../development/libraries/libgee/0.6.nix { }; - - libgee_0_8 = callPackage ../development/libraries/libgee/0.8.nix { }; - libgig = callPackage ../development/libraries/libgig { }; - libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome_keyring3 = gnome3.libgnome_keyring; + libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; + libgnome-keyring3 = gnome3.libgnome-keyring; libglvnd = callPackage ../development/libraries/libglvnd { }; @@ -9624,7 +9677,9 @@ with pkgs; libgroove = callPackage ../development/libraries/libgroove { }; - libseccomp = callPackage ../development/libraries/libseccomp { }; + libseccomp = if hostPlatform.isSeccomputable + then callPackage ../development/libraries/libseccomp { } + else null; libsecret = callPackage ../development/libraries/libsecret { }; @@ -9696,6 +9751,11 @@ with pkgs; libgpgerror = callPackage ../development/libraries/libgpg-error { }; + # https://github.com/gpg/libgpg-error/blob/70058cd9f944d620764e57c838209afae8a58c78/README#L118-L140 + libgpgerror-gen-posix-lock-obj = libgpgerror.override { + genPosixLockObjOnly = true; + }; + libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; libgpod = callPackage ../development/libraries/libgpod { @@ -9884,6 +9944,8 @@ with pkgs; graphviz = graphviz-nox; }; + libinput-gestures = callPackage ../tools/inputmethods/libinput-gestures {}; + libisofs = callPackage ../development/libraries/libisofs { }; libisoburn = callPackage ../development/libraries/libisoburn { }; @@ -10408,7 +10470,7 @@ with pkgs; ffmpeg = ffmpeg_2; }; - mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; + mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix { withGUI = false; @@ -10585,10 +10647,13 @@ with pkgs; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { enableCuda = config.cudaSupport or false; - cudatoolkit = cudatoolkit8; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; }; + opencv3WithoutCuda = opencv3.override { + enableCuda = false; + }; + # this ctl version is needed by openexr_viewers openexr_ctl = ctl; @@ -10669,7 +10734,7 @@ with pkgs; osinfo-db = callPackage ../data/misc/osinfo-db { }; osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { }; - p11_kit = callPackage ../development/libraries/p11-kit { }; + p11-kit = callPackage ../development/libraries/p11-kit { }; paperkey = callPackage ../tools/security/paperkey { }; @@ -10783,6 +10848,7 @@ with pkgs; }; postgis = callPackage ../development/libraries/postgis { }; + postgis_2_3 = callPackage ../development/libraries/postgis/2.3.nix { }; protobuf = callPackage ../development/libraries/protobuf/3.4.nix { }; @@ -11264,9 +11330,9 @@ with pkgs; inherit (pythonPackages) pyparsing; }; - spice_gtk = callPackage ../development/libraries/spice-gtk { }; + spice-gtk = callPackage ../development/libraries/spice-gtk { }; - spice_protocol = callPackage ../development/libraries/spice-protocol { }; + spice-protocol = callPackage ../development/libraries/spice-protocol { }; spice-up = callPackage ../applications/office/spice-up { }; @@ -11366,11 +11432,11 @@ with pkgs; tectonic = callPackage ../tools/typesetting/tectonic { }; - telepathy_glib = callPackage ../development/libraries/telepathy/glib { }; + telepathy-glib = callPackage ../development/libraries/telepathy/glib { }; - telepathy_farstream = callPackage ../development/libraries/telepathy/farstream {}; + telepathy-farstream = callPackage ../development/libraries/telepathy/farstream {}; - telepathy_qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; }; + telepathy-qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; }; tevent = callPackage ../development/libraries/tevent { python = python2; @@ -11843,10 +11909,6 @@ with pkgs; ### DEVELOPMENT / GO MODULES - buildGo18Package = callPackage ../development/go-modules/generic { - go = go_1_8; - }; - buildGo19Package = callPackage ../development/go-modules/generic { go = go_1_9; }; @@ -12475,6 +12537,8 @@ with pkgs; pyMAILt = callPackage ../servers/xmpp/pyMAILt {}; + pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; + qpid-cpp = callPackage ../servers/amqp/qpid-cpp { boost = boost155; }; @@ -12627,7 +12691,7 @@ with pkgs; shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; - piwik = callPackage ../servers/web-apps/piwik { }; + matomo = callPackage ../servers/web-apps/matomo { }; axis2 = callPackage ../servers/http/tomcat/axis2 { }; @@ -12662,7 +12726,7 @@ with pkgs; xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix { inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig - libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind + libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook autoconf automake libtool mtdev pixman cairo epoxy; @@ -12772,10 +12836,7 @@ with pkgs; cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - # Go 1.9 build fails with "go1.8.* required (see CONTRIBUTING.md)". - buildGoPackage = buildGo18Package; - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_1; # conky can use 5.2, but toluapp can not @@ -13082,22 +13143,6 @@ with pkgs; ]; }; - linux_4_13 = callPackage ../os-specific/linux/kernel/linux-4.13.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -13155,13 +13200,7 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - ] ++ lib.optionals hostPlatform.isRiscV [ - kernelPatches.riscv_modules - kernelPatches.riscv_irq_busy - kernelPatches.riscv_install - kernelPatches.riscv_initrd - kernelPatches.riscv_initrd_free - ]; + ]; }; linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix { @@ -13172,7 +13211,7 @@ with pkgs; # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - ]; + ]; }; /* Linux kernel modules are inherently tied to a specific kernel. So @@ -13247,10 +13286,14 @@ with pkgs; ply = callPackage ../os-specific/linux/ply { }; + rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { }; + rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; + rtl8814au = callPackage ../os-specific/linux/rtl8814au { }; + rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; openafs = callPackage ../servers/openafs/module.nix { }; @@ -13331,7 +13374,6 @@ with pkgs; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); - linuxPackages_4_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_13); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_15); # Don't forget to update linuxPackages_latest! @@ -13756,7 +13798,7 @@ with pkgs; udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { }; udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { }; - udisks = udisks1; + udisks = udisks2; udisks_glue = callPackage ../os-specific/linux/udisks-glue { }; @@ -13895,7 +13937,7 @@ with pkgs; caladea = callPackage ../data/fonts/caladea {}; - cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { }; + cantarell-fonts = callPackage ../data/fonts/cantarell-fonts { }; carlito = callPackage ../data/fonts/carlito {}; @@ -13919,6 +13961,8 @@ with pkgs; crimson = callPackage ../data/fonts/crimson {}; + deepin-icon-theme = callPackage ../data/icons/deepin-icon-theme { }; + dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { inherit (perlPackages) FontTTF; }); @@ -13981,7 +14025,6 @@ with pkgs; emojione = callPackage ../data/fonts/emojione { inherit (nodePackages) svgo; - inherit (pythonPackages) scfbuild; }; encode-sans = callPackage ../data/fonts/encode-sans { }; @@ -13997,7 +14040,8 @@ with pkgs; fira-mono = callPackage ../data/fonts/fira-mono { }; - font-awesome-ttf = callPackage ../data/fonts/font-awesome-ttf { }; + font-awesome_4 = callPackage ../data/fonts/font-awesome-4 { }; + font-awesome_5 = callPackage ../data/fonts/font-awesome-5 { }; freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; @@ -14015,7 +14059,7 @@ with pkgs; gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; - inherit (gnome3) gsettings_desktop_schemas; + inherit (gnome3) gsettings-desktop-schemas; go-font = callPackage ../data/fonts/go-font { }; @@ -14025,7 +14069,7 @@ with pkgs; helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; - hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { }; + hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; hanazono = callPackage ../data/fonts/hanazono { }; @@ -14114,7 +14158,7 @@ with pkgs; media-player-info = callPackage ../data/misc/media-player-info {}; - mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { }; + mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { }; monoid = callPackage ../data/fonts/monoid { }; @@ -14195,7 +14239,7 @@ with pkgs; mime-types = callPackage ../data/misc/mime-types { }; - shared_mime_info = callPackage ../data/misc/shared-mime-info { }; + shared-mime-info = callPackage ../data/misc/shared-mime-info { }; shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; @@ -14295,7 +14339,6 @@ with pkgs; twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { inherit (nodePackages) svgo; - inherit (pythonPackages) scfbuild; }; tzdata = callPackage ../data/misc/tzdata { }; @@ -14519,12 +14562,10 @@ with pkgs; autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; - avidemux_unwrapped = callPackage ../applications/video/avidemux { - libva = libva-full; # also wants libva-x11 + avidemux = libsForQt5.callPackage ../applications/video/avidemux { + libva = libva-full; }; - avidemux = callPackage ../applications/video/avidemux/wrapper.nix { }; - avogadro = callPackage ../applications/science/chemistry/avogadro { eigen = eigen2; }; @@ -14678,7 +14719,10 @@ with pkgs; openjpeg = openjpeg_1; }; - perkeep = callPackage ../applications/misc/perkeep { }; + perkeep = callPackage ../applications/misc/perkeep { + # Perkeep is very particular about which go version to build with. + go = go_1_9; + }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; @@ -14744,7 +14788,7 @@ with pkgs; cinelerra = callPackage ../applications/video/cinelerra { }; claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { - inherit (gnome3) gsettings_desktop_schemas; + inherit (gnome3) gsettings-desktop-schemas; inherit (xorg) libSM; enableNetworkManager = config.networking.networkmanager.enable or false; }; @@ -14858,7 +14902,10 @@ with pkgs; pulseSupport = config.pulseaudio or true; }; - deadbeef-mpris2-plugin = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; + deadbeefPlugins = { + mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; + opus = callPackage ../applications/audio/deadbeef/plugins/opus.nix { }; + }; deadbeef-with-plugins = callPackage ../applications/audio/deadbeef/wrapper.nix { plugins = []; @@ -14900,7 +14947,8 @@ with pkgs; dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; - inherit (callPackage ../applications/virtualization/docker { }) + # go 1.9 pin until https://github.com/moby/moby/pull/35739 + inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) docker_17_12 docker_18_02; @@ -15246,7 +15294,7 @@ with pkgs; keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; inherit (gnome3) evince; - evolution_data_server = gnome3.evolution_data_server; + evolution-data-server = gnome3.evolution-data-server; keepass = callPackage ../applications/misc/keepass { buildDotnetPackage = buildDotnetPackage.override { mono = mono54; }; @@ -15254,10 +15302,11 @@ with pkgs; keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { }; - keepass-keefox = callPackage ../applications/misc/keepass-plugins/keefox { }; - keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { }; + keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { }; + keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 + exrdisplay = callPackage ../applications/graphics/exrdisplay { }; exrtools = callPackage ../applications/graphics/exrtools { }; @@ -15775,6 +15824,11 @@ with pkgs; gv = callPackage ../applications/misc/gv { }; + gutenberg = callPackage ../applications/misc/gutenberg { + inherit (darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin) cf-private; + }; + guvcview = callPackage ../os-specific/linux/guvcview { pulseaudioSupport = config.pulseaudio or true; ffmpeg = ffmpeg_2; @@ -16188,7 +16242,10 @@ with pkgs; bluez5 = bluez5_28; fontsConf = makeFontsConf { fontDirectories = [ + carlito dejavu_fonts freefont_ttf xorg.fontmiscmisc + liberation_ttf_v1_binary + liberation_ttf_v2_binary ]; }; clucene_core = clucene_core_2; @@ -16205,7 +16262,6 @@ with pkgs; inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; - #glm = glm_0954; bluez5 = bluez5_28; fontsConf = makeFontsConf { fontDirectories = [ @@ -16224,7 +16280,7 @@ with pkgs; liferea = callPackage ../applications/networking/newsreaders/liferea { - inherit (gnome3) libpeas gsettings_desktop_schemas dconf; + inherit (gnome3) libpeas gsettings-desktop-schemas dconf; }; lightworks = callPackage ../applications/video/lightworks { @@ -16248,6 +16304,8 @@ with pkgs; lighttable = callPackage ../applications/editors/lighttable {}; + libdsk = callPackage ../misc/emulators/libdsk { }; + links2 = callPackage ../applications/networking/browsers/links2 { }; linphone = callPackage ../applications/networking/instant-messengers/linphone rec { @@ -16489,6 +16547,8 @@ with pkgs; mm = callPackage ../applications/networking/instant-messengers/mm { }; + mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; + mplayer = callPackage ../applications/video/mplayer ({ pulseSupport = config.pulseaudio or false; libdvdnav = libdvdnav_4_2_1; @@ -16501,11 +16561,19 @@ with pkgs; }; mpv = callPackage ../applications/video/mpv rec { - lua = lua5_1; - lua5_sockets = lua5_1_sockets; + inherit (luaPackages) luasocket; youtube-dl = pythonPackages.youtube-dl; - libva = libva-full; - waylandSupport = stdenv.isLinux; + libva = libva-full; + waylandSupport = stdenv.isLinux; + alsaSupport = !stdenv.isDarwin; + pulseSupport = !stdenv.isDarwin; + rubberbandSupport = !stdenv.isDarwin; + dvdreadSupport = !stdenv.isDarwin; + dvdnavSupport = !stdenv.isDarwin; + drmSupport = !stdenv.isDarwin; + x11Support = !stdenv.isDarwin; + xineramaSupport = !stdenv.isDarwin; + xvSupport = !stdenv.isDarwin; }; mpvScripts = { @@ -16760,10 +16828,12 @@ with pkgs; openscad = callPackage ../applications/graphics/openscad {}; + opentx = callPackage ../applications/misc/opentx { }; + opera = callPackage ../applications/networking/browsers/opera {}; orca = python3Packages.callPackage ../applications/misc/orca { - inherit (gnome3) yelp_tools; + inherit (gnome3) yelp-tools; }; osm2xmap = callPackage ../applications/misc/osm2xmap { @@ -16919,7 +16989,7 @@ with pkgs; pinfo = callPackage ../applications/misc/pinfo { }; pinpoint = callPackage ../applications/office/pinpoint { - inherit (gnome3) clutter clutter_gtk; + inherit (gnome3) clutter clutter-gtk; }; pinta = callPackage ../applications/graphics/pinta { @@ -17181,6 +17251,8 @@ with pkgs; rofi-menugen = callPackage ../applications/misc/rofi-menugen { }; + rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rstudio = libsForQt5.callPackage ../applications/editors/rstudio { }; rsync = callPackage ../applications/networking/sync/rsync { @@ -17189,6 +17261,8 @@ with pkgs; }; rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {}; + rtl_433 = callPackage ../applications/misc/rtl_433 { }; + rtl-sdr = callPackage ../applications/misc/rtl-sdr { }; rtv = callPackage ../applications/misc/rtv { }; @@ -17518,8 +17592,6 @@ with pkgs; syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { }; - syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { }; - syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; # linux only by now @@ -17564,17 +17636,17 @@ with pkgs; telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; - telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; + telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; - telepathy_haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; + telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; - telepathy_logger = callPackage ../applications/networking/instant-messengers/telepathy/logger {}; + telepathy-logger = callPackage ../applications/networking/instant-messengers/telepathy/logger {}; - telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { }; + telepathy-mission-control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { }; - telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; + telepathy-salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; - telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; termdown = (newScope pythonPackages) ../applications/misc/termdown { }; @@ -17585,7 +17657,7 @@ with pkgs; }; lxterminal = callPackage ../applications/misc/lxterminal { - vte = gnome2.vte; + vte = gnome3.vte; }; deepin-terminal = callPackage ../applications/misc/deepin-terminal { @@ -17831,7 +17903,6 @@ with pkgs; virtmanager = callPackage ../applications/virtualization/virt-manager { vte = gnome3.vte; dconf = gnome3.dconf; - spice_gtk = spice_gtk; system-libvirt = libvirt; }; @@ -17963,6 +18034,8 @@ with pkgs; wayv = callPackage ../tools/X11/wayv {}; + webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; + weechat = callPackage ../applications/networking/irc/weechat { inherit (darwin) libobjc; inherit (darwin) libresolv; @@ -18325,7 +18398,7 @@ with pkgs; roxterm = callPackage ../applications/misc/roxterm { inherit (pythonPackages) lockfile; - inherit (gnome3) gsettings_desktop_schemas vte; + inherit (gnome3) gsettings-desktop-schemas vte; }; xtrace = callPackage ../tools/X11/xtrace { }; @@ -18537,7 +18610,7 @@ with pkgs; digikam = libsForQt5.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; inherit (kdeApplications) kcalcore; - opencv3 = opencv3.override { enableContrib = true; }; + opencv3 = opencv3WithoutCuda; }; displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; @@ -18912,6 +18985,8 @@ with pkgs; sienna = callPackage ../games/sienna { love = love_0_10; }; + sil = callPackage ../games/sil { }; + simutrans = callPackage ../games/simutrans { }; # get binaries without data built by Hydra simutrans_binaries = lowPrio simutrans.binaries; @@ -19152,10 +19227,10 @@ with pkgs; } // { inherit (pkgs) # GTK Libs - glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra_gtk2 + glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2 # Included for backwards compatibility - libsoup libwnck gtk_doc gnome_doc_utils; + libsoup libwnck gtk-doc gnome-doc-utils; gtk = self.gtk2; gtkmm = self.gtkmm2; @@ -19173,7 +19248,7 @@ with pkgs; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { }; - pixel-saver = callPackage ../desktops/gnome-3/extensions/pixel-saver { }; + no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; @@ -19221,7 +19296,7 @@ with pkgs; gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { }; - gnome_themes_standard = gnome3.gnome_themes_standard; + gnome-themes-standard = gnome3.gnome-themes-standard; numix-gtk-theme = callPackage ../misc/themes/numix { }; @@ -19247,7 +19322,7 @@ with pkgs; mkPlasma5 = import ../desktops/plasma-5; attrs = { inherit libsForQt5 lib fetchurl; - inherit (gnome3) gconf gsettings_desktop_schemas; + inherit (gnome3) gconf gsettings-desktop-schemas; }; in recurseIntoAttrs (makeOverridable mkPlasma5 attrs); @@ -19261,7 +19336,7 @@ with pkgs; kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings xdg-desktop-portal-kde; + systemsettings user-manager xdg-desktop-portal-kde; ### SCIENCE @@ -19649,6 +19724,8 @@ with pkgs; z3_4_5_0 = callPackage ../applications/science/logic/z3/4.5.0.nix {}; z3 = callPackage ../applications/science/logic/z3 { python = python2; }; + tlaplus = callPackage ../applications/science/logic/tlaplus {}; + aiger = callPackage ../applications/science/logic/aiger {}; avy = callPackage ../applications/science/logic/avy {}; @@ -19700,6 +19777,8 @@ with pkgs; caffe = callPackage ../applications/science/math/caffe rec { cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false; cudnnSupport = cudaSupport; + # Used only for image loading. + opencv3 = opencv3WithoutCuda; }; caffe2 = callPackage ../development/libraries/science/math/caffe2 { @@ -19707,14 +19786,16 @@ with pkgs; inherit (python3Packages) python future six numpy pydot; protobuf = protobuf3_1; python-protobuf = python3Packages.protobuf3_1; + # Used only for image loading. + opencv3 = opencv3WithoutCuda; }; cntk = callPackage ../applications/science/math/cntk rec { cudaSupport = pkgs.config.cudaSupport or false; cudnnSupport = cudaSupport; inherit (linuxPackages) nvidia_x11; - cudatoolkit = cudatoolkit8; - cudnn = cudnn6_cudatoolkit8; + # Used only for image loading. + opencv3 = opencv3WithoutCuda; }; ecm = callPackage ../applications/science/math/ecm { }; @@ -19930,6 +20011,8 @@ with pkgs; cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio {}; + cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { }; + crashplan = callPackage ../applications/backup/crashplan { }; crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { inherit (gnome3) gconf; }; @@ -20259,6 +20342,8 @@ with pkgs; pt = callPackage ../applications/misc/pt { }; + protocol = python3Packages.callPackage ../applications/networking/protocol { }; + pykms = callPackage ../tools/networking/pykms { }; pyload = callPackage ../applications/networking/pyload {}; @@ -20406,8 +20491,6 @@ with pkgs; tewi-font = callPackage ../data/fonts/tewi {}; - tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = ""; }; - texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; # TeX Live; see http://nixos.org/nixpkgs/manual/#sec-language-texlive @@ -20644,6 +20727,8 @@ with pkgs; zsnes = callPackage_i686 ../misc/emulators/zsnes { }; + xcpc = callPackage ../misc/emulators/xcpc { }; + zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; @@ -20693,6 +20778,10 @@ with pkgs; iterm2 = callPackage ../applications/misc/iterm2 {}; + sequeler = callPackage ../applications/misc/sequeler { + inherit (gnome3) gtksourceview libgda libgee; + }; + sequelpro = callPackage ../applications/misc/sequelpro {}; maphosts = callPackage ../tools/networking/maphosts {}; @@ -20775,7 +20864,7 @@ with pkgs; tlwg = callPackage ../data/fonts/tlwg { }; - safeDiscardStringContext = callPackage ../build-support/safe-discard-string-context.nix { }; - simplehttp2server = callPackage ../servers/simplehttp2server { }; + + diceware = callPackage ../tools/security/diceware { }; } |