diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1362 |
1 files changed, 557 insertions, 805 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffe55bb47fc77..4a867078fdbf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -193,7 +193,6 @@ with pkgs; pythonInterpreter = "${python3.withPackages (ps: [ ps.pyelftools ])}/bin/python"; autoPatchelfScript = ../build-support/setup-hooks/auto-patchelf.py; }; - meta.platforms = lib.platforms.linux; } ../build-support/setup-hooks/auto-patchelf.sh; tomato-c = callPackage ../applications/misc/tomato-c { }; @@ -231,8 +230,6 @@ with pkgs; # Post 24.11 branch-off, this should throw an error in aliases.nix. addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; - quickemu = callPackage ../development/quickemu { }; - quickgui = callPackage ../applications/virtualization/quickgui { }; adcli = callPackage ../os-specific/linux/adcli { }; @@ -311,8 +308,6 @@ with pkgs; asn1c = callPackage ../development/compilers/asn1c { }; - assemblyscript = callPackage ../development/compilers/assemblyscript { }; - authz0 = callPackage ../tools/security/authz0 { }; auth0-cli = callPackage ../tools/admin/auth0-cli { }; @@ -408,8 +403,6 @@ with pkgs; buildFHSEnvChroot = callPackage ../build-support/build-fhsenv-chroot { }; # Deprecated; use buildFHSEnv/buildFHSEnvBubblewrap buildFHSEnvBubblewrap = callPackage ../build-support/build-fhsenv-bubblewrap { }; - buildMaven = callPackage ../build-support/build-maven.nix { }; - c64-debugger = callPackage ../applications/emulators/c64-debugger { }; camunda-modeler = callPackage ../applications/misc/camunda-modeler { }; @@ -422,12 +415,8 @@ with pkgs; castget = callPackage ../applications/networking/feedreaders/castget { }; - castxml = callPackage ../development/tools/castxml { }; - catatonit = callPackage ../applications/virtualization/catatonit { }; - catppuccin-catwalk = callPackage ../development/tools/misc/catppuccin-catwalk { }; - catppuccin-gtk = callPackage ../data/themes/catppuccin-gtk { }; catppuccin-kde = callPackage ../data/themes/catppuccin-kde { }; @@ -436,8 +425,6 @@ with pkgs; catppuccin-papirus-folders = callPackage ../data/icons/catppuccin-papirus-folders { }; - catppuccin-plymouth = callPackage ../data/themes/catppuccin-plymouth { }; - btdu = callPackage ../tools/misc/btdu { }; ccal = callPackage ../tools/misc/ccal { }; @@ -504,10 +491,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - codeberg-cli = callPackage ../applications/version-management/codeberg-cli { - inherit (darwin.apple_sdk.frameworks) Security CoreServices; - }; - conftest = callPackage ../development/tools/conftest { }; coldsnap = callPackage ../tools/admin/coldsnap { @@ -542,12 +525,8 @@ with pkgs; containerlab = callPackage ../tools/networking/containerlab { }; - containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; - coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); - coost = callPackage ../development/libraries/coost { }; - confetty = callPackage ../applications/misc/confetty { }; confy = callPackage ../applications/misc/confy { }; @@ -719,7 +698,7 @@ with pkgs; buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; - probe-rs = callPackage ../development/tools/rust/probe-rs { + probe-rs-tools = callPackage ../by-name/pr/probe-rs-tools/package.nix { inherit (darwin.apple_sdk.frameworks) AppKit; inherit (darwin) DarwinTools; }; @@ -769,8 +748,6 @@ with pkgs; protoc-gen-prost-serde = callPackage ../development/tools/protoc-gen-prost-serde { }; - protoc-gen-rust = callPackage ../development/tools/protoc-gen-rust { }; - protoc-gen-tonic = callPackage ../development/tools/protoc-gen-tonic { }; protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; @@ -835,7 +812,8 @@ with pkgs; oletools = with python3.pkgs; toPythonApplication oletools; - ollama = callPackage ../tools/misc/ollama { }; + ollama-rocm = callPackage ../by-name/ol/ollama/package.nix { acceleration = "rocm"; }; + ollama-cuda = callPackage ../by-name/ol/ollama/package.nix { acceleration = "cuda"; }; ots = callPackage ../tools/security/ots { }; @@ -1084,8 +1062,6 @@ with pkgs; mod = callPackage ../development/tools/mod { }; - mods = callPackage ../tools/misc/mods { }; - mongosh = callPackage ../development/tools/mongosh { }; mya = callPackage ../applications/misc/mya { }; @@ -1096,15 +1072,15 @@ with pkgs; antlr = antlr4_10; boost = boost177; # Configure checks for specific version. icu = icu73; - protobuf = protobuf_21; + protobuf = protobuf_24; }; mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { inherit (darwin) cctools DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; antlr = antlr4_10; - icu = icu69; - protobuf = protobuf_21; + icu = icu73; + protobuf = protobuf_24; }; broadlink-cli = callPackage ../tools/misc/broadlink-cli { }; @@ -1161,7 +1137,7 @@ with pkgs; fetchurl = stdenv.fetchurlBoot; }; }); - perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; + perl = buildPackages.perl.override { inherit zlib; fetchurl = stdenv.fetchurlBoot; }; openssl = buildPackages.openssl.override { fetchurl = stdenv.fetchurlBoot; buildPackages = { @@ -1169,7 +1145,7 @@ with pkgs; fetchurl = stdenv.fetchurlBoot; inherit perl; xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; }; - gmp = null; + gmpSupport = false; aclSupport = false; attrSupport = false; }; @@ -1308,7 +1284,9 @@ with pkgs; makeBinaryWrapper = callPackage ../build-support/setup-hooks/make-binary-wrapper { }; - compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware-xz.nix { }; + compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware.nix { type = "xz"; }; + + compressFirmwareZstd = callPackage ../build-support/kernel/compress-firmware.nix { type = "zstd"; }; makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: callPackage ../build-support/kernel/modules-closure.nix { @@ -1434,13 +1412,18 @@ with pkgs; name = "find-xml-catalogs-hook"; } ../build-support/setup-hooks/find-xml-catalogs.sh; - wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { - makeWrapper = makeBinaryWrapper; + wrapGAppsHook3 = wrapGAppsNoGuiHook.override { + isGraphical = true; }; - wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = __splicedPackages.gtk4; }; + wrapGAppsHook4 = wrapGAppsNoGuiHook.override { + isGraphical = true; + gtk3 = __splicedPackages.gtk4; + }; - wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; + wrapGAppsNoGuiHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { + makeWrapper = makeBinaryWrapper; + }; separateDebugInfo = makeSetupHook { name = "separate-debug-info-hook"; @@ -1490,6 +1473,7 @@ with pkgs; _6tunnel = callPackage ../tools/networking/6tunnel { }; _7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { }; + _7zz-rar = _7zz.override { enableUnfree = true; }; _9pfs = callPackage ../tools/filesystems/9pfs { }; @@ -1509,8 +1493,6 @@ with pkgs; abduco = callPackage ../tools/misc/abduco { }; - ablog = callPackage ../applications/misc/ablog { }; - acct = callPackage ../tools/system/acct { }; accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { }; @@ -1519,8 +1501,6 @@ with pkgs; acme-sh = callPackage ../tools/admin/acme-sh { }; - acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { }; - alsaequal = callPackage ../tools/audio/alsaequal { }; acpica-tools = callPackage ../tools/system/acpica-tools { }; @@ -1765,8 +1745,6 @@ with pkgs; donkey = callPackage ../tools/security/donkey { }; - dualsensectl = callPackage ../tools/games/dualsensectl { }; - dwarfs = callPackage ../tools/filesystems/dwarfs { }; dysk = callPackage ../tools/filesystems/dysk { }; @@ -1837,8 +1815,6 @@ with pkgs; gh-dash = callPackage ../tools/misc/gh-dash { }; - gh-eco = callPackage ../tools/misc/gh-eco { }; - gh-markdown-preview = callPackage ../tools/misc/gh-markdown-preview { }; ghostie = callPackage ../tools/misc/ghostie { }; @@ -1851,8 +1827,6 @@ with pkgs; goflow = callPackage ../tools/networking/goflow { }; - goflow2 = callPackage ../tools/networking/goflow2 { }; - gofu = callPackage ../applications/misc/gofu { }; godspeed = callPackage ../tools/networking/godspeed { }; @@ -1980,12 +1954,14 @@ with pkgs; node-glob = callPackage ../tools/misc/node-glob { }; nominatim = callPackage ../servers/nominatim { - postgresql = postgresql_12; + postgresql = postgresql_14; }; npm-check-updates = callPackage ../tools/package-management/npm-check-updates { }; - ntpd-rs = callPackage ../tools/networking/ntpd-rs { }; + ntpd-rs = darwin.apple_sdk_11_0.callPackage ../tools/networking/ntpd-rs { + inherit (darwin.apple_sdk_11_0.frameworks) Security; + }; ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; @@ -2020,8 +1996,6 @@ with pkgs; ronin = callPackage ../tools/security/ronin { }; - s0ix-selftest-tool = callPackage ../tools/system/s0ix-selftest-tool { }; - scarab = callPackage ../tools/games/scarab { }; sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { }; @@ -2172,7 +2146,9 @@ with pkgs; archi = callPackage ../tools/misc/archi { }; - breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; + breitbandmessung = callPackage ../applications/networking/breitbandmessung { + electron = electron_29; + }; ### APPLICATIONS/VERSION-MANAGEMENT @@ -2346,9 +2322,7 @@ with pkgs; git-crecord = callPackage ../applications/version-management/git-crecord { }; - git-credential-1password = callPackage ../applications/version-management/git-credential-1password { }; - - git-credential-keepassxc = callPackage ../applications/version-management/git-credential-keepassxc { + git-credential-keepassxc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-credential-keepassxc { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; }; @@ -2453,8 +2427,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-standup = callPackage ../applications/version-management/git-standup { }; - git-stree = callPackage ../applications/version-management/git-stree { }; git-subrepo = callPackage ../applications/version-management/git-subrepo { }; @@ -2507,8 +2479,6 @@ with pkgs; gitnr = callPackage ../applications/version-management/gitnr { }; - gitprompt-rs = callPackage ../applications/version-management/gitprompt-rs/default.nix { }; - gitsign = callPackage ../applications/version-management/gitsign { }; gitstats = callPackage ../applications/version-management/gitstats { }; @@ -2561,13 +2531,6 @@ with pkgs; qgit = qt5.callPackage ../applications/version-management/qgit { }; - radicle-cli = callPackage ../applications/version-management/radicle-cli { - inherit (darwin) DarwinTools; - inherit (darwin.apple_sdk.frameworks) AppKit; - }; - - radicle-upstream = callPackage ../applications/version-management/radicle-upstream { }; - rs-git-fsmonitor = callPackage ../applications/version-management/rs-git-fsmonitor { }; scmpuff = callPackage ../applications/version-management/scmpuff { }; @@ -2665,8 +2628,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa; }; - duckstation = qt6Packages.callPackage ../applications/emulators/duckstation { }; - dynamips = callPackage ../applications/emulators/dynamips { }; emu2 = callPackage ../applications/emulators/emu2 { }; @@ -2750,24 +2711,40 @@ with pkgs; pcem = callPackage ../applications/emulators/pcem { }; - pcsx2 = qt6Packages.callPackage ../applications/emulators/pcsx2 { }; - pcsxr = callPackage ../applications/emulators/pcsxr { }; - ppsspp-sdl = ppsspp.override { - enableQt = false; - enableVulkan = true; - }; - - ppsspp-sdl-wayland = ppsspp.override { - forceWayland = true; - enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/13845 - }; - - ppsspp-qt = ppsspp.override { - enableQt = true; - enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628 - }; + ppsspp-sdl = let + argset = { + ffmpeg = ffmpeg_4; + glew = glew.override { enableEGL = argset.forceWayland; }; + enableQt = false; + enableVulkan = true; + forceWayland = false; + }; + in + ppsspp.override argset; + + ppsspp-sdl-wayland = let + argset = { + ffmpeg = ffmpeg_4; + glew = glew.override { enableEGL = argset.forceWayland; }; + enableQt = false; + enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/13845 + forceWayland = true; + }; + in + ppsspp.override argset; + + ppsspp-qt = let + argset = { + ffmpeg = ffmpeg_4; + glew = glew.override { enableEGL = argset.forceWayland; }; + enableQt = true; + enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628 + forceWayland = false; + }; + in + ppsspp.override argset; proton-caller = callPackage ../applications/emulators/proton-caller { }; @@ -2781,6 +2758,10 @@ with pkgs; ripes = qt6Packages.callPackage ../applications/emulators/ripes { }; + rmg-wayland = callPackage ../by-name/rm/rmg/package.nix { + withWayland = true; + }; + rpcemu = callPackage ../applications/emulators/rpcemu { }; ruffle = callPackage ../applications/emulators/ruffle { }; @@ -2833,6 +2814,7 @@ with pkgs; ### APPLICATIONS/EMULATORS/DOLPHIN-EMU dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; }; @@ -2906,8 +2888,6 @@ with pkgs; inherit (qt5) wrapQtAppsHook; }; - felix-fm = callPackage ../applications/file-managers/felix-fm { }; - krusader = libsForQt5.callPackage ../applications/file-managers/krusader { }; lesscpy = callPackage ../development/compilers/lesscpy { }; @@ -2930,6 +2910,8 @@ with pkgs; portfolio-filemanager = callPackage ../applications/file-managers/portfolio-filemanager { }; + pot = callPackage ../by-name/po/pot/package.nix { pnpm = pnpm_8; }; + potreeconverter = callPackage ../applications/graphics/potreeconverter { }; ranger = callPackage ../applications/file-managers/ranger { }; @@ -2977,8 +2959,6 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - darklua = callPackage ../development/tools/darklua { }; - darktile = callPackage ../applications/terminal-emulators/darktile { }; dterm = callPackage ../applications/terminal-emulators/dterm { }; @@ -3291,8 +3271,6 @@ with pkgs; async = callPackage ../development/tools/async { }; - async-profiler = callPackage ../development/tools/async-profiler { }; - atheme = callPackage ../servers/irc/atheme { }; atinout = callPackage ../tools/networking/atinout { }; @@ -3339,8 +3317,6 @@ with pkgs; aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; - aws-env = callPackage ../tools/admin/aws-env { }; - aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { }; @@ -3389,8 +3365,6 @@ with pkgs; bitwise = callPackage ../tools/misc/bitwise { }; - blanket = callPackage ../applications/audio/blanket { }; - blisp = darwin.apple_sdk_11_0.callPackage ../development/embedded/blisp { inherit (darwin.apple_sdk_11_0.frameworks) IOKit; }; @@ -3499,8 +3473,6 @@ with pkgs; bazarr = callPackage ../servers/bazarr { }; - bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; - bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { openjdk11 = openjdk11.override { enableJavaFX = true; }; }; @@ -3677,6 +3649,8 @@ with pkgs; deterministic-uname = callPackage ../build-support/deterministic-uname { }; + deterministic-host-uname = deterministic-uname.override { forPlatform = stdenv.hostPlatform; }; + dfmt = callPackage ../tools/text/dfmt { }; diopser = callPackage ../applications/audio/diopser { }; @@ -3691,8 +3665,6 @@ with pkgs; djmount = callPackage ../tools/filesystems/djmount { }; - dgsh = callPackage ../shells/dgsh { }; - dkimpy = with python3Packages; toPythonApplication dkimpy; dl-librescore = callPackage ../tools/audio/dl-librescore { }; @@ -3941,8 +3913,6 @@ with pkgs; mobilecoin-wallet = callPackage ../applications/misc/mobilecoin-wallet { }; - mpdevil = callPackage ../applications/audio/mpdevil { }; - pacparser = callPackage ../tools/networking/pacparser { }; pairdrop = callPackage ../applications/misc/pairdrop { }; @@ -4098,7 +4068,7 @@ with pkgs; adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { }; adb-sync = callPackage ../development/mobile/adb-sync { - inherit (androidenv.androidPkgs_9_0) platform-tools; + inherit (androidenv.androidPkgs) platform-tools; }; amoco = callPackage ../tools/security/amoco { }; @@ -4114,7 +4084,7 @@ with pkgs; androidndkPkgs_23b = (callPackage ../development/androidndk-pkgs {})."23b"; androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs {})."24"; - androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk; + androidsdk = androidenv.androidPkgs.androidsdk; webos = recurseIntoAttrs { cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { }; @@ -4135,8 +4105,6 @@ with pkgs; aptdec = callPackage ../development/libraries/aptdec { }; - argc = callPackage ../development/tools/argc { }; - aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4153,9 +4121,7 @@ with pkgs; atftp = callPackage ../tools/networking/atftp { }; - atlas = callPackage ../development/tools/database/atlas { - buildGoModule = buildGo122Module; - }; + atlas = callPackage ../development/tools/database/atlas { }; authoscope = callPackage ../tools/security/authoscope { inherit (darwin.apple_sdk.frameworks) Security; @@ -4231,8 +4197,6 @@ with pkgs; beats = callPackage ../tools/misc/beats { }; - BeatSaberModManager = callPackage ../games/BeatSaberModManager/default.nix { }; - beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme { inherit (plasma5Packages) breeze-icons; }; @@ -4426,8 +4390,6 @@ with pkgs; bundletool = callPackage ../development/tools/bundletool { }; - bustle = haskellPackages.bustle; - bwm_ng = callPackage ../tools/networking/bwm-ng { }; bwbasic = callPackage ../development/interpreters/bwbasic { }; @@ -4485,10 +4447,6 @@ with pkgs; ''; }); - caddy = callPackage ../servers/caddy { }; - - xcaddy = callPackage ../servers/caddy/xcaddy { }; - traefik = callPackage ../servers/traefik { }; traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; @@ -4702,8 +4660,6 @@ with pkgs; shotman = callPackage ../tools/wayland/shotman { }; - slurp = callPackage ../tools/wayland/slurp { }; - sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix { wlroots = wlroots_0_17; }; @@ -4720,9 +4676,7 @@ with pkgs; wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { - ocamlPackages = ocaml-ng.ocamlPackages_5_0; - }; + wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; waylogout = callPackage ../tools/wayland/waylogout { }; @@ -4772,14 +4726,10 @@ with pkgs; wob = callPackage ../tools/wayland/wob { }; - wpaperd = callPackage ../tools/wayland/wpaperd { }; - wshowkeys = callPackage ../tools/wayland/wshowkeys { }; wtype = callPackage ../tools/wayland/wtype { }; - ydotool = callPackage ../tools/wayland/ydotool { }; - cambalache = callPackage ../development/tools/cambalache { }; cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { }; @@ -4844,6 +4794,8 @@ with pkgs; crudini = callPackage ../tools/misc/crudini { }; + csv2md = with python3Packages; toPythonApplication csv2md; + csv2odf = callPackage ../applications/office/csv2odf { }; csv2parquet = callPackage ../tools/misc/csv2parquet { }; @@ -4858,8 +4810,6 @@ with pkgs; csv2latex = callPackage ../tools/misc/csv2latex { }; - csvq = callPackage ../development/tools/csvq { }; - csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { }; cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { }; @@ -4880,8 +4830,6 @@ with pkgs; dante = callPackage ../servers/dante { }; - dapr-cli = callPackage ../development/tools/dapr/cli { }; - dasel = callPackage ../applications/misc/dasel { }; dasher = callPackage ../applications/accessibility/dasher { }; @@ -4948,16 +4896,12 @@ with pkgs; dialogbox = libsForQt5.callPackage ../tools/misc/dialogbox { }; - dibbler = callPackage ../tools/networking/dibbler { }; - dieharder = callPackage ../tools/security/dieharder { }; diesel-cli = callPackage ../development/tools/diesel-cli { inherit (darwin.apple_sdk.frameworks) Security; }; - refinery-cli = callPackage ../development/tools/refinery-cli { }; - digitemp = callPackage ../tools/misc/digitemp { }; dijo = callPackage ../tools/misc/dijo { @@ -5024,8 +4968,6 @@ with pkgs; dolibarr = callPackage ../servers/web-apps/dolibarr { }; - doppler = callPackage ../tools/security/doppler { }; - dosage = callPackage ../applications/graphics/dosage { }; dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { @@ -5084,6 +5026,8 @@ with pkgs; easyabc = callPackage ../applications/audio/easyabc { }; + easyaudiosync = qt6Packages.callPackage ../applications/audio/easyaudiosync {}; + easycrypt = callPackage ../applications/science/logic/easycrypt { why3 = pkgs.why3.override { ideSupport = false; }; }; @@ -5114,7 +5058,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_29; + electron = electron_30; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh @@ -5160,7 +5104,7 @@ with pkgs; eschalot = callPackage ../tools/security/eschalot { }; espanso = callPackage ../applications/office/espanso { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation IOKit Kernel AVFoundation Carbon QTKit AVKit WebKit; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation IOKit Kernel AVFoundation Carbon QTKit AVKit WebKit System; }; espanso-wayland = espanso.override { x11Support = false; @@ -5327,7 +5271,7 @@ with pkgs; # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive texlive = callPackage ../tools/typesetting/tex/texlive { }; inherit (texlive.schemes) texliveBasic texliveBookPub texliveConTeXt texliveFull texliveGUST texliveInfraOnly texliveMedium texliveMinimal texliveSmall texliveTeTeX; - texlivePackages = recurseIntoAttrs (lib.filterAttrs (_: lib.isDerivation) texlive.pkgs); + texlivePackages = recurseIntoAttrs (lib.mapAttrs (_: v: v.build) texlive.pkgs); fop = callPackage ../tools/typesetting/fop { }; @@ -5371,8 +5315,6 @@ with pkgs; gb-backup = callPackage ../tools/backup/gamerbackup { }; - gbsplay = callPackage ../applications/audio/gbsplay { }; - gdrive = callPackage ../applications/networking/gdrive { }; gdrive3 = callPackage ../applications/networking/gdrive3 { }; @@ -5417,6 +5359,8 @@ with pkgs; protobuf = protobuf_21; }; + ghidra-extensions = recurseIntoAttrs (callPackage ../tools/security/ghidra/extensions.nix { }); + ghidra-bin = callPackage ../tools/security/ghidra { }; gh2md = callPackage ../tools/backup/gh2md { }; @@ -5549,8 +5493,6 @@ with pkgs; hr = callPackage ../applications/misc/hr { }; - humioctl = callPackage ../applications/logging/humioctl { }; - huniq = callPackage ../tools/text/huniq { }; hunt = callPackage ../tools/misc/hunt { }; @@ -5558,11 +5500,6 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; - hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - wlroots-hyprland = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; - udis86-hyprland = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; - }; - hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { }; hyprland-per-window-layout = callPackage ../tools/wayland/hyprland-per-window-layout { }; @@ -5571,13 +5508,11 @@ with pkgs; hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; - hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { - wlroots = wlroots_0_16; - }; + hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { }; hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { }; - hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland/plugins.nix { }); + hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland-plugins { }); hysteria = callPackage ../tools/networking/hysteria { }; @@ -5615,10 +5550,6 @@ with pkgs; jellycli = callPackage ../applications/audio/jellycli { }; - jellyfin = callPackage ../servers/jellyfin { - ffmpeg = jellyfin-ffmpeg; - }; - jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { }; jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { @@ -5627,8 +5558,6 @@ with pkgs; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; - jellyfin-web = callPackage ../servers/jellyfin/web.nix { }; - jellyseerr = callPackage ../servers/jellyseerr { }; jiten = callPackage ../applications/misc/jiten { }; @@ -5671,7 +5600,7 @@ with pkgs; klipper = callPackage ../servers/klipper { }; - klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { gcc-arm-embedded = gcc-arm-embedded-11; }; + klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { gcc-arm-embedded = gcc-arm-embedded-13; }; klipper-flash = callPackage ../servers/klipper/klipper-flash.nix { }; @@ -5685,8 +5614,6 @@ with pkgs; klog = qt5.callPackage ../applications/radio/klog { }; - knxd = callPackage ../servers/knxd { }; - komga = callPackage ../servers/komga { }; komorebi = callPackage ../applications/graphics/komorebi { }; @@ -6088,10 +6015,6 @@ with pkgs; pcp = callPackage ../tools/misc/pcp { }; - persepolis = python3Packages.callPackage ../tools/networking/persepolis { - wrapQtAppsHook = qt5.wrapQtAppsHook; - }; - pev = callPackage ../development/tools/analysis/pev { }; phd2 = callPackage ../applications/science/astronomy/phd2 { }; @@ -6124,8 +6047,6 @@ with pkgs; poweralertd = callPackage ../tools/misc/poweralertd { }; - ps_mem = callPackage ../tools/system/ps_mem { }; - pscale = callPackage ../development/tools/pscale { }; pulsarctl = callPackage ../tools/admin/pulsarctl { }; @@ -6182,8 +6103,6 @@ with pkgs; rex = callPackage ../tools/system/rex { }; - river = callPackage ../applications/window-managers/river { }; - rivercarro = callPackage ../applications/misc/rivercarro { }; river-luatile = callPackage ../applications/misc/river-luatile{ }; @@ -6248,8 +6167,6 @@ with pkgs; socklog = callPackage ../tools/system/socklog { }; - soju = callPackage ../applications/networking/soju { }; - spacevim = callPackage ../applications/editors/spacevim { }; srvc = callPackage ../applications/version-management/srvc { }; @@ -6298,10 +6215,6 @@ with pkgs; rainloop-community rainloop-standard; - rav1e = callPackage ../tools/video/rav1e { - inherit (darwin.apple_sdk.frameworks) Security; - }; - raven-reader = callPackage ../applications/networking/newsreaders/raven-reader { }; razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; @@ -6502,8 +6415,6 @@ with pkgs; bfs = callPackage ../tools/system/bfs { }; - bevelbar = callPackage ../tools/X11/bevelbar { }; - bgs = callPackage ../tools/X11/bgs { }; bibclean = callPackage ../tools/typesetting/bibclean { }; @@ -6609,8 +6520,6 @@ with pkgs; ccze = callPackage ../tools/misc/ccze { }; - cdecl = callPackage ../development/tools/cdecl { }; - cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { }; cdist = python3Packages.callPackage ../tools/admin/cdist { }; @@ -7028,7 +6937,8 @@ with pkgs; ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; - clamav = darwin.apple_sdk_11_0.callPackage ../tools/security/clamav { + clamav = callPackage ../tools/security/clamav { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }; @@ -7158,10 +7068,6 @@ with pkgs; cudaPackages_12_3 = callPackage ./cuda-packages.nix { cudaVersion = "12.3"; }; cudaPackages_12 = cudaPackages_12_2; # Latest supported by cudnn - # Use the older cudaPackages for tensorflow and jax, as determined by cudnn - # compatibility: https://www.tensorflow.org/install/source#gpu - cudaPackagesGoogle = cudaPackages_11; - cudaPackages = recurseIntoAttrs cudaPackages_12; # TODO: move to alias @@ -7240,8 +7146,6 @@ with pkgs; davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { }; - dbench = callPackage ../development/tools/misc/dbench { }; dclxvi = callPackage ../development/libraries/dclxvi { }; @@ -7454,8 +7358,6 @@ with pkgs; dorkscout = callPackage ../tools/security/dorkscout { }; - downonspot = callPackage ../applications/misc/downonspot { }; - sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; drive = callPackage ../applications/networking/drive { }; @@ -7493,8 +7395,6 @@ with pkgs; dt-schema = callPackage ../development/tools/dt-schema { }; - dub = callPackage ../development/tools/build-managers/dub { }; - inherit (import ../build-support/dlang/dub-support.nix { inherit callPackage; }) buildDubPackage dub-to-nix; @@ -7671,9 +7571,7 @@ with pkgs; tracker = callPackage ../development/libraries/tracker { }; - tracker-miners = callPackage ../development/libraries/tracker-miners { }; - - tracy = callPackage ../development/tools/tracy { }; + tracy-x11 = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; }; trivy = callPackage ../tools/admin/trivy { }; @@ -7831,8 +7729,6 @@ with pkgs; endlessh = callPackage ../servers/endlessh { }; - endlessh-go = callPackage ../servers/endlessh-go { }; - ericw-tools = callPackage ../applications/misc/ericw-tools { }; cryfs = callPackage ../tools/filesystems/cryfs { }; @@ -7843,7 +7739,7 @@ with pkgs; enscript = callPackage ../tools/text/enscript { }; - ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { stdenv = gcc8Stdenv; }; + ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { }; entr = callPackage ../tools/misc/entr { }; @@ -7980,7 +7876,7 @@ with pkgs; ferm = callPackage ../tools/networking/ferm { }; feroxbuster = callPackage ../tools/security/feroxbuster { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; ffsend = callPackage ../tools/misc/ffsend { @@ -8107,8 +8003,6 @@ with pkgs; fim = callPackage ../tools/graphics/fim { }; - flac123 = callPackage ../applications/audio/flac123 { }; - flamegraph = callPackage ../development/tools/flamegraph { }; flawfinder = callPackage ../development/tools/flawfinder { }; @@ -8121,8 +8015,6 @@ with pkgs; flowblade = callPackage ../applications/video/flowblade { }; - fontfor = callPackage ../tools/misc/fontfor { }; - fontforge = lowPrio (callPackage ../tools/misc/fontforge { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; python = python3; @@ -8206,7 +8098,6 @@ with pkgs; frigate = callPackage ../applications/video/frigate { }; - frostwire = callPackage ../applications/networking/p2p/frostwire { }; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; ftgl = callPackage ../development/libraries/ftgl { }; @@ -8225,8 +8116,6 @@ with pkgs; fuseiso = callPackage ../tools/filesystems/fuseiso { }; - fusuma = callPackage ../tools/inputmethods/fusuma { }; - fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { }); inherit (fdbPackages) @@ -8324,8 +8213,6 @@ with pkgs; gdmap = callPackage ../tools/system/gdmap { }; - gdtoolkit = callPackage ../development/tools/gdtoolkit { }; - gef = callPackage ../development/tools/misc/gef { }; gelasio = callPackage ../data/fonts/gelasio { }; @@ -8348,8 +8235,6 @@ with pkgs; geteltorito = callPackage ../tools/misc/geteltorito { }; - getmail6 = callPackage ../tools/networking/getmail6 { }; - getopt = callPackage ../tools/misc/getopt { }; getoptions = callPackage ../tools/misc/getoptions { }; @@ -8425,8 +8310,6 @@ with pkgs; git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; - gitea = callPackage ../applications/version-management/gitea { }; - gitea-actions-runner = callPackage ../development/tools/continuous-integration/gitea-actions-runner { }; gokart = callPackage ../development/tools/gokart { }; @@ -8637,6 +8520,10 @@ with pkgs; gparted = callPackage ../tools/misc/gparted { }; + gpt4all-cuda = gpt4all.override { + cudaSupport = true; + }; + gpt2tc = callPackage ../tools/text/gpt2tc { }; gptcommit = callPackage ../development/tools/gptcommit { @@ -8928,8 +8815,6 @@ with pkgs; haste-server = callPackage ../servers/haste-server { }; - hatch = python3Packages.callPackage ../development/tools/hatch { }; - hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; @@ -8950,8 +8835,6 @@ with pkgs; hardinfo = callPackage ../tools/system/hardinfo { }; - harmonia = callPackage ../tools/package-management/harmonia { }; - hayagriva = callPackage ../tools/typesetting/hayagriva { }; hcl2json = callPackage ../applications/misc/hcl2json { }; @@ -9103,8 +8986,6 @@ with pkgs; hue-plus = libsForQt5.callPackage ../applications/misc/hue-plus { }; - hurl = callPackage ../tools/networking/hurl { }; - hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; humanfriendly = with python3Packages; toPythonApplication humanfriendly; @@ -9256,10 +9137,7 @@ with pkgs; internetarchive = with python3Packages; toPythonApplication internetarchive; - invidious = callPackage ../servers/invidious { - # normally video.js is downloaded at build time - videojs = callPackage ../servers/invidious/videojs.nix { }; - }; + invidious = callPackage ../servers/invidious { }; invoice2data = callPackage ../tools/text/invoice2data { }; @@ -9335,8 +9213,6 @@ with pkgs; iroh = callPackage ../applications/networking/iroh { }; - irrd = callPackage ../servers/misc/irrd { }; - ised = callPackage ../tools/misc/ised { }; isl = isl_0_20; @@ -9429,8 +9305,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; - stalwart-mail = callPackage ../servers/mail/stalwart { }; - jmespath = callPackage ../development/tools/jmespath { }; juicefs = callPackage ../tools/filesystems/juicefs { }; @@ -9586,8 +9460,6 @@ with pkgs; kdoctor = callPackage ../development/tools/kdoctor { }; - kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; - kdigger = callPackage ../tools/security/kdigger { }; kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { }; @@ -9598,17 +9470,7 @@ with pkgs; kestrel = callPackage ../tools/security/kestrel { }; - kexec-tools = callPackage ../os-specific/linux/kexec-tools { - # clangStdenv fails with - # purgatory/arch/i386/entry32-16.S:23:2: error: unknown directive - # .arch i386 - # ^ - # purgatory/arch/i386/entry32-16.S:115:11: error: unknown token in expression - # ljmp %cs:*(realdest - entry16) - # ^ - # make: *** [Makefile:128: purgatory/arch/i386/entry32-16.o] Error 1 - stdenv = gccStdenv; - }; + kexec-tools = callPackage ../os-specific/linux/kexec-tools { }; keepkey-agent = with python3Packages; toPythonApplication keepkey-agent; @@ -9727,8 +9589,6 @@ with pkgs; last-resort = callPackage ../data/fonts/last-resort { }; - ldc = callPackage ../development/compilers/ldc { }; - ligo = let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in callPackage ../development/compilers/ligo { @@ -10585,8 +10445,6 @@ with pkgs; mandoc = callPackage ../tools/misc/mandoc { }; - mangareader = libsForQt5.callPackage ../applications/graphics/mangareader { }; - mangohud = callPackage ../tools/graphics/mangohud { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; mangohud32 = pkgsi686Linux.mangohud; @@ -10766,7 +10624,7 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; morgen = callPackage ../applications/office/morgen { - electron = electron_28; + electron = electron_29; }; mosh = callPackage ../tools/networking/mosh { }; @@ -10911,7 +10769,7 @@ with pkgs; netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; netcdffortran = callPackage ../development/libraries/netcdf-fortran { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration; }; networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { }; @@ -11039,6 +10897,7 @@ with pkgs; nomad_1_5 nomad_1_6 nomad_1_7 + nomad_1_8 ; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; @@ -11085,8 +10944,6 @@ with pkgs; mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { }; - mpack = callPackage ../tools/networking/mpack { }; - mtm = callPackage ../tools/misc/mtm { }; op-geth = callPackage ../applications/blockchains/optimism/geth.nix { @@ -11257,7 +11114,7 @@ with pkgs; nylon = callPackage ../tools/networking/nylon { }; - nym = callPackage ../applications/networking/nym { + nym = darwin.apple_sdk_11_0.callPackage ../applications/networking/nym { inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; @@ -11328,8 +11185,6 @@ with pkgs; ogdf = callPackage ../development/libraries/ogdf { }; - oh-my-posh = callPackage ../development/tools/oh-my-posh { }; - oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; ola = callPackage ../applications/misc/ola { @@ -11456,12 +11311,21 @@ with pkgs; etcDir = "/etc/ssh"; }; + opensshWithKerberos = openssh.override { + withKerberos = true; + }; + openssh_hpn = opensshPackages.openssh_hpn.override { etcDir = "/etc/ssh"; }; + openssh_hpnWithKerberos = openssh_hpn.override { + withKerberos = true; + }; + openssh_gssapi = opensshPackages.openssh_gssapi.override { etcDir = "/etc/ssh"; + withKerberos = true; }; ssh-copy-id = callPackage ../tools/networking/openssh/copyid.nix { }; @@ -11615,6 +11479,7 @@ with pkgs; }; p7zip = callPackage ../tools/archivers/p7zip { }; + p7zip-rar = p7zip.override { enableUnfree = true; }; packagekit = callPackage ../tools/package-management/packagekit { }; @@ -11708,17 +11573,10 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; - percona-server_8_0 = callPackage ../servers/sql/percona-server/8.0.x.nix { - inherit (darwin) cctools developer_cmds DarwinTools; - inherit (darwin.apple_sdk.frameworks) CoreServices; - boost = boost177; # Configure checks for specific version. - icu = icu69; - protobuf = protobuf_21; - }; - percona-xtrabackup = percona-xtrabackup_8_0; - percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { - boost = boost177; - }; + inherit (import ../servers/sql/percona-server pkgs) percona-server_lts percona-server_innovation; + percona-server = percona-server_lts; + inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_lts percona-xtrabackup_innovation; + percona-xtrabackup = percona-xtrabackup_lts; pick = callPackage ../tools/misc/pick { }; @@ -12003,6 +11861,10 @@ with pkgs; pngquant = callPackage ../tools/graphics/pngquant { }; + inherit (callPackages ../development/tools/pnpm { }) + pnpm_8 pnpm_9; + pnpm = pnpm_9; + po4a = perlPackages.Po4a; poac = callPackage ../development/tools/poac { @@ -12035,8 +11897,6 @@ with pkgs; polipo = callPackage ../servers/polipo { }; - polkit_gnome = callPackage ../tools/security/polkit-gnome { }; - poly2tri-c = callPackage ../development/libraries/poly2tri-c { }; polypane = callPackage ../applications/networking/browsers/polypane { }; @@ -12057,7 +11917,11 @@ with pkgs; postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { }; - povray = callPackage ../tools/graphics/povray { }; + povray = callPackage ../tools/graphics/povray { + # https://github.com/POV-Ray/povray/issues/460 + # https://github.com/NixOS/nixpkgs/issues/311017 + stdenv = gcc12Stdenv; + }; power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { }; @@ -12441,8 +12305,6 @@ with pkgs; redsocks = callPackage ../tools/networking/redsocks { }; - renpy = callPackage ../development/interpreters/renpy { }; - rep = callPackage ../development/tools/rep { }; repseek = callPackage ../applications/science/biology/repseek { }; @@ -12971,8 +12833,6 @@ with pkgs; shout = nodePackages.shout; - showmethekey = callPackage ../applications/video/showmethekey { }; - shrikhand = callPackage ../data/fonts/shrikhand { }; shunit2 = callPackage ../tools/misc/shunit2 { }; @@ -12985,8 +12845,6 @@ with pkgs; sigal = callPackage ../applications/misc/sigal { }; - sigi = callPackage ../applications/misc/sigi { }; - sigil = libsForQt5.callPackage ../applications/editors/sigil { }; signalbackup-tools = darwin.apple_sdk_11_0.callPackage @@ -13521,8 +13379,6 @@ with pkgs; tarssh = callPackage ../servers/tarssh { }; - tartan = callPackage ../development/tools/analysis/tartan { }; - tartube = callPackage ../applications/video/tartube { }; tartube-yt-dlp = callPackage ../applications/video/tartube { @@ -13571,7 +13427,7 @@ with pkgs; inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }) teleport_13 teleport_14 teleport_15 teleport; + }) teleport_14 teleport_15 teleport; telepresence = callPackage ../tools/networking/telepresence { pythonPackages = python3Packages; @@ -13736,8 +13592,6 @@ with pkgs; pkgs = pkgs.__splicedPackages; }); - tmsu = callPackage ../tools/filesystems/tmsu { }; - tncattach = callPackage ../applications/radio/tncattach { }; to-html = callPackage ../tools/text/to-html { }; @@ -13831,7 +13685,7 @@ with pkgs; trunk-io = callPackage ../development/tools/trunk-io { }; trunk-ng = callPackage ../by-name/tr/trunk-ng/package.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; tthsum = callPackage ../applications/misc/tthsum { }; @@ -13842,7 +13696,7 @@ with pkgs; trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; - kernelshark = libsForQt5.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { }; + kernelshark = qt6Packages.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { }; traceroute = callPackage ../tools/networking/traceroute { }; @@ -14078,8 +13932,6 @@ with pkgs; up = callPackage ../tools/misc/up { }; - upbound = callPackage ../development/tools/upbound { }; - upterm = callPackage ../tools/misc/upterm { }; upx = callPackage ../tools/compression/upx { }; @@ -14194,6 +14046,8 @@ with pkgs; viking = callPackage ../applications/misc/viking { }; + vikunja = callPackage ../by-name/vi/vikunja/package.nix { pnpm = pnpm_8; }; + vim-vint = callPackage ../development/tools/vim-vint { }; vimer = callPackage ../tools/misc/vimer { }; @@ -14242,10 +14096,9 @@ with pkgs; 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 - # or xterm -ti 340 + vpWithSixel = vp.override { + # Enable next line for console graphics. Note that it requires `sixel` + # enabled terminals such as mlterm or xterm -ti 340 SDL = SDL_sixel; }; @@ -14279,8 +14132,6 @@ with pkgs; wakapi = callPackage ../tools/misc/wakapi { }; - wakatime = callPackage ../tools/misc/wakatime { }; - wambo = callPackage ../development/tools/wambo { }; weather = callPackage ../applications/misc/weather { }; @@ -14373,8 +14224,6 @@ with pkgs; woodpecker-cli = callPackage ../development/tools/continuous-integration/woodpecker/cli.nix { }; - woodpecker-pipeline-transform = callPackage ../development/tools/continuous-integration/woodpecker-pipeline-transform { }; - woodpecker-plugin-git = callPackage ../development/tools/continuous-integration/woodpecker-plugin-git { }; woodpecker-server = callPackage ../development/tools/continuous-integration/woodpecker/server.nix { }; @@ -14391,8 +14240,6 @@ with pkgs; wsmancli = callPackage ../tools/system/wsmancli { }; - wstunnel = haskell.lib.compose.justStaticExecutables haskellPackages.wstunnel; - wolfebin = callPackage ../tools/networking/wolfebin { }; wthrr = callPackage ../applications/misc/wthrr { }; @@ -14496,8 +14343,6 @@ with pkgs; unclutter-xfixes = callPackage ../tools/misc/unclutter-xfixes { }; - unbound = callPackage ../tools/networking/unbound { }; - unbound-with-systemd = unbound.override { withSystemd = true; }; @@ -14617,9 +14462,9 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish74; + varnish60 varnish74 varnish75; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages varnish74Packages; + varnish60Packages varnish74Packages varnish75Packages; varnishPackages = varnish74Packages; varnish = varnishPackages.varnish; @@ -14908,11 +14753,6 @@ with pkgs; ytfzf = callPackage ../tools/misc/ytfzf { }; - # To expose more packages for Yi, override the extraPackages arg. - yi = callPackage ../applications/editors/yi/wrapper.nix { - haskellPackages = haskell.packages.ghc810; - }; - yaydl = callPackage ../tools/video/yaydl { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15152,8 +14992,6 @@ with pkgs; ion = callPackage ../shells/ion { }; - jush = callPackage ../shells/jush { }; - ksh = callPackage ../shells/ksh { }; liquidprompt = callPackage ../shells/liquidprompt { }; @@ -15208,6 +15046,8 @@ with pkgs; temurin-bin = temurin-bin-21; temurin-jre-bin = temurin-jre-bin-21; + semeru-bin-21 = javaPackages.compiler.semeru-bin.jdk-21; + semeru-jre-bin-21 = javaPackages.compiler.semeru-bin.jre-21; semeru-bin-17 = javaPackages.compiler.semeru-bin.jdk-17; semeru-jre-bin-17 = javaPackages.compiler.semeru-bin.jre-17; semeru-bin-16 = javaPackages.compiler.semeru-bin.jdk-16; @@ -15217,8 +15057,8 @@ with pkgs; semeru-bin-8 = javaPackages.compiler.semeru-bin.jdk-8; semeru-jre-bin-8 = javaPackages.compiler.semeru-bin.jre-8; - semeru-bin = semeru-bin-17; - semeru-jre-bin = semeru-jre-bin-17; + semeru-bin = semeru-bin-21; + semeru-jre-bin = semeru-jre-bin-21; adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit stdenv lib; }; adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; @@ -15523,8 +15363,12 @@ with pkgs; fluidd = callPackage ../applications/misc/fluidd { }; - flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); + flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); + flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; }); + flutterPackages = flutterPackages-bin; flutter = flutterPackages.stable; + flutter323 = flutterPackages.v3_23; + flutter322 = flutterPackages.v3_22; flutter319 = flutterPackages.v3_19; flutter316 = flutterPackages.v3_16; flutter313 = flutterPackages.v3_13; @@ -15587,6 +15431,7 @@ with pkgs; gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11; gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12; gcc13Stdenv = overrideCC gccStdenv buildPackages.gcc13; + gcc14Stdenv = overrideCC gccStdenv buildPackages.gcc14; # This is not intended for use in nixpkgs but for providing a faster-running # compiler to nixpkgs users by building gcc with reproducibility-breaking @@ -15677,9 +15522,9 @@ with pkgs; }; inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; }) - gcc48 gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13; + gcc48 gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14; - gcc_latest = gcc13; + gcc_latest = gcc14; # Use the same GCC version as the one from stdenv by default gfortran = wrapCC (gcc.cc.override { @@ -15770,6 +15615,14 @@ with pkgs; profiledCompiler = false; }); + gfortran14 = wrapCC (gcc14.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + libgccjit = gcc.cc.override { name = "libgccjit"; langFortran = false; @@ -15808,6 +15661,13 @@ with pkgs; && stdenv.buildPlatform == stdenv.hostPlatform then buildPackages.gnat-bootstrap11 else buildPackages.gnat11; + stdenv = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + && stdenv.buildPlatform.isDarwin + && stdenv.buildPlatform.isx86_64 + then overrideCC stdenv gnat-bootstrap11 + else stdenv; }); gnat12 = wrapCC (gcc12.cc.override { @@ -15856,6 +15716,29 @@ with pkgs; else stdenv; }); + gnat14 = wrapCC (gcc14.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well do the same. + gnat-bootstrap = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnat-bootstrap12 + else buildPackages.gnat13; + stdenv = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + && stdenv.buildPlatform.isDarwin + && stdenv.buildPlatform.isx86_64 + then overrideCC stdenv gnat-bootstrap12 + else stdenv; + }); + gnat-bootstrap = gnat-bootstrap12; gnat-bootstrap11 = wrapCC (callPackage ../development/compilers/gnat-bootstrap { majorVersion = "11"; }); gnat-bootstrap12 = wrapCCWith ({ @@ -15910,6 +15793,18 @@ with pkgs; meta.broken = stdenv.hostPlatform.isDarwin; }); + gccgo14 = wrapCC (gcc14.cc.override { + name = "gccgo"; + langCC = true; #required for go. + langC = true; + langGo = true; + langJit = true; + profiledCompiler = false; + } // { + # not supported on darwin: https://github.com/golang/go/issues/463 + meta.broken = stdenv.hostPlatform.isDarwin; + }); + ghdl = ghdl-mcode; ghdl-mcode = callPackage ../development/compilers/ghdl { @@ -15990,7 +15885,10 @@ with pkgs; cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install; - stack = haskell.lib.compose.justStaticExecutables haskellPackages.stack; + stack = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.stack; hlint = haskell.lib.compose.justStaticExecutables haskellPackages.hlint; @@ -16073,10 +15971,6 @@ with pkgs; gocover-cobertura = callPackage ../development/tools/gocover-cobertura { }; - gobang = callPackage ../development/tools/database/gobang { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - }; - goblob = callPackage ../tools/security/goblob { }; gogetdoc = callPackage ../development/tools/gogetdoc { }; @@ -16159,8 +16053,6 @@ with pkgs; jdk17 = openjdk17; jdk17_headless = openjdk17_headless; - openjdk16-bootstrap = javaPackages.compiler.openjdk16-bootstrap; - openjdk19 = javaPackages.compiler.openjdk19; openjdk19_headless = javaPackages.compiler.openjdk19.headless; jdk19 = openjdk19; @@ -16350,7 +16242,8 @@ with pkgs; # assumption is that or any later version is good. choose = platform: /**/ if platform.isDarwin then 16 - else if platform.isFreeBSD then 12 + else if platform.isFreeBSD then 16 + else if platform.isOpenBSD then 18 else if platform.isAndroid then 12 else if platform.isLinux then 17 else if platform.isWasm then 16 @@ -16548,7 +16441,7 @@ with pkgs; ocamlformat # latest version ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 - ocamlformat_0_26_0 ocamlformat_0_26_1; + ocamlformat_0_26_0 ocamlformat_0_26_1 ocamlformat_0_26_2; inherit (ocamlPackages) odig; @@ -16599,8 +16492,6 @@ with pkgs; qbe = callPackage ../development/compilers/qbe { }; - rasm = callPackage ../development/compilers/rasm { }; - replibyte = callPackage ../development/tools/database/replibyte { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -16620,11 +16511,11 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_77 = callPackage ../development/compilers/rust/1_77.nix { + rust_1_78 = callPackage ../development/compilers/rust/1_78.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - llvm_17 = llvmPackages_17.libllvm; + llvm_18 = llvmPackages_18.libllvm; }; - rust = rust_1_77; + rust = rust_1_78; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -16632,8 +16523,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_77 = rust_1_77.packages.stable; - rustPackages = rustPackages_1_77; + rustPackages_1_78 = rust_1_78.packages.stable; + rustPackages = rustPackages_1_78; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -16663,9 +16554,7 @@ with pkgs; }; cargo-benchcmp = callPackage ../development/tools/rust/cargo-benchcmp { }; cargo-binstall = callPackage ../development/tools/rust/cargo-binstall { }; - cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { }; cargo-bitbake = callPackage ../development/tools/rust/cargo-bitbake { }; cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -16755,7 +16644,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; - cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { }; cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { inherit (darwin.apple_sdk.frameworks) AppKit; @@ -16783,10 +16671,6 @@ with pkgs; cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; - cargo-profiler = callPackage ../development/tools/rust/cargo-profiler { }; - cargo-raze = callPackage ../development/tools/rust/cargo-raze { - inherit (darwin.apple_sdk.frameworks) Security; - }; cargo-rdme = callPackage ../by-name/ca/cargo-rdme/package.nix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -16821,9 +16705,6 @@ with pkgs; cargo-vet = callPackage ../development/tools/rust/cargo-vet { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-wasi = callPackage ../development/tools/rust/cargo-wasi { - inherit (darwin.apple_sdk.frameworks) Security; - }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { inherit (darwin.apple_sdk.frameworks) Foundation Cocoa; }; @@ -17066,7 +16947,7 @@ with pkgs; # want the C++ library to be explicitly chosen by the caller, and null by # default. libcxx ? null - , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) ((threadsCrossFor cc.version).package) + , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross.package , nixSupport ? {} , ... } @ extraArgs: @@ -17141,7 +17022,7 @@ with pkgs; # BQN interpreters and compilers - mbqn = callPackage ../development/interpreters/bqn/mlochbaum-bqn { }; + mbqn = bqn; cbqn = cbqn-bootstrap.phase2; cbqn-replxx = cbqn-bootstrap.phase2-replxx; @@ -17166,43 +17047,46 @@ with pkgs; phase0 = callPackage ../development/interpreters/bqn/cbqn { inherit (cbqn-bootstrap) mbqn-source stdenv; - genBytecode = false; - bqn-path = null; + generateBytecode = false; + # Not really used, but since null can be dangerous... + bqn-interpreter = "${lib.getExe' buildPackages.mbqn "bqn"}"; }; phase0-replxx = callPackage ../development/interpreters/bqn/cbqn { inherit (cbqn-bootstrap) mbqn-source stdenv; - genBytecode = false; - bqn-path = null; enableReplxx = true; + generateBytecode = false; + # Not really used, but since null can be dangerous... + bqn-interpreter = "${lib.getExe' buildPackages.mbqn "bqn"}"; }; phase1 = callPackage ../development/interpreters/bqn/cbqn { inherit (cbqn-bootstrap) mbqn-source stdenv; - genBytecode = true; - bqn-path = "${buildPackages.cbqn-bootstrap.phase0}/bin/cbqn"; + generateBytecode = true; + bqn-interpreter = "${lib.getExe' buildPackages.cbqn-bootstrap.phase0 "cbqn"}"; }; phase2 = callPackage ../development/interpreters/bqn/cbqn { inherit (cbqn-bootstrap) mbqn-source stdenv; - genBytecode = true; - bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn"; + generateBytecode = true; + bqn-interpreter = "${lib.getExe' buildPackages.cbqn-bootstrap.phase0 "cbqn"}"; }; phase2-replxx = callPackage ../development/interpreters/bqn/cbqn { inherit (cbqn-bootstrap) mbqn-source stdenv; - genBytecode = true; - bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn"; + generateBytecode = true; enableReplxx = true; + bqn-interpreter = "${lib.getExe' buildPackages.cbqn-bootstrap.phase0 "cbqn"}"; }; }; - dbqn = callPackage ../development/interpreters/bqn/dzaima-bqn { + dbqn = callPackage ../by-name/db/dbqn/package.nix { buildNativeImage = false; - stdenv = stdenvNoCC; jdk = jre; + stdenv = stdenvNoCC; }; - dbqn-native = callPackage ../development/interpreters/bqn/dzaima-bqn { + + dbqn-native = dbqn.override { buildNativeImage = true; jdk = graalvm-ce; }; @@ -17275,9 +17159,8 @@ with pkgs; }; inherit (beam.interpreters) - erlang erlang_27-rc3 erlang_26 erlang_25 erlang_24 - erlang_odbc erlang_javac erlang_odbc_javac - elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 + erlang erlang_27 erlang_26 erlang_25 erlang_24 + elixir elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls; erlang_nox = beam_nox.interpreters.erlang; @@ -17758,10 +17641,6 @@ with pkgs; waagent = callPackage ../applications/networking/cluster/waagent { }; - wapm-cli = callPackage ../tools/package-management/wapm/cli { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - wasm = ocamlPackages.wasm; wasm3 = callPackage ../development/interpreters/wasm3 { }; @@ -17832,7 +17711,7 @@ with pkgs; guile-reader = callPackage ../development/guile-modules/guile-reader { }; - guile-sdl = callPackage ../development/guile-modules/guile-sdl { + guile-sdl = callPackage ../by-name/gu/guile-sdl/package.nix { guile = guile_2_2; }; @@ -18006,10 +17885,10 @@ with pkgs; nil = callPackage ../development/tools/language-servers/nil { }; - nixd = callPackage ../development/tools/language-servers/nixd { + inherit (callPackages ../development/tools/language-servers/nixd { llvmPackages = llvmPackages_16; nix = nixVersions.nix_2_19; - }; + }) nixf nixt nixd; openscad-lsp = callPackage ../development/tools/language-servers/openscad-lsp { }; @@ -18039,6 +17918,10 @@ with pkgs; ansible-lint = callPackage ../tools/admin/ansible/lint.nix { }; + antares = callPackage ../by-name/an/antares/package.nix { + electron = electron_29; + }; + antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; @@ -18097,17 +17980,19 @@ with pkgs; electron-source = callPackage ../development/tools/electron { }; inherit (callPackages ../development/tools/electron/binary { }) - electron-bin electron_24-bin electron_27-bin electron_28-bin - electron_29-bin; + electron_29-bin + electron_30-bin; electron_24 = electron_24-bin; - electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin; - electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin; + electron_27 = electron_27-bin; + electron_28 = electron_28-bin; electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin; - electron = electron_29; + electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; + electron = electron_30; + electron-bin = electron_30-bin; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -18350,14 +18235,6 @@ with pkgs; bpftools = callPackage ../os-specific/linux/bpftools { }; - bcc = callPackage ../os-specific/linux/bcc { - llvmPackages = llvmPackages_16; - }; - - bpftrace = callPackage ../os-specific/linux/bpftrace { - llvmPackages = llvmPackages_16; - }; - bpm-tools = callPackage ../tools/audio/bpm-tools { }; byacc = callPackage ../development/tools/parsing/byacc { }; @@ -18563,8 +18440,6 @@ with pkgs; libcxx = llvmPackages.libcxx; - librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; - libgcc = stdenv.cc.cc.libgcc or null; # This is for e.g. LLVM libraries on linux. @@ -18587,8 +18462,6 @@ with pkgs; sigrok-firmware-fx2lafw = callPackage ../development/tools/sigrok-firmware-fx2lafw { }; - cli11 = callPackage ../development/tools/misc/cli11 { }; - datree = callPackage ../development/tools/datree { }; detekt = callPackage ../development/tools/detekt { }; @@ -18647,15 +18520,7 @@ with pkgs; doclifter = callPackage ../development/tools/misc/doclifter { }; - docutils = with python3Packages; toPythonApplication ( - docutils.overridePythonAttrs (attrs: rec { - version = "0.20.1"; - src = attrs.src.override { - inherit version; - hash = "sha256-8IpOJ2w6FYOobc4+NKuj/gTQK7ot1R7RYQYkToqSPjs="; - }; - }) - ); + docutils = with python3Packages; toPythonApplication docutils; doctl = callPackage ../development/tools/doctl { }; @@ -18690,8 +18555,6 @@ with pkgs; easypdkprog = callPackage ../development/embedded/easypdkprog { }; - eclint = callPackage ../development/tools/eclint { }; - editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; @@ -18744,8 +18607,6 @@ with pkgs; license-scanner = callPackage ../development/tools/license-scanner { }; - Literate = callPackage ../development/tools/literate-programming/Literate { }; - md-tangle = callPackage ../development/tools/literate-programming/md-tangle { }; # NOTE: Override and set useIcon = false to use Awk instead of Icon. @@ -18936,7 +18797,10 @@ with pkgs; guile = guile_2_2; }; - hadolint = haskell.lib.compose.justStaticExecutables haskellPackages.hadolint; + hadolint = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.hadolint; halfempty = callPackage ../development/tools/halfempty { }; @@ -19174,8 +19038,8 @@ with pkgs; math-preview = callPackage ../tools/text/math-review { }; - maven = maven3; - maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + maven3 = maven; + inherit (maven) buildMaven; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; @@ -19193,7 +19057,7 @@ with pkgs; python-matter-server = with python3Packages; toPythonApplication ( python-matter-server.overridePythonAttrs (oldAttrs: { - propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ oldAttrs.passthru.optional-dependencies.server; + dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.server; }) ); @@ -19216,7 +19080,7 @@ with pkgs; modd = callPackage ../development/tools/modd { }; - mold = callPackage ../development/tools/mold { + mold = callPackage ../by-name/mo/mold/package.nix { stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; tbb = tbb_2021_11; }; @@ -19237,7 +19101,10 @@ with pkgs; msitools = callPackage ../development/tools/misc/msitools { }; - haskell-ci = haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci; + haskell-ci = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.haskell-ci; nailgun = callPackage ../development/tools/nailgun { }; @@ -19245,8 +19112,6 @@ with pkgs; nex = callPackage ../development/tools/parsing/nex { }; - ninja = callPackage ../development/tools/build-managers/ninja { }; - nimbo = with python3Packages; callPackage ../applications/misc/nimbo { }; gn = callPackage ../development/tools/build-managers/gn { }; @@ -19264,6 +19129,10 @@ with pkgs; jre_headless = jre8_headless; }; + nexusmods-app-unfree = callPackage ../by-name/ne/nexusmods-app/package.nix { + enableUnfree = true; + }; + nmrpflash = callPackage ../development/embedded/nmrpflash { }; norminette = callPackage ../development/tools/norminette { }; @@ -19324,8 +19193,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - pahole = callPackage ../development/tools/misc/pahole { }; - panopticon = callPackage ../development/tools/analysis/panopticon { }; parinfer-rust = callPackage ../development/tools/parinfer-rust { }; @@ -19581,8 +19448,6 @@ with pkgs; scala-cli = callPackage ../development/tools/build-managers/scala-cli { }; - scc = callPackage ../development/tools/misc/scc { }; - scss-lint = callPackage ../development/tools/scss-lint { }; segger-ozone = callPackage ../development/tools/misc/segger-ozone { }; @@ -19593,7 +19458,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - shake = haskell.lib.compose.justStaticExecutables haskellPackages.shake; + shake = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.shake; shallot = callPackage ../tools/misc/shallot { }; @@ -20272,8 +20140,6 @@ with pkgs; boost = boost181; - boost_process = callPackage ../development/libraries/boost-process { }; - bosh-cli = callPackage ../applications/networking/cluster/bosh-cli { }; botan2 = callPackage ../development/libraries/botan/2.0.nix { @@ -20363,6 +20229,7 @@ with pkgs; ccrtp = callPackage ../development/libraries/ccrtp { }; cctag = callPackage ../development/libraries/cctag { + stdenv = clangStdenv; tbb = tbb_2021_11; }; @@ -20460,8 +20327,6 @@ with pkgs; soxt = callPackage ../development/libraries/soxt { }; - CoinMP = callPackage ../development/libraries/CoinMP { }; - coinlive = callPackage ../tools/misc/coinlive { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -20511,7 +20376,10 @@ with pkgs; ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; additional_buildInputs = [ openssl ]; }; - ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { ssl_implementation = mbedtls_2; }; + ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { + ssl_implementation = mbedtls_2; + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; uri = callPackage ../development/libraries/uri { }; @@ -20527,8 +20395,6 @@ with pkgs; cre2 = callPackage ../development/libraries/cre2 { }; - criterion = callPackage ../development/libraries/criterion { }; - croaring = callPackage ../development/libraries/croaring { }; crocoddyl = callPackage ../development/libraries/crocoddyl { }; @@ -20559,9 +20425,7 @@ with pkgs; cypress = callPackage ../development/web/cypress { }; - cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { - libkrb5 = if stdenv.isFreeBSD then heimdal else libkrb5; - }; + cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { }; cyrus-sasl-xoauth2 = callPackage ../development/libraries/cyrus-sasl-xoauth2 { }; @@ -20606,16 +20470,8 @@ with pkgs; digiham = callPackage ../applications/radio/digiham { }; - dillo = callPackage ../applications/networking/browsers/dillo { - fltk = fltk13; - }; - - dillong = callPackage ../applications/networking/browsers/dillong { }; - directfb = callPackage ../development/libraries/directfb { }; - discord-gamesdk = callPackage ../development/libraries/discord-gamesdk { }; - discord-rpc = callPackage ../development/libraries/discord-rpc { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -20628,8 +20484,6 @@ with pkgs; docopt_cpp = callPackage ../development/libraries/docopt_cpp { }; - docopts = callPackage ../development/tools/misc/docopts { }; - dotconf = callPackage ../development/libraries/dotconf { }; draco = callPackage ../development/libraries/draco { @@ -20696,7 +20550,8 @@ with pkgs; elfio = callPackage ../development/libraries/elfio { }; - emanote = haskell.lib.compose.justStaticExecutables haskellPackages.emanote; + # TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013 + emanote = haskellPackages.emanote; enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; enchant = enchant2; @@ -20705,8 +20560,6 @@ with pkgs; entt = callPackage ../development/libraries/entt { }; - epoll-shim = callPackage ../development/libraries/epoll-shim { }; - libepoxy = callPackage ../development/libraries/libepoxy { inherit (darwin.apple_sdk.frameworks) Carbon OpenGL; }; @@ -20947,7 +20800,7 @@ with pkgs; gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; - geph = recurseIntoAttrs (callPackages ../applications/networking/geph { }); + geph = recurseIntoAttrs (callPackages ../applications/networking/geph { pnpm = pnpm_8; }); gephi = callPackage ../applications/science/misc/gephi { }; @@ -21010,6 +20863,7 @@ with pkgs; }; gdcm = callPackage ../development/libraries/gdcm { + inherit (darwin) DarwinTools; inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa; }; @@ -21029,7 +20883,7 @@ with pkgs; ghcid = haskellPackages.ghcid.bin; - gr-framework = libsForQt5.callPackage ../development/libraries/gr-framework { + gr-framework = callPackage ../by-name/gr/gr-framework/package.nix { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; @@ -21132,6 +20986,7 @@ with pkgs; then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else targetPackages.darwin.LibsystemCross or (throw "don't yet have a `targetPackages.darwin.LibsystemCross for ${stdenv.targetPlatform.config}`") else if name == "fblibc" then targetPackages.freebsdCross.libc or freebsdCross.libc + else if name == "oblibc" then targetPackages.openbsdCross.libc or openbsdCross.libc else if name == "nblibc" then targetPackages.netbsdCross.libc or netbsdCross.libc else if name == "wasilibc" then targetPackages.wasilibc or wasilibc else if name == "relibc" then targetPackages.relibc or relibc @@ -21139,16 +20994,12 @@ with pkgs; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; - threadsCross = threadsCrossFor null; - threadsCrossFor = cc_version: + threadsCross = lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)) { # other possible values: win32 or posix model = "mcf"; # For win32 or posix set this to null - package = - if cc_version == null || lib.versionAtLeast cc_version "13" - then targetPackages.windows.mcfgthreads or windows.mcfgthreads - else targetPackages.windows.mcfgthreads_pre_gcc_13 or windows.mcfgthreads_pre_gcc_13; + package = targetPackages.windows.mcfgthreads or windows.mcfgthreads; }; wasilibc = callPackage ../development/libraries/wasilibc { @@ -21251,7 +21102,7 @@ with pkgs; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg-headless; }); - inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL Security VideoToolbox; + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL Security SystemConfiguration VideoToolbox; }); gusb = callPackage ../development/libraries/gusb { }; @@ -21590,7 +21441,9 @@ with pkgs; ilmbase = callPackage ../development/libraries/ilmbase { }; - imgui = callPackage ../development/libraries/imgui { }; + imgui = callPackage ../development/libraries/imgui { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; imtui = callPackage ../development/libraries/imtui { }; @@ -21834,8 +21687,6 @@ with pkgs; lib3mf = callPackage ../development/libraries/lib3mf { }; - libAfterImage = callPackage ../development/libraries/libAfterImage { }; - libaacs = callPackage ../development/libraries/libaacs { }; libaal = callPackage ../development/libraries/libaal { }; @@ -22326,7 +22177,8 @@ with pkgs; libfabric = callPackage ../development/libraries/libfabric { }; - libfive = qt6Packages.callPackage ../development/libraries/libfive { + libfive = libsForQt5.callPackage ../development/libraries/libfive { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; }; @@ -22581,18 +22433,18 @@ with pkgs; # GNU libc provides libiconv so systems with glibc don't need to # build libiconv separately. Additionally, Apple forked/repackaged - # libiconv so we use that instead of the vanilla version on that OS, + # libiconv, so build and use the upstream one with a compatible ABI, # and BSDs include libiconv in libc. # # We also provide `libiconvReal`, which will always be a standalone libiconv, # just in case you want it regardless of platform. libiconv = - if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" "nblibc" "wasilibc" ] + if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" "nblibc" "wasilibc" "fblibc" ] then libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libcCross else stdenv.cc.libc) else if stdenv.hostPlatform.isDarwin - then darwin.libiconv + then libiconv-darwin else libiconvReal; libcIconv = libc: let @@ -22609,7 +22461,9 @@ with pkgs; if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" ] then lib.getBin stdenv.cc.libc else if stdenv.hostPlatform.isDarwin then - lib.getBin darwin.libiconv + lib.getBin libiconv + else if stdenv.hostPlatform.isFreeBSD then + lib.getBin freebsd.iconv else lib.getBin libiconvReal; @@ -22789,12 +22643,8 @@ with pkgs; libopenglrecorder = callPackage ../development/libraries/libopenglrecorder { }; - libopus = callPackage ../development/libraries/libopus { }; - libopusenc = callPackage ../development/libraries/libopusenc { }; - liboqs = callPackage ../development/libraries/liboqs { }; - libosinfo = callPackage ../development/libraries/libosinfo { }; libosip = callPackage ../development/libraries/osip { }; @@ -23333,7 +23183,10 @@ with pkgs; matio = callPackage ../development/libraries/matio { }; - matterhorn = haskell.lib.compose.justStaticExecutables haskellPackages.matterhorn; + matterhorn = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.matterhorn; maxflow = callPackage ../development/libraries/maxflow { }; @@ -23690,8 +23543,6 @@ with pkgs; ookla-speedtest = callPackage ../tools/networking/ookla-speedtest { }; - open62541 = callPackage ../development/libraries/open62541 { }; - openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; @@ -23707,6 +23558,17 @@ with pkgs; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; + opencascade-occt_7_6 = opencascade-occt.overrideAttrs rec { + pname = "opencascade-occt"; + version = "7.6.2"; + commit = "V${builtins.replaceStrings ["."] ["_"] version}"; + src = fetchurl { + name = "occt-${commit}.tar.gz"; + url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; + hash = "sha256-n3KFrN/mN1SVXfuhEUAQ1fJzrCvhiclxfEIouyj9Z18="; + }; + }; + opencl-headers = callPackage ../development/libraries/opencl-headers { }; opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { }; @@ -23731,6 +23593,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; ffmpeg = ffmpeg_4; + # OpenCV3 won't build with anything newer than CUDA 11 due to API changes. + cudaPackages = cudaPackages_11; }; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { @@ -23770,10 +23634,6 @@ with pkgs; openpa = callPackage ../development/libraries/openpa { }; - openpgp-card-tools = callPackage ../tools/security/openpgp-card-tools { - inherit (darwin.apple_sdk.frameworks) PCSC; - }; - opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; openscenegraph = callPackage ../development/libraries/openscenegraph { @@ -23792,7 +23652,7 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb { }; - openvr = callPackage ../development/libraries/openvr { + openvr = callPackage ../by-name/op/openvr/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation AppKit; }; @@ -23826,10 +23686,6 @@ with pkgs; opensupaplex = callPackage ../games/opensupaplex { }; - openturns = callPackage ../development/libraries/openturns { - inherit (darwin.apple_sdk.frameworks) Accelerate; - }; - open-wbo = callPackage ../applications/science/logic/open-wbo { }; openwsman = callPackage ../development/libraries/openwsman { }; @@ -23970,10 +23826,11 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf_24; + protobuf = protobuf_25; inherit ({ + protobuf_27 = callPackage ../development/libraries/protobuf/27.nix { }; protobuf_26 = callPackage ../development/libraries/protobuf/26.nix { }; protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { }; protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { }; @@ -23987,6 +23844,7 @@ with pkgs; abseil-cpp = abseil-cpp_202103; }; }) + protobuf_27 protobuf_26 protobuf_25 protobuf_24 @@ -24202,6 +24060,17 @@ with pkgs; rocksdb = callPackage ../development/libraries/rocksdb { }; + rocksdb_8_11 = rocksdb.overrideAttrs rec { + pname = "rocksdb"; + version = "8.11.4"; + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ZrU7G3xeimF3H2LRGBDHOq936u5pH/3nGecM4XEoWc8="; + }; + }; + rocksdb_8_3 = rocksdb.overrideAttrs rec { pname = "rocksdb"; version = "8.3.2"; @@ -24293,28 +24162,6 @@ with pkgs; SDL = SDL_classic; - SDL_audiolib = callPackage ../development/libraries/SDL_audiolib { }; - - SDL_sixel = callPackage ../development/libraries/SDL_sixel { }; - - SDL_gfx = callPackage ../development/libraries/SDL_gfx { }; - - SDL_gpu = callPackage ../development/libraries/SDL_gpu { }; - - SDL_image = callPackage ../development/libraries/SDL_image { }; - - SDL_mixer = callPackage ../development/libraries/SDL_mixer { }; - - SDL_net = callPackage ../development/libraries/SDL_net { }; - - SDL_Pango = callPackage ../development/libraries/SDL_Pango { }; - - SDL_sound = callPackage ../development/libraries/SDL_sound { }; - - SDL_stretch= callPackage ../development/libraries/SDL_stretch { }; - - SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; - SDL2 = callPackage ../development/libraries/SDL2 { inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; @@ -24340,22 +24187,10 @@ with pkgs; }; }); - SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; - }; - # SDL2_mixer_2_0 pinned for lzwolf - SDL2_mixer_2_0 = callPackage ../development/libraries/SDL2_mixer/2_0.nix { }; - - SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; - - SDL2_sound = callPackage ../development/libraries/SDL2_sound { - inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio; - }; - - SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; - sdrplay = callPackage ../applications/radio/sdrplay { }; + sdr-j-fm = libsForQt5.callPackage ../applications/radio/sdr-j-fm { }; + sdrpp = callPackage ../applications/radio/sdrpp { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -24674,8 +24509,6 @@ with pkgs; swiftclient = with python3Packages; toPythonApplication python-swiftclient; - sword = callPackage ../development/libraries/sword { }; - biblesync = callPackage ../development/libraries/biblesync { }; szip = callPackage ../development/libraries/szip { }; @@ -24839,8 +24672,6 @@ with pkgs; unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { }); - ustr = callPackage ../development/libraries/ustr { }; - usrsctp = callPackage ../development/libraries/usrsctp { }; usbredir = callPackage ../development/libraries/usbredir { }; @@ -24888,6 +24719,8 @@ with pkgs; vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; }; + vesktop = callPackage ../by-name/ve/vesktop/package.nix { pnpm = pnpm_8; }; + vid-stab = callPackage ../development/libraries/vid-stab { inherit (llvmPackages) openmp; }; @@ -25005,7 +24838,7 @@ with pkgs; whereami = callPackage ../development/libraries/whereami { }; wildmidi = callPackage ../development/libraries/wildmidi { - inherit (darwin.apple_sdk.frameworks) OpenAL; + inherit (darwin.apple_sdk.frameworks) OpenAL CoreAudioKit; }; wiredtiger = callPackage ../development/libraries/wiredtiger { }; @@ -25087,8 +24920,6 @@ with pkgs; xml-security-c = callPackage ../development/libraries/xml-security-c { }; - xml-tooling-c = callPackage ../development/libraries/xml-tooling-c { }; - xlslib = callPackage ../development/libraries/xlslib { }; xsimd = callPackage ../development/libraries/xsimd { }; @@ -25161,24 +24992,26 @@ with pkgs; libzra = callPackage ../development/libraries/libzra { }; # requires a newer Apple SDK - zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9.nix { + zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9 { llvmPackages = llvmPackages_13; }; # requires a newer Apple SDK - zig_0_10 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.10.nix { + zig_0_10 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.10 { llvmPackages = llvmPackages_15; }; # requires a newer Apple SDK - zig_0_11 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.11.nix { + zig_0_11 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.11 { llvmPackages = llvmPackages_16; }; # requires a newer Apple SDK - zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12.nix { + zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12 { llvmPackages = llvmPackages_17; }; - zig = zig_0_12; - - zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { }; + # requires a newer Apple SDK + zig_0_13 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.13 { + llvmPackages = llvmPackages_18; + }; + zig = zig_0_13; zimlib = callPackage ../development/libraries/zimlib { }; @@ -25192,8 +25025,6 @@ with pkgs; zix = callPackage ../development/libraries/audio/zix { }; - zz = callPackage ../development/compilers/zz { }; - zziplib = callPackage ../development/libraries/zziplib { }; glpng = callPackage ../development/libraries/glpng { }; @@ -25325,6 +25156,10 @@ with pkgs; leaps = callPackage ../development/tools/leaps { }; + ### DEVELOPMENT / HARE + + hareHook = callPackage ../by-name/ha/hare/hook.nix { }; + ### DEVELOPMENT / JAVA MODULES javaPackages = recurseIntoAttrs (callPackage ./java-packages.nix { }); @@ -25348,36 +25183,6 @@ with pkgs; texLive = null; }; - ## DEPRECATED, will be removed in a future release - - clwrapperFunction = callPackage ../development/lisp-modules-obsolete/clwrapper; - - wrapLisp_old = lisp: clwrapperFunction { inherit lisp; }; - - lispPackagesFor = clwrapper: callPackage ../development/lisp-modules-obsolete/lisp-packages.nix { - inherit clwrapper; - }; - - lispPackages = quicklispPackages // - (lispPackagesFor (wrapLisp_old sbcl)) // { __attrsFailEvaluation = true; }; - - quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules-obsolete/quicklisp-to-nix.nix { - inherit clwrapper; - } // { __attrsFailEvaluation = true; }; - quicklispPackagesClisp = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old clisp)); - quicklispPackagesSBCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old sbcl)); - quicklispPackagesECL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old ecl)); - quicklispPackagesCCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old ccl)); - quicklispPackagesABCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old abcl)); - quicklispPackagesGCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old gcl)); - quicklispPackages = quicklispPackagesSBCL; - - # Alternative lisp-modules implementation - lispPackages_new = callPackage ../development/lisp-modules-new-obsolete/lisp-packages.nix {} - // { __attrsFailEvaluation = true; }; - - ## End of DEPRECATED - wrapLisp = callPackage ../development/lisp-modules/nix-cl.nix {}; # Armed Bear Common Lisp @@ -25397,7 +25202,7 @@ with pkgs; # Clasp Common Lisp clasp-common-lisp = wrapLisp { pkg = callPackage ../development/compilers/clasp { }; - faslExt = "fasp"; + faslExt = "fasl"; }; # CLISP @@ -25439,17 +25244,17 @@ with pkgs; }; # Steel Bank Common Lisp - sbcl_2_4_3 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.3"; }; + sbcl_2_4_4 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.4"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_4 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.4"; }; + sbcl_2_4_5 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.5"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_4; + sbcl = sbcl_2_4_5; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -25534,8 +25339,6 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; - allmark = callPackage ../servers/allmark { }; - alps = callPackage ../servers/alps { }; anuko-time-tracker = callPackage ../servers/web-apps/anuko-time-tracker { }; @@ -25798,8 +25601,6 @@ with pkgs; inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird; - flashmq = callPackage ../servers/mqtt/flashmq { }; - freeradius = callPackage ../servers/freeradius { }; freshrss = callPackage ../servers/web-apps/freshrss { }; @@ -25978,7 +25779,7 @@ with pkgs; leafnode1 = callPackage ../servers/news/leafnode/1.nix { }; lemmy-server = callPackage ../servers/web-apps/lemmy/server.nix { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { @@ -26025,7 +25826,7 @@ with pkgs; matrix-alertmanager = callPackage ../servers/monitoring/matrix-alertmanager { }; - mattermost = callPackage ../servers/mattermost { buildGoModule = buildGo122Module; }; + mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterbridge = callPackage ../servers/matterbridge { }; @@ -26162,8 +25963,6 @@ with pkgs; olaris-server = callPackage ../servers/olaris { }; - onagre = callPackage ../applications/misc/onagre { }; - onlyoffice-documentserver = callPackage ../servers/onlyoffice-documentserver { }; outline = callPackage ../servers/web-apps/outline (lib.fix (super: { @@ -26355,7 +26154,9 @@ with pkgs; buildGoModule = buildGo122Module; }; - mir = callPackage ../servers/mir { }; + inherit (callPackage ../servers/mir { }) + mir + mir_2_15; miriway = callPackage ../applications/window-managers/miriway { }; @@ -26504,7 +26305,6 @@ with pkgs; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-dcgm-exporter = callPackage ../servers/monitoring/prometheus/dcgm-exporter { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; - prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { }; prometheus-fastly-exporter = callPackage ../servers/monitoring/prometheus/fastly-exporter.nix { }; prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { }; @@ -26596,13 +26396,11 @@ with pkgs; rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; - elixir = elixir_1_14; + erlang = erlang_26; }; radicale2 = callPackage ../servers/radicale/2.x.nix { }; - radicale3 = callPackage ../servers/radicale/3.x.nix { }; - - radicale = radicale3; + radicale3 = radicale; qcal = callPackage ../tools/networking/qcal/default.nix { }; @@ -26810,8 +26608,6 @@ with pkgs; urserver = callPackage ../servers/urserver { }; - uxplay = callPackage ../servers/uxplay { }; - vouch-proxy = callPackage ../servers/vouch-proxy { }; virtiofsd = callPackage ../servers/misc/virtiofsd { }; @@ -26928,8 +26724,6 @@ with pkgs; pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; - tile38 = callPackage ../servers/geospatial/tile38 { }; - ### OS-SPECIFIC airbuddy = callPackage ../os-specific/darwin/airbuddy { }; @@ -27177,9 +26971,7 @@ with pkgs; fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt5.callPackage ../os-specific/linux/ffado { - inherit (linuxPackages) kernel; - }; + ffado = libsForQt5.callPackage ../os-specific/linux/ffado { }; libffado = ffado; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -27310,8 +27102,6 @@ with pkgs; itpp = callPackage ../development/libraries/science/math/itpp { }; - iw = callPackage ../os-specific/linux/iw { }; - iwd = callPackage ../os-specific/linux/iwd { }; jool-cli = callPackage ../os-specific/linux/jool/cli.nix { }; @@ -27472,6 +27262,10 @@ with pkgs; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened; linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened; + linuxPackages_6_8_hardened = linuxKernel.packages.linux_6_8_hardened; + linux_6_8_hardened = linuxKernel.kernels.linux_6_8_hardened; + linuxPackages_6_9_hardened = linuxKernel.packages.linux_6_9_hardened; + linux_6_9_hardened = linuxKernel.kernels.linux_6_9_hardened; # GNU Linux-libre kernels linuxPackages-libre = linuxKernel.packages.linux_libre; @@ -27639,8 +27433,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; }; - nushellFull = nushell.override { additionalFeatures = p: p ++ ["dataframe"]; }; - nu_scripts = callPackage ../shells/nushell/nu_scripts { }; nushellPlugins = recurseIntoAttrs (callPackage ../shells/nushell/plugins { @@ -27705,8 +27497,6 @@ with pkgs; go-protobuf = callPackage ../development/tools/go-protobuf { }; - go-symbols = callPackage ../development/tools/go-symbols { }; - go-toml = callPackage ../development/tools/go-toml { }; go-outline = callPackage ../development/tools/go-outline { }; @@ -27745,8 +27535,6 @@ with pkgs; gotraceui = callPackage ../development/tools/gotraceui { }; - govers = callPackage ../development/tools/govers { }; - goverview = callPackage ../tools/security/goverview { }; go-tools = callPackage ../development/tools/go-tools { @@ -27803,6 +27591,7 @@ with pkgs; odin = callPackage ../development/compilers/odin { inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; @@ -27815,8 +27604,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - ols = callPackage ../development/tools/ols { }; - openpam = callPackage ../development/libraries/openpam { }; openbsm = callPackage ../development/libraries/openbsm { }; @@ -27869,8 +27656,6 @@ with pkgs; perf-tools = callPackage ../os-specific/linux/perf-tools { }; - pgrok = callPackage ../tools/networking/pgrok { }; - picoprobe-udev-rules = callPackage ../os-specific/linux/picoprobe-udev-rules { }; pipes = callPackage ../misc/screensavers/pipes { }; @@ -27986,7 +27771,9 @@ with pkgs; sdparm = callPackage ../os-specific/linux/sdparm { }; - sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { }; + sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; setools = callPackage ../os-specific/linux/setools { }; @@ -28367,10 +28154,6 @@ with pkgs; ananicy = callPackage ../misc/ananicy { }; - ananicy-cpp = callPackage ../misc/ananicy-cpp { }; - - ananicy-rules-cachyos = callPackage ../misc/ananicy-rules-cachyos { }; - andagii = callPackage ../data/fonts/andagii { }; andika = callPackage ../data/fonts/andika { }; @@ -28435,8 +28218,6 @@ with pkgs; brise = callPackage ../data/misc/brise { }; - apl386 = callPackage ../data/fonts/apl386 { }; - bqn386 = callPackage ../data/fonts/bqn386 { }; cacert = callPackage ../data/misc/cacert { }; @@ -28455,8 +28236,6 @@ with pkgs; cascadia-code = callPackage ../data/fonts/cascadia-code { }; - catppuccin-cursors = callPackage ../data/icons/catppuccin-cursors { }; - ccsymbols = callPackage ../data/fonts/ccsymbols { }; charis-sil = callPackage ../data/fonts/charis-sil { }; @@ -28495,8 +28274,6 @@ with pkgs; comixcursors = callPackage ../data/icons/comixcursors { }; - corefonts = callPackage ../data/fonts/corefonts { }; - courier-prime = callPackage ../data/fonts/courier-prime { }; cozette = callPackage ../data/fonts/cozette { }; @@ -28652,8 +28429,6 @@ with pkgs; flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { }; flat-remix-gnome = callPackage ../data/themes/flat-remix-gnome { }; - fluent-gtk-theme = callPackage ../data/themes/fluent-gtk-theme { }; - fluent-icon-theme = callPackage ../data/icons/fluent-icon-theme { }; font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4; @@ -28817,7 +28592,7 @@ with pkgs; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono { }; - kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; + kde-rounded-corners = kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; khmeros = callPackage ../data/fonts/khmeros { }; @@ -29174,7 +28949,7 @@ with pkgs; poly = callPackage ../data/fonts/poly { }; - polychromatic = libsForQt5.callPackage ../applications/misc/polychromatic { }; + polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { }; polytopes_db = callPackage ../data/misc/polytopes_db { }; @@ -29216,6 +28991,10 @@ with pkgs; redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; + ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix { + protobuf = protobuf_21; # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178 + }; + rime-data = callPackage ../data/misc/rime-data { }; roapi-http = callPackage ../servers/roapi/http.nix { }; @@ -29366,6 +29145,8 @@ with pkgs; siji = callPackage ../data/fonts/siji { }; + smc-chilanka = callPackage ../data/fonts/smc-chilanka { }; + sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; source-code-pro = callPackage ../data/fonts/source-code-pro { }; @@ -29494,7 +29275,10 @@ with pkgs; unscii = callPackage ../data/fonts/unscii { }; - utterly-nord-plasma = libsForQt5.callPackage ../data/themes/utterly-nord-plasma { }; + utterly-nord-plasma = kdePackages.callPackage ../data/themes/utterly-nord-plasma { + # renamed in KF6 + plasma-framework = kdePackages.libplasma; + }; utterly-round-plasma-style = callPackage ../data/themes/utterly-round-plasma-style { }; @@ -29723,6 +29507,7 @@ with pkgs; androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { }); android-studio = androidStudioPackages.stable; + android-studio-full = android-studio.full; antfs-cli = callPackage ../applications/misc/antfs-cli { }; @@ -29753,10 +29538,6 @@ with pkgs; appgate-sdp = callPackage ../applications/networking/appgate-sdp { }; - apostrophe = callPackage ../applications/editors/apostrophe { - pythonPackages = python3Packages; - }; - ardour = callPackage ../applications/audio/ardour { }; ardour_7 = callPackage ../applications/audio/ardour/7.nix { }; @@ -29788,8 +29569,6 @@ with pkgs; atlassian-cli = callPackage ../applications/office/atlassian-cli { }; - pulsar = callPackage ../applications/editors/pulsar { }; - asap = callPackage ../tools/audio/asap { }; aseprite = callPackage ../applications/editors/aseprite { }; @@ -30214,6 +29993,8 @@ with pkgs; clight = callPackage ../applications/misc/clight { }; + clight-gui = libsForQt5.callPackage ../applications/misc/clight/clight-gui.nix { }; + clightd = callPackage ../applications/misc/clight/clightd.nix { }; clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { }; @@ -30309,8 +30090,6 @@ with pkgs; cplay-ng = callPackage ../applications/audio/cplay-ng { }; - cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { }; - cqrlog = callPackage ../applications/radio/cqrlog { hamlib = hamlib_4; }; @@ -30709,12 +30488,6 @@ with pkgs; expenses = callPackage ../applications/misc/expenses { }; - flowtime = callPackage ../applications/misc/flowtime { }; - - furnace = callPackage ../applications/audio/furnace { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - furtherance = callPackage ../applications/misc/furtherance { }; gigalixir = callPackage ../tools/misc/gigalixir { }; @@ -30817,8 +30590,6 @@ with pkgs; fig2dev = callPackage ../applications/graphics/fig2dev { }; - FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; - finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -30873,7 +30644,10 @@ with pkgs; fondo = callPackage ../applications/graphics/fondo { }; - font-manager = callPackage ../applications/misc/font-manager { }; + font-manager = callPackage ../by-name/fo/font-manager/package.nix { + libsoup = libsoup_3; + webkitgtk = webkitgtk_4_1; + }; fontfinder = callPackage ../applications/misc/fontfinder { }; @@ -31279,8 +31053,6 @@ with pkgs; fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - fragments = callPackage ../applications/networking/p2p/fragments { }; - freedv = callPackage ../applications/radio/freedv { inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia; codec2 = codec2.override { @@ -31295,9 +31067,9 @@ with pkgs; freenet = callPackage ../applications/networking/p2p/freenet { gradle = gradle_7; - jdk = jdk_headless; + jdk = jdk17_headless; # Reduce closure size - jre = pkgs.jre_minimal.override { + jre = pkgs.jre17_minimal.override { modules = [ "java.base" "java.logging" @@ -31306,14 +31078,12 @@ with pkgs; "java.desktop" "java.management" ]; - jdk = jdk_headless; + jdk = jdk17_headless; }; }; freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; - freeplane = callPackage ../applications/misc/freeplane { }; - freepv = callPackage ../applications/graphics/freepv { }; xfontsel = callPackage ../applications/misc/xfontsel { }; @@ -31323,10 +31093,20 @@ with pkgs; pulseaudio-module-xrdp = callPackage ../applications/networking/remote/xrdp/pulseaudio-module-xrdp { }; - freerdp = callPackage ../applications/networking/remote/freerdp { - inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; - inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; - }; + inherit + ({ + freerdp = callPackage ../applications/networking/remote/freerdp { + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; + }; + freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; + }; + }) + freerdp + freerdp3 + ; freerdpUnstable = freerdp; @@ -31334,8 +31114,6 @@ with pkgs; python3Packages = python39Packages; }; - fte = callPackage ../applications/editors/fte { }; - g933-utils = callPackage ../tools/misc/g933-utils { }; gavrasm = callPackage ../development/compilers/gavrasm { }; @@ -31396,9 +31174,16 @@ with pkgs; vmopts = config.jetbrains.vmopts or null; jdk = jetbrains.jdk; }) // { - jdk-no-jcef = callPackage ../development/compilers/jetbrains-jdk { withJcef = false; }; - jdk = callPackage ../development/compilers/jetbrains-jdk { }; - jcef = callPackage ../development/compilers/jetbrains-jdk/jcef.nix { }; + jdk-no-jcef = callPackage ../development/compilers/jetbrains-jdk { + jdk = jdk21; + withJcef = false; + }; + jdk = callPackage ../development/compilers/jetbrains-jdk { + jdk = jdk21; + }; + jcef = callPackage ../development/compilers/jetbrains-jdk/jcef.nix { + jdk = jdk21; + }; }); jmusicbot = callPackage ../applications/audio/jmusicbot { }; @@ -31441,6 +31226,15 @@ with pkgs; manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; + metacubexd = callPackage ../by-name/me/metacubexd/package.nix { + pnpm = callPackage ../development/tools/pnpm/generic.nix { + version = "9.1.4"; + hash = "sha256-MKGAGsTnI3ee/tE6IfTDn562yfu0ztEBvOBrQiWT18k="; + }; + }; + + minari = python3Packages.toPythonApplication python3Packages.minari; + mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; mi2ly = callPackage ../applications/audio/mi2ly { }; @@ -31550,8 +31344,6 @@ with pkgs; googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; - google-chrome = callPackage ../applications/networking/browsers/google-chrome { }; - go-graft = callPackage ../applications/networking/go-graft { }; gostatic = callPackage ../applications/misc/gostatic { }; @@ -31567,8 +31359,6 @@ with pkgs; gpsd = callPackage ../servers/gpsd { }; - gpsprune = callPackage ../applications/misc/gpsprune { }; - gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { }; gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { }; @@ -31595,8 +31385,6 @@ with pkgs; gtklock-userinfo-module = callPackage ../tools/wayland/gtklock/userinfo-module.nix { }; - guardian-agent = callPackage ../tools/networking/guardian-agent { }; - gv = callPackage ../applications/misc/gv { }; guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; @@ -31655,8 +31443,6 @@ with pkgs; hexdino = callPackage ../applications/editors/hexdino { }; - hexedit = callPackage ../applications/editors/hexedit { }; - hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { }; hydrogen-web = callPackage ../applications/networking/instant-messengers/hydrogen-web/wrapper.nix { @@ -31670,7 +31456,10 @@ with pkgs; hledger-iadd = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-iadd; hledger-interest = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-interest; hledger-ui = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-ui; - hledger-web = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-web; + hledger-web = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.hledger-web; hledger-utils = with python3.pkgs; toPythonApplication hledger-utils; hmm = callPackage ../applications/misc/hmm { }; @@ -31813,8 +31602,6 @@ with pkgs; protonup-qt = python3Packages.callPackage ../applications/misc/protonup-qt { }; - pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; - pokeget-rs = callPackage ../tools/misc/pokeget-rs { }; popura = callPackage ../tools/networking/popura { }; @@ -31867,8 +31654,6 @@ with pkgs; srain = callPackage ../applications/networking/irc/srain { }; - streamdeck-ui = callPackage ../applications/misc/streamdeck-ui { }; - super-productivity = callPackage ../applications/office/super-productivity { }; inherit (callPackages ../development/libraries/wlroots {}) @@ -31892,14 +31677,10 @@ with pkgs; waycorner = callPackage ../applications/misc/waycorner { }; - waylock = callPackage ../applications/misc/waylock { }; - wayshot = callPackage ../tools/misc/wayshot { }; waylevel = callPackage ../tools/misc/waylevel { }; - wbg = callPackage ../applications/misc/wbg { }; - i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; @@ -32090,8 +31871,6 @@ with pkgs; img2pdf = with python3Packages; toPythonApplication img2pdf; - imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { }; - imgcat = callPackage ../applications/graphics/imgcat { }; img-cat = callPackage ../applications/graphics/img-cat { }; @@ -32162,8 +31941,10 @@ with pkgs; }; jabref = callPackage ../applications/office/jabref { - jdk = jdk21.override { enableJavaFX = true; }; - gradle = gradle_8; + jdk = jdk.override { + enableJavaFX = true; + openjfx = openjfx22.override { withWebKit = true; }; + }; }; jack_capture = callPackage ../applications/audio/jack-capture { }; @@ -32209,8 +31990,6 @@ with pkgs; johnny = callPackage ../applications/misc/johnny { }; - josm = callPackage ../applications/misc/josm { }; - js8call = qt5.callPackage ../applications/radio/js8call { }; jwm = callPackage ../applications/window-managers/jwm { }; @@ -32219,8 +31998,13 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo121Module; - }) k3s_1_26 k3s_1_27 k3s_1_28 k3s_1_29; - k3s = k3s_1_29; + go = go_1_21; + }) k3s_1_28 k3s_1_29; + inherit (callPackage ../applications/networking/cluster/k3s { + buildGoModule = buildGo122Module; + go = go_1_22; + }) k3s_1_30; + k3s = k3s_1_30; k3sup = callPackage ../applications/networking/cluster/k3sup { }; @@ -32287,6 +32071,8 @@ with pkgs; kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; + kiwitalk = callPackage ../by-name/ki/kiwitalk/package.nix { pnpm = pnpm_8; }; + kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { }; @@ -32445,8 +32231,6 @@ with pkgs; fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; - fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; - linkerd = callPackage ../applications/networking/cluster/linkerd { }; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; linkerd_stable = linkerd; @@ -32571,56 +32355,49 @@ with pkgs; libreoffice-unwrapped = libreoffice.unwrapped; - libreoffice-args = { - inherit (perlPackages) ArchiveZip IOCompress; - zip = zip.override { enableNLS = false; }; - fontsConf = makeFontsConf { - fontDirectories = [ - carlito dejavu_fonts - freefont_ttf xorg.fontmiscmisc - liberation_ttf_v1 - liberation_ttf_v2 - ]; - }; - clucene_core = clucene_core_2; - lcms = lcms2; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - boost = boost179; - }; - libreoffice-qt-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - unwrapped = libsForQt5.callPackage ../applications/office/libreoffice - (libreoffice-args // { - kdeIntegration = true; - variant = "fresh"; - }); + unwrapped = libsForQt5.callPackage ../applications/office/libreoffice { + kdeIntegration = true; + variant = "fresh"; + }; }); libreoffice-qt-fresh-unwrapped = libreoffice-qt-fresh.unwrapped; libreoffice-qt-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - unwrapped = libsForQt5.callPackage ../applications/office/libreoffice - (libreoffice-args // { - kdeIntegration = true; - variant = "still"; - }); + unwrapped = libsForQt5.callPackage ../applications/office/libreoffice { + kdeIntegration = true; + variant = "still"; + }; }); libreoffice-qt-still-unwrapped = libreoffice-qt-still.unwrapped; + libreoffice-qt6-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { + unwrapped = kdePackages.callPackage ../applications/office/libreoffice { + kdeIntegration = true; + variant = "fresh"; + }; + }); + libreoffice-qt6-fresh-unwrapped = libreoffice-qt6-fresh.unwrapped; + + libreoffice-qt6-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { + unwrapped = kdePackages.callPackage ../applications/office/libreoffice { + kdeIntegration = true; + variant = "still"; + }; + }); + libreoffice-qt6-still-unwrapped = libreoffice-qt-still.unwrapped; + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - unwrapped = callPackage ../applications/office/libreoffice - (libreoffice-args // { - variant = "fresh"; - }); + unwrapped = callPackage ../applications/office/libreoffice { + variant = "fresh"; + }; }); libreoffice-fresh-unwrapped = libreoffice-fresh.unwrapped; libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - unwrapped = callPackage ../applications/office/libreoffice - (libreoffice-args // { - variant = "still"; - }); + unwrapped = callPackage ../applications/office/libreoffice { + variant = "still"; + }; }); libreoffice-still-unwrapped = libreoffice-still.unwrapped; @@ -32777,8 +32554,6 @@ with pkgs; makeself = callPackage ../applications/misc/makeself { }; - mako = callPackage ../applications/misc/mako { }; - mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { }; mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; @@ -33032,8 +32807,6 @@ with pkgs; motif = callPackage ../development/libraries/motif { }; - mousai = callPackage ../applications/audio/mousai { }; - mozjpeg = callPackage ../applications/graphics/mozjpeg { }; edgetx = libsForQt5.callPackage ../applications/misc/edgetx { }; @@ -33060,8 +32833,6 @@ with pkgs; withConplay = false; }; - mpg321 = callPackage ../applications/audio/mpg321 { }; - mpc-cli = callPackage ../applications/audio/mpc { inherit (python3Packages) sphinx; }; @@ -33153,15 +32924,14 @@ with pkgs; inherit lua; }; - shaka-packager = callPackage ../applications/video/shaka-packager { }; + # Wrap avoiding rebuild + mpv = mpv-unwrapped.wrapper { mpv = mpv-unwrapped; }; - # Wraps without triggering a rebuild - wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { }; - mpv = wrapMpv mpv-unwrapped { }; + mpvScripts = mpv-unwrapped.scripts; - mpvpaper = callPackage ../tools/wayland/mpvpaper { }; + shaka-packager = callPackage ../applications/video/shaka-packager { }; - mpvScripts = callPackage ../applications/video/mpv/scripts { }; + mpvpaper = callPackage ../tools/wayland/mpvpaper { }; open-in-mpv = callPackage ../applications/video/open-in-mpv { }; @@ -33269,8 +33039,6 @@ with pkgs; nwg-menu = callPackage ../applications/misc/nwg-menu { }; - nwg-panel = callPackage ../applications/misc/nwg-panel { }; - nwg-wrapper = callPackage ../applications/misc/nwg-wrapper { }; ocm = callPackage ../applications/networking/cluster/ocm { }; @@ -33399,8 +33167,6 @@ with pkgs; protobuf = protobuf_21; }; - smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt5.callPackage ../applications/video/smtube { }; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { }; @@ -33549,7 +33315,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; }; - nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; + nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { }; notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; @@ -33596,9 +33362,7 @@ with pkgs; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { }; - obsidian = callPackage ../applications/misc/obsidian { - electron = electron_28; - }; + obsidian = callPackage ../applications/misc/obsidian { }; octoprint = callPackage ../applications/misc/octoprint { }; @@ -33639,8 +33403,6 @@ with pkgs; openexr = openexr_3; }; - openjump = callPackage ../applications/misc/openjump { }; - open-music-kontrollers = lib.recurseIntoAttrs { eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { }; jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { }; @@ -33675,10 +33437,6 @@ with pkgs; oranda = callPackage ../applications/misc/oranda { }; - orca = python3Packages.callPackage ../applications/misc/orca { - inherit pkg-config; - }; - orca-c = callPackage ../applications/audio/orca-c { }; organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { }; @@ -33963,8 +33721,6 @@ with pkgs; premid = callPackage ../applications/misc/premid { }; - process-cpp = callPackage ../development/libraries/process-cpp { }; - processing = callPackage ../applications/graphics/processing { jdk = jdk17; }; @@ -34084,8 +33840,6 @@ with pkgs; qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { }; - qrcode = callPackage ../tools/graphics/qrcode { }; - qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; qscreenshot = libsForQt5.callPackage ../applications/graphics/qscreenshot { }; @@ -34289,7 +34043,15 @@ with pkgs; rke = callPackage ../applications/networking/cluster/rke { }; - rke2 = callPackage ../applications/networking/cluster/rke2 { }; + inherit (callPackage ../applications/networking/cluster/rke2 { + buildGoModule = buildGo121Module; + go = go_1_21; + }) rke2_stable; + inherit (callPackage ../applications/networking/cluster/rke2 { + buildGoModule = buildGo122Module; + go = go_1_22; + }) rke2_latest rke2_testing; + rke2 = rke2_stable; rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { }; @@ -34448,8 +34210,6 @@ with pkgs; skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; - SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; - slingshot = callPackage ../tools/misc/slingshot { }; slop = callPackage ../tools/misc/slop { }; @@ -34596,8 +34356,6 @@ with pkgs; peru = callPackage ../applications/version-management/peru { }; - petrinizer = haskellPackages.callPackage ../applications/science/logic/petrinizer { }; - pmidi = callPackage ../applications/audio/pmidi { }; printrun = callPackage ../applications/misc/printrun { }; @@ -34677,13 +34435,7 @@ with pkgs; psst = callPackage ../applications/audio/psst { }; - squeezelite = darwin.apple_sdk_11_0.callPackage ../applications/audio/squeezelite { - inherit (darwin.apple_sdk_11_0.frameworks) CoreVideo VideoDecodeAcceleration CoreAudio AudioToolbox AudioUnit Carbon; - }; - - squeezelite-pulse = darwin.apple_sdk_11_0.callPackage ../applications/audio/squeezelite { - inherit (darwin.apple_sdk_11_0.frameworks) CoreVideo VideoDecodeAcceleration CoreAudio AudioToolbox AudioUnit Carbon; - + squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix { audioBackend = "pulse"; }; @@ -34734,8 +34486,6 @@ with pkgs; pythonBindings = true; }; - sublime-music = callPackage ../applications/audio/sublime-music { }; - subtitlr = callPackage ../applications/audio/subtitlr { }; subunit = callPackage ../development/libraries/subunit { }; @@ -34786,8 +34536,6 @@ with pkgs; stc-cli = callPackage ../applications/networking/stc-cli { }; - syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; - syncthingtray = kdePackages.callPackage ../applications/misc/syncthingtray { # renamed in KF5 -> KF6 plasma-framework = kdePackages.libplasma; @@ -34915,9 +34663,9 @@ with pkgs; termimage = callPackage ../tools/graphics/termimage { }; - terminal-notifier = callPackage ../applications/misc/terminal-notifier { }; + terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects ; - textpieces = callPackage ../tools/text/textpieces { }; + terminal-notifier = callPackage ../applications/misc/terminal-notifier { }; textplots = callPackage ../tools/graphics/textplots { }; @@ -35017,7 +34765,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - tipp10 = qt5.callPackage ../applications/misc/tipp10 { }; + tipp10 = qt6.callPackage ../applications/misc/tipp10 { }; tkrev = callPackage ../applications/version-management/tkrev { }; @@ -35135,8 +34883,6 @@ with pkgs; tremc = callPackage ../applications/networking/p2p/tremc { }; - tribler = callPackage ../applications/networking/p2p/tribler { }; - trillian-im = callPackage ../applications/networking/instant-messengers/trillian-im { }; trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; @@ -35230,8 +34976,6 @@ with pkgs; unigine-superposition = libsForQt5.callPackage ../applications/graphics/unigine-superposition { }; - unipicker = callPackage ../applications/misc/unipicker { }; - unpaper = callPackage ../tools/graphics/unpaper { }; unison-ucm = callPackage ../development/compilers/unison { }; @@ -35317,8 +35061,6 @@ with pkgs; qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { }; - qtile = callPackage ../development/python-modules/qtile/wrapper.nix { }; - vimgolf = callPackage ../games/vimgolf { }; vimpc = callPackage ../applications/audio/vimpc { }; @@ -35328,7 +35070,7 @@ with pkgs; # so expect breakage. use wrapNeovim instead if you want a stable alternative wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); - neovim-unwrapped = callPackage ../applications/editors/neovim { + neovim-unwrapped = callPackage ../by-name/ne/neovim-unwrapped/package.nix { CoreServices = darwin.apple_sdk.frameworks.CoreServices; lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1; }; @@ -35347,8 +35089,6 @@ with pkgs; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; - neovide = callPackage ../applications/editors/neovim/neovide { }; - neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; viw = callPackage ../applications/editors/viw { }; @@ -35368,7 +35108,7 @@ with pkgs; }; virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { - qtermwidget = lxqt.qtermwidget; + qtermwidget = lxqt.qtermwidget_1_4; }; virtscreen = callPackage ../tools/admin/virtscreen { }; @@ -35378,7 +35118,9 @@ with pkgs; virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; - jdk = openjdk17; + + # VirtualBox uses wsimport, which was removed after JDK 8. + jdk = jdk8; }; virtualboxKvm = lowPrio (virtualbox.override { @@ -35585,9 +35327,9 @@ with pkgs; webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; - webcord = callPackage ../applications/networking/instant-messengers/webcord { }; + webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_30; }; - webcord-vencord = callPackage ../applications/networking/instant-messengers/webcord/webcord-vencord { }; + webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_29; }; webex = callPackage ../applications/networking/instant-messengers/webex { }; @@ -35884,7 +35626,7 @@ with pkgs; xlife = callPackage ../applications/graphics/xlife { }; - xmobar = haskellPackages.xmobar; + xmobar = haskellPackages.xmobar.bin; xmonad-log = callPackage ../tools/misc/xmonad-log { }; @@ -36017,7 +35759,9 @@ with pkgs; youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light; - youtube-music = callPackage ../applications/audio/youtube-music { }; + youtube-music = callPackage ../applications/audio/youtube-music { + pnpm = pnpm_9; + }; youtube-tui = callPackage ../applications/video/youtube-tui { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; @@ -36095,7 +35839,7 @@ with pkgs; zotero = callPackage ../applications/office/zotero { }; - zotero_7 = callPackage ../applications/office/zotero/zotero_7.nix { }; + zotero_7 = pkgs.zotero-beta; zscroll = callPackage ../applications/misc/zscroll { }; @@ -36353,8 +36097,6 @@ with pkgs; lightwalletd = callPackage ../applications/blockchains/lightwalletd { }; - openethereum = callPackage ../applications/blockchains/openethereum { }; - polkadot = callPackage ../applications/blockchains/polkadot { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -36373,9 +36115,14 @@ with pkgs; beancount-black = with python3.pkgs; toPythonApplication beancount-black; + beanhub-cli = with python3.pkgs; toPythonApplication beanhub-cli; + bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; - bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench; + bench = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.bench; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; @@ -36432,11 +36179,11 @@ with pkgs; ballerburg = callPackage ../games/ballerburg { } ; - blockattack = callPackage ../games/blockattack { } ; - colobot = callPackage ../games/colobot { }; - corsix-th = callPackage ../games/corsix-th { }; + corsix-th = callPackage ../games/corsix-th { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreVideo; + }; enigma = callPackage ../games/enigma { }; @@ -36610,8 +36357,6 @@ with pkgs; abuse = callPackage ../games/abuse { }; - adom = callPackage ../games/adom { }; - airshipper = callPackage ../games/airshipper { }; airstrike = callPackage ../games/airstrike { }; @@ -36684,10 +36429,9 @@ with pkgs; bsdgames = callPackage ../games/bsdgames { }; - btanks = callPackage ../games/btanks { }; - bugdom = callPackage ../games/bugdom { - inherit (darwin.apple_sdk.frameworks) IOKit Foundation; + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL; }; bzflag = callPackage ../games/bzflag { @@ -37192,8 +36936,6 @@ with pkgs; oilrush = callPackage ../games/oilrush { }; - onscripter-en = callPackage ../games/onscripter-en { }; - openarena = callPackage ../games/openarena { }; opendungeons = callPackage ../games/opendungeons { }; @@ -37522,8 +37264,8 @@ with pkgs; tcl2048 = callPackage ../games/tcl2048 { }; - the-powder-toy = callPackage ../games/the-powder-toy { - lua = lua5_1; + the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix { + lua = lua5_2; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -37633,8 +37375,6 @@ with pkgs; vitetris = callPackage ../games/vitetris { }; - vms-empire = callPackage ../games/vms-empire { }; - voxelands = callPackage ../games/voxelands { }; vvvvvv = callPackage ../by-name/vv/vvvvvv/package.nix { @@ -37810,6 +37550,7 @@ with pkgs; gnome43Extensions gnome44Extensions gnome45Extensions + gnome46Extensions ; gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { }; @@ -37854,8 +37595,6 @@ with pkgs; pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { }); - pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { }; - wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { }; rox-filer = callPackage ../desktops/rox/rox-filer { @@ -37912,6 +37651,8 @@ with pkgs; marvin = callPackage ../applications/science/chemistry/marvin { }; + molbar = with python3Packages; toPythonApplication molbar; + molden = callPackage ../applications/science/chemistry/molden { }; mopac = callPackage ../applications/science/chemistry/mopac { }; @@ -38106,7 +37847,7 @@ with pkgs; minia = callPackage ../applications/science/biology/minia { }; - mirtk = callPackage ../development/libraries/science/biology/mirtk { }; + mirtk = callPackage ../development/libraries/science/biology/mirtk { itk = itk_5_2; }; muscle = callPackage ../applications/science/biology/muscle { }; @@ -38204,8 +37945,6 @@ with pkgs; seaview = callPackage ../applications/science/biology/seaview { }; - SPAdes = callPackage ../applications/science/biology/spades { }; - svaba = callPackage ../applications/science/biology/svaba { }; tandem-aligner = callPackage ../applications/science/biology/tandem-aligner { }; @@ -38397,6 +38136,8 @@ with pkgs; version = "11"; }; + mathmod = libsForQt5.callPackage ../applications/science/math/mathmod { }; + metis = callPackage ../development/libraries/science/math/metis { }; nauty = callPackage ../applications/science/math/nauty { }; @@ -38404,6 +38145,7 @@ with pkgs; osi = callPackage ../development/libraries/science/math/osi { }; or-tools = callPackage ../development/libraries/science/math/or-tools { + inherit (darwin) DarwinTools; stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; protobuf = protobuf_21; @@ -39331,11 +39073,7 @@ with pkgs; epson-workforce-635-nx625-series = callPackage ../misc/drivers/epson-workforce-635-nx625-series { }; - foomatic-db = callPackage ../misc/cups/drivers/foomatic-db { }; - foomatic-db-engine = callPackage ../misc/cups/drivers/foomatic-db-engine { }; - foomatic-db-nonfree = callPackage ../misc/cups/drivers/foomatic-db-nonfree { }; - foomatic-db-ppds = callPackage ../misc/cups/drivers/foomatic-db-ppds { }; - foomatic-db-ppds-withNonfreeDb = callPackage ../misc/cups/drivers/foomatic-db-ppds { withNonfreeDb = true; }; + foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { withNonfreeDb = true; }; gutenprint = callPackage ../misc/drivers/gutenprint { }; @@ -39712,6 +39450,16 @@ with pkgs; nixStatic = pkgsStatic.nix; + lixVersions = recurseIntoAttrs (callPackage ../tools/package-management/lix { + storeDir = config.nix.storeDir or "/nix/store"; + stateDir = config.nix.stateDir or "/nix/var"; + inherit (darwin.apple_sdk.frameworks) Security; + }); + + lix = lixVersions.stable; + + lixStatic = pkgsStatic.lix; + inherit (callPackages ../applications/networking/cluster/nixops { }) nixops_unstable_minimal @@ -39824,9 +39572,14 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; - nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_21; - }; + nix-eval-jobs = if stdenv.isDarwin then + callPackage ../tools/package-management/nix-eval-jobs/2.19.nix { + nix = nixVersions.nix_2_19; + } + else + callPackage ../tools/package-management/nix-eval-jobs { + nix = nixVersions.nix_2_22; + }; nix-doc = callPackage ../tools/package-management/nix-doc { }; @@ -39970,7 +39723,6 @@ with pkgs; }; mysql = mysql; pcre = pcre-cpp; - jre = openjdk19; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); r128gain = callPackage ../applications/audio/r128gain { }; @@ -40083,7 +39835,7 @@ with pkgs; rfc-bibtex = callPackage ../tools/typesetting/rfc-bibtex { }; pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { - inherit glib gtk3 gobject-introspection wrapGAppsHook; + inherit glib gtk3 gobject-introspection wrapGAppsHook3; }; rpl = callPackage ../tools/text/rpl { }; @@ -40094,8 +39846,6 @@ with pkgs; roadrunner = callPackage ../servers/roadrunner { }; - rmfakecloud = callPackage ../servers/rmfakecloud { }; - rmfuse = callPackage ../tools/filesystems/rmfuse { }; rmount = callPackage ../tools/filesystems/rmount { }; @@ -40355,8 +40105,6 @@ with pkgs; ssh-tools = callPackage ../applications/misc/ssh-tools { }; - auto-cpufreq = callPackage ../tools/system/auto-cpufreq { }; - thermald = callPackage ../tools/system/thermald { }; therion = callPackage ../applications/misc/therion { }; @@ -40383,8 +40131,6 @@ with pkgs; twitch-cli = callPackage ../development/tools/twitch-cli { }; - twiggy = callPackage ../development/tools/twiggy { }; - uacme = callPackage ../tools/admin/uacme { }; ufiformat = callPackage ../tools/system/ufiformat { }; @@ -40430,7 +40176,7 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - veilid = callPackage ../tools/networking/veilid { + veilid = darwin.apple_sdk_11_0.callPackage ../tools/networking/veilid { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; @@ -40524,6 +40270,15 @@ with pkgs; winePackagesFor = wineBuild: lib.makeExtensible (self: with self; { callPackage = newScope self; + stdenv = + if pkgs.stdenv.isDarwin then + # Match upstream, which builds with the latest SDK and a 10.7 deployment target. + overrideSDK pkgs.stdenv { + darwinMinVersion = "10.7"; + darwinSdkVersion = "11.0"; + } + else + pkgs.stdenv; inherit wineBuild; @@ -40553,8 +40308,6 @@ with pkgs; with-shell = callPackage ../applications/misc/with-shell { }; - wizer = darwin.apple_sdk_11_0.callPackage ../development/tools/wizer { }; - wmutils-core = callPackage ../tools/X11/wmutils-core { }; wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { }; @@ -40801,7 +40554,7 @@ with pkgs; nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; - nitrokey-app2 = callPackage ../tools/security/nitrokey-app2 { }; + nitrokey-app2 = qt6Packages.callPackage ../tools/security/nitrokey-app2 { }; fpm2 = callPackage ../tools/security/fpm2 { }; @@ -40903,17 +40656,18 @@ with pkgs; name = "bsd-setup-hook"; } ../os-specific/bsd/setup-hook.sh; - freebsd = callPackage ../os-specific/bsd/freebsd { }; - freebsdCross = callPackage ../os-specific/bsd/freebsd { - stdenv = crossLibcStdenv; - }; + inherit (callPackage ../os-specific/bsd/freebsd { }) + freebsd freebsdCross; netbsd = callPackage ../os-specific/bsd/netbsd { }; netbsdCross = callPackage ../os-specific/bsd/netbsd { stdenv = crossLibcStdenv; }; - yrd = callPackage ../tools/networking/yrd { }; + openbsd = callPackage ../os-specific/bsd/openbsd { }; + openbsdCross = callPackage ../os-specific/bsd/openbsd { + stdenv = crossLibcStdenv; + }; powershell = callPackage ../shells/powershell { }; @@ -41061,8 +40815,6 @@ with pkgs; gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; - navidrome = callPackage ../servers/misc/navidrome { }; - zalgo = callPackage ../tools/misc/zalgo { }; inherit (callPackage ../applications/misc/zettlr { }) zettlr; @@ -41073,8 +40825,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - treefmt = callPackage ../development/tools/treefmt { }; - nufmt = callPackage ../development/tools/nufmt { }; bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { }; @@ -41195,8 +40945,6 @@ with pkgs; dict-cc-py = callPackage ../applications/misc/dict-cc-py { }; - sirikali = libsForQt5.callPackage ../tools/security/sirikali { }; - wpm = callPackage ../applications/misc/wpm { }; weggli = callPackage ../tools/security/weggli { }; @@ -41212,4 +40960,8 @@ with pkgs; insulator2 = callPackage ../applications/misc/insulator2 {}; animdl = python3Packages.callPackage ../applications/video/animdl { }; + + dillo = callPackage ../by-name/di/dillo/package.nix { + fltk = fltk13; + }; } |