diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/all-packages.nix')
-rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 1755 |
1 files changed, 1203 insertions, 552 deletions
diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 039e9f805f8..1b91dfd4553 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -121,7 +121,11 @@ in autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } ../build-support/setup-hooks/auto-patchelf.sh; - appimageTools = callPackage ../build-support/appimage { }; + appimageTools = callPackage ../build-support/appimage { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }; + + appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { }; ensureNewerSourcesHook = { year }: makeSetupHook {} (writeScript "ensure-newer-sources-hook.sh" '' @@ -134,6 +138,8 @@ in addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; + alda = callPackage ../development/interpreters/alda { }; + ankisyncd = callPackage ../servers/ankisyncd { }; avro-tools = callPackage ../development/tools/avro-tools { }; @@ -153,7 +159,10 @@ in buildEnv = callPackage ../build-support/buildenv { }; # not actually a package - buildFHSUserEnv = callPackage ../build-support/build-fhs-userenv { }; + # TODO: eventually migrate everything to buildFHSUserEnvBubblewrap + buildFHSUserEnv = buildFHSUserEnvChroot; + buildFHSUserEnvChroot = callPackage ../build-support/build-fhs-userenv { }; + buildFHSUserEnvBubblewrap = callPackage ../build-support/build-fhs-userenv-bubblewrap { }; buildMaven = callPackage ../build-support/build-maven.nix {}; @@ -175,6 +184,8 @@ in colorz = callPackage ../tools/misc/colorz { }; + colorpicker = callPackage ../tools/misc/colorpicker { }; + comedilib = callPackage ../development/libraries/comedilib { }; cpu-x = callPackage ../applications/misc/cpu-x { }; @@ -191,6 +202,8 @@ in hobbes = callPackage ../development/tools/hobbes { }; + html5validator = python36Packages.callPackage ../applications/misc/html5validator { }; + proto-contrib = callPackage ../development/tools/proto-contrib {}; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; @@ -205,6 +218,8 @@ in onesixtyone = callPackage ../tools/security/onesixtyone {}; + creddump = callPackage ../tools/security/creddump {}; + device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; @@ -213,7 +228,7 @@ in archiver = callPackage ../applications/misc/archiver { }; - digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; + digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; grsync = callPackage ../applications/misc/grsync { }; @@ -261,7 +276,7 @@ in dispad = callPackage ../tools/X11/dispad { }; - dupeguru = callPackage ../applications/misc/dupeguru { }; + dupeguru = callPackage ../applications/misc/dupeguru { qt5 = qt514; }; dump1090 = callPackage ../applications/radio/dump1090 { }; @@ -269,6 +284,8 @@ in etBook = callPackage ../data/fonts/et-book { }; + fet-sh = callPackage ../tools/misc/fet-sh { }; + fetchbower = callPackage ../build-support/fetchbower { inherit (nodePackages) bower2nix; }; @@ -536,6 +553,8 @@ in _1password = callPackage ../applications/misc/1password { }; + _1password-gui = callPackage ../tools/security/1password-gui { }; + _6tunnel = callPackage ../tools/networking/6tunnel { }; _9pfs = callPackage ../tools/filesystems/9pfs { }; @@ -562,7 +581,10 @@ in acpica-tools = callPackage ../tools/system/acpica-tools { }; - act = callPackage ../development/tools/misc/act {}; + act = callPackage ../development/tools/misc/act { + # go 1.15 cannot connect to docker-for-mac https://github.com/docker/for-mac/issues/4855 + buildGoModule = if stdenv.isDarwin then buildGo114Module else buildGoModule; + }; actdiag = with python3.pkgs; toPythonApplication actdiag; @@ -597,7 +619,7 @@ in aescrypt = callPackage ../tools/misc/aescrypt { }; - acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; }; + acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; stdenv = gccStdenv; }; amass = callPackage ../tools/networking/amass { }; @@ -719,11 +741,13 @@ in arduino = arduino-core.override { withGui = true; }; + arduino-cli = callPackage ../development/arduino/arduino-cli { }; + arduino-core = callPackage ../development/arduino/arduino-core { }; arduino-mk = callPackage ../development/arduino/arduino-mk {}; - apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; + apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; arguments = callPackage ../development/libraries/arguments { }; @@ -748,8 +772,12 @@ in asciinema = callPackage ../tools/misc/asciinema {}; + asciinema-scenario = callPackage ../tools/misc/asciinema-scenario {}; + asciiquarium = callPackage ../applications/misc/asciiquarium {}; + ashuffle = callPackage ../applications/audio/ashuffle {}; + asls = callPackage ../development/tools/misc/asls { }; asymptote = callPackage ../tools/graphics/asymptote { @@ -809,10 +837,12 @@ in brakeman = callPackage ../development/tools/analysis/brakeman { }; - brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; + brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; boxes = callPackage ../tools/text/boxes { }; + chamber = callPackage ../tools/admin/chamber { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -845,6 +875,8 @@ in automirror = callPackage ../tools/misc/automirror { }; + barman = python3Packages.callPackage ../tools/misc/barman { }; + bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; bashcards = callPackage ../tools/misc/bashcards { }; @@ -885,6 +917,8 @@ in calls = callPackage ../applications/networking/calls { }; + inherit (nodePackages) castnow; + certigo = callPackage ../tools/admin/certigo { }; catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; @@ -896,6 +930,8 @@ in withDriver = false; }; + chroma = callPackage ../tools/text/chroma { }; + clair = callPackage ../tools/admin/clair { }; cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; @@ -920,6 +956,8 @@ in codespell = with python3Packages; toPythonApplication codespell; + coolreader = libsForQt5.callPackage ../applications/misc/coolreader {}; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; ctrtool = callPackage ../tools/archivers/ctrtool { }; @@ -955,6 +993,12 @@ in dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; + dot-http = callPackage ../development/tools/dot-http { + inherit (darwin.apple_sdk.frameworks) Security; + }; + + doona = callPackage ../tools/security/doona { }; + ecdsautils = callPackage ../tools/security/ecdsautils { }; sedutil = callPackage ../tools/security/sedutil { }; @@ -987,7 +1031,9 @@ in fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; - genpass = callPackage ../tools/security/genpass { }; + genpass = callPackage ../tools/security/genpass { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; genymotion = callPackage ../development/mobile/genymotion { }; @@ -1073,6 +1119,7 @@ in pass-wayland = callPackage ../tools/security/pass { waylandSupport = true; + pass = pass-wayland; }; passExtensions = recurseIntoAttrs pass.extensions; @@ -1121,6 +1168,8 @@ in wiiload = callPackage ../development/tools/wiiload { }; + wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; ssh-agents = callPackage ../tools/networking/ssh-agents { }; @@ -1147,6 +1196,7 @@ in androidndkPkgs = androidndkPkgs_18b; androidndkPkgs_18b = (callPackage ../development/androidndk-pkgs {})."18b"; + androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21"; androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk; @@ -1291,7 +1341,7 @@ in bindfs = callPackage ../tools/filesystems/bindfs { }; - birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; + birdtray = libsForQt514.callPackage ../applications/misc/birdtray { }; bitbucket-cli = python2Packages.bitbucket-cli; @@ -1315,6 +1365,8 @@ in quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; + mirage-im = libsForQt5.callPackage ../applications/networking/instant-messengers/mirage {}; + tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { @@ -1329,12 +1381,19 @@ in then python.pkgs.tensorflow.libtensorflow else libtensorflow-bin; + libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { + inherit (linuxPackages) nvidia_x11; + cudaSupport = pkgs.config.cudaSupport or false; + }; + behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; bless = callPackage ../applications/editors/bless { }; blink1-tool = callPackage ../tools/misc/blink1-tool { }; + blis = callPackage ../development/libraries/science/math/blis { }; + bliss = callPackage ../applications/science/math/bliss { }; blobfuse = callPackage ../tools/filesystems/blobfuse { }; @@ -1357,7 +1416,7 @@ in boringtun = callPackage ../tools/networking/boringtun { }; - boomerang = libsForQt5.callPackage ../development/tools/boomerang { }; + boomerang = libsForQt512.callPackage ../development/tools/boomerang { }; boost-build = callPackage ../development/tools/boost-build { }; @@ -1432,7 +1491,6 @@ in bs-platform = callPackage ../development/compilers/bs-platform {}; c3d = callPackage ../applications/graphics/c3d { - stdenv = gcc8Stdenv; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -1458,11 +1516,14 @@ in ''; }); - caddy = callPackage ../servers/caddy { }; - caddy2 = callPackage ../servers/caddy/v2.nix { }; - traefik = callPackage ../servers/traefik { }; + caddy = callPackage ../servers/caddy { buildGoModule = buildGo114Module; }; # https://github.com/lucas-clemente/quic-go/issues/2614 + caddy1 = callPackage ../servers/caddy/v1.nix { buildGoModule = buildGo114Module; }; + + # Traefik 2.2 uses go1.14, pinning can be removed with 2.3 + # https://github.com/containous/traefik/issues/7234#issuecomment-684950612 + traefik = callPackage ../servers/traefik { buildGoModule = buildGo114Module; }; - calamares = libsForQt5.callPackage ../tools/misc/calamares { + calamares = libsForQt514.callPackage ../tools/misc/calamares { python = python3; boost = pkgs.boost.override { python = python3; }; }; @@ -1567,6 +1628,8 @@ in colpack = callPackage ../applications/science/math/colpack { }; + commitizen = callPackage ../applications/version-management/commitizen {}; + compactor = callPackage ../applications/networking/compactor { }; consul = callPackage ../servers/consul { }; @@ -1626,6 +1689,8 @@ in compsize = callPackage ../os-specific/linux/compsize { }; + cot = with python3Packages; toPythonApplication cot; + coturn = callPackage ../servers/coturn { }; coursier = callPackage ../development/tools/coursier {}; @@ -1662,6 +1727,8 @@ in dante = callPackage ../servers/dante { }; + dapr-cli = callPackage ../development/tools/dapr/cli {}; + dasher = callPackage ../applications/accessibility/dasher { }; datamash = callPackage ../tools/misc/datamash { }; @@ -1678,6 +1745,8 @@ in dconf = callPackage ../development/libraries/dconf { }; + dcw-gmt = callPackage ../applications/gis/gmt/dcw.nix { }; + ddar = callPackage ../tools/backup/ddar { }; ddate = callPackage ../tools/misc/ddate { }; @@ -1757,6 +1826,8 @@ in dokuwiki = callPackage ../servers/web-apps/dokuwiki { }; + doppler = callPackage ../tools/security/doppler {}; + dosage = callPackage ../applications/graphics/dosage { }; dozenal = callPackage ../applications/misc/dozenal { }; @@ -1806,6 +1877,8 @@ in eksctl = callPackage ../tools/admin/eksctl { }; + electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; + element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { }; element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { @@ -1902,6 +1975,10 @@ in fuzzel = callPackage ../applications/misc/fuzzel { }; + flashfocus = python3Packages.callPackage ../misc/flashfocus { }; + + qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; + fwup = callPackage ../tools/misc/fwup { }; fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; @@ -1964,18 +2041,25 @@ in gmic = callPackage ../tools/graphics/gmic { }; - gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; + gmic-qt = libsForQt514.callPackage ../tools/graphics/gmic-qt { }; gmic-qt-krita = gmic-qt.override { variant = "krita"; }; + gmt = callPackage ../applications/gis/gmt { + inherit (darwin.apple_sdk.frameworks) + Accelerate CoreGraphics CoreVideo; + }; + goa = callPackage ../development/tools/goa { }; gohai = callPackage ../tools/system/gohai { }; gorilla-bin = callPackage ../tools/security/gorilla-bin { }; + godu = callPackage ../tools/misc/godu { }; + gosu = callPackage ../tools/misc/gosu { }; gotify-cli = callPackage ../tools/misc/gotify-cli { }; @@ -1990,7 +2074,9 @@ in gringo = callPackage ../tools/misc/gringo { }; - grobi = callPackage ../tools/X11/grobi { }; + grobi = callPackage ../tools/X11/grobi { + buildGoModule = buildGo114Module; + }; gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; @@ -2036,6 +2122,8 @@ in jellyfin = callPackage ../servers/jellyfin { }; + jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { }; + jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; jotta-cli = callPackage ../applications/misc/jotta-cli { }; @@ -2082,6 +2170,8 @@ in numatop = callPackage ../os-specific/linux/numatop { }; + numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { }; + iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; @@ -2096,17 +2186,17 @@ in marlin-calc = callPackage ../tools/misc/marlin-calc {}; - mathics = with python2Packages; toPythonApplication mathics; - masscan = callPackage ../tools/security/masscan { stdenv = gccStdenv; }; massren = callPackage ../tools/misc/massren { }; + maxcso = callPackage ../tools/archivers/maxcso {}; + medusa = callPackage ../tools/security/medusa { }; - megasync = libsForQt5.callPackage ../applications/misc/megasync { }; + megasync = libsForQt514.callPackage ../applications/misc/megasync { }; megacmd = callPackage ../applications/misc/megacmd { }; @@ -2164,12 +2254,16 @@ in mq-cli = callPackage ../tools/system/mq-cli { }; + nextdns = callPackage ../applications/networking/nextdns { }; + nfdump = callPackage ../tools/networking/nfdump { }; nfstrace = callPackage ../tools/networking/nfstrace { }; nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nix-template = callPackage ../tools/package-management/nix-template { }; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; @@ -2202,6 +2296,8 @@ in obinskit = callPackage ../applications/misc/obinskit {}; + odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; + pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -2250,6 +2346,8 @@ in remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { }; + ryujinx = callPackage ../misc/emulators/ryujinx { }; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; @@ -2260,6 +2358,8 @@ in simg2img = callPackage ../tools/filesystems/simg2img { }; + simplenes = callPackage ../misc/emulators/simplenes { }; + snipes = callPackage ../games/snipes { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; @@ -2409,8 +2509,6 @@ in assh = callPackage ../tools/networking/assh { }; - asynk = callPackage ../tools/networking/asynk { }; - b2sum = callPackage ../tools/security/b2sum { inherit (llvmPackages) openmp; }; @@ -2458,12 +2556,16 @@ in inherit (python27Packages) pillow; }; + blueberry = callPackage ../tools/bluetooth/blueberry { }; + blueman = callPackage ../tools/bluetooth/blueman { }; bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; bogofilter = callPackage ../tools/misc/bogofilter { }; + bomutils = callPackage ../tools/archivers/bomutils { }; + bsdbuild = callPackage ../development/tools/misc/bsdbuild { }; bsdiff = callPackage ../tools/compression/bsdiff { }; @@ -2498,6 +2600,8 @@ in bzip2 = callPackage ../tools/compression/bzip2 { }; + bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { }; + cabextract = callPackage ../tools/archivers/cabextract { }; cadaver = callPackage ../tools/networking/cadaver { @@ -2581,14 +2685,14 @@ in cksfv = callPackage ../tools/networking/cksfv { }; - clementine = libsForQt5.callPackage ../applications/audio/clementine { + clementine = libsForQt514.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; }; clementineUnfree = clementine.unfree; - mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; + mellowplayer = libsForQt514.callPackage ../applications/audio/mellowplayer { }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -2609,12 +2713,14 @@ in citra = libsForQt5.callPackage ../misc/emulators/citra { }; + cmigemo = callPackage ../tools/text/cmigemo { }; + cmst = libsForQt5.callPackage ../tools/networking/cmst { }; cmt = callPackage ../applications/audio/cmt {}; codimd = callPackage ../servers/web-apps/codimd { - nodejs = nodejs-10_x; + nodejs = nodejs-12_x; }; colord = callPackage ../tools/misc/colord { }; @@ -2710,6 +2816,8 @@ in ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; + bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { }; + hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; kkc = callPackage ../tools/inputmethods/ibus-engines/ibus-kkc { }; @@ -2721,7 +2829,7 @@ in mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; @@ -2756,6 +2864,12 @@ in biosdevname = callPackage ../tools/networking/biosdevname { }; + code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; + }; + code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk = true; + qtbase = qt5.qtbase; + }; + c14 = callPackage ../applications/networking/c14 { }; certstrap = callPackage ../tools/security/certstrap { }; @@ -2846,7 +2960,9 @@ in cudatoolkit_10 cudatoolkit_10_0 cudatoolkit_10_1 - cudatoolkit_10_2; + cudatoolkit_10_2 + cudatoolkit_11 + cudatoolkit_11_0; cudatoolkit = cudatoolkit_10; @@ -2863,7 +2979,9 @@ in cudnn_cudatoolkit_10 cudnn_cudatoolkit_10_0 cudnn_cudatoolkit_10_1 - cudnn_cudatoolkit_10_2; + cudnn_cudatoolkit_10_2 + cudnn_cudatoolkit_11 + cudnn_cudatoolkit_11_0; cudnn = cudnn_cudatoolkit_10; @@ -2917,6 +3035,8 @@ in dclxvi = callPackage ../development/libraries/dclxvi { }; + dconf2nix = callPackage ../development/tools/haskell/dconf2nix { }; + dcraw = callPackage ../tools/graphics/dcraw { }; dcfldd = callPackage ../tools/system/dcfldd { }; @@ -3103,12 +3223,14 @@ in dropbear = callPackage ../tools/networking/dropbear { }; - dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; + dsview = libsForQt514.callPackage ../applications/science/electronics/dsview { }; dtach = callPackage ../tools/misc/dtach { }; dtc = callPackage ../development/compilers/dtc { }; + dt-schema = python3Packages.callPackage ../development/tools/dt-schema { }; + dub = callPackage ../development/tools/build-managers/dub { }; duc = callPackage ../tools/misc/duc { }; @@ -3191,6 +3313,10 @@ in mcrcon = callPackage ../tools/networking/mcrcon {}; + mozwire = callPackage ../tools/networking/mozwire { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rage = callPackage ../tools/security/rage { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -3203,7 +3329,7 @@ in sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; + strawberry = libsForQt514.callPackage ../applications/audio/strawberry { }; tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; @@ -3211,7 +3337,9 @@ in teamocil = callPackage ../tools/misc/teamocil { }; - the-way = callPackage ../development/tools/the-way { }; + the-way = callPackage ../development/tools/the-way { + inherit (darwin.apple_sdk.frameworks) AppKit Security; + }; tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; @@ -3279,14 +3407,10 @@ in cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { }; - emscriptenVersion = "1.39.1"; + choose = callPackage ../tools/text/choose { }; emscripten = callPackage ../development/compilers/emscripten { }; - emscriptenfastcompPackages = dontRecurseIntoAttrs (callPackage ../development/compilers/emscripten/fastcomp { }); - - emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp; - emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; }; @@ -3411,7 +3535,7 @@ in f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; - Fabric = python2Packages.Fabric; + Fabric = with python3Packages; toPythonApplication Fabric; fail2ban = callPackage ../tools/security/fail2ban { }; @@ -3450,7 +3574,7 @@ in mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; table-extra = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-extra { }; @@ -3478,7 +3602,7 @@ in fdtools = callPackage ../tools/misc/fdtools { }; - featherpad = callPackage ../applications/editors/featherpad {}; + featherpad = qt5.callPackage ../applications/editors/featherpad {}; feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; @@ -3550,7 +3674,7 @@ in flashrom = callPackage ../tools/misc/flashrom { }; - flent = python3Packages.callPackage ../applications/networking/flent { }; + flent = python3Packages.callPackage ../applications/networking/flent { qt5 = qt514; }; flpsed = callPackage ../applications/editors/flpsed { }; @@ -3654,6 +3778,10 @@ in freetds = callPackage ../development/libraries/freetds { }; + freqtweak = callPackage ../applications/audio/freqtweak { + wxGTK = wxGTK31-gtk2; + }; + frescobaldi = python3Packages.callPackage ../misc/frescobaldi {}; frostwire = callPackage ../applications/networking/p2p/frostwire { }; @@ -3754,6 +3882,8 @@ in genimage = callPackage ../tools/filesystems/genimage { }; + geonkick = callPackage ../applications/audio/geonkick {}; + gerrit = callPackage ../applications/version-management/gerrit { }; geteltorito = callPackage ../tools/misc/geteltorito { }; @@ -3908,6 +4038,10 @@ in godot = callPackage ../development/tools/godot {}; + godot-headless = callPackage ../development/tools/godot/headless.nix { }; + + godot-server = callPackage ../development/tools/godot/server.nix { }; + goklp = callPackage ../tools/networking/goklp {}; go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; @@ -3946,6 +4080,8 @@ in gopro = callPackage ../tools/video/gopro { }; + goreplay = callPackage ../tools/networking/goreplay { }; + gource = callPackage ../applications/version-management/gource { }; govc = callPackage ../tools/virtualization/govc { }; @@ -4171,7 +4307,7 @@ in hal-flash = callPackage ../os-specific/linux/hal-flash { }; - hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; + hal-hardware-analyzer = libsForQt514.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; half = callPackage ../development/libraries/half { }; @@ -4239,7 +4375,7 @@ in hecate = callPackage ../applications/editors/hecate { }; - heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; + heaptrack = libsForQt514.callPackage ../development/tools/profiling/heaptrack {}; heimdall = libsForQt5.callPackage ../tools/misc/heimdall { }; @@ -4322,11 +4458,11 @@ in i2pd = callPackage ../tools/networking/i2pd { }; - i-score = libsForQt5.callPackage ../applications/audio/i-score { }; + i-score = libsForQt514.callPackage ../applications/audio/i-score { }; iasl = callPackage ../development/compilers/iasl { }; - iannix = libsForQt5.callPackage ../applications/audio/iannix { }; + iannix = libsForQt514.callPackage ../applications/audio/iannix { }; jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; @@ -4373,6 +4509,8 @@ in packages = config.ihaskell.packages or (self: []); }; + iruby = callPackage ../applications/editors/jupyter-kernels/iruby { }; + imapproxy = callPackage ../tools/networking/imapproxy { openssl = openssl_1_0_2; }; @@ -4439,9 +4577,13 @@ in iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { }; + ipfs = callPackage ../applications/networking/ipfs { + buildGoModule = buildGo114Module; + }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { + buildGoModule = buildGo114Module; + }; ipget = callPackage ../applications/networking/ipget { }; @@ -4479,6 +4621,8 @@ in isync = callPackage ../tools/networking/isync { }; + itm-tools = callPackage ../development/tools/misc/itm-tools { }; + ix = callPackage ../tools/misc/ix { }; jaaa = callPackage ../applications/audio/jaaa { }; @@ -4645,6 +4789,8 @@ in kibana = kibana6; kibana-oss = kibana6-oss; + kibi = callPackage ../applications/editors/kibi { }; + kismet = callPackage ../applications/networking/sniffers/kismet { }; klick = callPackage ../applications/audio/klick { }; @@ -4657,31 +4803,31 @@ in krakenx = callPackage ../tools/system/krakenx { }; - partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; + partition-manager = libsForQt514.callPackage ../tools/misc/partition-manager { }; kpcli = callPackage ../tools/security/kpcli { }; - krename = libsForQt5.callPackage ../applications/misc/krename { }; + krename = libsForQt514.callPackage ../applications/misc/krename { }; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; - kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; + kronometer = libsForQt514.callPackage ../tools/misc/kronometer { }; krop = callPackage ../applications/graphics/krop { }; - kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; + kdiff3 = libsForQt514.callPackage ../tools/text/kdiff3 { }; kube-router = callPackage ../applications/networking/cluster/kube-router { }; kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; - peruse = libsForQt5.callPackage ../tools/misc/peruse { }; + peruse = libsForQt514.callPackage ../tools/misc/peruse { }; - ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { }; + ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { }; - kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; + kst = libsForQt514.callPackage ../tools/graphics/kst { gsl = gsl_1; }; - kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { }; + kstars = libsForQt514.callPackage ../applications/science/astronomy/kstars { }; kytea = callPackage ../tools/text/kytea { }; @@ -4727,7 +4873,6 @@ in liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { ffmpeg = ffmpeg-full; - ocamlPackages = ocaml-ng.ocamlPackages_4_07; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; @@ -4758,6 +4903,8 @@ in lolcat = callPackage ../tools/misc/lolcat { }; + lottieconverter = callPackage ../tools/misc/lottieconverter { }; + lsd = callPackage ../tools/misc/lsd { }; lsdvd = callPackage ../tools/cd-dvd/lsdvd {}; @@ -4829,6 +4976,8 @@ in minergate-cli = callPackage ../applications/misc/minergate-cli { }; + minica = callPackage ../tools/security/minica { }; + minidlna = callPackage ../tools/networking/minidlna { }; minisign = callPackage ../tools/security/minisign { }; @@ -4915,7 +5064,7 @@ in ninka = callPackage ../development/tools/misc/ninka { }; - nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; + nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { }; nodejs = hiPrio nodejs-12_x; @@ -5125,6 +5274,8 @@ in logstalgia = callPackage ../tools/graphics/logstalgia {}; + lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { }; + loki = callPackage ../development/libraries/loki { }; longview = callPackage ../servers/monitoring/longview { }; @@ -5157,7 +5308,7 @@ in lzip = callPackage ../tools/compression/lzip { }; - luxcorerender = callPackage ../tools/graphics/luxcorerender { }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { qt5 = qt514; }; xz = callPackage ../tools/compression/xz { }; lzma = xz; # TODO: move to aliases.nix @@ -5179,8 +5330,15 @@ in mailhog = callPackage ../servers/mail/mailhog {}; mailnag = callPackage ../applications/networking/mailreaders/mailnag { - pythonPackages = python3Packages; + availablePlugins = { + # More are listed here: https://github.com/pulb/mailnag/#desktop-integration + # Use the attributes here as arguments to `plugins` list + goa = callPackage ../applications/networking/mailreaders/mailnag/goa-plugin.nix { }; + }; }; + mailnagWithPlugins = mailnag.withPlugins( + builtins.attrValues mailnag.availablePlugins + ); mailsend = callPackage ../tools/networking/mailsend { }; @@ -5320,13 +5478,13 @@ in pythonPackages = python3Packages; }; + mirakurun = nodePackages.mirakurun; + miredo = callPackage ../tools/networking/miredo { }; mirrorbits = callPackage ../servers/mirrorbits { }; - mitmproxy = callPackage ../tools/networking/mitmproxy { - python3Packages = python37Packages; - }; + mitmproxy = with python3Packages; toPythonApplication mitmproxy; mjpegtools = callPackage ../tools/video/mjpegtools { }; @@ -5358,6 +5516,8 @@ in molly-guard = callPackage ../os-specific/linux/molly-guard { }; + molotov = callPackage ../applications/video/molotov {}; + moneyplex = callPackage ../applications/office/moneyplex { }; monit = callPackage ../tools/system/monit { }; @@ -5428,6 +5588,8 @@ in mycli = callPackage ../tools/admin/mycli { }; + mycrypto = callPackage ../applications/blockchains/mycrypto { }; + mydumper = callPackage ../tools/backup/mydumper { }; mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { }; @@ -5456,9 +5618,8 @@ in xnbd = callPackage ../tools/networking/xnbd { }; nccl = callPackage ../development/libraries/science/math/nccl { }; - nccl_cudatoolkit_9_0 = nccl.override { cudatoolkit = cudatoolkit_9_0; }; - nccl_cudatoolkit_9 = nccl.override { cudatoolkit = cudatoolkit_9; }; nccl_cudatoolkit_10 = nccl.override { cudatoolkit = cudatoolkit_10; }; + nccl_cudatoolkit_11 = nccl.override { cudatoolkit = cudatoolkit_11; }; ndjbdns = callPackage ../tools/networking/ndjbdns { }; @@ -5492,6 +5653,8 @@ in ncftp = callPackage ../tools/networking/ncftp { }; + ncgopher = callPackage ../applications/networking/ncgopher { }; + ncompress = callPackage ../tools/compression/ncompress { }; ndisc6 = callPackage ../tools/networking/ndisc6 { }; @@ -5508,6 +5671,8 @@ in netkittftp = callPackage ../tools/networking/netkit/tftp { }; + netlify-cli = nodePackages.netlify-cli; + netpbm = callPackage ../tools/graphics/netpbm { }; netrw = callPackage ../tools/networking/netrw { }; @@ -5554,7 +5719,7 @@ in inherit (callPackage ../servers/nextcloud {}) nextcloud17 nextcloud18 nextcloud19; - nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; + nextcloud-client = libsForQt514.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; @@ -5576,7 +5741,16 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { }; + nomad = nomad_0_11; + # Nomad never updates major go versions within a release series and is unsupported + # on Go versions that it did not ship with. Due to historic bugs when compiled + # with different versions we pin Go for all versions. + nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { + buildGoPackage = buildGo114Package; + }; + nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { + buildGoPackage = buildGo114Package; + }; notable = callPackage ../applications/misc/notable { }; @@ -5596,6 +5770,8 @@ in pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; + pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { }; + pasystray = callPackage ../tools/audio/pasystray { }; phash = callPackage ../development/libraries/phash { }; @@ -5638,7 +5814,7 @@ in graphicalSupport = true; }; - nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; + nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { }; nnn = callPackage ../applications/misc/nnn { }; @@ -5740,7 +5916,7 @@ in ola = callPackage ../applications/misc/ola { }; - olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { + olive-editor = libsForQt514.callPackage ../applications/video/olive-editor { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; @@ -5781,6 +5957,8 @@ in openjade = callPackage ../tools/text/sgml/openjade { }; + openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { }; + openimagedenoise = callPackage ../development/libraries/openimagedenoise { }; openmvg = callPackage ../applications/science/misc/openmvg { }; @@ -5873,6 +6051,8 @@ in osl = callPackage ../development/compilers/osl { }; + osqp = callPackage ../development/libraries/science/math/osqp { }; + ossec = callPackage ../tools/security/ossec {}; osslsigncode = callPackage ../development/tools/osslsigncode {}; @@ -5887,7 +6067,7 @@ in overmind = callPackage ../applications/misc/overmind { }; - owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; + owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; oxidized = callPackage ../tools/admin/oxidized { }; @@ -5895,6 +6075,8 @@ in p2pvc = callPackage ../applications/video/p2pvc {}; + p3x-onenote = callPackage ../applications/office/p3x-onenote { }; + p7zip = callPackage ../tools/archivers/p7zip { }; packagekit = callPackage ../tools/package-management/packagekit { }; @@ -6089,6 +6271,8 @@ in pirate-get = callPackage ../tools/networking/pirate-get { }; + pipr = callPackage ../applications/misc/pipr { }; + pipreqs = callPackage ../tools/misc/pipreqs { }; pius = callPackage ../tools/security/pius { }; @@ -6280,6 +6464,8 @@ in pywal = with python3Packages; toPythonApplication pywal; + rbw = callPackage ../tools/security/rbw { }; + remarshal = callPackage ../development/tools/remarshal { }; rig = callPackage ../tools/misc/rig { @@ -6298,9 +6484,9 @@ in openmodelica = callPackage ../applications/science/misc/openmodelica { }; - qarte = libsForQt5.callPackage ../applications/video/qarte { }; + qarte = libsForQt514.callPackage ../applications/video/qarte { }; - qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; + qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { }; qnial = callPackage ../development/interpreters/qnial { }; @@ -6322,7 +6508,9 @@ in qjoypad = callPackage ../tools/misc/qjoypad { }; - qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { }; + qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; + + qownnotes = libsForQt514.callPackage ../applications/office/qownnotes { }; qpdf = callPackage ../development/libraries/qpdf { }; @@ -6334,7 +6522,7 @@ in qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { }; - qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + qtikz = libsForQt514.callPackage ../applications/graphics/ktikz { }; quickjs = callPackage ../development/interpreters/quickjs { }; @@ -6400,7 +6588,7 @@ in reredirect = callPackage ../tools/misc/reredirect { }; - retext = libsForQt5.callPackage ../applications/editors/retext { }; + retext = libsForQt514.callPackage ../applications/editors/retext { }; richgo = callPackage ../development/tools/richgo { }; @@ -6425,7 +6613,7 @@ in recutils = callPackage ../tools/misc/recutils { }; - recoll = callPackage ../applications/search/recoll { }; + recoll = libsForQt5.callPackage ../applications/search/recoll { }; redoc-cli = nodePackages.redoc-cli; @@ -6514,7 +6702,7 @@ in rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; - rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; + rosegarden = libsForQt514.callPackage ../applications/audio/rosegarden { }; rowhammer-test = callPackage ../tools/system/rowhammer-test { }; @@ -6536,7 +6724,7 @@ in rshijack = callPackage ../tools/networking/rshijack { }; - rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { }; + rsibreak = libsForQt514.callPackage ../applications/misc/rsibreak { }; rss2email = callPackage ../applications/networking/feedreaders/rss2email { pythonPackages = python3Packages; @@ -6564,6 +6752,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + rustscan = callPackage ../tools/security/rustscan { }; + rw = callPackage ../tools/misc/rw { }; rxp = callPackage ../tools/text/xml/rxp { }; @@ -6646,7 +6836,7 @@ in quazip = quazip_qt4; }; - screenkey = python2Packages.callPackage ../applications/video/screenkey { }; + screenkey = callPackage ../applications/video/screenkey { }; quazip_qt4 = libsForQt5.quazip.override { qtbase = qt4; @@ -6664,6 +6854,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + sd-mux-ctrl = callPackage ../tools/misc/sd-mux-ctrl { }; + sd-switch = callPackage ../os-specific/linux/sd-switch { }; sdate = callPackage ../tools/misc/sdate { }; @@ -6714,12 +6906,18 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { }; + sharutils = callPackage ../tools/archivers/sharutils { }; shelldap = callPackage ../tools/misc/shelldap { }; schema2ldif = callPackage ../tools/text/schema2ldif { }; + shen-sbcl = callPackage ../development/interpreters/shen-sbcl { }; + + shen-sources = callPackage ../development/interpreters/shen-sources { }; + shocco = callPackage ../tools/text/shocco { }; shopify-themekit = callPackage ../development/web/shopify-themekit { }; @@ -6746,7 +6944,7 @@ in sigal = callPackage ../applications/misc/sigal { }; - sigil = libsForQt5.callPackage ../applications/editors/sigil { }; + sigil = libsForQt514.callPackage ../applications/editors/sigil { }; signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; @@ -6795,7 +6993,7 @@ in sleuthkit = callPackage ../tools/system/sleuthkit {}; - sleepyhead = libsForQt5.callPackage ../applications/misc/sleepyhead {}; + sleepyhead = libsForQt514.callPackage ../applications/misc/sleepyhead {}; slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; @@ -6805,6 +7003,8 @@ in conf = config.slstatus.conf or null; }; + sm64ex = callPackage ../games/sm64ex { }; + smartdns = callPackage ../tools/networking/smartdns { }; smartmontools = callPackage ../tools/system/smartmontools { @@ -6838,6 +7038,10 @@ in snort = callPackage ../applications/networking/ids/snort { }; + so = callPackage ../development/tools/so { + inherit (darwin.apple_sdk.frameworks) Security; + }; + soapui = callPackage ../applications/networking/soapui { }; sshguard = callPackage ../tools/security/sshguard {}; @@ -6883,12 +7087,12 @@ in stdman = callPackage ../data/documentation/stdman { }; + steck = callPackage ../servers/pinnwand/steck.nix { }; + stenc = callPackage ../tools/backup/stenc { }; stm32loader = with python3Packages; toPythonApplication stm32loader; - storebrowse = callPackage ../tools/system/storebrowse { }; - stubby = callPackage ../tools/networking/stubby { }; syntex = callPackage ../tools/graphics/syntex {}; @@ -6947,7 +7151,7 @@ in subberthehut = callPackage ../tools/misc/subberthehut { }; - subsurface = libsForQt5.callPackage ../applications/misc/subsurface { }; + subsurface = libsForQt514.callPackage ../applications/misc/subsurface { }; sudo = callPackage ../tools/security/sudo { }; @@ -6963,8 +7167,6 @@ in supertux-editor = callPackage ../applications/editors/supertux-editor { }; - super-user-spark = haskellPackages.callPackage ../applications/misc/super_user_spark { }; - svgbob = callPackage ../tools/graphics/svgbob { }; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; @@ -7032,8 +7234,6 @@ in swec = callPackage ../tools/networking/swec { }; - swfdec = callPackage ../tools/graphics/swfdec {}; - svnfs = callPackage ../tools/filesystems/svnfs { }; svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; @@ -7104,7 +7304,7 @@ in ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { }; teleconsole = callPackage ../tools/misc/teleconsole { }; @@ -7138,7 +7338,7 @@ in textadept = callPackage ../applications/editors/textadept { }; - texworks = libsForQt5.callPackage ../applications/editors/texworks { }; + texworks = libsForQt514.callPackage ../applications/editors/texworks { }; thc-hydra = callPackage ../tools/security/thc-hydra { }; @@ -7178,6 +7378,8 @@ in tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; + tinycbor = callPackage ../development/libraries/tinycbor { }; + tiny8086 = callPackage ../applications/virtualization/8086tiny { }; tinyemu = callPackage ../applications/virtualization/tinyemu { }; @@ -7236,6 +7438,8 @@ in torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + toss = callPackage ../tools/networking/toss { }; + tox-node = callPackage ../tools/networking/tox-node { }; toxvpn = callPackage ../tools/networking/toxvpn { }; @@ -7398,6 +7602,8 @@ in untrunc = callPackage ../tools/video/untrunc { }; + untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { }; + up = callPackage ../tools/misc/up { }; upx = callPackage ../tools/compression/upx { }; @@ -7440,6 +7646,8 @@ in vbetool = callPackage ../tools/system/vbetool { }; + vcsi = callPackage ../tools/video/vcsi { }; + vde2 = callPackage ../tools/networking/vde2 { }; vboot_reference = callPackage ../tools/system/vboot_reference {}; @@ -7458,6 +7666,10 @@ in verilog = callPackage ../applications/science/electronics/verilog {}; + vgrep = callPackage ../tools/text/vgrep { }; + + vhd2vl = callPackage ../applications/science/electronics/vhd2vl { }; + video2midi = callPackage ../tools/audio/video2midi { pythonPackages = python3Packages; }; @@ -7507,6 +7719,8 @@ in vpnc = callPackage ../tools/networking/vpnc { }; + vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { }; + vp = callPackage ../applications/misc/vp { # Enable next line for console graphics. Note that # it requires `sixel` enabled terminals such as mlterm @@ -7811,6 +8025,8 @@ in libpsl = null; }; + wg-bond = callPackage ../applications/networking/wg-bond { }; + which = callPackage ../tools/system/which { }; whsniff = callPackage ../applications/networking/sniffers/whsniff { }; @@ -7829,7 +8045,7 @@ in wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { }; + wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { }; wml = callPackage ../development/web/wml { }; @@ -7869,6 +8085,8 @@ in clipnotify = callPackage ../tools/misc/clipnotify { }; + x3270 = callPackage ../applications/misc/x3270 { }; + xclip = callPackage ../tools/misc/xclip { }; xcur2png = callPackage ../tools/graphics/xcur2png { }; @@ -7961,6 +8179,7 @@ in inherit (yarn2nix-moretea) yarn2nix mkYarnPackage + mkYarnModules fixup_yarn_lock; yasr = callPackage ../applications/audio/yasr { }; @@ -8131,8 +8350,6 @@ in tcsh = callPackage ../shells/tcsh { }; - rssh = callPackage ../shells/rssh { }; - rush = callPackage ../shells/rush { }; xonsh = callPackage ../shells/xonsh { }; @@ -8243,7 +8460,7 @@ in colm = callPackage ../development/compilers/colm { }; - colmap = libsForQt5.callPackage ../applications/science/misc/colmap { }; + colmap = libsForQt514.callPackage ../applications/science/misc/colmap { }; colmapWithCuda = colmap.override { cudaSupport = true; }; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; @@ -8286,6 +8503,7 @@ in }; }; + clang_11 = llvmPackages_11.clang; clang_10 = llvmPackages_10.clang; clang_9 = llvmPackages_9.clang; clang_8 = llvmPackages_8.clang; @@ -8317,7 +8535,9 @@ in cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; - compcert = callPackage ../development/compilers/compcert { }; + compcert = callPackage ../development/compilers/compcert { + inherit (coqPackages_8_10) coq; + }; computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; computecpp = wrapCCWith rec { @@ -8335,12 +8555,12 @@ in mkdir -p "$rsrc/lib" ln -s "${cc}/lib" "$rsrc/include" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && cc ? gcc && !(stdenv.targetPlatform.useLLVM or false)) '' - echo "--gcc-toolchain=${cc.gcc}" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' + echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; }; - cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; + copper = callPackage ../development/compilers/copper {}; inherit (callPackages ../development/compilers/crystal { inherit (llvmPackages_10) stdenv clang llvm; @@ -8862,13 +9082,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_13 = callPackage ../development/compilers/go/1.13.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; - }); - go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs stdenv.isAarch64 { @@ -8883,7 +9096,7 @@ in buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; }); - go = go_1_14; + go = go_1_15; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -9004,6 +9217,7 @@ in openjdk_headless = openjdk8_headless; jdk8 = openjdk8; + jdk8_headless = openjdk8_headless; jre8 = openjdk8.jre; jre8_headless = openjdk8_headless.jre; @@ -9029,7 +9243,7 @@ in graalvm8-ee graalvm11-ee; - openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; + openshot-qt = libsForQt514.callPackage ../applications/video/openshot-qt { }; openspin = callPackage ../development/compilers/openspin { }; @@ -9088,6 +9302,21 @@ in jwasm = callPackage ../development/compilers/jwasm { }; + knightos-kcc = callPackage ../development/tools/knightos/kcc { }; + + knightos-kimg = callPackage ../development/tools/knightos/kimg { + asciidoc = asciidoc-full; + imagemagick = imagemagick7Big; + }; + + knightos-kpack = callPackage ../development/tools/knightos/kpack { }; + + knightos-mkrom = callPackage ../development/tools/knightos/mkrom { + asciidoc = asciidoc-full; + }; + + knightos-scas = callPackage ../development/tools/knightos/scas { }; + kotlin = callPackage ../development/compilers/kotlin { }; lazarus = callPackage ../development/compilers/fpc/lazarus.nix { @@ -9107,6 +9336,7 @@ in lld_8 = llvmPackages_8.lld; lld_9 = llvmPackages_9.lld; lld_10 = llvmPackages_10.lld; + lld_11 = llvmPackages_11.lld; lldb = llvmPackages.lldb; lldb_5 = llvmPackages_5.lldb; @@ -9115,10 +9345,12 @@ in lldb_8 = llvmPackages_8.lldb; lldb_9 = llvmPackages_9.lldb; lldb_10 = llvmPackages_10.lldb; + lldb_11 = llvmPackages_11.lldb; llvm = llvmPackages.llvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_11 = llvmPackages_11.llvm; llvm_10 = llvmPackages_10.llvm; llvm_9 = llvmPackages_9.llvm; llvm_8 = llvmPackages_8.llvm; @@ -9128,52 +9360,46 @@ in llvmPackages = recurseIntoAttrs llvmPackages_7; - llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ + llvmPackages_5 = callPackage ../development/compilers/llvm/5 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - }); + }; - llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({ + llvmPackages_6 = callPackage ../development/compilers/llvm/6 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_6.tools; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - # with gcc-7 on i686: undefined reference to `__divmoddi4' - # Failing tests with gcc8. - stdenv = overrideCC stdenv (if stdenv.hostPlatform.isi686 then gcc6 else gcc7); - }); + }; - llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({ + llvmPackages_7 = callPackage ../development/compilers/llvm/7 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - }); + }; - llvmPackages_8 = callPackage ../development/compilers/llvm/8 ({ + llvmPackages_8 = callPackage ../development/compilers/llvm/8 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_8.tools; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - }); + }; - llvmPackages_9 = callPackage ../development/compilers/llvm/9 ({ + llvmPackages_9 = callPackage ../development/compilers/llvm/9 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_9.tools; targetLlvmLibraries = targetPackages.llvmPackages_9.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - }); + }; - llvmPackages_10 = callPackage ../development/compilers/llvm/10 ({ + llvmPackages_10 = callPackage ../development/compilers/llvm/10 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_10.tools; targetLlvmLibraries = targetPackages.llvmPackages_10.libraries; + }; + + llvmPackages_11 = callPackage ../development/compilers/llvm/11 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_11.tools; + targetLlvmLibraries = targetPackages.llvmPackages_11.libraries; } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; }); @@ -9241,16 +9467,20 @@ in mosml = callPackage ../development/compilers/mosml { }; - mozart2 = callPackage ../development/compilers/mozart { }; + mozart2 = callPackage ../development/compilers/mozart { + emacs = emacs-nox; + }; mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; nim = callPackage ../development/compilers/nim { }; + nim-unwrapped = nim.unwrapped; + nrpl = callPackage ../development/tools/nrpl { }; neko = callPackage ../development/compilers/neko { }; - nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { + nextpnr = libsForQt514.callPackage ../development/compilers/nextpnr { inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -9335,9 +9565,9 @@ in inherit (llvmPackages_rocm) clang clang-unwrapped lld llvm; }; - rocm-runtime = callPackage ../development/libraries/rocm-runtime { }; - - rocm-runtime-ext = callPackage ../development/libraries/rocm-runtime-ext { }; + rocm-runtime = callPackage ../development/libraries/rocm-runtime { + inherit (llvmPackages_rocm) clang-unwrapped llvm; + }; # Python >= 3.8 still gives a bunch of warnings. rocm-smi = python37.pkgs.callPackage ../tools/system/rocm-smi { }; @@ -9385,12 +9615,16 @@ in cargo-audit = callPackage ../tools/package-management/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-c = callPackage ../development/tools/rust/cargo-c { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; cargo-deb = callPackage ../tools/package-management/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-deps = callPackage ../tools/package-management/cargo-deps { }; cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + cargo-kcov = callPackage ../tools/package-management/cargo-kcov { }; cargo-graph = callPackage ../tools/package-management/cargo-graph { }; cargo-license = callPackage ../tools/package-management/cargo-license { }; cargo-outdated = callPackage ../tools/package-management/cargo-outdated {}; @@ -9398,20 +9632,29 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { }; - cargo-tree = callPackage ../tools/package-management/cargo-tree { }; - cargo-update = callPackage ../tools/package-management/cargo-update { }; + cargo-update = callPackage ../tools/package-management/cargo-update { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-asm = callPackage ../development/tools/rust/cargo-asm { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; + cargo-cache = callPackage ../development/tools/rust/cargo-cache { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-embed = callPackage ../development/tools/rust/cargo-embed { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; + cargo-flash = callPackage ../development/tools/rust/cargo-flash { }; + cargo-fund = callPackage ../development/tools/rust/cargo-fund { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { inherit (darwin) libiconv; @@ -9470,8 +9713,6 @@ in scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; scala = scala_2_13; - scas = callPackage ../development/compilers/scas { }; - metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; scalafix = callPackage ../development/tools/scalafix { }; @@ -9628,6 +9869,8 @@ in zulip = callPackage ../applications/networking/instant-messengers/zulip { }; + zulip-term = callPackage ../applications/networking/instant-messengers/zulip-term { }; + zulu8 = callPackage ../development/compilers/zulu/8.nix { }; zulu = callPackage ../development/compilers/zulu { }; @@ -9797,13 +10040,6 @@ in me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { }; - mesos = callPackage ../applications/networking/cluster/mesos { - sasl = cyrus_sasl; - inherit (pythonPackages) python boto setuptools wrapPython; - pythonProtobuf = pythonPackages.protobuf.override { protobuf = protobuf3_6; }; - perf = linuxPackages.perf; - }; - mesos-dns = callPackage ../servers/mesos-dns { }; metamath = callPackage ../development/interpreters/metamath { }; @@ -9836,18 +10072,16 @@ in php = php74; phpPackages = php74Packages; - php72Packages = recurseIntoAttrs php72.packages; php73Packages = recurseIntoAttrs php73.packages; php74Packages = recurseIntoAttrs php74.packages; phpExtensions = php74Extensions; - php72Extensions = recurseIntoAttrs php72.extensions; php73Extensions = recurseIntoAttrs php73.extensions; php74Extensions = recurseIntoAttrs php74.extensions; inherit (callPackage ../development/interpreters/php { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }) php74 php73 php72; + }) php74 php73; picoc = callPackage ../development/interpreters/picoc {}; @@ -9874,15 +10108,43 @@ in # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. - pythonFull = python.override{x11Support=true;}; - python2Full = python2.override{x11Support=true;}; - python27Full = python27.override{x11Support=true;}; - python3Full = python3.override{x11Support=true;}; - python35Full = python35.override{x11Support=true;}; - python36Full = python36.override{x11Support=true;}; - python37Full = python37.override{x11Support=true;}; - python38Full = python38.override{x11Support=true;}; - python39Full = python39.override{x11Support=true;}; + pythonFull = python.override { + self = pythonFull; + x11Support = true; + }; + python2Full = python2.override { + self = python2Full; + x11Support = true; + }; + python27Full = python27.override { + self = python27Full; + x11Support = true; + }; + python3Full = python3.override { + self = python3Full; + bluezSupport = true; + x11Support = true; + }; + python36Full = python36.override { + self = python36Full; + bluezSupport = true; + x11Support = true; + }; + python37Full = python37.override { + self = python37Full; + bluezSupport = true; + x11Support = true; + }; + python38Full = python38.override { + self = python38Full; + bluezSupport = true; + x11Support = true; + }; + python39Full = python39.override { + self = python39Full; + bluezSupport = true; + x11Support = true; + }; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python.pkgs; @@ -9890,11 +10152,10 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 python38 python39 python3Minimal pypy27 pypy36; + inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); - python35Packages = python35.pkgs; python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.pkgs; python38Packages = recurseIntoAttrs python38.pkgs; @@ -10030,6 +10291,8 @@ in spark = callPackage ../applications/networking/cluster/spark { }; + sparkleshare = callPackage ../applications/version-management/sparkleshare { }; + spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; @@ -10043,7 +10306,7 @@ in ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; - supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { + supercollider = libsForQt514.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; @@ -10167,9 +10430,9 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible - ansible_2_7 ansible_2_8 - ansible_2_9; + ansible_2_9 + ansible_2_10; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; @@ -10213,8 +10476,7 @@ in aws-adfs = with python3Packages; toPythonApplication aws-adfs; inherit (callPackages ../development/tools/electron { }) - electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9; - electron = electron_9; + electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -10250,7 +10512,7 @@ in bazel_0_26 = callPackage ../development/tools/build-managers/bazel/bazel_0_26 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8; + buildJdk = jdk8_headless; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10259,7 +10521,7 @@ in bazel_0_29 = callPackage ../development/tools/build-managers/bazel/bazel_0_29 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8; + buildJdk = jdk8_headless; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10269,7 +10531,7 @@ in bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8; + buildJdk = jdk8_headless; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10279,7 +10541,7 @@ in bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8; + buildJdk = jdk8_headless; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10301,6 +10563,8 @@ in bazelisk = callPackage ../development/tools/bazelisk { }; + rebazel = callPackage ../development/tools/rebazel { }; + buildBazelPackage = callPackage ../build-support/build-bazel-package { }; bear = callPackage ../development/tools/build-managers/bear { }; @@ -10336,6 +10600,8 @@ in black = with python3Packages; toPythonApplication black; + black-macchiato = with python3Packages; toPythonApplication black-macchiato; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; @@ -10513,6 +10779,17 @@ in stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems }; + # This is for e.g. LLVM libraries on linux. + gccForLibs = + # with gcc-7: undefined reference to `__divmoddi4' + if stdenv.targetPlatform.isi686 + then gcc6.cc + else if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU + # Can only do this is in the native case, otherwise we might get infinite + # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`. + then targetPackages.stdenv.cc.cc + else gcc.cc; + libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { }; libsigrok = callPackage ../development/tools/libsigrok { }; @@ -10615,6 +10892,8 @@ in eggdbus = callPackage ../development/tools/misc/eggdbus { }; + effitask = callPackage ../applications/misc/effitask { }; + egypt = callPackage ../development/tools/analysis/egypt { }; elfinfo = callPackage ../development/tools/misc/elfinfo { }; @@ -10623,6 +10902,8 @@ in elfutils = callPackage ../development/tools/misc/elfutils { }; + eliot-tree = callPackage ../development/tools/eliot-tree { }; + emma = callPackage ../development/tools/analysis/emma { }; epm = callPackage ../development/tools/misc/epm { }; @@ -10667,6 +10948,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; + fujprog = callPackage ../development/tools/misc/fujprog { }; + funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { }; @@ -10741,7 +11024,7 @@ in gradle_4_10 = res.gradleGen.gradle_4_10; gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; - gradle_6 = res.gradleGen.gradle_6_5; + gradle_6 = res.gradleGen.gradle_6_6; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -10837,7 +11120,7 @@ in kati = callPackage ../development/tools/build-managers/kati { }; - kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; + kcc = libsForQt514.callPackage ../applications/graphics/kcc { }; kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { gperf = gperf_3_0; @@ -10875,6 +11158,8 @@ in lazygit = callPackage ../development/tools/lazygit { }; + laminar = callPackage ../development/tools/continuous-integration/laminar { }; + Literate = callPackage ../development/tools/literate-programming/Literate {}; lcov = callPackage ../development/tools/analysis/lcov { }; @@ -10909,7 +11194,7 @@ in lttv = callPackage ../development/tools/misc/lttv { }; - massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; + massif-visualizer = libsForQt514.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; @@ -10931,7 +11216,7 @@ in minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; - minizincide = qt5.callPackage ../development/tools/minizinc/ide.nix { }; + minizincide = qt514.callPackage ../development/tools/minizinc/ide.nix { }; mk = callPackage ../development/tools/build-managers/mk { }; @@ -11034,7 +11319,7 @@ in phantomjs = callPackage ../development/tools/phantomjs { }; - phantomjs2 = libsForQt5.callPackage ../development/tools/phantomjs2 { }; + phantomjs2 = libsForQt514.callPackage ../development/tools/phantomjs2 { }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; @@ -11089,7 +11374,7 @@ in pyrseas = callPackage ../development/tools/database/pyrseas { }; - qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; + qtcreator = libsForQt514.callPackage ../development/tools/qtcreator { }; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; @@ -11100,7 +11385,7 @@ in lua = lua5; } // (config.radare or {}))) radare2 r2-for-cutter; - radare2-cutter = libsForQt5.callPackage ../development/tools/analysis/radare2/cutter.nix { }; + radare2-cutter = libsForQt514.callPackage ../development/tools/analysis/radare2/cutter.nix { }; ragel = ragelStable; @@ -11130,6 +11415,8 @@ in remake = callPackage ../development/tools/build-managers/remake { }; + replacement = callPackage ../development/tools/misc/replacement { }; + retdec = callPackage ../development/tools/analysis/retdec { stdenv = gcc8Stdenv; }; @@ -11256,6 +11543,12 @@ in strace = callPackage ../development/tools/misc/strace { }; + summon = callPackage ../development/tools/summon { }; + + svlint = callPackage ../development/tools/analysis/svlint { }; + + svls = callPackage ../development/tools/misc/svls { }; + swarm = callPackage ../development/tools/analysis/swarm { }; swiftformat = callPackage ../development/tools/swiftformat { }; @@ -11288,11 +11581,15 @@ in terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; + terraformer = callPackage ../development/tools/misc/terraformer { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; - texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; - texinfo = texinfo6; + texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; + texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; + # Temporarily use older version on Darwin until it works. + texinfo = if stdenv.isDarwin then texinfo6_5 else texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } ); @@ -11405,6 +11702,8 @@ in xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; + xxe-pe = callPackage ../applications/editors/xxe-pe { }; + xxdiff-tip = xxdiff; yaml2json = callPackage ../development/tools/yaml2json { }; @@ -11412,12 +11711,15 @@ in ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; python = python3; + # currently broken + rustracerd = null; }; yodl = callPackage ../development/tools/misc/yodl { }; yq = callPackage ../development/tools/yq { - inherit (python3Packages) buildPythonApplication fetchPypi pyyaml xmltodict; + inherit (python3Packages) + buildPythonApplication fetchPypi argcomplete pyyaml xmltodict pytest coverage flake8 toml; }; yq-go = callPackage ../development/tools/yq-go { }; @@ -11476,8 +11778,6 @@ in appstream-glib = callPackage ../development/libraries/appstream-glib { }; - appstream-qt = libsForQt5.callPackage ../development/libraries/appstream/qt.nix { }; - apr = callPackage ../development/libraries/apr { }; aprutil = callPackage ../development/libraries/apr-util { @@ -11542,6 +11842,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; + ayatana-ido = callPackage ../development/libraries/ayatana-ido { }; + babl = callPackage ../development/libraries/babl { }; backward-cpp = callPackage ../development/libraries/backward-cpp { }; @@ -11852,9 +12154,12 @@ in dotconf = callPackage ../development/libraries/dotconf { }; + draco = callPackage ../development/libraries/draco { }; + # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) + amdvlk mesa vaapiIntel libvdpau-va-gl @@ -11868,8 +12173,6 @@ in duckdb = callPackage ../development/libraries/duckdb {}; - dxflib = callPackage ../development/libraries/dxflib {}; - easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; eccodes = callPackage ../development/libraries/eccodes { @@ -11965,6 +12268,7 @@ in openal = if stdenv.isDarwin then null else openal; libmfx = if stdenv.isDarwin then null else intel-media-sdk; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; + rav1e = if stdenv.isDarwin then null else rav1e; samba = if stdenv.isDarwin then null else samba; vid-stab = if stdenv.isDarwin then null else vid-stab; x265 = if stdenv.isDarwin then null else x265; @@ -12024,12 +12328,8 @@ in cfitsio = callPackage ../development/libraries/cfitsio { }; - fontconfig_210 = callPackage ../development/libraries/fontconfig/2.10.nix { }; - fontconfig = callPackage ../development/libraries/fontconfig { }; - fontconfig-penultimate = callPackage ../data/fonts/fontconfig-penultimate {}; - folly = callPackage ../development/libraries/folly { }; folks = callPackage ../development/libraries/folks { }; @@ -12304,9 +12604,7 @@ in gperftools = callPackage ../development/libraries/gperftools { }; - grab-site = callPackage ../tools/backup/grab-site { - python3Packages = python37Packages; - }; + grab-site = callPackage ../tools/backup/grab-site { }; grib-api = callPackage ../development/libraries/grib-api { }; @@ -12323,24 +12621,6 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }); - gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { }; - - gst-plugins-base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; - - gst-plugins-good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {}; - - gst-plugins-bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {}; - - gst-plugins-ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {}; - - gst-python = callPackage ../development/libraries/gstreamer/legacy/gst-python {}; - - gstreamermm = callPackage ../development/libraries/gstreamer/legacy/gstreamermm { }; - - gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; - gusb = callPackage ../development/libraries/gusb { }; qt-mobility = callPackage ../development/libraries/qt-mobility {}; @@ -12556,7 +12836,9 @@ in haxor-news = callPackage ../applications/misc/haxor-news { }; - herqq = libsForQt5.callPackage ../development/libraries/herqq { }; + hdt = callPackage ../misc/hdt {}; + + herqq = libsForQt514.callPackage ../development/libraries/herqq { }; heyefi = haskellPackages.heyefi; @@ -12717,6 +12999,8 @@ in isocodes = callPackage ../development/libraries/iso-codes { }; + iso-flags = callPackage ../data/icons/iso-flags { }; + ispc = callPackage ../development/compilers/ispc { stdenv = llvmPackages_10.stdenv; llvmPackages = llvmPackages_10; @@ -12724,14 +13008,14 @@ in isso = callPackage ../servers/isso { }; - itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; }; + itk4 = callPackage ../development/libraries/itk/4.x.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; itk = callPackage ../development/libraries/itk { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - jasper = callPackage ../development/libraries/jasper { }; - jama = callPackage ../development/libraries/jama { }; jansson = callPackage ../development/libraries/jansson { }; @@ -12776,7 +13060,7 @@ in let mkFrameworks = import ../development/libraries/kde-frameworks; attrs = { - inherit libsForQt5; + libsForQt5 = libsForQt514; inherit lib fetchurl; }; in @@ -12877,6 +13161,10 @@ in libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; libappindicator = callPackage ../development/libraries/libappindicator { }; + libayatana-appindicator-gtk2 = libayatana-appindicator.override { gtkVersion = "2"; }; + libayatana-appindicator-gtk3 = libayatana-appindicator.override { gtkVersion = "3"; }; + libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { }; + libarchive = callPackage ../development/libraries/libarchive { }; libasr = callPackage ../development/libraries/libasr { }; @@ -12894,7 +13182,7 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; libav = libav_11; # branch 11 is API-compatible with branch 10 - libav_all = callPackage ../development/libraries/libav { }; + libav_all = callPackages ../development/libraries/libav { }; inherit (libav_all) libav_0_8 libav_11 libav_12; libavc1394 = callPackage ../development/libraries/libavc1394 { }; @@ -13299,6 +13587,8 @@ in libhttpseverywhere = callPackage ../development/libraries/libhttpseverywhere { }; + libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { }; + libHX = callPackage ../development/libraries/libHX { }; libibmad = callPackage ../development/libraries/libibmad { }; @@ -13317,6 +13607,10 @@ in libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; libindicator = callPackage ../development/libraries/libindicator { }; + libayatana-indicator-gtk2 = libayatana-indicator.override { gtkVersion = "2"; }; + libayatana-indicator-gtk3 = libayatana-indicator.override { gtkVersion = "3"; }; + libayatana-indicator = callPackage ../development/libraries/libayatana-indicator { }; + libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { }; libiodbc = callPackage ../development/libraries/libiodbc { @@ -13672,6 +13966,8 @@ in libqalculate = callPackage ../development/libraries/libqalculate { }; + libqt5pas = callPackage ../development/compilers/fpc/libqt5pas.nix { }; + libroxml = callPackage ../development/libraries/libroxml { }; librsvg = callPackage ../development/libraries/librsvg { }; @@ -13736,6 +14032,8 @@ in libtheora = callPackage ../development/libraries/libtheora { }; + libthreadar = callPackage ../development/libraries/libthreadar { }; + libtiff = callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; @@ -13930,6 +14228,8 @@ in libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + rang = callPackage ../development/libraries/rang { }; + libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { src = pkgs.fetchurl { url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; @@ -14040,23 +14340,7 @@ in llvmPackages = llvmPackages_9; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; - } - # Temporary fix for .drivers that avoids causing lots of rebuilds; see #91145 - // { drivers = (mesa.overrideAttrs (a: { - nativeBuildInputs = [ - (patchelf.overrideAttrs (pa: { - src = fetchFromGitHub { - owner = "NixOS"; - repo = "patchelf"; - rev = "61bc10176"; # current master; what matters is merge of #225 - sha256 = "0cy77mn77w3mn64ggp20f4ygnbxfjmddhjjhfwkva53lsirg6w93"; - }; - nativeBuildInputs = pa.nativeBuildInputs or [] ++ [ autoreconfHook ]; - })) - ] ++ a.nativeBuildInputs or []; - })).drivers; - } - ; + }; mesa_glu = callPackage ../development/libraries/mesa-glu { inherit (darwin.apple_sdk.frameworks) ApplicationServices; @@ -14074,6 +14358,8 @@ in micropython = callPackage ../development/interpreters/micropython { }; + MIDIVisualizer = callPackage ../applications/audio/midi-visualizer { }; + mimalloc = callPackage ../development/libraries/mimalloc { }; minizip = callPackage ../development/libraries/minizip { }; @@ -14132,6 +14418,8 @@ in inherit (darwin.stubs) setfile; }; + muparserx = callPackage ../development/libraries/muparserx { }; + mutest = callPackage ../development/libraries/mutest { }; mygpoclient = pythonPackages.mygpoclient; @@ -14181,6 +14469,8 @@ in nettle = callPackage ../development/libraries/nettle { }; + newman = callPackage ../development/web/newman {}; + newt = callPackage ../development/libraries/newt { }; nghttp2 = callPackage ../development/libraries/nghttp2 { }; @@ -14471,8 +14761,9 @@ in python = python37; }; - protobuf = protobuf3_12; + protobuf = protobuf3_13; + protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { }; protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { }; @@ -14504,7 +14795,7 @@ in python-qt = callPackage ../development/libraries/python-qt { python = python27; - inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; + inherit (qt514) qmake qttools qtwebengine qtxmlpatterns; }; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; @@ -14514,15 +14805,12 @@ in qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; - qca2-qt5 = qca2.override { qt = qt5.qtbase; }; qimageblitz = callPackage ../development/libraries/qimageblitz {}; qjson = callPackage ../development/libraries/qjson { }; - qoauth = callPackage ../development/libraries/qoauth { }; - - qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; + qolibri = libsForQt514.callPackage ../applications/misc/qolibri { }; qt3 = callPackage ../development/libraries/qt-3 { libpng = libpng12; @@ -14572,9 +14860,43 @@ in libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); - # TODO bump to 5.12 on darwin once it's not broken - qt5 = qt512; - libsForQt5 = libsForQt512; + qt514 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.14) { + inherit newScope; + inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit bison; + inherit cups; + inherit dconf; + inherit harfbuzz; + inherit libGL; + inherit perl; + inherit gtk3; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit llvmPackages_5; + }); + + qt515 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.15) { + inherit newScope; + inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit bison; + inherit cups; + inherit dconf; + inherit harfbuzz; + inherit libGL; + inherit perl; + inherit gtk3; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit llvmPackages_5; + }); + + libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); + + libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5); + + # TODO bump to 5.14 on darwin once it's not broken; see #95199 + qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt515; + libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt515; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -14585,15 +14907,16 @@ in inherit (kdeFrameworks.override { libsForQt5 = self; }) attica baloo bluez-qt kactivities kactivities-stats karchive kauth kbookmarks kcmutils kcalendarcore kcodecs kcompletion kconfig - kconfigwidgets kcoreaddons kcrash kdbusaddons kdeclarative kdelibs4support + kconfigwidgets kcoreaddons kcrash kdav kdbusaddons kdeclarative kdelibs4support kdesignerplugin kdnssd kemoticons kfilemetadata kglobalaccel kguiaddons khtml ki18n kiconthemes kidletime kimageformats kio kitemmodels kitemviews kjobwidgets kjs kjsembed kmediaplayer knewstuff knotifications knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt - networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting - syndication threadweaver kirigami2 kholidays kpurpose kcontacts; + networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet + syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose + kcontacts kquickcharts; ### KDE PLASMA 5 @@ -14611,6 +14934,10 @@ in alkimia = callPackage ../development/libraries/alkimia { }; + appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; + + dxflib = callPackage ../development/libraries/dxflib {}; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; @@ -14659,6 +14986,8 @@ in phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; + plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { }; + polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; poppler = callPackage ../development/libraries/poppler { @@ -14672,7 +15001,10 @@ in qmltermwidget = callPackage ../development/libraries/qmltermwidget { inherit (darwin.apple_sdk.libs) utmp; }; - qmlbox2d = libsForQt5.callPackage ../development/libraries/qmlbox2d { }; + + qmlbox2d = callPackage ../development/libraries/qmlbox2d { }; + + qoauth = callPackage ../development/libraries/qoauth { }; qscintilla = callPackage ../development/libraries/qscintilla { withQt5 = true; @@ -14686,14 +15018,18 @@ in withQt5 = true; }; + qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; + qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; - qtstyleplugin-kvantum = libsForQt5.callPackage ../development/libraries/qtstyleplugin-kvantum { }; + qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { }; quazip = callPackage ../development/libraries/quazip { }; qwt = callPackage ../development/libraries/qwt/6.nix { }; + soqt = callPackage ../development/libraries/soqt { }; + telepathy = callPackage ../development/libraries/telepathy/qt { }; vlc = callPackage ../applications/video/vlc {}; @@ -14707,8 +15043,6 @@ in qtkeychain = callPackage ../development/libraries/qtkeychain { }; - qtpbfimageplugin = libsForQt5.callPackage ../development/libraries/qtpbfimageplugin { }; - qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { }; @@ -14792,10 +15126,12 @@ in qrupdate = callPackage ../development/libraries/qrupdate { }; - qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; + qgnomeplatform = libsForQt514.callPackage ../development/libraries/qgnomeplatform { }; randomx = callPackage ../development/libraries/randomx { }; + redkite = callPackage ../development/libraries/redkite { }; + resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { @@ -14805,6 +15141,8 @@ in rlog = callPackage ../development/libraries/rlog { }; + rlottie = callPackage ../development/libraries/rlottie { }; + rocksdb = callPackage ../development/libraries/rocksdb { }; rocksdb_lite = rocksdb.override { enableLite = true; }; @@ -14912,7 +15250,6 @@ in simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; - stdenv = gcc8Stdenv; }; sfml = callPackage ../development/libraries/sfml { @@ -15004,8 +15341,6 @@ in soprano = callPackage ../development/libraries/soprano { }; - soqt = callPackage ../development/libraries/soqt { }; - sord = callPackage ../development/libraries/sord {}; soundtouch = callPackage ../development/libraries/soundtouch {}; @@ -15107,8 +15442,7 @@ in stlport = callPackage ../development/libraries/stlport { }; streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; }; - - strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; + streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {}; subdl = callPackage ../applications/video/subdl { }; @@ -15325,7 +15659,9 @@ in vcg = callPackage ../development/libraries/vcg { }; - vid-stab = callPackage ../development/libraries/vid-stab { }; + vid-stab = callPackage ../development/libraries/vid-stab { + inherit (llvmPackages) openmp; + }; vigra = callPackage ../development/libraries/vigra { }; @@ -15360,6 +15696,14 @@ in CoreText IOSurface ImageIO OpenGL GLUT; }; + vtk_9 = libsForQt514.callPackage ../development/libraries/vtk/9.x.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + IOKit CFNetwork Security ApplicationServices + CoreText IOSurface ImageIO OpenGL GLUT; + }; + vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; @@ -15391,7 +15735,7 @@ in }); }; - vtkWithQt5 = vtk.override { qtLib = qt5; }; + vtkWithQt5 = vtk.override { qtLib = qt514; }; vxl = callPackage ../development/libraries/vxl { libpng = libpng12; @@ -15413,7 +15757,6 @@ in webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; - stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947 }; websocketpp = callPackage ../development/libraries/websocket++ { }; @@ -15429,24 +15772,22 @@ in wt3 wt4; + wxformbuilder = callPackage ../development/tools/wxformbuilder { }; + wxGTK = wxGTK28; wxGTK30 = wxGTK30-gtk2; wxGTK31 = wxGTK31-gtk2; - wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { - inherit (gnome2) GConf; - }; + wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; }; wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = true; - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; @@ -15459,7 +15800,6 @@ in wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { withGtk2 = true; - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; @@ -15696,9 +16036,6 @@ in ### DEVELOPMENT / GO MODULES - buildGo113Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_13; - }; buildGo114Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_14; }; @@ -15706,11 +16043,8 @@ in go = buildPackages.go_1_15; }; - buildGoPackage = buildGo114Package; + buildGoPackage = buildGo115Package; - buildGo113Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_13; - }; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; }; @@ -15718,7 +16052,7 @@ in go = buildPackages.go_1_15; }; - buildGoModule = buildGo114Module; + buildGoModule = buildGo115Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -15770,14 +16104,14 @@ in ### DEVELOPMENT / PERL MODULES perlInterpreters = callPackages ../development/interpreters/perl {}; - inherit (perlInterpreters) perl528 perl530 perldevel; + inherit (perlInterpreters) perl530 perl532 perldevel; - perl528Packages = recurseIntoAttrs perl528.pkgs; perl530Packages = recurseIntoAttrs perl530.pkgs; + perl532Packages = recurseIntoAttrs perl532.pkgs; perldevelPackages = perldevel.pkgs; - perl = perl530; - perlPackages = perl530Packages; + perl = perl532; + perlPackages = perl532Packages; ack = perlPackages.ack; @@ -15937,6 +16271,11 @@ in erlang = erlangR21; }; + couchdb3 = callPackage ../servers/http/couchdb/3.nix { + spidermonkey = spidermonkey_68; + erlang = erlangR22; + }; + couchpotato = callPackage ../servers/couchpotato {}; dex-oidc = callPackage ../servers/dex { }; @@ -16034,9 +16373,13 @@ in gofish = callPackage ../servers/gopher/gofish { }; - grafana = callPackage ../servers/monitoring/grafana { }; + grafana = callPackage ../servers/monitoring/grafana { + buildGoModule = buildGo114Module; + }; - grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana-loki = callPackage ../servers/monitoring/loki { + buildGoPackage = buildGo114Package; + }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -16048,17 +16391,9 @@ in hashi-ui = callPackage ../servers/hashi-ui {}; - /* This package duplicates a lot of functionality from haskellPackages - instead of using the packages we maintain there. Now, a recent update to - haskellPackages causes these tools to fail evaluation, and I have been - unable to mark them as "broken" in a way that ofBorg bot recognizes. Since - I don't want to merge code into master that generates evaluation errors, I - have no other idea but to comment them out entirely. + hasura-graphql-engine = haskellPackages.graphql-engine; - inherit (callPackage ../servers/hasura { }) - hasura-cli - hasura-graphql-engine; - */ + hasura-cli = callPackage ../servers/hasura/cli.nix { }; heapster = callPackage ../servers/monitoring/heapster { }; @@ -16134,8 +16469,6 @@ in mediatomb = callPackage ../servers/mediatomb { }; - meguca = callPackage ../servers/meguca { }; - memcached = callPackage ../servers/memcached {}; meteor = callPackage ../servers/meteor { }; @@ -16195,7 +16528,9 @@ in unit = callPackage ../servers/http/unit { }; - ncdns = callPackage ../servers/dns/ncdns { }; + ncdns = callPackage ../servers/dns/ncdns { + buildGoPackage = buildGo114Package; + }; nginx = nginxStable; @@ -16234,6 +16569,8 @@ in oauth2_proxy = callPackage ../servers/oauth2_proxy { }; + openbgpd = callPackage ../servers/openbgpd { }; + openafs = callPackage ../servers/openafs/1.6 { tsmbac = null; ncurses = null; }; openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; }; @@ -16283,7 +16620,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; - qpaeq = qt5.callPackage ../servers/pulseaudio/qpaeq.nix { }; + qpaeq = libsForQt514.callPackage ../servers/pulseaudio/qpaeq.nix { }; pulseaudioFull = pulseaudio.override { x11Support = true; @@ -16479,6 +16816,8 @@ in asciidoc = asciidoc-full; }; + timescale-prometheus = callPackage ../servers/monitoring/timescale-prometheus { }; + timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; @@ -16497,7 +16836,10 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { }; + prometheus = callPackage ../servers/monitoring/prometheus { + buildGoPackage = buildGo114Package; + go = go_1_14; + }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; @@ -16593,6 +16935,7 @@ in restya-board = callPackage ../servers/web-apps/restya-board { }; rethinkdb = callPackage ../servers/nosql/rethinkdb { + stdenv = clangStdenv; libtool = darwin.cctools; }; @@ -16632,7 +16975,7 @@ in enableMDNS = true; enableDomainController = true; enableRegedit = true; - enableCephFS = true; + enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64; enableGlusterFS = true; }); @@ -16721,6 +17064,8 @@ in tt-rss-plugin-auth-ldap = callPackage ../servers/tt-rss/plugin-auth-ldap { }; tt-rss-theme-feedly = callPackage ../servers/tt-rss/theme-feedly { }; + rss-bridge = callPackage ../servers/web-apps/rss-bridge { }; + searx = callPackage ../servers/web-apps/searx { }; selfoss = callPackage ../servers/web-apps/selfoss { }; @@ -16742,6 +17087,8 @@ in unifiStable; unifi = unifiStable; + urserver = callPackage ../servers/urserver { }; + victoriametrics = callPackage ../servers/nosql/victoriametrics { }; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; @@ -16817,11 +17164,11 @@ in server = server-pgsql; }; - zabbix44 = recurseIntoAttrs (zabbixFor "v44"); + zabbix50 = recurseIntoAttrs (zabbixFor "v50"); zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); zabbix30 = dontRecurseIntoAttrs (zabbixFor "v30"); - zabbix = zabbix44; + zabbix = zabbix50; zipkin = callPackage ../servers/monitoring/zipkin { }; @@ -16957,6 +17304,8 @@ in cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; + cramfsprogs = callPackage ../os-specific/linux/cramfsprogs { }; + cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; crda = callPackage ../os-specific/linux/crda { }; @@ -17018,7 +17367,7 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt5.callPackage ../os-specific/linux/ffado { + ffado = libsForQt514.callPackage ../os-specific/linux/ffado { inherit (pkgs.linuxPackages) kernel; }; libffado = ffado; @@ -17082,6 +17431,8 @@ in pcm = callPackage ../os-specific/linux/pcm { }; + ifmetric = callPackage ../os-specific/linux/ifmetric {}; + ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { openssl = openssl_1_0_2; }; @@ -17288,6 +17639,22 @@ in ]; }; + linux-rt_5_4 = callPackage ../os-specific/linux/kernel/linux-rt-5.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + + linux-rt_5_6 = callPackage ../os-specific/linux/kernel/linux-rt-5.6.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + linux_5_7 = callPackage ../os-specific/linux/kernel/linux-5.7.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17296,6 +17663,14 @@ in ]; }; + linux_5_8 = callPackage ../os-specific/linux/kernel/linux-5.8.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17318,6 +17693,14 @@ in ]; }; + linux_zen = callPackage ../os-specific/linux/kernel/linux-zen.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -17362,8 +17745,6 @@ in ddcci-driver = callPackage ../os-specific/linux/ddcci { }; - deepin-anything = callPackage ../os-specific/linux/deepin-anything { }; - digimend = callPackage ../os-specific/linux/digimend { }; dpdk = callPackage ../os-specific/linux/dpdk { }; @@ -17430,6 +17811,8 @@ in rtl88x2bu = callPackage ../os-specific/linux/rtl88x2bu { }; + rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; + rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; openafs = callPackage ../servers/openafs/1.6/module.nix { }; @@ -17454,6 +17837,8 @@ in netatop = callPackage ../os-specific/linux/netatop { }; + oci-seccomp-bpf-hook = if stdenv.lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; + perf = callPackage ../os-specific/linux/kernel/perf.nix { }; phc-intel = if stdenv.lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; @@ -17511,23 +17896,32 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_7; + linuxPackages_latest = linuxPackages_5_8; linux_latest = linuxPackages_latest.kernel; - # Build the kernel modules for the some of the kernels. + # Realtime kernel packages. + linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; + linuxPackages-rt = linuxPackages-rt_5_4; + linux-rt = linuxPackages-rt.kernel; + linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6; + linuxPackages-rt_latest = linuxPackages-rt_5_6; + linux-rt_latest = linuxPackages-rt_latest.kernel; + linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi1 = linuxPackagesFor pkgs.linux_rpi1; linuxPackages_rpi2 = linuxPackagesFor pkgs.linux_rpi2; linuxPackages_rpi3 = linuxPackagesFor pkgs.linux_rpi3; linuxPackages_rpi4 = linuxPackagesFor pkgs.linux_rpi4; + # Build kernel modules for some of the kernels. linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7); + linuxPackages_5_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_8); - # When adding to this list: + # When adding to the list above: # - Update linuxPackages_latest to the latest version # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. @@ -17598,6 +17992,9 @@ in linuxPackages_latest-libre = recurseIntoAttrs (linuxPackagesFor linux_latest-libre); linux_latest-libre = linux-libre.override { linux = linux_latest; }; + # zen-kernel + linuxPackages_zen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_zen); + # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); @@ -17647,6 +18044,14 @@ in librealsense = callPackage ../development/libraries/librealsense { }; + librealsenseWithCuda = callPackage ../development/libraries/librealsense { + cudaSupport = true; + }; + + librealsenseWithoutCuda = callPackage ../development/libraries/librealsense { + cudaSupport = false; + }; + libsass = callPackage ../development/libraries/libsass { }; libsepol = callPackage ../os-specific/linux/libsepol { }; @@ -17679,7 +18084,12 @@ in lsscsi = callPackage ../os-specific/linux/lsscsi { }; - lvm2 = callPackage ../os-specific/linux/lvm2 { }; + lvm2 = callPackage ../os-specific/linux/lvm2 { + # udev is the same package as systemd which depends on cryptsetup + # which depends on lvm2 again. But we only need the libudev part + # which does not depend on cryptsetup. + udev = udev.override { cryptsetup = null; }; + }; lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 { enableDmeventd = true; enableCmdlib = true; @@ -17748,6 +18158,8 @@ in iferr = callPackage ../development/tools/iferr { }; + ginkgo = callPackage ../development/tools/ginkgo { }; + go-bindata = callPackage ../development/tools/go-bindata { }; go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; @@ -17796,6 +18208,8 @@ in gotop = callPackage ../tools/system/gotop { }; + go-migrate = callPackage ../development/tools/go-migrate { }; + gomodifytags = callPackage ../development/tools/gomodifytags { }; go-langserver = callPackage ../development/tools/go-langserver { }; @@ -17840,6 +18254,8 @@ in pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { }; + pam_gnupg = callPackage ../os-specific/linux/pam_gnupg { }; + pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { }; pam_ldap = callPackage ../os-specific/linux/pam_ldap { }; @@ -17929,8 +18345,6 @@ in regionset = callPackage ../os-specific/linux/regionset { }; - rfkill = callPackage ../os-specific/linux/rfkill { }; - rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; riscv-pk = callPackage ../misc/riscv-pk { }; @@ -17959,7 +18373,7 @@ in sdparm = callPackage ../os-specific/linux/sdparm { }; - sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { }; + sdrangel = libsForQt512.callPackage ../applications/radio/sdrangel { }; sepolgen = callPackage ../os-specific/linux/sepolgen { }; @@ -18001,12 +18415,26 @@ in sysstat = callPackage ../os-specific/linux/sysstat { }; systemd = callPackage ../os-specific/linux/systemd { - utillinux = utillinuxMinimal; # break the cyclic dependency + # break some cyclic dependencies + utillinux = utillinuxMinimal; + # provide a super minimal gnupg used for systemd-machined + gnupg = callPackage ../tools/security/gnupg/22.nix { + enableMinimal = true; + guiSupport = false; + pcsclite = null; + sqlite = null; + pinentry = null; + adns = null; + gnutls = null; + libusb1 = null; + openldap = null; + readline = null; + zlib = null; + bzip2 = null; + }; }; - udev = systemd; # TODO: move to aliases.nix - # standalone cryptsetup generator for systemd - systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; + udev = systemd; # TODO: move to aliases.nix systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; @@ -18052,6 +18480,7 @@ in ubootPine64 ubootPine64LTS ubootPinebook + ubootPinebookPro ubootQemuAarch64 ubootQemuArm ubootRaspberryPi @@ -18175,6 +18604,8 @@ in amiri = callPackage ../data/fonts/amiri { }; + anarchism = callPackage ../data/documentation/anarchism { }; + andagii = callPackage ../data/fonts/andagii { }; andika = callPackage ../data/fonts/andika { }; @@ -18484,12 +18915,14 @@ in kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; - kde2-decoration = libsForQt5.callPackage ../data/themes/kde2 { }; + kde2-decoration = libsForQt514.callPackage ../data/themes/kde2 { }; kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + kopia = callPackage ../tools/backup/kopia { }; + lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; @@ -18544,6 +18977,8 @@ in luculent = callPackage ../data/fonts/luculent { }; + luna-icons = callPackage ../data/icons/luna-icons { }; + maia-icon-theme = callPackage ../data/icons/maia-icon-theme { }; mailcap = callPackage ../data/misc/mailcap { }; @@ -18556,6 +18991,10 @@ in marwaita = callPackage ../data/themes/marwaita { }; + marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; + + marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { }; + matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; @@ -18576,8 +19015,6 @@ in medio = callPackage ../data/fonts/medio { }; - mint-x-icons = callPackage ../data/icons/mint-x-icons { }; - mno16 = callPackage ../data/fonts/mno16 { }; mnist = callPackage ../data/machine-learning/mnist { }; @@ -18720,7 +19157,7 @@ in qogir-theme = callPackage ../data/themes/qogir { }; - qtcurve = libsForQt5.callPackage ../data/themes/qtcurve {}; + qtcurve = libsForQt514.callPackage ../data/themes/qtcurve {}; redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; @@ -18754,6 +19191,8 @@ in sierra-gtk-theme = callPackage ../data/themes/sierra { }; + snap7 = callPackage ../development/libraries/snap7 {}; + snowblind = callPackage ../data/themes/snowblind { }; solarc-gtk-theme = callPackage ../data/themes/solarc { }; @@ -18783,7 +19222,7 @@ in qgo = libsForQt5.callPackage ../games/qgo { }; - qmc2 = libsForQt5.callPackage ../misc/emulators/qmc2 { }; + qmc2 = libsForQt514.callPackage ../misc/emulators/qmc2 { }; quattrocento = callPackage ../data/fonts/quattrocento {}; @@ -18935,6 +19374,8 @@ in vegeta = callPackage ../tools/networking/vegeta { }; + venta = callPackage ../data/themes/venta { }; + victor-mono = callPackage ../data/fonts/victor-mono { }; vimix-gtk-themes = callPackage ../data/themes/vimix {}; @@ -18971,7 +19412,7 @@ in zafiro-icons = callPackage ../data/icons/zafiro-icons { }; - zeal = libsForQt5.callPackage ../data/documentation/zeal { }; + zeal = libsForQt514.callPackage ../data/documentation/zeal { }; zilla-slab = callPackage ../data/fonts/zilla-slab { }; @@ -19021,7 +19462,7 @@ in ahoviewer = callPackage ../applications/graphics/ahoviewer { }; - airwave = callPackage ../applications/audio/airwave { }; + airwave = callPackage ../applications/audio/airwave { qt5 = qt514; }; akira-unstable = callPackage ../applications/graphics/akira { }; @@ -19039,7 +19480,7 @@ in msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { }; - amarok = libsForQt5.callPackage ../applications/audio/amarok { }; + amarok = libsForQt514.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility amfora = callPackage ../applications/networking/browsers/amfora { }; @@ -19051,14 +19492,16 @@ in amsn = callPackage ../applications/networking/instant-messengers/amsn { }; androidStudioPackages = recurseIntoAttrs - (callPackage ../applications/editors/android-studio { }); + (callPackage ../applications/editors/android-studio { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }); android-studio = androidStudioPackages.stable; animbar = callPackage ../applications/graphics/animbar { }; antfs-cli = callPackage ../applications/misc/antfs-cli {}; - antimony = libsForQt5.callPackage ../applications/graphics/antimony {}; + antimony = libsForQt514.callPackage ../applications/graphics/antimony {}; antiword = callPackage ../applications/office/antiword {}; @@ -19091,8 +19534,6 @@ in arion = callPackage ../applications/virtualization/arion { }; - arora = callPackage ../applications/networking/browsers/arora { }; - asuka = callPackage ../applications/networking/browsers/asuka { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -19137,7 +19578,7 @@ in bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - cadence = qt5.callPackage ../applications/audio/cadence { }; + cadence = libsForQt514.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; @@ -19209,11 +19650,13 @@ in bb = callPackage ../applications/misc/bb { }; + bchoppr = callPackage ../applications/audio/bchoppr { }; + berry = callPackage ../applications/window-managers/berry { }; bevelbar = callPackage ../applications/window-managers/bevelbar { }; - bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; + bibletime = libsForQt514.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { glew = glew110; @@ -19255,6 +19698,8 @@ in bgpq3 = callPackage ../tools/networking/bgpq3 { }; + bgpq4 = callPackage ../tools/networking/bgpq4 { }; + blackbox = callPackage ../applications/version-management/blackbox { }; bleachbit = callPackage ../applications/misc/bleachbit { }; @@ -19297,6 +19742,8 @@ in bjumblr = callPackage ../applications/audio/bjumblr { }; + bschaffl = callPackage ../applications/audio/bschaffl { }; + bsequencer = callPackage ../applications/audio/bsequencer { }; bslizr = callPackage ../applications/audio/bslizr { }; @@ -19321,9 +19768,13 @@ in calculix = callPackage ../applications/science/math/calculix {}; - calibre = libsForQt5.callPackage ../applications/misc/calibre { }; + calibre-py2 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; + + calibre-py3 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; }; + + calibre = calibre-py3; - calligra = libsForQt5.callPackage ../applications/office/calligra { + calligra = libsForQt514.callPackage ../applications/office/calligra { inherit (kdeApplications) akonadi-calendar akonadi-contacts; openjpeg = openjpeg_1; poppler = poppler_0_61; @@ -19337,17 +19788,17 @@ in carddav-util = callPackage ../tools/networking/carddav-util { }; - carla = qt5.callPackage ../applications/audio/carla { }; + carla = libsForQt514.callPackage ../applications/audio/carla { }; castor = callPackage ../applications/networking/browsers/castor { }; catimg = callPackage ../tools/misc/catimg { }; - catt = python3Packages.callPackage ../applications/video/catt { }; + catt = callPackage ../applications/video/catt { }; cava = callPackage ../applications/audio/cava { }; - cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; + cb2bib = libsForQt514.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -19382,8 +19833,6 @@ in chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); - chronos = callPackage ../applications/networking/cluster/chronos { }; - chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); chromiumDev = lowPrio (chromium.override { channel = "dev"; }); @@ -19413,7 +19862,7 @@ in clightd = callPackage ../applications/misc/clight/clightd.nix { }; - clipgrab = qt5.callPackage ../applications/video/clipgrab { }; + clipgrab = libsForQt514.callPackage ../applications/video/clipgrab { }; clipmenu = callPackage ../applications/misc/clipmenu { }; @@ -19440,11 +19889,11 @@ in cntr = callPackage ../applications/virtualization/cntr { }; - communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; + communi = libsForQt514.callPackage ../applications/networking/irc/communi { }; confclerk = callPackage ../applications/misc/confclerk { }; - copyq = libsForQt5.callPackage ../applications/misc/copyq { }; + copyq = libsForQt514.callPackage ../applications/misc/copyq { }; coriander = callPackage ../applications/video/coriander { inherit (gnome2) libgnomeui GConf; @@ -19461,13 +19910,17 @@ in pygments = python27Packages.pygments; }; - csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { + csound-qt = libsForQt514.callPackage ../applications/audio/csound/csound-qt { python = python27; }; codeblocks = callPackage ../applications/editors/codeblocks { }; codeblocksFull = codeblocks.override { contribPlugins = true; }; + cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; }; + cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk2"; }; + cudatext = cudatext-qt; + convos = callPackage ../applications/networking/irc/convos { }; comical = callPackage ../applications/graphics/comical { }; @@ -19476,11 +19929,13 @@ in convchain = callPackage ../tools/graphics/convchain {}; + cordless = callPackage ../applications/networking/instant-messengers/cordless { }; + coursera-dl = callPackage ../applications/misc/coursera-dl {}; coyim = callPackage ../applications/networking/instant-messengers/coyim {}; - cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { + cq-editor = libsForQt514.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; }; @@ -19500,7 +19955,7 @@ in curseradio = callPackage ../applications/audio/curseradio { }; - cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; + cutecom = libsForQt514.callPackage ../tools/misc/cutecom { }; cvs = callPackage ../applications/version-management/cvs { }; @@ -19556,13 +20011,13 @@ in dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { }; + dfilemanager = libsForQt514.callPackage ../applications/misc/dfilemanager { }; dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome2) libart_lgpl libgnomeui; }; - direwolf = callPackage ../applications/misc/direwolf { }; + direwolf = callPackage ../applications/radio/direwolf { }; dirt = callPackage ../applications/audio/dirt {}; @@ -19621,23 +20076,19 @@ in dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { }; - draftsight = callPackage ../applications/graphics/draftsight { }; - dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { }; drawing = callPackage ../applications/graphics/drawing { }; drawio = callPackage ../applications/graphics/drawio {}; - drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; - drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { + drawpile = libsForQt514.callPackage ../applications/graphics/drawpile { }; + drawpile-server-headless = libsForQt514.callPackage ../applications/graphics/drawpile { buildClient = false; buildServerGui = false; }; - droopy = callPackage ../applications/networking/droopy { - inherit (python3Packages) wrapPython; - }; + droopy = python37Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; @@ -19696,13 +20147,13 @@ in ekho = callPackage ../applications/audio/ekho { }; - electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; + electron-cash = libsForQt514.callPackage ../applications/misc/electron-cash { }; electrum = libsForQt5.callPackage ../applications/misc/electrum { }; electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; - electrum-ltc = callPackage ../applications/misc/electrum/ltc.nix { }; + electrum-ltc = libsForQt514.callPackage ../applications/misc/electrum/ltc.nix { }; elementary-planner = callPackage ../applications/office/elementary-planner { }; @@ -19710,11 +20161,12 @@ in elvis = callPackage ../applications/editors/elvis { }; - emacs = emacs26; - emacsPackages = emacs26Packages; - emacs-nox = emacs26-nox; + emacs = emacs27; + emacsPackages = emacs27Packages; + emacs-nox = emacs27-nox; + emacsWithPackages = emacsPackages.emacsWithPackages; - emacs26 = callPackage ../applications/editors/emacs { + emacs27 = callPackage ../applications/editors/emacs/27.nix { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -19726,14 +20178,14 @@ in inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; - emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { + emacs27-nox = lowPrio (appendToName "nox" (emacs27.override { withX = false; withNS = false; withGTK2 = false; withGTK3 = false; })); - emacs25 = callPackage ../applications/editors/emacs/25.nix { + emacs26 = callPackage ../applications/editors/emacs/26.nix { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -19745,8 +20197,9 @@ in inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; - emacs25-nox = lowPrio (appendToName "nox" (emacs25.override { + emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { withX = false; + withNS = false; withGTK2 = false; withGTK3 = false; })); @@ -19782,12 +20235,10 @@ in }; }; - emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25); emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); - - emacs25WithPackages = emacs25Packages.emacsWithPackages; + emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27); emacs26WithPackages = emacs26Packages.emacsWithPackages; - emacsWithPackages = emacsPackages.emacsWithPackages; + emacs27WithPackages = emacs27Packages.emacsWithPackages; inherit (gnome3) empathy; @@ -19801,6 +20252,8 @@ in epeg = callPackage ../applications/graphics/epeg { }; + epgstation = callPackage ../applications/video/epgstation { }; + inherit (gnome3) epiphany; ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; @@ -19834,7 +20287,7 @@ in evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); - evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; + evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { }; exercism = callPackage ../applications/misc/exercism { }; @@ -19894,6 +20347,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + finalfusion-utils = callPackage ../applications/science/machine-learning/finalfusion-utils { + inherit (darwin.apple_sdk.frameworks) Security; + }; + flacon = libsForQt5.callPackage ../applications/audio/flacon { }; flexget = callPackage ../applications/networking/flexget { }; @@ -19932,13 +20389,15 @@ in foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; + foot = callPackage ../applications/misc/foot { }; + fossil = callPackage ../applications/version-management/fossil { }; freebayes = callPackage ../applications/science/biology/freebayes { }; freewheeling = callPackage ../applications/audio/freewheeling { }; - fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; + fritzing = libsForQt514.callPackage ../applications/science/electronics/fritzing { }; fsv = callPackage ../applications/misc/fsv { }; @@ -19952,6 +20411,8 @@ in gcal = callPackage ../applications/misc/gcal { }; + gcstar = callPackage ../applications/misc/gcstar { }; + geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; @@ -19959,7 +20420,7 @@ in geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; - ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; + ghostwriter = libsForQt514.callPackage ../applications/editors/ghostwriter { }; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; @@ -19994,7 +20455,7 @@ in gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { + goldendict = libsForQt514.callPackage ../applications/misc/goldendict { inherit (darwin) libiconv; }; @@ -20003,7 +20464,7 @@ in inherit (ocamlPackages) google-drive-ocamlfuse; google-musicmanager = callPackage ../applications/audio/google-musicmanager { - inherit (qt5) qtbase qtwebkit; + inherit (qt514) qtbase qtwebkit; # Downgrade to 1.34 to get libidn.so.11 libidn = (libidn.overrideAttrs (oldAttrs: { src = fetchurl { @@ -20019,6 +20480,8 @@ in gopher = callPackage ../applications/networking/gopher/gopher { }; + gophernotes = callPackage ../applications/editors/gophernotes { }; + goxel = callPackage ../applications/graphics/goxel { }; gpa = callPackage ../applications/misc/gpa { }; @@ -20029,7 +20492,7 @@ in gpx = callPackage ../applications/misc/gpx { }; - gqrx = qt5.callPackage ../applications/radio/gqrx { }; + gqrx = libsForQt514.callPackage ../applications/radio/gqrx { }; gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; @@ -20110,11 +20573,9 @@ in }); firefox-unwrapped = firefoxPackages.firefox; - firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78; firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; - firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { }; firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { }; firefox-esr = firefox-esr-78; @@ -20156,7 +20617,7 @@ in redoflacs = callPackage ../applications/audio/redoflacs { }; - flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; + flameshot = libsForQt514.callPackage ../tools/misc/flameshot { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {}); @@ -20180,7 +20641,7 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = qt5.callPackage ../applications/graphics/freecad { + freecad = libsForQt514.callPackage ../applications/graphics/freecad { mpi = openmpi; # pyside2 5.12 is broken under python 3.8 python3Packages = python37Packages; @@ -20206,7 +20667,7 @@ in freerdpUnstable = freerdp; - friture = libsForQt5.callPackage ../applications/audio/friture { }; + friture = libsForQt514.callPackage ../applications/audio/friture { }; fte = callPackage ../applications/editors/fte { }; @@ -20266,6 +20727,8 @@ in gitolite = callPackage ../applications/version-management/gitolite { }; + gitoxide = callPackage ../applications/version-management/gitoxide { }; + inherit (gnome3) gitg; gmrun = callPackage ../applications/misc/gmrun {}; @@ -20298,17 +20761,17 @@ in opencv = python37Packages.opencv3; }; - manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; + manuskript = libsForQt514.callPackage ../applications/editors/manuskript { }; manul = callPackage ../development/tools/manul { }; - mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; + mindforger = libsForQt514.callPackage ../applications/editors/mindforger { }; mi2ly = callPackage ../applications/audio/mi2ly {}; moe = callPackage ../applications/editors/moe { }; - multibootusb = qt5.callPackage ../applications/misc/multibootusb {}; + multibootusb = libsForQt514.callPackage ../applications/misc/multibootusb { qt5 = qt514; }; praat = callPackage ../applications/audio/praat { }; @@ -20347,7 +20810,7 @@ in gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { }); - gnunet-gtk = callPackage ../applications/networking/p2p/gnunet-gtk { }; + gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { }; gocr = callPackage ../applications/graphics/gocr { }; @@ -20396,6 +20859,8 @@ in gollum = callPackage ../applications/misc/gollum { }; + gonic = callPackage ../servers/gonic { }; + googleearth = callPackage ../applications/misc/googleearth { }; google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; @@ -20410,11 +20875,11 @@ in gosmore = callPackage ../applications/misc/gosmore { }; - gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { + gpsbabel = libsForQt514.callPackage ../applications/misc/gpsbabel { inherit (darwin) IOKit; }; - gpsbabel-gui = libsForQt5.callPackage ../applications/misc/gpsbabel/gui.nix { }; + gpsbabel-gui = libsForQt514.callPackage ../applications/misc/gpsbabel/gui.nix { }; gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; @@ -20440,12 +20905,16 @@ in gv = callPackage ../applications/misc/gv { }; - gvisor = callPackage ../applications/virtualization/gvisor { }; + gvisor = callPackage ../applications/virtualization/gvisor { + go = go_1_14; + }; gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { }; guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; + gwc = callPackage ../applications/audio/gwc { }; + gxmessage = callPackage ../applications/misc/gxmessage { }; gxmatcheq-lv2 = callPackage ../applications/audio/gxmatcheq-lv2 { }; @@ -20454,6 +20923,8 @@ in hackrf = callPackage ../applications/radio/hackrf { }; + hacksaw = callPackage ../tools/misc/hacksaw {}; + hakuneko = callPackage ../tools/misc/hakuneko { }; hamster = callPackage ../applications/misc/hamster { }; @@ -20462,6 +20933,8 @@ in hactool = callPackage ../tools/compression/hactool { }; + hdhomerun-config-gui = callPackage ../applications/video/hdhomerun-config-gui { }; + heimer = libsForQt5.callPackage ../applications/misc/heimer { }; hello = callPackage ../applications/misc/hello { }; @@ -20521,8 +20994,8 @@ in hugo = callPackage ../applications/misc/hugo { }; - hydrogen = callPackage ../applications/audio/hydrogen { }; - hydrogen-unstable = qt5.callPackage ../applications/audio/hydrogen/unstable.nix { }; + hydrogen = qt5.callPackage ../applications/audio/hydrogen { }; + hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit. hydroxide = callPackage ../applications/networking/hydroxide { }; @@ -20634,6 +21107,8 @@ in i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; + i3lock-fancy-rapid = callPackage ../applications/window-managers/i3/lock-fancy-rapid.nix { }; + i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { @@ -20650,6 +21125,8 @@ in i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; + windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; + wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; wmfs = callPackage ../applications/window-managers/wmfs/default.nix { }; @@ -20674,6 +21151,10 @@ in iksemel = callPackage ../development/libraries/iksemel { }; + imag = callPackage ../applications/misc/imag { + inherit (darwin.apple_sdk.frameworks) Security; + }; + imagej = callPackage ../applications/graphics/imagej { }; imagemagick_light = imagemagick.override { @@ -20747,21 +21228,23 @@ in # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; + inkcut = libsForQt514.callPackage ../applications/misc/inkcut { }; + inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; }; - inkscape_0 = callPackage ../applications/graphics/inkscape/0.x.nix { - lcms = lcms2; - }; + inkscape-with-extensions = callPackage ../applications/graphics/inkscape/with-extensions.nix { }; - inspectrum = libsForQt5.callPackage ../applications/radio/inspectrum { }; + inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); + + inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; }; - ipe = libsForQt5.callPackage ../applications/graphics/ipe { + ipe = libsForQt514.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; lua5 = lua5_3; @@ -20852,7 +21335,7 @@ in k3s = callPackage ../applications/networking/cluster/k3s {}; - k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; + k9copy = libsForQt514.callPackage ../applications/video/k9copy {}; kail = callPackage ../tools/networking/kail { }; @@ -20860,40 +21343,67 @@ in kanshi = callPackage ../tools/misc/kanshi { }; + kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { }; + kdeApplications = let mkApplications = import ../applications/kde; attrs = { - inherit lib libsForQt5 fetchurl; + libsForQt5 = libsForQt514; + inherit lib fetchurl; inherit okteta; }; in recurseIntoAttrs (makeOverridable mkApplications attrs); inherit (kdeApplications) - akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b - kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog - keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake - kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle; + akonadi akregator ark + bomber bovo + dolphin dragon + elisa + ffmpegthumbs filelight + granatier gwenview + k3b + kaddressbook kalzium kapptemplate kapman kate katomic + kblackbox kblocks kbounce + kcachegrind kcalc kcharselect kcolorchooser + kdenlive kdf kdialog kdiamond + keditbookmarks + kfind kfloppy + kget kgpg + khelpcenter + kig kigo killbots kitinerary + kleopatra klettres klines + kmag kmail kmines kmix kmplot + knavalbattle knetwalk knights + kollision kolourpaint kompare konsole kontact korganizer + kpkpass + krdc kreversi krfb + kshisen ksquares ksystemlog + kteatime ktimer ktouch kturtle + kwalletmanager kwave + marble minuet + okular + picmi + spectacle + yakuake; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; - - kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer { }; + kdeconnect = libsForQt514.callPackage ../applications/misc/kdeconnect { }; inherit (kdeFrameworks) kdesu; - kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; + kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { + kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix { llvmPackages = llvmPackages_10; }; - kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; - kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { + kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; + kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix { python = python3; }; @@ -20907,7 +21417,7 @@ in kermit = callPackage ../tools/misc/kermit { }; - kexi = libsForQt5.callPackage ../applications/office/kexi { }; + kexi = libsForQt514.callPackage ../applications/office/kexi { }; khronos = callPackage ../applications/office/khronos { }; @@ -20915,7 +21425,7 @@ in keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; - kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; + kgraphviewer = libsForQt514.callPackage ../applications/graphics/kgraphviewer { }; khal = callPackage ../applications/misc/khal { }; @@ -20939,9 +21449,11 @@ in klayout = libsForQt5.callPackage ../applications/misc/klayout { }; + kmetronome = libsForQt5.callPackage ../applications/audio/kmetronome { }; + kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { + kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { inherit (kdeApplications) kidentitymanagement; inherit (kdeFrameworks) kdewebkit; }; @@ -20950,23 +21462,23 @@ in kondo = callPackage ../applications/misc/kondo { }; - konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; + konversation = libsForQt514.callPackage ../applications/networking/irc/konversation { }; - kotatogram-desktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; + kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; kpt = callPackage ../applications/networking/cluster/kpt { }; - krita = libsForQt5.callPackage ../applications/graphics/krita { + krita = libsForQt514.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; }; - krusader = libsForQt5.callPackage ../applications/misc/krusader { }; + krusader = libsForQt514.callPackage ../applications/misc/krusader { }; ksuperkey = callPackage ../tools/X11/ksuperkey { }; ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { }; - ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; + ktorrent = libsForQt514.callPackage ../applications/networking/p2p/ktorrent { }; kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; @@ -21000,7 +21512,7 @@ in python3Packages = python36Packages; }; - kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; + kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; lame = callPackage ../development/libraries/lame { }; @@ -21034,11 +21546,11 @@ in legit = gitAndTools.legit; - leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; + leo-editor = libsForQt514.callPackage ../applications/editors/leo-editor { }; libowfat = callPackage ../development/libraries/libowfat { }; - librecad = libsForQt5.callPackage ../applications/misc/librecad { }; + librecad = libsForQt514.callPackage ../applications/misc/librecad { }; libreoffice = hiPrio libreoffice-still; libreoffice-unwrapped = libreoffice.libreoffice; @@ -21062,10 +21574,11 @@ in }; libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libsForQt5.callPackage ../applications/office/libreoffice + libreoffice = libsForQt514.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "fresh"; + jdk = jdk11; }); }); @@ -21073,6 +21586,7 @@ in libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { variant = "fresh"; + jdk = jdk11; }); }); libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice; @@ -21080,6 +21594,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { + icu = icu64; variant = "still"; }); }); @@ -21099,17 +21614,14 @@ in linuxband = callPackage ../applications/audio/linuxband { }; - ledger = callPackage ../applications/office/ledger { - # Boost >= 1.67 changed the name of boost python; ledger's cmake build needs - # an update to find it: - # https://www.boost.org/doc/libs/1_68_0/libs/python/doc/html/rn.html - boost = boost15x; - }; + ledger = callPackage ../applications/office/ledger { }; ledger-autosync = callPackage ../applications/office/ledger-autosync { }; ledger-web = callPackage ../applications/office/ledger-web { }; + lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { }; + lighthouse = callPackage ../applications/misc/lighthouse { }; lighttable = callPackage ../applications/editors/lighttable {}; @@ -21136,13 +21648,13 @@ in loxodo = callPackage ../applications/misc/loxodo { }; - lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { }; + lsd2dsl = libsForQt514.callPackage ../applications/misc/lsd2dsl { }; lrzsz = callPackage ../tools/misc/lrzsz { }; lsp-plugins = callPackage ../applications/audio/lsp-plugins { }; - luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = libsForQt514.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; @@ -21180,16 +21692,20 @@ in luppp = callPackage ../applications/audio/luppp { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - inherit (gnome3) gnome-desktop libgnome-keyring; + inherit (gnome3) gnome-desktop; wine = wineWowPackages.staging; }; - lutris = callPackage ../applications/misc/lutris/chrootenv.nix { }; + lutris = callPackage ../applications/misc/lutris/fhsenv.nix { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }; lutris-free = lutris.override { steamSupport = false; }; lv2bm = callPackage ../applications/audio/lv2bm { }; + lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { }; + lynx = callPackage ../applications/networking/browsers/lynx { }; lyx = libsForQt5.callPackage ../applications/misc/lyx { }; @@ -21221,9 +21737,8 @@ in mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { }; - mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; + mapmap = libsForQt514.callPackage ../applications/video/mapmap { }; - marathon = callPackage ../applications/networking/cluster/marathon { }; marathonctl = callPackage ../tools/virtualization/marathonctl { } ; markdown-pp = callPackage ../tools/text/markdown-pp { }; @@ -21268,7 +21783,7 @@ in meme = callPackage ../applications/graphics/meme { }; - mendeley = libsForQt5.callPackage ../applications/office/mendeley { + mendeley = libsForQt514.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; @@ -21283,7 +21798,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -21312,7 +21827,7 @@ in minishift = callPackage ../applications/networking/cluster/minishift { }; - minitube = libsForQt5.callPackage ../applications/video/minitube { }; + minitube = libsForQt514.callPackage ../applications/video/minitube { }; mimic = callPackage ../applications/audio/mimic { }; @@ -21351,6 +21866,8 @@ in xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; + molot-lite = callPackage ../applications/audio/molot-lite { }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monkeysphere = callPackage ../tools/security/monkeysphere { }; @@ -21372,6 +21889,8 @@ in moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; + mooSpace = callPackage ../applications/audio/mooSpace { }; + mop = callPackage ../applications/misc/mop { }; mopidyPackages = callPackages ../applications/audio/mopidy/default.nix { @@ -21393,6 +21912,7 @@ in mopidy-soundcloud mopidy-spotify mopidy-spotify-tunigo + mopidy-tunein mopidy-youtube; motif = callPackage ../development/libraries/motif { }; @@ -21465,9 +21985,11 @@ in mpv = wrapMpv mpv-unwrapped {}; mpvScripts = recurseIntoAttrs { + autoload = callPackage ../applications/video/mpv/scripts/autoload.nix {}; convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; + sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; @@ -21488,6 +22010,7 @@ in avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; + grpcSupport = config.murmur.grpcSupport or true; }).murmur; mumble = (callPackages ../applications/networking/mumble { @@ -21495,6 +22018,7 @@ in jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or stdenv.isLinux; + qt5 = qt514; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { @@ -21510,7 +22034,7 @@ in if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } else - libsForQt5.callPackage ../applications/audio/musescore { }; + libsForQt514.callPackage ../applications/audio/musescore { }; mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; @@ -21530,8 +22054,6 @@ in neocomp = callPackage ../applications/window-managers/neocomp { }; - netease-cloud-music = callPackage ../applications/audio/netease-cloud-music {}; - newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { @@ -21540,6 +22062,8 @@ in nixos-shell = callPackage ../tools/virtualization/nixos-shell {}; + noaa-apt = callPackage ../applications/radio/noaa-apt { }; + node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; ninjas2 = callPackage ../applications/audio/ninjas2 {}; @@ -21559,9 +22083,12 @@ in osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; - ostinato = callPackage ../applications/networking/ostinato { }; + ostinato = callPackage ../applications/networking/ostinato { + wireshark = wireshark.override { qt5 = qt514; }; + }; - p4v = libsForQt5.callPackage ../applications/version-management/p4v { }; + p4 = callPackage ../applications/version-management/p4 { }; + p4v = libsForQt514.callPackage ../applications/version-management/p4v { }; partio = callPackage ../development/libraries/partio {}; @@ -21608,7 +22135,7 @@ in i3GapsSupport = false; }; - polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; + polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { jre = openjdk11; @@ -21618,11 +22145,11 @@ in qbec = callPackage ../applications/networking/cluster/qbec { }; - rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; + rssguard = libsForQt514.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; - shotcut = libsForQt5.callPackage ../applications/video/shotcut { + shotcut = libsForQt514.callPackage ../applications/video/shotcut { libmlt = mlt; }; @@ -21639,11 +22166,13 @@ in }; }; - sky = callPackage ../applications/networking/instant-messengers/sky {}; + sky = callPackage ../applications/networking/instant-messengers/sky { + qt5 = qt514; + }; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt5.callPackage ../applications/video/smtube {}; + smtube = libsForQt514.callPackage ../applications/video/smtube {}; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; @@ -21664,7 +22193,7 @@ in }; synfigstudio = callPackage ../applications/graphics/synfigstudio { - mlt-qt5 = libsForQt5.mlt; + mlt-qt5 = libsForQt514.mlt; }; typora = callPackage ../applications/editors/typora { }; @@ -21721,7 +22250,7 @@ in mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; - mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; + mythtv = libsForQt514.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { }; @@ -21764,7 +22293,7 @@ in nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; - notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; + notepadqq = libsForQt514.callPackage ../applications/editors/notepadqq { }; notbit = callPackage ../applications/networking/mailreaders/notbit { }; @@ -21793,13 +22322,13 @@ in obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; + obs-studio = libsForQt514.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; - obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; + obs-v4l2sink = libsForQt514.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; - obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; + obs-ndi = libsForQt514.callPackage ../applications/video/obs-studio/obs-ndi.nix { }; obsidian = callPackage ../applications/misc/obsidian { }; @@ -21819,6 +22348,8 @@ in inherit (python3Packages.callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui; + openambit = qt5.callPackage ../applications/misc/openambit { }; + openbox = callPackage ../applications/window-managers/openbox { }; openbox-menu = callPackage ../applications/misc/openbox-menu { @@ -21837,12 +22368,16 @@ in openjump = callPackage ../applications/misc/openjump { }; - openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; + openorienteering-mapper = libsForQt514.callPackage ../applications/gis/openorienteering-mapper { }; openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; + opentoonz = (qt514.overrideScope' (_: _: { + libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; + })).callPackage ../applications/graphics/opentoonz { }; + opentx = libsForQt5.callPackage ../applications/misc/opentx { }; opera = callPackage ../applications/networking/browsers/opera {}; @@ -21980,6 +22515,8 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + picoloop = callPackage ../applications/audio/picoloop { }; + pidgin = callPackage ../applications/networking/instant-messengers/pidgin { openssl = if config.pidgin.openssl or true then openssl else null; gnutls = if config.pidgin.gnutls or false then gnutls else null; @@ -22056,7 +22593,7 @@ in plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; - plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); + plover = recurseIntoAttrs (libsForQt514.callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; @@ -22098,13 +22635,13 @@ in protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; - protonvpn-cli-ng = callPackage ../applications/networking/protonvpn-cli-ng { }; + protonvpn-gui = callPackage ../applications/networking/protonvpn-gui { }; ps2client = callPackage ../applications/networking/ps2client { }; - psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; + psi = libsForQt514.callPackage ../applications/networking/instant-messengers/psi { }; - psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { }; + psi-plus = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { }; psol = callPackage ../development/libraries/psol { }; @@ -22118,7 +22655,7 @@ in pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { }; - pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { }; + pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview { }; puredata = callPackage ../applications/audio/puredata { }; puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; @@ -22151,7 +22688,7 @@ in qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; - qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { + qgis-unwrapped = libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix { withGrass = false; }; @@ -22163,11 +22700,11 @@ in qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { }; - qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {}; + qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {}; garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; - qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; + qmapshack = libsForQt514.callPackage ../applications/misc/qmapshack { }; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { boost = boost17x; @@ -22183,7 +22720,7 @@ in qmmp = libsForQt5.callPackage ../applications/audio/qmmp { }; - qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; + qnotero = libsForQt514.callPackage ../applications/office/qnotero { }; qrcode = callPackage ../tools/graphics/qrcode {}; @@ -22196,7 +22733,7 @@ in qsstv = qt5.callPackage ../applications/radio/qsstv { }; - qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; + qsyncthingtray = libsForQt514.callPackage ../applications/misc/qsyncthingtray { }; qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { guvcview = guvcview.override { @@ -22244,9 +22781,9 @@ in quilter = callPackage ../applications/editors/quilter { }; - quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; + quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; - falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; + falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { }; quodlibet = callPackage ../applications/audio/quodlibet { keybinder3 = null; @@ -22277,7 +22814,12 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser = libsForQt515.callPackage ../applications/networking/browsers/qutebrowser { + python3Packages = python3Packages.override { + qt5 = qt515; + libsForQt5 = libsForQt515; + }; + }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; @@ -22295,9 +22837,9 @@ in raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {}; - rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; }; + rapcad = libsForQt514.callPackage ../applications/graphics/rapcad { boost = boost159; }; - rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { }; + rapid-photo-downloader = libsForQt514.callPackage ../applications/graphics/rapid-photo-downloader { }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -22313,7 +22855,7 @@ in rclone = callPackage ../applications/networking/sync/rclone { }; - rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; + rclone-browser = libsForQt514.callPackage ../applications/networking/sync/rclone/browser.nix { }; rcs = callPackage ../applications/version-management/rcs { }; @@ -22333,7 +22875,7 @@ in remotebox = callPackage ../applications/virtualization/remotebox { }; - retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; + retroshare = libsForQt514.callPackage ../applications/networking/p2p/retroshare { }; retroshare06 = retroshare; rgp = libsForQt5.callPackage ../development/tools/rgp { }; @@ -22359,11 +22901,11 @@ in rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; - rstudio = libsForQt5.callPackage ../applications/editors/rstudio { + rstudio = libsForQt514.callPackage ../applications/editors/rstudio { boost = boost166; llvmPackages = llvmPackages_7; }; @@ -22397,15 +22939,17 @@ in udiskie = callPackage ../applications/misc/udiskie { }; + sacc = callPackage ../applications/networking/gopher/sacc { }; + sakura = callPackage ../applications/misc/sakura { }; - sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; + sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; scantailor = callPackage ../applications/graphics/scantailor { }; - scantailor-advanced = qt5.callPackage ../applications/graphics/scantailor/advanced.nix { }; + scantailor-advanced = libsForQt514.callPackage ../applications/graphics/scantailor/advanced.nix { }; sc-im = callPackage ../applications/misc/sc-im { }; @@ -22415,9 +22959,9 @@ in inherit (gnome2) libart_lgpl; }; - scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { }; + scribusUnstable = libsForQt514.callPackage ../applications/office/scribus/unstable.nix { }; - seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; + seafile-client = libsForQt514.callPackage ../applications/networking/seafile-client { }; seeks = callPackage ../tools/networking/p2p/seeks { protobuf = protobuf3_1; @@ -22427,6 +22971,8 @@ in seq24 = callPackage ../applications/audio/seq24 { }; + seq66 = qt5.callPackage ../applications/audio/seq66 { }; + setbfree = callPackage ../applications/audio/setbfree { }; sfizz = callPackage ../applications/audio/sfizz { }; @@ -22543,7 +23089,7 @@ in maestral = with python3Packages; toPythonApplication maestral; - maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; + maestral-gui = libsForQt514.callPackage ../applications/networking/maestral-qt { }; insync = callPackage ../applications/networking/insync { }; @@ -22580,11 +23126,11 @@ in curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; - cura = qt5.callPackage ../applications/misc/cura { }; + cura = libsForQt514.callPackage ../applications/misc/cura { }; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaLulzbot = qt5.callPackage ../applications/misc/cura/lulzbot/default.nix { }; + curaLulzbot = libsForQt514.callPackage ../applications/misc/cura/lulzbot/default.nix { }; curaByDagoma = callPackage ../applications/misc/curabydagoma { }; @@ -22598,9 +23144,13 @@ in prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; - sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; + super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; + + robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; + + sddm = libsForQt514.callPackage ../applications/display-managers/sddm { }; - skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; + skrooge = libsForQt514.callPackage ../applications/office/skrooge {}; smartgithg = callPackage ../applications/version-management/smartgithg { jre = openjdk11; @@ -22616,11 +23166,11 @@ in sipp = callPackage ../development/tools/misc/sipp { }; - skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; + skanlite = libsForQt514.callPackage ../applications/office/skanlite { }; soci = callPackage ../development/libraries/soci { }; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; + sonic-lineup = libsForQt514.callPackage ../applications/audio/sonic-lineup { }; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; @@ -22710,11 +23260,16 @@ in surf-display = callPackage ../desktops/surf-display { }; + surge = callPackage ../applications/audio/surge { + inherit (gnome3) zenity; + git = gitMinimal; + }; + sunvox = callPackage ../applications/audio/sunvox { }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; - swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im { + swift-im = libsForQt514.callPackage ../applications/networking/instant-messengers/swift-im { inherit (gnome2) GConf; boost = boost168; }; @@ -22726,7 +23281,9 @@ in # this can be changed to python3 once pyside2 is updated to support the latest python version syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { }; - inherit (callPackages ../applications/networking/syncthing { }) + inherit (callPackages ../applications/networking/syncthing { + buildGoModule = buildGo114Module; + }) syncthing syncthing-cli syncthing-discovery @@ -22772,14 +23329,20 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + talentedhack = callPackage ../applications/audio/talentedhack { }; + tambura = callPackage ../applications/audio/tambura { }; + tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { }; + + tanka = callPackage ../applications/networking/cluster/tanka { }; + teams = callPackage ../applications/networking/instant-messengers/teams { }; teamspeak_client = libsForQt512.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - taskell = callPackage ../applications/misc/taskell { }; + taskell = haskell.lib.justStaticExecutables haskellPackages.taskell; taskjuggler = callPackage ../applications/misc/taskjuggler { }; @@ -22823,6 +23386,8 @@ in terminus = callPackage ../applications/misc/terminus { }; + tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; + lxterminal = callPackage ../applications/misc/lxterminal { }; aminal = callPackage ../applications/misc/aminal { @@ -22917,7 +23482,7 @@ in todoman = callPackage ../applications/office/todoman { }; - toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { }; + toggldesktop = libsForQt514.callPackage ../applications/misc/toggldesktop { }; topydo = callPackage ../applications/misc/topydo {}; @@ -22929,7 +23494,7 @@ in tortoisehg = callPackage ../applications/version-management/tortoisehg { }; - tony = libsForQt5.callPackage ../applications/audio/tony { }; + tony = libsForQt514.callPackage ../applications/audio/tony { }; toot = callPackage ../applications/misc/toot { }; @@ -22971,14 +23536,20 @@ in treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; }; + tremc = callPackage ../applications/networking/p2p/tremc { }; + tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { + trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { inherit (kdeApplications) akonadi-contacts; }; tudu = callPackage ../applications/office/tudu { }; + tunefish = callPackage ../applications/audio/tunefish { + stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4 + }; + tut = callPackage ../applications/misc/tut { }; tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; @@ -22995,6 +23566,8 @@ in ueberzug = with python3Packages; toPythonApplication ueberzug; + uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { }; + umurmur = callPackage ../applications/networking/umurmur { }; udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; @@ -23027,7 +23600,7 @@ in utox = callPackage ../applications/networking/instant-messengers/utox { }; - valentina = libsForQt5.callPackage ../applications/misc/valentina { }; + valentina = libsForQt514.callPackage ../applications/misc/valentina { }; vbindiff = callPackage ../applications/editors/vbindiff { }; @@ -23064,18 +23637,12 @@ in vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; - qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { inherit (xorg) libxcb; }; - qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix { - features = "huge"; # one of tiny, small, normal, big or huge - lua = pkgs.lua5; - flags = [ "python" "X11" ]; # only flag "X11" by now - }); - vimpc = callPackage ../applications/audio/vimpc { }; wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; @@ -23089,7 +23656,7 @@ in neovim = wrapNeovim neovim-unwrapped { }; - neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; + neovim-qt = libsForQt514.callPackage ../applications/editors/neovim/qt.nix { }; olifant = callPackage ../applications/misc/olifant { }; @@ -23105,6 +23672,8 @@ in inherit (lua52Packages) lpeg; }; + viw = callPackage ../applications/editors/viw { }; + virt-viewer = callPackage ../applications/virtualization/virt-viewer { }; virt-top = callPackage ../applications/virtualization/virt-top { }; @@ -23115,7 +23684,7 @@ in system-libvirt = libvirt; }; - virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { + virt-manager-qt = libsForQt514.callPackage ../applications/virtualization/virt-manager/qt.nix { qtermwidget = lxqt.qtermwidget; }; @@ -23123,7 +23692,9 @@ in virtscreen = callPackage ../tools/admin/virtscreen {}; - virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { + virtual-ans = callPackage ../applications/audio/virtual-ans {}; + + virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; }; @@ -23180,12 +23751,14 @@ in vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = libsForQt5.vlc; + vlc = libsForQt514.vlc; vlc_qt5 = vlc; vmpk = callPackage ../applications/audio/vmpk { }; + vocproc = callPackage ../applications/audio/vocproc { }; + vnstat = callPackage ../applications/networking/vnstat { }; vocal = callPackage ../applications/audio/vocal { }; @@ -23258,9 +23831,9 @@ in wayvnc = callPackage ../applications/networking/remote/wayvnc { }; - webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; + webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { }; - webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; + webmacs = libsForQt514.callPackage ../applications/networking/browsers/webmacs {}; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; @@ -23338,7 +23911,7 @@ in worldengine-cli = python3Packages.worldengine; - wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice {}; + wpsoffice = libsForQt514.callPackage ../applications/office/wpsoffice {}; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; @@ -23505,6 +24078,8 @@ in xawtv = callPackage ../applications/video/xawtv { }; + xbattbar = callPackage ../applications/misc/xbattbar { }; + xbindkeys = callPackage ../tools/X11/xbindkeys { }; xbindkeys-config = callPackage ../tools/X11/xbindkeys-config { @@ -23711,6 +24286,8 @@ in xmacro = callPackage ../tools/X11/xmacro { }; + xmenu = callPackage ../applications/misc/xmenu { }; + xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { }; xmp = callPackage ../applications/audio/xmp { }; @@ -23721,7 +24298,7 @@ in inherit (gnome2) scrollkeeper libglade; }; - xygrib = libsForQt5.callPackage ../applications/misc/xygrib/default.nix {}; + xygrib = libsForQt514.callPackage ../applications/misc/xygrib/default.nix {}; xzgv = callPackage ../applications/graphics/xzgv { }; @@ -23755,11 +24332,13 @@ in youtube-viewer = perlPackages.WWWYoutubeViewer; + ytalk = callPackage ../applications/networking/instant-messengers/ytalk { }; + ytcc = callPackage ../tools/networking/ytcc { }; zam-plugins = callPackage ../applications/audio/zam-plugins { }; - zanshin = libsForQt5.callPackage ../applications/office/zanshin { + zanshin = libsForQt514.callPackage ../applications/office/zanshin { inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap; inherit (kdeFrameworks) krunner kwallet kcalendarcore; boost = boost160; @@ -23802,7 +24381,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; + zoom-us = libsForQt514.callPackage ../applications/networking/instant-messengers/zoom-us { }; zotero = callPackage ../applications/office/zotero { }; @@ -23830,7 +24409,7 @@ in withGui = false; }; - bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited.nix { + bitcoin-unlimited = libsForQt514.callPackage ../applications/blockchains/bitcoin-unlimited.nix { inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; withGui = true; }; @@ -23839,10 +24418,10 @@ in withGui = false; }; - bitcoin-classic = libsForQt5.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; + bitcoin-classic = libsForQt514.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; }; - bitcoin-gold = libsForQt5.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; + bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; }; btc1 = callPackage ../applications/blockchains/btc1.nix { @@ -23860,7 +24439,7 @@ in dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; }; - digibyte = libsForQt5.callPackage ../applications/blockchains/digibyte.nix { withGui = true; }; + digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte.nix { withGui = true; }; digibyted = callPackage ../applications/blockchains/digibyte.nix { withGui = false; }; dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; @@ -23880,7 +24459,7 @@ in ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; - litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin.nix { + litecoin = libsForQt514.callPackage ../applications/blockchains/litecoin.nix { inherit (darwin.apple_sdk.frameworks) AppKit; }; litecoind = litecoin.override { withGui = false; }; @@ -23898,14 +24477,12 @@ in masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; - mist = callPackage ../applications/blockchains/mist.nix { }; - nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; - pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; + pivx = libsForQt514.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; ethabi = callPackage ../applications/blockchains/ethabi.nix { }; @@ -23916,7 +24493,7 @@ in tessera = callPackage ../applications/blockchains/tessera.nix { }; - vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; + vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; }; wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; @@ -23927,7 +24504,7 @@ in zcash = callPackage ../applications/blockchains/zcash { }; - parity = callPackage ../applications/blockchains/parity { }; + openethereum = callPackage ../applications/blockchains/openethereum { }; parity-ui = callPackage ../applications/blockchains/parity-ui { }; @@ -24048,7 +24625,7 @@ in chessx = libsForQt5.callPackage ../games/chessx { }; - chiaki = libsForQt5.callPackage ../games/chiaki { }; + chiaki = libsForQt514.callPackage ../games/chiaki { }; chocolateDoom = callPackage ../games/chocolate-doom { }; @@ -24100,7 +24677,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam = libsForQt5.callPackage ../applications/graphics/digikam { + digikam = libsForQt514.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; inherit (kdeApplications) akonadi-contacts; inherit (kdeFrameworks) kcalendarcore; @@ -24187,7 +24764,7 @@ in freecell-solver = callPackage ../games/freecell-solver { }; - freeciv = callPackage ../games/freeciv { }; + freeciv = callPackage ../games/freeciv { qt5 = qt514; }; freeciv_gtk = freeciv.override { gtkClient = true; @@ -24214,10 +24791,11 @@ in fsg = callPackage ../games/fsg { wxGTK = wxGTK28.override { unicode = false; - gst-plugins-base = null; }; }; + fslint = callPackage ../applications/misc/fslint {}; + galaxis = callPackage ../games/galaxis { }; gambatte = callPackage ../games/gambatte { }; @@ -24262,6 +24840,8 @@ in gshogi = python3Packages.callPackage ../games/gshogi {}; + gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { }; + qtads = qt5.callPackage ../games/qtads { }; gtetrinet = callPackage ../games/gtetrinet { @@ -24278,7 +24858,7 @@ in hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; - hedgewars = libsForQt5.callPackage ../games/hedgewars { + hedgewars = libsForQt514.callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; }; @@ -24305,17 +24885,25 @@ in katago = callPackage ../games/katago { }; katagoWithCuda = katago.override { - cudaSupport = true; + enableCuda = true; cudnn = cudnn_cudatoolkit_10_2; cudatoolkit = cudatoolkit_10_2; }; + katagoCPU = katago.override { + enableGPU = false; + }; + klavaro = callPackage ../games/klavaro {}; kobodeluxe = callPackage ../games/kobodeluxe { }; leela-zero = libsForQt5.callPackage ../games/leela-zero { }; + legendary-gl = python38Packages.callPackage ../games/legendary-gl { }; + + left4gore-bin = callPackage ../games/left4gore { }; + lgogdownloader = callPackage ../games/lgogdownloader { }; liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; @@ -24468,7 +25056,7 @@ in papermc = callPackage ../games/papermc { }; - pentobi = libsForQt5.callPackage ../games/pentobi { }; + pentobi = libsForQt514.callPackage ../games/pentobi { }; performous = callPackage ../games/performous { boost = boost166; @@ -24553,11 +25141,11 @@ in rrootage = callPackage ../games/rrootage { }; - saga = callPackage ../applications/gis/saga { + saga = libsForQt514.callPackage ../applications/gis/saga { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - samplv1 = callPackage ../applications/audio/samplv1 { }; + samplv1 = callPackage ../applications/audio/samplv1 { qt5 = qt514; }; sauerbraten = callPackage ../games/sauerbraten {}; @@ -24591,6 +25179,8 @@ in service-wrapper = callPackage ../os-specific/linux/service-wrapper { }; + sfrotz = callPackage ../games/sfrotz { }; + sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { }; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; @@ -24609,9 +25199,9 @@ in lua = lua5_1; }; - solarus = libsForQt5.callPackage ../games/solarus { }; - - solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; + # solarus and solarus-quest-editor must use the same version of Qt. + solarus = libsForQt514.callPackage ../games/solarus { }; + solarus-quest-editor = libsForQt514.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; @@ -24628,9 +25218,11 @@ in stockfish = callPackage ../games/stockfish { }; - steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { }); + steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }); - steam = steamPackages.steam-chrootenv; + steam = steamPackages.steam-fhsenv; steam-run = steam.run; steam-run-native = (steam.override { @@ -24811,6 +25403,8 @@ in tk = tk-8_5; }; + xcowsay = callPackage ../games/xcowsay { }; + xjump = callPackage ../games/xjump { }; # TODO: the corresponding nix file is missing # xracer = callPackage ../games/xracer { }; @@ -24893,10 +25487,7 @@ in cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); - deepin = recurseIntoAttrs (import ../desktops/deepin { - inherit pkgs libsForQt5; - inherit (lib) makeScope; - }); + inherit (cinnamon) mint-x-icons mint-y-icons; enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { callPackage = newScope pkgs.enlightenment; @@ -24951,7 +25542,9 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { - inherit pkgs libsForQt5; + qt5 = qt514; + libsForQt5 = libsForQt514; + inherit pkgs; inherit (lib) makeScope; }); @@ -24965,7 +25558,7 @@ in inherit (python3Packages) python pygobject3 pyxdg wrapPython; inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa; geoclue = geoclue2; - }) redshift redshift-wlr; + }) redshift redshift-wlr gammastep; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; @@ -24987,7 +25580,8 @@ in let mkPlasma5 = import ../desktops/plasma-5; attrs = { - inherit libsForQt5 lib fetchurl; + libsForQt5 = libsForQt514; + inherit lib fetchurl; gconf = gnome2.GConf; inherit gsettings-desktop-schemas; }; @@ -25005,9 +25599,11 @@ in plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm systemsettings user-manager xdg-desktop-portal-kde; - kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { }; - - krohnkite = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/krohnkite.nix { }; + inherit (plasma5.thirdParty) + plasma-applet-caffeine-plus + kwin-dynamic-workspaces + kwin-tiling + krohnkite; ### SCIENCE @@ -25017,6 +25613,8 @@ in eigen = eigen2; }; + d-seams = callPackage ../applications/science/chemistry/d-seams {}; + gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; jmol = callPackage ../applications/science/chemistry/jmol { }; @@ -25061,9 +25659,7 @@ in alliance = callPackage ../applications/science/electronics/alliance { }; - ants = callPackage ../applications/science/biology/ants { - stdenv = gcc8Stdenv; - }; + ants = callPackage ../applications/science/biology/ants { }; aragorn = callPackage ../applications/science/biology/aragorn { }; @@ -25117,7 +25713,7 @@ in est-sfs = callPackage ../applications/science/biology/est-sfs { }; - ezminc = callPackage ../applications/science/biology/EZminc { stdenv = gcc8Stdenv; }; + ezminc = callPackage ../applications/science/biology/EZminc { }; exonerate = callPackage ../applications/science/biology/exonerate { }; @@ -25222,6 +25818,8 @@ in snpeff = callPackage ../applications/science/biology/snpeff { }; + somafm-cli = callPackage ../tools/misc/somafm-cli/default.nix { }; + somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; sortmerna = callPackage ../applications/science/biology/sortmerna { }; @@ -25251,6 +25849,8 @@ in varscan = callPackage ../applications/science/biology/varscan { }; + whisper = callPackage ../applications/science/biology/whisper { }; + hmmer = callPackage ../applications/science/biology/hmmer { }; bwa = callPackage ../applications/science/biology/bwa { }; @@ -25263,6 +25863,10 @@ in almonds = callPackage ../applications/science/math/almonds { }; + amd-blis = callPackage ../development/libraries/science/math/amd-blis { }; + + amd-libflame = callPackage ../development/libraries/science/math/amd-libflame { }; + arpack = callPackage ../development/libraries/science/math/arpack { }; blas = callPackage ../build-support/alternatives/blas { }; @@ -25442,7 +26046,7 @@ in xfitter = callPackage ../applications/science/physics/xfitter {}; - xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; + xflr5 = libsForQt514.callPackage ../applications/science/physics/xflr5 { }; ### SCIENCE/PROGRAMMING @@ -25538,11 +26142,11 @@ in ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; isabelle = callPackage ../applications/science/logic/isabelle { - polyml = stdenv.lib.overrideDerivation polyml57 (attrs: { + polyml = stdenv.lib.overrideDerivation polyml (attrs: { configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; }); - java = if stdenv.isLinux then jre else jdk; + java = openjdk11; }; iprover = callPackage ../applications/science/logic/iprover { }; @@ -25557,6 +26161,7 @@ in lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; elan = callPackage ../applications/science/logic/elan {}; + mathlibtools = with python3Packages; toPythonApplication mathlibtools; leo2 = callPackage ../applications/science/logic/leo2 { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;}; @@ -25660,6 +26265,8 @@ in adms = callPackage ../applications/science/electronics/adms { }; + appcsxcad = libsForQt514.callPackage ../applications/science/electronics/appcsxcad { }; + # Since version 8 Eagle requires an Autodesk account and a subscription # in contrast to single payment for the charged editions. # This is the last version with the old model. @@ -25667,10 +26274,12 @@ in openssl = openssl_1_0_2; }; - eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; + eagle = libsForQt514.callPackage ../applications/science/electronics/eagle/eagle.nix { }; caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; + csxcad = callPackage ../applications/science/electronics/csxcad { }; + fparser = callPackage ../applications/science/electronics/fparser { }; geda = callPackage ../applications/science/electronics/geda { @@ -25681,6 +26290,8 @@ in gtkwave = callPackage ../applications/science/electronics/gtkwave { }; + hyp2mat = callPackage ../applications/science/electronics/hyp2mat { }; + fped = callPackage ../applications/science/electronics/fped { }; # this is a wrapper for kicad.base and kicad.libraries @@ -25700,6 +26311,8 @@ in pcb = callPackage ../applications/science/electronics/pcb { }; + qcsxcad = libsForQt514.callPackage ../applications/science/electronics/qcsxcad { }; + qucs = callPackage ../applications/science/electronics/qucs { }; xcircuit = callPackage ../applications/science/electronics/xcircuit { }; @@ -25711,6 +26324,7 @@ in caffe = callPackage ../applications/science/math/caffe ({ opencv3 = opencv3WithoutCuda; # Used only for image loading. + blas = openblas; inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; } // (config.caffe or {})); @@ -25748,6 +26362,7 @@ in gap-full = lowPrio (gap.override { packageSet = "full"; }); geogebra = callPackage ../applications/science/math/geogebra { }; + geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { }; maxima = callPackage ../applications/science/math/maxima { ecl = null; @@ -25925,7 +26540,7 @@ in ### SCIENCE/ROBOTICS - apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; + apmplanner2 = libsForQt514.callPackage ../applications/science/robotics/apmplanner2 { }; betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; @@ -25935,7 +26550,7 @@ in android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; - antimicro = libsForQt5.callPackage ../tools/misc/antimicro { }; + antimicroX = libsForQt5.callPackage ../tools/misc/antimicroX { }; atari800 = callPackage ../misc/emulators/atari800 { }; @@ -25965,7 +26580,7 @@ in cached-nix-shell = callPackage ../tools/nix/cached-nix-shell {}; - calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; + calaos_installer = libsForQt514.callPackage ../misc/calaos/installer {}; ccemux = callPackage ../misc/emulators/ccemux { }; @@ -25973,6 +26588,8 @@ in clinfo = callPackage ../tools/system/clinfo { }; + clpeak = callPackage ../tools/misc/clpeak { }; + cups = callPackage ../misc/cups { }; cups-filters = callPackage ../misc/cups/filters.nix { }; @@ -26012,6 +26629,8 @@ in cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; + cups-brother-hl1210w = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1210w { }; + cups-brother-hl3140cw = pkgsi686Linux.callPackage ../misc/cups/drivers/hl3140cw { }; cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { }; @@ -26053,6 +26672,8 @@ in dumb = callPackage ../misc/dumb { }; + dump = callPackage ../tools/backup/dump { }; + ecdsatool = callPackage ../tools/security/ecdsatool { }; emulationstation = callPackage ../misc/emulators/emulationstation { }; @@ -26108,7 +26729,8 @@ in fuse-emulator = callPackage ../misc/emulators/fuse-emulator {}; gajim = callPackage ../applications/networking/instant-messengers/gajim { - inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly; + inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; + gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; gammu = callPackage ../applications/misc/gammu { }; @@ -26139,9 +26761,7 @@ in hatari = callPackage ../misc/emulators/hatari { }; - helm = callPackage ../applications/audio/helm { - stdenv = gcc8Stdenv; - }; + helm = callPackage ../applications/audio/helm { }; helmfile = callPackage ../applications/networking/cluster/helmfile { }; @@ -26212,11 +26832,11 @@ in # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_15 kops_1_16 kops_1_17 + kops_1_18 ; - kops = kops_1_17; + kops = kops_1_18; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -26234,7 +26854,9 @@ in icu = icu58; }; - mame = libsForQt5.callPackage ../misc/emulators/mame { + mamba = callPackage ../applications/audio/mamba { }; + + mame = libsForQt514.callPackage ../misc/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; }; @@ -26410,6 +27032,8 @@ in nixdoc = callPackage ../tools/nix/nixdoc {}; + nix-doc = callPackage ../tools/package-management/nix-doc { }; + nix-bundle = callPackage ../tools/package-management/nix-bundle { }; nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate; @@ -26572,6 +27196,8 @@ in pyload = callPackage ../applications/networking/pyload {}; + pwntools = with python3Packages; toPythonApplication pwntools; + uae = callPackage ../misc/emulators/uae { }; fsuae = callPackage ../misc/emulators/fs-uae { }; @@ -26584,6 +27210,8 @@ in py-wmi-client = callPackage ../tools/networking/py-wmi-client { }; + rargs = callPackage ../tools/misc/rargs { }; + redprl = callPackage ../applications/science/logic/redprl { }; renderizer = pkgs.callPackage ../development/tools/renderizer {}; @@ -26629,6 +27257,8 @@ in sift = callPackage ../tools/text/sift { }; + xdragon = lowPrio (callPackage ../applications/misc/xdragon { }); + xlockmore = callPackage ../misc/screensavers/xlockmore { }; xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { }; @@ -26689,9 +27319,7 @@ in sanoid = callPackage ../tools/backup/sanoid { }; - satysfi = callPackage ../tools/typesetting/satysfi { - ocamlPackages = ocaml-ng.ocamlPackages_4_07; - }; + satysfi = callPackage ../tools/typesetting/satysfi { }; sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { inherit libusb1; # Shadow python.pkgs.libusb1. @@ -26742,7 +27370,7 @@ in prow = callPackage ../applications/networking/cluster/prow { }; - tellico = libsForQt5.callPackage ../applications/misc/tellico { }; + tellico = libsForQt514.callPackage ../applications/misc/tellico { }; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; @@ -26774,6 +27402,8 @@ in tilt = callPackage ../applications/networking/cluster/tilt {}; + timeular = callPackage ../applications/office/timeular {}; + tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tewi-font = callPackage ../data/fonts/tewi @@ -26789,7 +27419,7 @@ in ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; - vnote = libsForQt5.callPackage ../applications/office/vnote { }; + vnote = libsForQt514.callPackage ../applications/office/vnote { }; ssh-audit = callPackage ../tools/security/ssh-audit { }; @@ -26865,9 +27495,13 @@ in vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { }; + vokoscreen-ng = libsForQt5.callPackage ../applications/video/vokoscreen-ng { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly; + }; + vttest = callPackage ../tools/misc/vttest { }; - wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; + wacomtablet = libsForQt514.callPackage ../tools/misc/wacomtablet { }; wasmer = callPackage ../development/interpreters/wasmer { }; @@ -26884,6 +27518,8 @@ in webfs = callPackage ../servers/http/webfs { }; + webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { }; + websocketd = callPackage ../applications/networking/websocketd { }; wikicurses = callPackage ../applications/misc/wikicurses { @@ -26918,6 +27554,8 @@ in wmutils-core = callPackage ../tools/X11/wmutils-core { }; + wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { }; + wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; wordpress = callPackage ../servers/web-apps/wordpress { }; @@ -26936,6 +27574,8 @@ in wxGTK = wxGTK30; }; + wyvern = callPackage ../games/wyvern { }; + x11idle = callPackage ../tools/misc/x11idle {}; x11docker = callPackage ../applications/virtualization/x11docker { }; @@ -26984,6 +27624,8 @@ in xteddy = callPackage ../applications/misc/xteddy { }; + xva-img = callPackage ../tools/virtualization/xva-img { }; + xwiimote = callPackage ../misc/drivers/xwiimote { }; xzoom = callPackage ../tools/X11/xzoom {}; @@ -27037,7 +27679,7 @@ in snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; openmsx = callPackage ../misc/emulators/openmsx { - python = python27; + python = python3; }; higan = callPackage ../misc/emulators/higan { @@ -27090,7 +27732,7 @@ in inherit pkgs; }; - golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = libsForQt512.callPackage ../applications/misc/golden-cheetah {}; linkchecker = callPackage ../tools/networking/linkchecker { }; @@ -27108,6 +27750,8 @@ in sequelpro = callPackage ../applications/misc/sequelpro {}; + snowsql = callPackage ../applications/misc/snowsql {}; + sidequest = callPackage ../applications/misc/sidequest {}; maphosts = callPackage ../tools/networking/maphosts {}; @@ -27258,6 +27902,8 @@ in kube3d = callPackage ../applications/networking/cluster/kube3d {}; + zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots {}; + zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; runwayml = callPackage ../applications/graphics/runwayml {}; @@ -27317,4 +27963,9 @@ in gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; navidrome = callPackage ../servers/misc/navidrome {}; + + zettlr = callPackage ../applications/misc/zettlr { }; + + unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; + } |