diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/top-level/all-packages.nix | |
parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
Diffstat (limited to 'nixpkgs/pkgs/top-level/all-packages.nix')
-rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 394 |
1 files changed, 270 insertions, 124 deletions
diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index aff08482282c..38b38ce1472b 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -126,6 +126,8 @@ in } ''); + addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; + # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; @@ -464,6 +466,8 @@ in wxGTK = wxGTK30; } // (config.aegisub or {})); + aerc = callPackage ../applications/networking/mailreaders/aerc { }; + aerospike = callPackage ../servers/nosql/aerospike { }; aespipe = callPackage ../tools/security/aespipe { }; @@ -699,6 +703,8 @@ in bunny = callPackage ../tools/package-management/bunny { }; + certigo = callPackage ../tools/admin/certigo { }; + chezmoi = callPackage ../tools/misc/chezmoi { }; chipsec = callPackage ../tools/security/chipsec { @@ -766,6 +772,8 @@ in git-fire = callPackage ../tools/misc/git-fire { }; + git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; + git-town = callPackage ../tools/misc/git-town { }; github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; @@ -804,9 +812,7 @@ in asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; - gopass = callPackage ../tools/security/gopass { - buildGoPackage = buildGo110Package; - }; + gopass = callPackage ../tools/security/gopass { }; browserpass = callPackage ../tools/security/browserpass { }; @@ -818,6 +824,10 @@ in kwakd = callPackage ../servers/kwakd { }; + chunkwm = callPackage ../os-specific/darwin/chunkwm { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa ScriptingBridge; + }; + kwm = callPackage ../os-specific/darwin/kwm { }; khd = callPackage ../os-specific/darwin/khd { @@ -1318,6 +1328,8 @@ in xcbuildHook = xcbuild6Hook; }; + colorls = callPackage ../tools/system/colorls { }; + compsize = callPackage ../os-specific/linux/compsize { }; coturn = callPackage ../servers/coturn { }; @@ -1360,9 +1372,7 @@ in ddate = callPackage ../tools/misc/ddate { }; - dedup = callPackage ../tools/backup/dedup { - inherit (llvmPackages) openmp; - }; + dedup = callPackage ../tools/backup/dedup { }; dehydrated = callPackage ../tools/admin/dehydrated { }; @@ -1746,6 +1756,8 @@ in pev = callPackage ../development/tools/analysis/pev { }; + phoronix-test-suite = callPackage ../tools/misc/phoronix-test-suite { }; + photon = callPackage ../tools/networking/photon { }; playerctl = callPackage ../tools/audio/playerctl { }; @@ -2091,6 +2103,16 @@ in citrix_receiver = citrix_receiver_unwrapped_13_8_0; }; + citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; + citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; }; + + citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped; + }; + citrix_workspace_19_3_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped_19_3_0; + }; + citra = libsForQt5.callPackage ../misc/emulators/citra { }; cmst = libsForQt5.callPackage ../tools/networking/cmst { }; @@ -2131,12 +2153,14 @@ in colormake = callPackage ../development/tools/build-managers/colormake { }; - ethash = callPackage ../development/libraries/ethash { }; - cpuminer = callPackage ../tools/misc/cpuminer { }; cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; + cryptpad = callPackage ../servers/web-apps/cryptpad { }; + + ethash = callPackage ../development/libraries/ethash { }; + ethminer = callPackage ../tools/misc/ethminer { }; cuetools = callPackage ../tools/cd-dvd/cuetools { }; @@ -2437,10 +2461,14 @@ in dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; + dnsenum = callPackage ../tools/security/dnsenum { }; + dnsmasq = callPackage ../tools/networking/dnsmasq { }; dnsperf = callPackage ../tools/networking/dnsperf { }; + dnsrecon = callPackage ../tools/security/dnsrecon { }; + dnstop = callPackage ../tools/networking/dnstop { }; dhcp = callPackage ../tools/networking/dhcp { }; @@ -2497,6 +2525,8 @@ in docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; + docear = callPackage ../applications/office/docear { }; + dockbarx = callPackage ../applications/misc/dockbarx { }; dog = callPackage ../tools/system/dog { }; @@ -2621,6 +2651,8 @@ in teamocil = callPackage ../tools/misc/teamocil { }; + tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { @@ -2712,6 +2744,13 @@ in sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; }; }); + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + version = "3.12"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1aqjl8dk9amd4zr99n8v2qxzgmr2hdvqfma4zh7a41rj6336c9sr"; + }; + }); }; }).pkgs; toPythonApplication elasticsearch-curator; @@ -2723,6 +2762,8 @@ in enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; + endlessh = callPackage ../servers/endlessh { }; + cryfs = callPackage ../tools/filesystems/cryfs { spdlog = spdlog_0; }; @@ -2777,6 +2818,8 @@ in exiftool = perlPackages.ImageExifTool; + exodus = callPackage ../applications/altcoins/exodus { }; + ext4magic = callPackage ../tools/filesystems/ext4magic { }; extract_url = callPackage ../applications/misc/extract_url { }; @@ -2877,7 +2920,16 @@ in flatpak-builder = callPackage ../development/tools/flatpak-builder { }; - fltrdr = callPackage ../tools/misc/fltrdr { stdenv = gcc8Stdenv; }; + fltrdr = callPackage ../tools/misc/fltrdr { + stdenv = gcc8Stdenv; + icu = icu63; + }; + + fluent-bit = callPackage ../tools/misc/fluent-bit { + stdenv = gccStdenv; + }; + + fierce = callPackage ../tools/security/fierce { }; figlet = callPackage ../tools/misc/figlet { }; @@ -3043,7 +3095,7 @@ in foundationdb61 ; - foundationdb = foundationdb60; + foundationdb = foundationdb61; fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; @@ -3491,6 +3543,8 @@ in hashcat = callPackage ../tools/security/hashcat { }; + hashcat-utils = callPackage ../tools/security/hashcat-utils { }; + hash_extender = callPackage ../tools/security/hash_extender { }; hash-slinger = callPackage ../tools/security/hash-slinger { }; @@ -3501,12 +3555,14 @@ in halibut = callPackage ../tools/typesetting/halibut { }; - halide = callPackage ../development/compilers/halide { }; + halide = callPackage ../development/compilers/halide { llvmPackages=llvmPackages_6; }; ham = pkgs.perlPackages.ham; hardinfo = callPackage ../tools/system/hardinfo { }; + hcxtools = callPackage ../tools/security/hcxtools { }; + hdapsd = callPackage ../os-specific/linux/hdapsd { }; hdaps-gl = callPackage ../tools/misc/hdaps-gl { }; @@ -3993,6 +4049,8 @@ in libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; + libcoap = callPackage ../applications/networking/libcoap {}; + libcroco = callPackage ../development/libraries/libcroco { }; libcryptui = callPackage ../development/libraries/libcryptui { }; @@ -4056,7 +4114,7 @@ in matrix-synapse = callPackage ../servers/matrix-synapse { }; - mautrix-telegram = callPackage ../servers/mautrix-telegram { }; + mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; @@ -4175,12 +4233,22 @@ in }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { openssl = openssl_1_1; + icu = icu63; }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; openssl = openssl_1_1; + icu = icu63; }; + # Update this when adding the newest nodejs major version! + nodejs_latest = nodejs-12_x; + nodejs-slim_latest = nodejs-slim-12_x; + + nodePackages_12_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v12.nix { + nodejs = pkgs.nodejs-12_x; + }); + nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix { nodejs = pkgs.nodejs-10_x; }); @@ -4748,6 +4816,8 @@ in nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; + ndstool = callPackage ../tools/archivers/ndstool { }; + ngrep = callPackage ../tools/networking/ngrep { }; ngrok = ngrok-2; @@ -5440,6 +5510,8 @@ in quota = if stdenv.isLinux then linuxquota else unixtools.quota; + qview = libsForQt5.callPackage ../applications/graphics/qview {}; + wiggle = callPackage ../development/tools/wiggle { }; radamsa = callPackage ../tools/security/radamsa { }; @@ -5582,9 +5654,7 @@ in routino = callPackage ../tools/misc/routino { }; - rq = callPackage ../development/tools/rq { - v8 = v8.override { static = true; }; - }; + rq = callPackage ../development/tools/rq { }; rsnapshot = callPackage ../tools/backup/rsnapshot { }; @@ -5701,7 +5771,7 @@ in screenkey = python2Packages.callPackage ../applications/video/screenkey { }; quazip_qt4 = libsForQt5.quazip.override { - qtbase = qt4; qmake = qmake4Hook; + qtbase = qt4; }; scfbuild = python2.pkgs.callPackage ../tools/misc/scfbuild { }; @@ -5793,9 +5863,7 @@ in silc_server = callPackage ../servers/silc-server { }; - sile = callPackage ../tools/typesetting/sile { - inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg luasocket luasec; - }; + sile = callPackage ../tools/typesetting/sile { }; silver-searcher = callPackage ../tools/text/silver-searcher { }; @@ -6022,6 +6090,8 @@ in svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; + symengine = callPackage ../development/libraries/symengine { }; + sysbench = callPackage ../development/tools/misc/sysbench {}; system-config-printer = callPackage ../tools/misc/system-config-printer { @@ -6463,6 +6533,8 @@ in wal_e = callPackage ../tools/backup/wal-e { }; + wasabiwallet = callPackage ../applications/altcoins/wasabiwallet { }; + watchexec = callPackage ../tools/misc/watchexec { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -6676,7 +6748,7 @@ in deps = [ python ]; substitutions = { inherit waf; - crossFlags = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) + crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; }; } ../development/tools/build-managers/waf/setup-hook.sh; @@ -7099,8 +7171,6 @@ in compcert = callPackage ../development/compilers/compcert { }; - cpp-gsl = callPackage ../development/libraries/cpp-gsl { }; - cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; inherit (callPackages ../development/compilers/crystal { @@ -7930,6 +8000,7 @@ in cargo-web = callPackage ../development/tools/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; + inherit (darwin) cf-private; }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; @@ -8326,8 +8397,8 @@ in pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; - php = php72; - phpPackages = php72Packages; + php = php73; + phpPackages = php73Packages; php71Packages = recurseIntoAttrs (callPackage ./php-packages.nix { php = php71; @@ -8362,7 +8433,7 @@ in php72 php73; - php-embed = php72-embed; + php-embed = php73-embed; php71-embed = php71.override { config.php.embed = true; @@ -8379,7 +8450,7 @@ in config.php.apxs2 = false; }; - php-unit = php72-unit; + php-unit = php73-unit; php71-unit = php71.override { config.php.embed = true; @@ -8554,8 +8625,8 @@ in self = pkgsi686Linux.callPackage ../development/interpreters/self { }; - spark = spark_22; - spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; + spark = spark_24; + spark_24 = callPackage ../applications/networking/cluster/spark { version = "2.4.3"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ @@ -8581,35 +8652,13 @@ in tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; - proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { - v8_static = v8.override { static = true; }; - }; + proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; wasm-gc = callPackage ../development/interpreters/wasm-gc { }; ### DEVELOPMENT / MISC - amdadlsdk = callPackage ../development/misc/amdadl-sdk { }; - - amdappsdk26 = amdappsdk.override { - version = "2.6"; - }; - - amdappsdk27 = amdappsdk.override { - version = "2.7"; - }; - - amdappsdk28 = amdappsdk.override { - version = "2.8"; - }; - - amdappsdk = callPackage ../development/misc/amdapp-sdk { }; - - amdappsdkFull = amdappsdk.override { - samples = true; - }; - amtk = callPackage ../development/libraries/amtk { }; avrlibc = callPackage ../development/misc/avr/libc {}; @@ -8680,6 +8729,8 @@ in pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64; pharo-launcher = callPackage ../development/pharo/launcher { }; + srandrd = callPackage ../tools/X11/srandrd { }; + srecord = callPackage ../development/tools/misc/srecord { }; srelay = callPackage ../tools/networking/srelay { }; @@ -8704,7 +8755,6 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible - ansible_2_5 ansible_2_6 ansible_2_7; @@ -8852,6 +8902,8 @@ in buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { }; buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { }; + libbpf = callPackage ../os-specific/linux/libbpf { }; + bpftool = callPackage ../os-specific/linux/bpftool { }; byacc = callPackage ../development/tools/parsing/byacc { }; @@ -9206,6 +9258,8 @@ in graphene-hardened-malloc = callPackage ../development/libraries/graphene-hardened-malloc { }; + graphene = callPackage ../development/libraries/graphene { }; + gtk-doc = callPackage ../development/tools/documentation/gtk-doc { }; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; @@ -9416,6 +9470,8 @@ in noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; + nrfutil = callPackage ../development/tools/misc/nrfutil { }; + obelisk = callPackage ../development/tools/ocaml/obelisk { }; obuild = callPackage ../development/tools/ocaml/obuild { }; @@ -9676,6 +9732,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; + uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; + uhd = callPackage ../applications/radio/uhd { }; uisp = callPackage ../development/tools/misc/uisp { }; @@ -10072,6 +10130,8 @@ in cre2 = callPackage ../development/libraries/cre2 { }; + croaring = callPackage ../development/libraries/croaring { }; + cryptopp = callPackage ../development/libraries/crypto++ { }; cryptominisat = callPackage ../applications/science/logic/cryptominisat { }; @@ -10181,9 +10241,10 @@ in elastix = callPackage ../development/libraries/science/biology/elastix { }; - enchant = callPackage ../development/libraries/enchant { }; + enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; + enchant = enchant2; enet = callPackage ../development/libraries/enet { }; @@ -10365,6 +10426,8 @@ in gcab = callPackage ../development/libraries/gcab { }; + gcovr = with python3Packages; toPythonApplication gcovr; + gcr = callPackage ../development/libraries/gcr { }; gdl = callPackage ../development/libraries/gdl { }; @@ -10590,12 +10653,10 @@ in gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; }); + callPackage = newScope { libav = pkgs.ffmpeg; }; }); - gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { - bison = bison2; - }; + gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { }; gst-plugins-base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base { inherit (darwin.apple_sdk.frameworks) ApplicationServices; @@ -10726,6 +10787,8 @@ in }; gtk2-x11 = gtk2.override { + cairo = cairo.override { x11Support = true; }; + pango = pango.override { cairo = cairo.override { x11Support = true; }; x11Support = true; }; gdktarget = "x11"; }; @@ -10735,6 +10798,8 @@ in # On darwin gtk uses cocoa by default instead of x11. gtk3-x11 = gtk3.override { + cairo = cairo.override { x11Support = true; }; + pango = pango.override { cairo = cairo.override { x11Support = true; }; x11Support = true; }; x11Support = true; }; @@ -10777,7 +10842,7 @@ in gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; - gtkspell2 = callPackage ../development/libraries/gtkspell { }; + gtkspell2 = callPackage ../development/libraries/gtkspell { enchant = enchant1; }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; @@ -10881,8 +10946,13 @@ in } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' })); + icu64 = callPackage ../development/libraries/icu/64.nix ({ + nativeBuildRoot = buildPackages.icu64.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; + icu = icu64; id3lib = callPackage ../development/libraries/id3lib { }; @@ -10973,6 +11043,8 @@ in jsonnet = callPackage ../development/compilers/jsonnet { }; + go-jsonnet = callPackage ../development/compilers/go-jsonnet { }; + jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { }; jxrlib = callPackage ../development/libraries/jxrlib { }; @@ -11011,6 +11083,10 @@ in libkrb5 = krb5.override { type = "lib"; }; kerberos = libkrb5; # TODO: move to aliases.nix + l-smash = callPackage ../development/libraries/l-smash { + stdenv = gccStdenv; + }; + languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); lasem = callPackage ../development/libraries/lasem { }; @@ -11148,6 +11224,8 @@ in then pkgs.libcanberra else pkgs.libcanberra-gtk2; + libcbor = callPackage ../development/libraries/libcbor { }; + libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; @@ -11304,6 +11382,8 @@ in then callPackage ../development/libraries/libelf-freebsd { } else callPackage ../development/libraries/libelf { }; + libelfin = callPackage ../development/libraries/libelfin { }; + libetpan = callPackage ../development/libraries/libetpan { }; libexecinfo = callPackage ../development/libraries/libexecinfo { }; @@ -11312,6 +11392,8 @@ in libfakekey = callPackage ../development/libraries/libfakekey { }; + libfido2 = callPackage ../development/libraries/libfido2 { }; + libfilezilla = callPackage ../development/libraries/libfilezilla { }; libfm = callPackage ../development/libraries/libfm { }; @@ -12178,7 +12260,9 @@ in }; mesa = mesa_noglu; - mesa_glu = callPackage ../development/libraries/mesa-glu { }; + mesa_glu = callPackage ../development/libraries/mesa-glu { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; # NOTE: 2018-07-12: legacy alias: # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ @@ -12394,7 +12478,7 @@ in opencv3 = callPackage ../development/libraries/opencv/3.x.nix { inherit (darwin) cf-private; - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; opencv3WithoutCuda = opencv3.override { @@ -12403,7 +12487,7 @@ in opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin) cf-private; - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; openexr = callPackage ../development/libraries/openexr { }; @@ -12439,11 +12523,10 @@ in openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_2_7 libressl_2_8 libressl_2_9; - libressl = libressl_2_8; + libressl = libressl_2_9; boringssl = callPackage ../development/libraries/boringssl { }; @@ -12929,6 +13012,8 @@ in lvtk = callPackage ../development/libraries/audio/lvtk { }; + patchwork = callPackage ../applications/networking/ssb/patchwork { }; + qradiolink = callPackage ../applications/radio/qradiolink { }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -12954,6 +13039,8 @@ in rshell = python3.pkgs.callPackage ../development/tools/rshell { }; + rttr = callPackage ../development/libraries/rttr { }; + rubberband = callPackage ../development/libraries/rubberband { inherit (vamp) vampSDK; }; @@ -13167,10 +13254,7 @@ in sphinxsearch = callPackage ../servers/search/sphinxsearch { }; - spice = callPackage ../development/libraries/spice { - celt = celt_0_5_1; - inherit (pythonPackages) pyparsing; - }; + spice = callPackage ../development/libraries/spice { }; spice-gtk = callPackage ../development/libraries/spice-gtk { }; @@ -13249,7 +13333,7 @@ in subdl = callPackage ../applications/video/subdl { }; - subtitleeditor = callPackage ../applications/video/subtitleeditor { }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; }; suil = callPackage ../development/libraries/audio/suil { }; @@ -13437,11 +13521,7 @@ in stdenv = if stdenv.isDarwin then stdenv else overrideCC stdenv gcc5; }; - v8_6_x = callPackage ../development/libraries/v8/6_x.nix { - inherit (python2Packages) python; - }; - - v8 = callPackage ../development/libraries/v8 ({ + v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({ inherit (python2Packages) python gyp; icu = icu58; # v8-5.4.232 fails against icu4c-59.1 } // lib.optionalAttrs stdenv.isLinux { @@ -13449,6 +13529,14 @@ in stdenv = overrideCC stdenv gcc6; }); + v8_6_x = v8; + v8 = callPackage ../development/libraries/v8 { + inherit (python2Packages) python; + } // lib.optionalAttrs stdenv.isLinux { + # doesn't build with gcc7 + stdenv = overrideCC stdenv gcc6; + }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; @@ -13916,9 +14004,10 @@ in ### DEVELOPMENT / PERL MODULES perlInterpreters = callPackages ../development/interpreters/perl {}; - inherit (perlInterpreters) perl528 perldevel; + inherit (perlInterpreters) perl528 perl530 perldevel; perl528Packages = recurseIntoAttrs perl528.pkgs; + perl530Packages = recurseIntoAttrs perl530.pkgs; perldevelPackages = perldevel.pkgs; perl = perl528; @@ -14054,7 +14143,8 @@ in clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { - inherit (llvmPackages_latest) clang-unwrapped lld llvm; + # clickhouse doesn't build on llvm8. + inherit (llvmPackages_7) clang-unwrapped lld llvm; }; couchdb = callPackage ../servers/http/couchdb { @@ -14114,6 +14204,8 @@ in elasticmq = callPackage ../servers/elasticmq { }; + elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { }; + eventstore = callPackage ../servers/nosql/eventstore { Nuget = dotnetPackages.Nuget; }; @@ -14158,6 +14250,8 @@ in grafana = callPackage ../servers/monitoring/grafana { }; + grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; h2o = callPackage ../servers/http/h2o { }; @@ -14244,6 +14338,8 @@ in mpdscribble = callPackage ../tools/misc/mpdscribble { }; + mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { }; + micro-httpd = callPackage ../servers/http/micro-httpd { }; miniHttpd = callPackage ../servers/http/mini-httpd {}; @@ -14382,7 +14478,9 @@ in mariadb = callPackage ../servers/sql/mariadb { asio = asio_1_10; - jemalloc = jemalloc.override ({ disableInitExecTls = true; }); + # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4". + # https://jira.mariadb.org/browse/MDEV-15034 + jemalloc = jemalloc450.override ({ disableInitExecTls = true; }); inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; @@ -14546,6 +14644,9 @@ in prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; + prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { }; @@ -14660,6 +14761,11 @@ in sensu = callPackage ../servers/monitoring/sensu { }; + inherit (callPackages ../servers/monitoring/sensu-go { }) + sensu-go-agent + sensu-go-backend + sensu-go-cli; + uchiwa = callPackage ../servers/monitoring/uchiwa { }; shishi = callPackage ../servers/shishi { @@ -14904,11 +15010,7 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; @@ -15373,8 +15475,6 @@ in sch_cake = callPackage ../os-specific/linux/sch_cake { }; - spl = callPackage ../os-specific/linux/spl { }; - sysdig = callPackage ../os-specific/linux/sysdig {}; systemtap = callPackage ../development/tools/profiling/systemtap { }; @@ -15403,7 +15503,7 @@ in inherit (callPackage ../os-specific/linux/zfs { configFile = "kernel"; - inherit kernel spl; + inherit kernel; }) zfsStable zfsUnstable; zfs = zfsStable; @@ -15903,6 +16003,8 @@ in ubootOrangePiZeroPlus2H5 ubootPcduino3Nano ubootPine64 + ubootPine64LTS + ubootPinebook ubootQemuAarch64 ubootQemuArm ubootRaspberryPi @@ -15929,7 +16031,7 @@ in stdenv = crossLibcStdenv; }; - eudev = callPackage ../os-specific/linux/eudev {}; + eudev = callPackage ../os-specific/linux/eudev { utillinux = utillinuxMinimal; }; libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { }; @@ -15997,6 +16099,8 @@ in adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { }; + adementary-theme = callPackage ../data/themes/adementary { }; + agave = callPackage ../data/fonts/agave { }; aileron = callPackage ../data/fonts/aileron { }; @@ -16326,6 +16430,8 @@ in medio = callPackage ../data/fonts/medio { }; + mno16 = callPackage ../data/fonts/mno16 { }; + mnist = callPackage ../data/machine-learning/mnist { }; mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { }; @@ -16356,6 +16462,8 @@ in nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding { }; + national-park-typeface = callPackage ../data/fonts/national-park { }; + nordic = callPackage ../data/themes/nordic { }; nordic-polar = callPackage ../data/themes/nordic-polar { }; @@ -16438,6 +16546,8 @@ in public-sans = callPackage ../data/fonts/public-sans { }; + publicsuffix-list = callPackage ../data/misc/publicsuffix-list { }; + qogir-theme = callPackage ../data/themes/qogir { }; redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; @@ -16541,6 +16651,8 @@ in spleen = callPackage ../data/fonts/spleen { }; + stilo-themes = callPackage ../data/themes/stilo { }; + sudo-font = callPackage ../data/fonts/sudo { }; inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; @@ -16567,8 +16679,6 @@ in termtekst = callPackage ../misc/emulators/termtekst { }; - tetra-gtk-theme = callPackage ../data/themes/tetra { }; - tex-gyre = callPackages ../data/fonts/tex-gyre { }; tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; @@ -16984,7 +17094,7 @@ in carddav-util = callPackage ../tools/networking/carddav-util { }; - carla = callPackage ../applications/audio/carla { }; + carla = qt5.callPackage ../applications/audio/carla { }; catfish = callPackage ../applications/search/catfish { }; @@ -17017,9 +17127,7 @@ in inherit (python3Packages) python wrapPython pygments markdown; }; - cgminer = callPackage ../applications/misc/cgminer { - amdappsdk = amdappsdk28; - }; + cgminer = callPackage ../applications/misc/cgminer { }; chirp = callPackage ../applications/radio/chirp { inherit (pythonPackages) pyserial pygtk; @@ -17049,6 +17157,8 @@ in clfswm = callPackage ../applications/window-managers/clfswm { }; + clickshare-csc1 = callPackage ../applications/video/clickshare-csc1 { }; + cligh = python3Packages.callPackage ../development/tools/github/cligh {}; clipgrab = qt5.callPackage ../applications/video/clipgrab { }; @@ -17388,6 +17498,7 @@ in inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec { @@ -17726,21 +17837,21 @@ in gnuradio-with-packages = callPackage ../applications/radio/gnuradio/wrapper.nix { inherit (python2Packages) python; - extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-ais gnuradio-rds ] - ++ lib.optionals stdenv.isLinux [ gnuradio-gsm gnuradio-limesdr ]; + extraPackages = [ gr-nacl gr-osmosdr gr-ais gr-rds ] + ++ lib.optionals stdenv.isLinux [ gr-gsm gr-limesdr ]; }; - gnuradio-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; + gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; - gnuradio-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; + gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; - gnuradio-ais = callPackage ../applications/radio/gnuradio/ais.nix { }; + gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { }; - gnuradio-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { }; + gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { }; - gnuradio-rds = callPackage ../applications/radio/gnuradio/rds.nix { }; + gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { }; - gnuradio-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; + gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; @@ -17961,12 +18072,6 @@ in freerdpUnstable = freerdp; - # This must go when weston v2 is released - freerdp_legacy = callPackage ../applications/networking/remote/freerdp/legacy.nix { - cmake = cmake_2_8; - ffmpeg = ffmpeg_2; - }; - fte = callPackage ../applications/editors/fte { }; game-music-emu = callPackage ../applications/audio/game-music-emu { }; @@ -18016,6 +18121,8 @@ in python = python27; }; + git-quick-stats = callPackage ../development/tools/git-quick-stats {}; + git-review = callPackage ../applications/version-management/git-review { }; gitolite = callPackage ../applications/version-management/gitolite { }; @@ -18262,6 +18369,8 @@ in jackline = callPackage ../applications/networking/instant-messengers/jackline { }; + leftwm = callPackage ../applications/window-managers/leftwm { }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; slack-dark = pkgs.slack.override { darkMode = true; }; @@ -18640,6 +18749,8 @@ in python3Packages = python36Packages; }; + kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; + lame = callPackage ../development/libraries/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -18797,6 +18908,8 @@ in luppp = callPackage ../applications/audio/luppp { }; + lutris = callPackage ../applications/misc/lutris { }; + lv2bm = callPackage ../applications/audio/lv2bm { }; lynx = callPackage ../applications/networking/browsers/lynx { }; @@ -19190,7 +19303,7 @@ in synapse = callPackage ../applications/misc/synapse { }; synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; synfigstudio = callPackage ../applications/graphics/synfigstudio { @@ -19233,6 +19346,8 @@ in mupdf = callPackage ../applications/misc/mupdf { }; + mystem = callPackage ../applications/misc/mystem { }; + diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; }; @@ -19338,6 +19453,8 @@ in stdenv = overrideCC stdenv gcc6; }; + openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { }; + openjump = callPackage ../applications/misc/openjump { }; openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; @@ -19825,9 +19942,6 @@ in rstudio = libsForQt5.callPackage ../applications/editors/rstudio { boost = boost166; - }; - rstudio-preview = libsForQt5.callPackage ../applications/editors/rstudio/preview.nix { - boost = boost166; llvmPackages = llvmPackages_7; }; @@ -20008,10 +20122,6 @@ in resilio-sync = callPackage ../applications/networking/resilio-sync { }; - bittorrentSync = bittorrentSync14; - bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; - bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; - dropbox = callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; @@ -20340,6 +20450,8 @@ in inherit (linuxPackages) x86_energy_perf_policy; }; + tmatrix = callPackage ../applications/misc/tmatrix { }; + tnef = callPackage ../applications/misc/tnef { }; todiff = callPackage ../applications/misc/todiff { }; @@ -20421,6 +20533,8 @@ in testssl = callPackage ../applications/networking/testssl { }; + ulauncher = callPackage ../applications/misc/ulauncher { }; + umurmur = callPackage ../applications/networking/umurmur { }; udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; @@ -20610,7 +20724,7 @@ in vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; - vscode = callPackage ../applications/editors/vscode { }; + vscode = callPackage ../applications/editors/vscode/vscode.nix { }; vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix {}; @@ -20618,6 +20732,8 @@ in vscode-extensions = recurseIntoAttrs (callPackage ../misc/vscode-extensions {}); + vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; + vue = callPackage ../applications/misc/vue { }; vuze = callPackage ../applications/networking/p2p/vuze { }; @@ -20685,9 +20801,7 @@ in chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; - weston = callPackage ../applications/window-managers/weston { - freerdp = freerdp_legacy; - }; + weston = callPackage ../applications/window-managers/weston { }; whitebox-tools = callPackage ../applications/gis/whitebox-tools { inherit (darwin.apple_sdk.frameworks) Security; @@ -20901,7 +21015,7 @@ in inherit (xorg) xcompmgr; - inherit (callPackage ../applications/window-managers/compton {}) compton compton-git; + compton = callPackage ../applications/window-managers/compton {}; xdaliclock = callPackage ../tools/misc/xdaliclock {}; @@ -20956,7 +21070,9 @@ in xmind = callPackage ../applications/misc/xmind { }; - xneur = callPackage ../applications/misc/xneur { }; + xneur = callPackage ../applications/misc/xneur { + enchant = enchant1; + }; gxneur = callPackage ../applications/misc/gxneur { inherit (gnome2) libglade GConf; @@ -20967,6 +21083,7 @@ in inherit (gnome2) libglade scrollkeeper; gtkhtml = gnome2.gtkhtml4; python = python27; + enchant = enchant1; }; xournal = callPackage ../applications/graphics/xournal { @@ -21096,6 +21213,8 @@ in youtube-viewer = perlPackages.WWWYoutubeViewer; + ytcc = callPackage ../tools/networking/ytcc { }; + zam-plugins = callPackage ../applications/audio/zam-plugins { }; zanshin = libsForQt5.callPackage ../applications/office/zanshin { @@ -21148,6 +21267,8 @@ in _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; + abbaye-des-morts = callPackage ../games/abbaye-des-morts { }; + adom = callPackage ../games/adom { }; airstrike = callPackage ../games/airstrike { }; @@ -21226,8 +21347,7 @@ in }; cataclysm-dda = callPackage ../games/cataclysm-dda { - inherit (darwin.apple_sdk.frameworks) Cocoa; - ncurses = ncurses5; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa; }; cataclysm-dda-git = callPackage ../games/cataclysm-dda/git.nix { @@ -21242,6 +21362,8 @@ in crispyDoom = callPackage ../games/crispy-doom { }; + cri-o = callPackage ../applications/virtualization/cri-o {}; + ckan = callPackage ../games/ckan { }; cockatrice = libsForQt5.callPackage ../games/cockatrice { }; @@ -21436,6 +21558,8 @@ in gzdoom = callPackage ../games/gzdoom { }; + harmonist = callPackage ../games/harmonist { }; + hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; hedgewars = callPackage ../games/hedgewars { @@ -22021,7 +22145,7 @@ in kakasi = callPackage ../tools/text/kakasi { }; - lumina = libsForQt5.callPackage ../desktops/lumina { }; + lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { inherit pkgs libsForQt5; @@ -22741,6 +22865,8 @@ in opencv3 = opencv3WithoutCuda; # Used only for image loading. }); + caffeine-ng = callPackage ../tools/X11/caffeine-ng {}; + cntk = callPackage ../applications/science/math/cntk { inherit (linuxPackages) nvidia_x11; opencv3 = opencv3WithoutCuda; # Used only for image loading. @@ -22870,7 +22996,7 @@ in simgrid = callPackage ../applications/science/misc/simgrid { }; - spyder = callPackage ../applications/science/spyder { }; + spyder = with python3.pkgs; toPythonApplication spyder; openspace = callPackage ../applications/science/astronomy/openspace { }; @@ -22940,6 +23066,8 @@ in apmplanner2 = libsForQt511.callPackage ../applications/science/robotics/apmplanner2 { }; + betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; + ### MISC acpilight = callPackage ../misc/acpilight { }; @@ -23065,6 +23193,8 @@ in ekiga = callPackage ../applications/networking/instant-messengers/ekiga { }; + dumb = callPackage ../misc/dumb { }; + emulationstation = callPackage ../misc/emulators/emulationstation { stdenv = overrideCC stdenv gcc5; }; @@ -23161,6 +23291,10 @@ in hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; }; + hplip_3_18_5 = callPackage ../misc/drivers/hplip/3.18.5.nix { }; + + hplipWithPlugin_3_18_5 = hplip_3_18_5.override { withPlugin = true; }; + hyperfine = callPackage ../tools/misc/hyperfine { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -23175,6 +23309,8 @@ in igraph = callPackage ../development/libraries/igraph { }; + igprof = callPackage ../development/tools/misc/igprof { }; + illum = callPackage ../tools/system/illum { }; image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; }; @@ -23464,12 +23600,16 @@ in redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { }; + robin-map = callPackage ../development/libraries/robin-map { }; + robo3t = callPackage ../applications/misc/robo3t { }; rucksack = callPackage ../development/tools/rucksack { }; sam-ba = callPackage ../tools/misc/sam-ba { }; + sndio = callPackage ../misc/sndio { }; + opkg = callPackage ../tools/package-management/opkg { }; opkg-utils = callPackage ../tools/package-management/opkg-utils { }; @@ -23687,6 +23827,8 @@ in ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; + vnote = libsForQt5.callPackage ../applications/office/vnote { }; + ssh-audit = callPackage ../tools/security/ssh-audit { }; thermald = callPackage ../tools/system/thermald { }; @@ -24084,6 +24226,8 @@ in gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc; }; + tdm = callPackage ../games/tdm { }; + newlib = callPackage ../development/misc/newlib { }; newlibCross = callPackage ../development/misc/newlib { stdenv = crossLibcStdenv; @@ -24095,4 +24239,6 @@ in bemenu = callPackage ../applications/misc/bemenu { }; + dapper = callPackage ../development/tools/dapper { }; + } |