diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1996 |
1 files changed, 633 insertions, 1363 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77b6a3e34d3a6..ead8073181cbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -217,7 +217,11 @@ with pkgs; } (writeScript "ensure-newer-sources-hook.sh" '' postUnpackHooks+=(_ensureNewerSources) _ensureNewerSources() { - '${findutils}/bin/find' "$sourceRoot" \ + local r=$sourceRoot + # Avoid passing option-looking directory to find. The example is diffoscope-269: + # https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/378 + [[ $r == -* ]] && r="./$r" + '${findutils}/bin/find' "$r" \ '!' -newermt '${year}-01-01' -exec touch -h -d '${year}-01-02' '{}' '+' } ''); @@ -226,10 +230,6 @@ with pkgs; # many more scenarios than just opengl now. addDriverRunpath = callPackage ../build-support/add-driver-runpath { }; - # addOpenGLRunpath should be added to aliases.nix after the 24.05 branch-off. - # Post 24.11 branch-off, this should throw an error in aliases.nix. - addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; - quickgui = callPackage ../applications/virtualization/quickgui { }; adcli = callPackage ../os-specific/linux/adcli { }; @@ -266,6 +266,8 @@ with pkgs; altserver-linux = callPackage ../tools/misc/altserver-linux { }; + archipelago-minecraft = callPackage ../by-name/ar/archipelago/package.nix { extraPackages = [jdk17]; }; + asciicam = callPackage ../applications/video/asciicam { }; asitop = pkgs.python3Packages.callPackage ../os-specific/darwin/asitop { }; @@ -332,8 +334,6 @@ with pkgs; bakelite = callPackage ../tools/backup/bakelite { }; - bazecor = callPackage ../applications/misc/bazecor { }; - bearer = callPackage ../development/tools/bearer { }; benthos = callPackage ../development/tools/benthos { }; @@ -405,6 +405,10 @@ with pkgs; c64-debugger = callPackage ../applications/emulators/c64-debugger { }; + cameractrls-gtk4 = cameractrls.override { withGtk = 4; }; + + cameractrls-gtk3 = cameractrls.override { withGtk = 3; }; + camunda-modeler = callPackage ../applications/misc/camunda-modeler { }; checkpointBuildTools = callPackage ../build-support/checkpoint-build.nix {}; @@ -639,8 +643,6 @@ with pkgs; firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; - flaca = callPackage ../applications/graphics/flaca { }; - frece = callPackage ../development/tools/frece { }; frida-tools = callPackage ../tools/security/frida-tools { }; @@ -697,17 +699,10 @@ with pkgs; inherit (darwin) DarwinTools; }; - probe-run = callPackage ../development/tools/rust/probe-run { - inherit (darwin.apple_sdk.frameworks) AppKit IOKit; - inherit (darwin) DarwinTools; - }; - mix2nix = callPackage ../development/tools/mix2nix { }; n98-magerun = callPackage ../development/tools/misc/n98-magerun { }; - n98-magerun2 = callPackage ../development/tools/misc/n98-magerun2 { }; - prisma-engines = callPackage ../development/tools/database/prisma-engines { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -792,8 +787,6 @@ with pkgs; octosuite = callPackage ../tools/security/octosuite { }; - octosql = callPackage ../tools/misc/octosql { }; - onesixtyone = callPackage ../tools/security/onesixtyone { }; oletools = with python3.pkgs; toPythonApplication oletools; @@ -847,17 +840,13 @@ with pkgs; tarsum = callPackage ../build-support/docker/tarsum.nix { }; - snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04; - nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { }; docker-ls = callPackage ../tools/misc/docker-ls { }; docker-slim = callPackage ../applications/virtualization/docker-slim { }; - doc2go = callPackage ../development/tools/doc2go { - buildGoModule = buildGo122Module; - }; + doc2go = callPackage ../development/tools/doc2go { }; docker-sync = callPackage ../tools/misc/docker-sync { }; @@ -873,8 +862,6 @@ with pkgs; # Dotnet - csharp-ls = callPackage ../development/tools/language-servers/csharp-ls { }; - dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); dotnet-sdk_6 = dotnetCorePackages.sdk_6_0; @@ -896,7 +883,7 @@ with pkgs; buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { }; mkNugetSource = callPackage ../build-support/dotnet/make-nuget-source { }; - mkNugetDeps = callPackage ../build-support/dotnet/make-nuget-deps { }; + mkNugetDeps = (newScope dotnetCorePackages) ../build-support/dotnet/make-nuget-deps { }; buildDotnetGlobalTool = callPackage ../build-support/dotnet/build-dotnet-global-tool { }; @@ -920,11 +907,11 @@ with pkgs; dippi = callPackage ../tools/graphics/dippi { }; - dispad = callPackage ../tools/X11/dispad { }; - diswall = callPackage ../applications/networking/diswall { }; - dupeguru = callPackage ../applications/misc/dupeguru { }; + dupeguru = callPackage ../applications/misc/dupeguru { + python3Packages = python311Packages; + }; dump1090 = callPackage ../applications/radio/dump1090 { }; @@ -986,6 +973,8 @@ with pkgs; inherit (callPackages ../build-support/node/fetch-yarn-deps { }) fixup-yarn-lock prefetch-yarn-deps + yarnConfigHook + yarnBuildHook fetchYarnDeps; find-cursor = callPackage ../tools/X11/find-cursor { }; @@ -1004,8 +993,6 @@ with pkgs; graph-easy = callPackage ../tools/graphics/graph-easy { }; - mangal = callPackage ../applications/misc/mangal { }; - mermaid-filter = callPackage ../tools/misc/mermaid-filter { }; graphw00f = callPackage ../tools/security/graphw00f { }; @@ -1020,8 +1007,6 @@ with pkgs; packcc = callPackage ../development/tools/packcc { }; - packer = callPackage ../development/tools/packer { }; - packr = callPackage ../development/libraries/packr { }; pacup = callPackage ../tools/package-management/pacup { }; @@ -1050,21 +1035,24 @@ with pkgs; mod = callPackage ../development/tools/mod { }; - mongosh = callPackage ../development/tools/mongosh { }; - mya = callPackage ../applications/misc/mya { }; - mysql-shell = callPackage ../development/tools/mysql-shell { - inherit (darwin) cctools DarwinTools; - inherit (darwin.apple_sdk.frameworks) CoreServices; - antlr = antlr4_10; - boost = boost177; # Configure checks for specific version. - icu = icu73; - protobuf = protobuf_24; - }; + mysql-shell = mysql-shell_8; + + inherit ({ + mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix { + inherit (darwin) DarwinTools; + inherit (darwin.apple_sdk.frameworks) CoreServices; + antlr = antlr4_10; + icu = icu73; + protobuf = protobuf_24; + }; + }) + mysql-shell_8 + ; mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { - inherit (darwin) cctools DarwinTools; + inherit (darwin) DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; antlr = antlr4_10; icu = icu73; @@ -1229,8 +1217,6 @@ with pkgs; libredirect = callPackage ../build-support/libredirect { }; - livecaptions = callPackage ../applications/misc/livecaptions { }; - madonctl = callPackage ../applications/misc/madonctl { }; copyDesktopItems = makeSetupHook { @@ -1290,7 +1276,10 @@ with pkgs; mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; }; + nixBufferBuilders = import ../applications/editors/emacs/build-support/buffer.nix { + inherit lib writeText; + inherit (emacs.pkgs) inherit-local; + }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -1340,6 +1329,8 @@ with pkgs; replaceDependency = callPackage ../build-support/replace-dependency.nix { }; + replaceVars = callPackage ../build-support/replace-vars { }; + nukeReferences = callPackage ../build-support/nuke-references { inherit (darwin) signingUtils; }; @@ -1363,7 +1354,7 @@ with pkgs; fixDarwinDylibNames = makeSetupHook { name = "fix-darwin-dylib-names-hook"; - substitutions = { inherit (binutils) targetPrefix; }; + substitutions = { inherit (darwin.binutils) targetPrefix; }; meta.platforms = lib.platforms.darwin; } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; @@ -1393,6 +1384,10 @@ with pkgs; makeHardcodeGsettingsPatch = callPackage ../build-support/make-hardcode-gsettings-patch { }; + mitm-cache = callPackage ../build-support/mitm-cache { + inherit (darwin.apple_sdk.frameworks) Security; + }; + # intended to be used like nix-build -E 'with import <nixpkgs> { }; enableDebugging fooPackage' enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; @@ -1477,8 +1472,6 @@ with pkgs; abcm2ps = callPackage ../tools/audio/abcm2ps { }; - abcmidi = callPackage ../tools/audio/abcmidi { }; - abduco = callPackage ../tools/misc/abduco { }; acct = callPackage ../tools/system/acct { }; @@ -1532,6 +1525,7 @@ with pkgs; admin-fe = callPackage ../servers/akkoma/admin-fe { nodejs = nodejs_18; yarn = yarn.override { nodejs = nodejs_18; }; + python3 = python311; }; }; akkoma-emoji = recurseIntoAttrs { @@ -1548,8 +1542,6 @@ with pkgs; wxGTK = wxGTK32; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { }; - aerospike = callPackage ../servers/nosql/aerospike { }; aespipe = callPackage ../tools/security/aespipe { }; @@ -1596,12 +1588,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - agate = callPackage ../servers/gemini/agate { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - agda-pkg = callPackage ../development/tools/agda-pkg { }; - agi = callPackage ../tools/graphics/agi { }; agola = callPackage ../development/tools/continuous-integration/agola { }; @@ -1646,7 +1632,8 @@ with pkgs; inherit (plasma5Packages) kdialog; }; - akku = callPackage ../tools/package-management/akku { }; + inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { })) + akku akkuPackages; albert = qt6Packages.callPackage ../applications/misc/albert { }; @@ -1788,16 +1775,10 @@ with pkgs; gfshare = callPackage ../tools/security/gfshare { }; - gh-actions-cache = callPackage ../tools/misc/gh-actions-cache { }; - gh-cal = callPackage ../tools/misc/gh-cal { inherit (darwin.apple_sdk.frameworks) Security; }; - gh-dash = callPackage ../tools/misc/gh-dash { }; - - gh-markdown-preview = callPackage ../tools/misc/gh-markdown-preview { }; - ghostie = callPackage ../tools/misc/ghostie { }; glooctl = callPackage ../applications/networking/cluster/glooctl { }; @@ -1846,8 +1827,6 @@ with pkgs; hsd = callPackage ../tools/misc/hsd { }; - httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { }; - hyperpotamus = callPackage ../tools/misc/hyperpotamus { }; immich-cli = callPackage ../tools/misc/immich-cli { }; @@ -1940,10 +1919,6 @@ with pkgs; npm-check-updates = callPackage ../tools/package-management/npm-check-updates { }; - 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 { }; openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; @@ -2078,8 +2053,6 @@ with pkgs; vitess = callPackage ../development/tools/database/vitess { }; - voms = callPackage ../tools/networking/voms { }; - vopono = callPackage ../tools/networking/vopono { }; vprof = with python3Packages; toPythonApplication vprof; @@ -2094,8 +2067,6 @@ with pkgs; wine = wineWowPackages.stable; }; - wtwitch = callPackage ../tools/video/wtwitch { }; - wwcd = callPackage ../tools/misc/wwcd { }; writedisk = callPackage ../tools/misc/writedisk { }; @@ -2188,11 +2159,11 @@ with pkgs; commitlint = nodePackages."@commitlint/cli"; - conform = callPackage ../applications/version-management/conform { - buildGoModule = buildGo122Module; - }; + conform = callPackage ../applications/version-management/conform { }; - datalad = callPackage ../applications/version-management/datalad { }; + datalad = with python3Packages; toPythonApplication datalad; + + datalad-gooey = with python3Packages; toPythonApplication datalad-gooey; darcs-to-git = callPackage ../applications/version-management/darcs-to-git { }; @@ -2202,6 +2173,8 @@ with pkgs; diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { }; + forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; + gex = callPackage ../applications/version-management/gex { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -2265,10 +2238,6 @@ with pkgs; git-backdate = callPackage ../applications/version-management/git-backdate { }; - git-backup = callPackage ../applications/version-management/git-backup { - inherit (darwin.apple_sdk.frameworks) Security; - }; - git-big-picture = callPackage ../applications/version-management/git-big-picture { }; git-bars = callPackage ../applications/version-management/git-bars { }; @@ -2295,8 +2264,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - git-codeowners = callPackage ../applications/version-management/git-codeowners { }; - git-codereview = callPackage ../applications/version-management/git-codereview { }; git-cola = callPackage ../applications/version-management/git-cola { }; @@ -2349,8 +2316,6 @@ with pkgs; git-mit = callPackage ../applications/version-management/git-mit { }; - git-my = callPackage ../applications/version-management/git-my { }; - git-machete = python3Packages.callPackage ../applications/version-management/git-machete { }; git-nomad = callPackage ../applications/version-management/git-nomad { }; @@ -2559,8 +2524,6 @@ with pkgs; unfreeEnableDiscord = true; }; - attract-mode = callPackage ../applications/emulators/attract-mode { }; - basiliskii = callPackage ../applications/emulators/basiliskii { }; box64 = callPackage ../applications/emulators/box64 { @@ -2570,6 +2533,24 @@ with pkgs; pkgsCross.gnu64.hello; }; + box86 = + let + args = { + hello-x86_32 = if stdenv.hostPlatform.isx86_32 then + hello + else + pkgsCross.gnu32.hello; + }; + in + if stdenv.hostPlatform.is32bit then + callPackage ../applications/emulators/box86 args + else if stdenv.hostPlatform.isx86_64 then + pkgsCross.gnu32.callPackage ../applications/emulators/box86 args + else if stdenv.hostPlatform.isAarch64 then + pkgsCross.armv7l-hf-multiplatform.callPackage ../applications/emulators/box86 args + else + throw "Don't know 32-bit platform for cross from: ${stdenv.hostPlatform.stdenv}"; + caprice32 = callPackage ../applications/emulators/caprice32 { }; ccemux = callPackage ../applications/emulators/ccemux { }; @@ -2695,7 +2676,6 @@ with pkgs; ppsspp-sdl = let argset = { ffmpeg = ffmpeg_4; - glew = glew.override { enableEGL = argset.forceWayland; }; enableQt = false; enableVulkan = true; forceWayland = false; @@ -2706,7 +2686,6 @@ with pkgs; 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; @@ -2717,7 +2696,6 @@ with pkgs; 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; @@ -2763,8 +2741,6 @@ with pkgs; tiny8086 = callPackage ../applications/emulators/tiny8086 { }; - tinyemu = callPackage ../applications/emulators/tinyemu { }; - uae = callPackage ../applications/emulators/uae { }; vbam = callPackage ../applications/emulators/vbam { }; @@ -2775,8 +2751,6 @@ with pkgs; xcpc = callPackage ../applications/emulators/xcpc { }; - yapesdl = callPackage ../applications/emulators/yapesdl { }; - zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { }; @@ -2847,7 +2821,7 @@ with pkgs; x16-run = x16.run; yabause = libsForQt5.callPackage ../applications/emulators/yabause { - freeglut = null; + libglut = null; openal = null; }; @@ -2891,8 +2865,6 @@ 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 { }; @@ -2994,8 +2966,6 @@ with pkgs; sakura = callPackage ../applications/terminal-emulators/sakura { }; - scriv = callPackage ../applications/version-management/scriv { }; - st = callPackage ../applications/terminal-emulators/st { conf = config.st.conf or null; patches = config.st.patches or []; @@ -3188,8 +3158,6 @@ with pkgs; arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { }; - arduino-cli = callPackage ../development/embedded/arduino/arduino-cli { }; - arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { }; arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { }; @@ -3260,7 +3228,7 @@ with pkgs; authenticator = callPackage ../applications/misc/authenticator { }; - authelia = callPackage ../servers/authelia { }; + authelia = callPackage ../servers/authelia { pnpm = pnpm_9; }; authentik-outposts = recurseIntoAttrs (callPackages ../by-name/au/authentik/outposts.nix { }); @@ -3278,7 +3246,10 @@ with pkgs; awscli = callPackage ../tools/admin/awscli { }; - awscli2 = callPackage ../tools/admin/awscli2 { }; + awscli2 = callPackage ../by-name/aw/awscli2/package.nix { + # change when https://github.com/aws/aws-cli/issues/8342 resolved + python3 = python311; + }; okta-aws-cli = callPackage ../tools/admin/okta-aws-cli { }; @@ -3294,8 +3265,6 @@ with pkgs; aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; - aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; - aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { }; aws-nuke = callPackage ../tools/admin/aws-nuke { }; @@ -3304,20 +3273,14 @@ with pkgs; aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; - aws-sso-cli = callPackage ../tools/admin/aws-sso-cli { }; - aws-sso-creds = callPackage ../tools/admin/aws-sso-creds { }; - aws-vault = callPackage ../tools/admin/aws-vault { }; - iamy = callPackage ../tools/admin/iamy { }; iam-policy-json-to-terraform = callPackage ../tools/misc/iam-policy-json-to-terraform { }; azeret-mono = callPackage ../data/fonts/azeret-mono { }; - azure-cli = callPackage ../tools/admin/azure-cli { }; - azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; azure-functions-core-tools = callPackage ../development/tools/azure-functions-core-tools { }; @@ -3332,8 +3295,6 @@ with pkgs; berglas = callPackage ../tools/admin/berglas { }; - betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { }; - betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { }; binocle = callPackage ../applications/misc/binocle { @@ -3363,6 +3324,8 @@ with pkgs; } else if stdenv.hostPlatform.isLinux then callPackage ../stdenv/linux/make-bootstrap-tools.nix {} + else if stdenv.hostPlatform.isFreeBSD then + callPackage ../stdenv/freebsd/make-bootstrap-tools.nix {} else throw "freshBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}"; boxes = callPackage ../tools/text/boxes { }; @@ -3462,8 +3425,6 @@ with pkgs; bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { }; - inherit (nodePackages) concurrently; - bklk = callPackage ../applications/misc/bklk { }; bkt = callPackage ../tools/misc/bkt { }; @@ -3538,8 +3499,6 @@ with pkgs; fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; - ccextractor = callPackage ../applications/video/ccextractor { }; - cconv = callPackage ../tools/text/cconv { }; go-check = callPackage ../development/tools/check { }; @@ -3616,11 +3575,6 @@ with pkgs; dell-command-configure = callPackage ../tools/system/dell-command-configure { }; - deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop { - electron = electron_30; - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - deskew = callPackage ../applications/graphics/deskew { }; detect-secrets = with python3Packages; toPythonApplication detect-secrets; @@ -3653,10 +3607,6 @@ with pkgs; doona = callPackage ../tools/security/doona { }; - dotter = callPackage ../tools/misc/dotter { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - droidcam = callPackage ../applications/video/droidcam { }; droidmote = callPackage ../tools/inputmethods/droidmote { }; @@ -3816,16 +3766,12 @@ with pkgs; glyr = callPackage ../tools/audio/glyr { }; - google-amber = callPackage ../tools/graphics/amber { - inherit (darwin) cctools; - }; + google-amber = callPackage ../tools/graphics/amber { }; hakrawler = callPackage ../tools/security/hakrawler { }; harsh = callPackage ../applications/misc/harsh { }; - harvid = callPackage ../tools/video/harvid { }; - headset = callPackage ../applications/audio/headset { }; hilbish = callPackage ../shells/hilbish { }; @@ -3854,8 +3800,6 @@ with pkgs; imagelol = callPackage ../tools/compression/imagelol { }; - imageworsener = callPackage ../tools/graphics/imageworsener { }; - imgpatchtools = callPackage ../development/mobile/imgpatchtools { }; imgcrypt = callPackage ../applications/virtualization/imgcrypt { }; @@ -3925,8 +3869,6 @@ with pkgs; xjadeo = callPackage ../tools/video/xjadeo { }; - asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; - go-audit = callPackage ../tools/system/go-audit { }; gopass = callPackage ../tools/security/gopass { }; @@ -4010,8 +3952,6 @@ with pkgs; xc = callPackage ../development/tools/xc { }; - ios-webkit-debug-proxy = callPackage ../development/mobile/ios-webkit-debug-proxy { }; - xcodeenv = callPackage ../development/mobile/xcodeenv { }; xcodes = swiftPackages.callPackage ../development/tools/xcodes { @@ -4059,7 +3999,7 @@ with pkgs; androidndkPkgs = androidndkPkgs_26; androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21"; - androidndkPkgs_23b = (callPackage ../development/androidndk-pkgs {})."23b"; + androidndkPkgs_23 = (callPackage ../development/androidndk-pkgs {})."23"; androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs {})."24"; androidndkPkgs_25 = (callPackage ../development/androidndk-pkgs {})."25"; androidndkPkgs_26 = (callPackage ../development/androidndk-pkgs {})."26"; @@ -4139,8 +4079,6 @@ with pkgs; libssl = openssl; }; - b3sum = callPackage ../tools/security/b3sum { }; - backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; bandwhich = callPackage ../tools/networking/bandwhich { @@ -4262,9 +4200,7 @@ with pkgs; libtensorflow = python3.pkgs.tensorflow.libtensorflow; - libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { - inherit (config) cudaSupport; - }; + libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { }; tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { }; @@ -4392,8 +4328,6 @@ with pkgs; burpsuite = callPackage ../tools/networking/burpsuite { }; - bs-platform = callPackage ../development/compilers/bs-platform { }; - ciano = callPackage ../applications/graphics/ciano { inherit (pantheon) granite; python = python3; @@ -4480,16 +4414,12 @@ with pkgs; gflags = null; # only required for examples/tests }; - cbor-diag = callPackage ../development/tools/cbor-diag { }; - cassowary = callPackage ../tools/networking/cassowary { }; croc = callPackage ../tools/networking/croc { }; cbftp = callPackage ../tools/networking/cbftp { }; - cddl = callPackage ../development/tools/cddl { }; - cedille = callPackage ../applications/science/logic/cedille { inherit (haskellPackages) alex happy Agda ghcWithPackages; }; @@ -4508,8 +4438,6 @@ with pkgs; cht-sh = callPackage ../tools/misc/cht.sh { }; - cinny = callPackage ../applications/networking/instant-messengers/cinny { }; - cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop { }; ckbcomp = callPackage ../tools/X11/ckbcomp { }; @@ -4522,10 +4450,6 @@ with pkgs; clevercsv = with python3Packages; toPythonApplication clevercsv; - clevis = callPackage ../tools/security/clevis { - asciidoc = asciidoc-full; - }; - cli53 = callPackage ../tools/admin/cli53 { }; cli-visualizer = callPackage ../applications/misc/cli-visualizer { }; @@ -4580,7 +4504,7 @@ with pkgs; comma = callPackage ../tools/package-management/comma { }; - commitizen = callPackage ../applications/version-management/commitizen { }; + commitizen = with python3Packages; toPythonApplication commitizen; common-licenses = callPackage ../data/misc/common-licenses { }; @@ -4612,8 +4536,6 @@ with pkgs; corosync = callPackage ../servers/corosync { }; - cowsay = callPackage ../tools/misc/cowsay { }; - fw-ectool = callPackage ../os-specific/linux/fw-ectool { }; chayang = callPackage ../tools/wayland/chayang { }; @@ -4682,9 +4604,7 @@ with pkgs; wl-mirror = callPackage ../tools/wayland/wl-mirror { }; - wl-screenrec = callPackage ../tools/wayland/wl-screenrec { - ffmpeg = ffmpeg_5; - }; + wl-screenrec = callPackage ../tools/wayland/wl-screenrec { }; wleave = callPackage ../tools/wayland/wleave { }; @@ -4722,8 +4642,6 @@ with pkgs; clockify = callPackage ../applications/office/clockify { }; - contrast = callPackage ../applications/accessibility/contrast { }; - cplex = callPackage ../applications/science/math/cplex (config.cplex or {}); cpulimit = callPackage ../tools/misc/cpulimit { }; @@ -4878,10 +4796,6 @@ with pkgs; dieharder = callPackage ../tools/security/dieharder { }; - diesel-cli = callPackage ../development/tools/diesel-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; - digitemp = callPackage ../tools/misc/digitemp { }; dijo = callPackage ../tools/misc/dijo { @@ -4895,8 +4809,6 @@ with pkgs; dirb = callPackage ../tools/networking/dirb { }; - direnv = callPackage ../tools/misc/direnv { }; - dirstalk = callPackage ../tools/security/dirstalk { }; h = callPackage ../tools/misc/h { }; @@ -5122,6 +5034,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; + f3d_egl = f3d.override { vtk_9 = vtk_9_egl; }; + facedetect = callPackage ../tools/graphics/facedetect { }; faketty = callPackage ../tools/misc/faketty { }; @@ -5166,8 +5080,6 @@ with pkgs; fioctl = callPackage ../tools/admin/fioctl { }; - firecracker = callPackage ../applications/virtualization/firecracker { }; - firectl = callPackage ../applications/virtualization/firectl { }; firestarter = callPackage ../applications/misc/firestarter { }; @@ -5355,8 +5267,6 @@ with pkgs; girsh = callPackage ../tools/networking/girsh { }; - gist = callPackage ../tools/text/gist { }; - gitjacker = callPackage ../tools/security/gitjacker { }; gixy = callPackage ../tools/admin/gixy { }; @@ -5463,7 +5373,6 @@ with pkgs; hocr-tools = with python3Packages; toPythonApplication hocr-tools; homepage-dashboard = callPackage ../servers/homepage-dashboard { - inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -5530,8 +5439,6 @@ with pkgs; iotools = callPackage ../tools/misc/iotools { }; - irpf = callPackage ../applications/finance/irpf { }; - jellycli = callPackage ../applications/audio/jellycli { }; jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { }; @@ -5743,6 +5650,8 @@ with pkgs; mat2 = with python3.pkgs; toPythonApplication mat2; + materialx = with python3Packages; toPythonApplication materialx; + maxcso = callPackage ../tools/archivers/maxcso { }; measureme = callPackage ../development/tools/rust/measureme { }; @@ -5864,8 +5773,6 @@ with pkgs; mrkd = callPackage ../tools/text/mrkd { }; - naproche = callPackage ../applications/science/logic/naproche { }; - nautilus-open-any-terminal = callPackage ../tools/misc/nautilus-open-any-terminal { }; n2n = callPackage ../tools/networking/n2n { }; @@ -5922,8 +5829,6 @@ with pkgs; nsz = with python3.pkgs; toPythonApplication nsz; - nwipe = callPackage ../tools/security/nwipe { }; - nx2elf = callPackage ../tools/compression/nx2elf { }; nx-libs = callPackage ../tools/X11/nx-libs { }; @@ -6117,8 +6022,6 @@ with pkgs; sgp4 = callPackage ../development/libraries/sgp4 { }; - shab = callPackage ../tools/text/shab { }; - sheldon = callPackage ../tools/misc/sheldon { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -6167,6 +6070,10 @@ with pkgs; statserial = callPackage ../tools/misc/statserial { }; + steampipePackages = recurseIntoAttrs ( + callPackage ../tools/misc/steampipe-packages { } + ); + step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; }; @@ -6205,8 +6112,6 @@ with pkgs; razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; - replay-sorcery = callPackage ../tools/video/replay-sorcery { }; - recyclarr = callPackage ../tools/video/recyclarr { }; tsduck = callPackage ../tools/video/tsduck { }; @@ -6382,8 +6287,6 @@ with pkgs; usePoppler = true; }; - beanstalkd = callPackage ../servers/beanstalkd { }; - beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { }); inherit (beetsPackages) beets beets-unstable; @@ -6460,10 +6363,6 @@ with pkgs; boltbrowser = callPackage ../tools/misc/boltbrowser { }; - bsc = callPackage ../tools/compression/bsc { - inherit (llvmPackages) openmp; - }; - bzip2 = callPackage ../tools/compression/bzip2 { }; bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { }; @@ -6578,9 +6477,7 @@ with pkgs; cicero-tui = callPackage ../tools/misc/cicero-tui { }; - cilium-cli = callPackage ../applications/networking/cluster/cilium { - buildGoModule = buildGo122Module; - }; + cilium-cli = callPackage ../applications/networking/cluster/cilium { }; cjdns = callPackage ../tools/networking/cjdns { }; cjdns-tools = callPackage ../tools/admin/cjdns-tools { }; @@ -6836,8 +6733,6 @@ with pkgs; age = callPackage ../tools/security/age { }; - agebox = callPackage ../tools/security/agebox { }; - age-plugin-ledger = callPackage ../tools/security/age-plugin-ledger { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -6947,7 +6842,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - cobang = python3Packages.callPackage ../applications/misc/cobang { + cobang = python311Packages.callPackage ../applications/misc/cobang { gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; @@ -7005,8 +6900,6 @@ with pkgs; cpufetch = callPackage ../tools/misc/cpufetch { }; - crackmapexec = callPackage ../tools/security/crackmapexec { }; - crackxls = callPackage ../tools/security/crackxls { }; crd2pulumi = callPackage ../development/tools/crd2pulumi { }; @@ -7447,8 +7340,6 @@ with pkgs; edit = callPackage ../applications/editors/edit { }; - edk2 = callPackage ../development/compilers/edk2 { }; - edk2-uefi-shell = callPackage ../tools/misc/edk2-uefi-shell { }; edl = callPackage ../development/embedded/edl { }; @@ -7543,8 +7434,7 @@ with pkgs; timeline = callPackage ../applications/office/timeline { }; - tsm-client = callPackage ../tools/backup/tsm-client { }; - tsm-client-withGui = callPackage ../tools/backup/tsm-client { enableGui = true; }; + tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; }; tracker = callPackage ../development/libraries/tracker { }; @@ -7569,12 +7459,6 @@ with pkgs; volctl = callPackage ../tools/audio/volctl { }; - volk = if (stdenv.isDarwin && stdenv.isAarch64) then - (callPackage ../development/libraries/volk/2.5.0.nix { }) - else - (callPackage ../development/libraries/volk { }) - ; - vorta = qt6Packages.callPackage ../applications/backup/vorta { }; vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; @@ -7591,8 +7475,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - inherit (nodePackages) wrangler; - wrangler_1 = callPackage ../development/tools/wrangler_1 { inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; }; @@ -7652,7 +7534,7 @@ with pkgs; easeprobe = callPackage ../tools/misc/easeprobe { }; emscripten = callPackage ../development/compilers/emscripten { - llvmPackages = llvmPackages_17; + llvmPackages = llvmPackages_19; }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); @@ -7778,12 +7660,8 @@ with pkgs; expliot = callPackage ../tools/security/expliot { }; - f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; - Fabric = with python3Packages; toPythonApplication fabric; - fail2ban = callPackage ../tools/security/fail2ban { }; - fakeroot = callPackage ../tools/system/fakeroot { }; fakeroute = callPackage ../tools/networking/fakeroute { }; @@ -7873,8 +7751,6 @@ with pkgs; icu = icu63; }; - fluent-bit = darwin.apple_sdk_11_0.callPackage ../tools/misc/fluent-bit { }; - fluent-reader = callPackage ../applications/networking/feedreaders/fluent-reader { }; flux = callPackage ../development/compilers/flux { }; @@ -7903,8 +7779,9 @@ with pkgs; fingerprintx = callPackage ../tools/security/fingerprintx { }; - bsd-finger = callPackage ../tools/networking/bsd-finger { }; - bsd-fingerd = bsd-finger.override({ buildClient = false; }); + bsd-fingerd = bsd-finger.override({ + buildProduct = "daemon"; + }); iprange = callPackage ../applications/networking/firehol/iprange.nix { }; @@ -7943,7 +7820,7 @@ with pkgs; lpd8editor = libsForQt5.callPackage ../applications/audio/lpd8editor {}; lp_solve = callPackage ../applications/science/math/lp_solve { - inherit (darwin) cctools autoSignDarwinBinariesHook; + inherit (darwin) autoSignDarwinBinariesHook; }; fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { }; @@ -7982,8 +7859,6 @@ with pkgs; flintlock = callPackage ../applications/virtualization/flintlock { }; - flip-link = callPackage ../development/tools/flip-link { }; - flips = callPackage ../tools/compression/flips { }; flowblade = callPackage ../applications/video/flowblade { }; @@ -8011,9 +7886,7 @@ with pkgs; fortune = callPackage ../tools/misc/fortune { }; - fox = callPackage ../development/libraries/fox { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + fox = callPackage ../development/libraries/fox {}; fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -8063,7 +7936,7 @@ with pkgs; wxGTK = wxGTK32; }; - frescobaldi = python3Packages.callPackage ../misc/frescobaldi { }; + frescobaldi = callPackage ../misc/frescobaldi { }; freshfetch = callPackage ../tools/misc/freshfetch { inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation DiskArbitration Foundation IOKit; @@ -8204,8 +8077,6 @@ with pkgs; geonkick = callPackage ../applications/audio/geonkick { }; - gerrit = callPackage ../applications/version-management/gerrit { }; - geteltorito = callPackage ../tools/misc/geteltorito { }; getopt = callPackage ../tools/misc/getopt { }; @@ -8238,18 +8109,12 @@ with pkgs; gibo = callPackage ../tools/misc/gibo { }; - gifsicle = callPackage ../tools/graphics/gifsicle { }; - gifski = callPackage ../tools/graphics/gifski { - ffmpeg = ffmpeg_5; + ffmpeg = ffmpeg_6; }; github-backup = callPackage ../tools/misc/github-backup { }; - github-runner = callPackage ../development/tools/continuous-integration/github-runner { - inherit (darwin) autoSignDarwinBinariesHook; - }; - gitkraken = callPackage ../applications/version-management/gitkraken { }; gitlab = callPackage ../applications/version-management/gitlab { }; @@ -8263,8 +8128,6 @@ with pkgs; gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { }; - gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; - gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; gitlab-triage = callPackage ../applications/version-management/gitlab-triage { }; @@ -8397,8 +8260,6 @@ with pkgs; gocryptfs = callPackage ../tools/filesystems/gocryptfs { }; - godot_4 = callPackage ../development/tools/godot/4 { }; - godot3 = callPackage ../development/tools/godot/3 { }; godot3-export-templates = callPackage ../development/tools/godot/3/export-templates.nix { }; @@ -8427,9 +8288,6 @@ with pkgs; go-sct = callPackage ../tools/X11/go-sct { }; - # rename to upower-notify? - go-upower-notify = callPackage ../tools/misc/upower-notify { }; - goattracker = callPackage ../applications/audio/goattracker { }; goattracker-stereo = callPackage ../applications/audio/goattracker { @@ -8511,8 +8369,6 @@ with pkgs; gpp = callPackage ../development/tools/gpp { }; - gnuastro = callPackage ../applications/science/astronomy/gnuastro { }; - gpredict = callPackage ../applications/science/astronomy/gpredict { hamlib = hamlib_4; }; @@ -8525,8 +8381,6 @@ with pkgs; gql = callPackage ../applications/version-management/gql { }; - grafterm = callPackage ../tools/misc/grafterm { }; - gradience = callPackage ../applications/misc/gradience { }; grafx2 = callPackage ../applications/graphics/grafx2 { }; @@ -8537,6 +8391,8 @@ with pkgs; graylog-5_2 = callPackage ../tools/misc/graylog/5.2.nix { }; + graylog-6_0 = callPackage ../tools/misc/graylog/6.0.nix { }; + graylogPlugins = recurseIntoAttrs ( callPackage ../tools/misc/graylog/plugins.nix { } ); @@ -8630,8 +8486,6 @@ with pkgs; efitools = callPackage ../tools/security/efitools { }; - sbctl = callPackage ../tools/security/sbctl { }; - sbsigntool = callPackage ../tools/security/sbsigntool { }; sonic-server = callPackage ../servers/search/sonic-server { }; @@ -8743,13 +8597,6 @@ with pkgs; hans = callPackage ../tools/networking/hans { }; - h2 = callPackage ../servers/h2 { }; - - h5utils = callPackage ../tools/misc/h5utils { - libmatheval = null; - hdf4 = null; - }; - haproxy = callPackage ../tools/networking/haproxy { }; hackertyper = callPackage ../tools/misc/hackertyper { }; @@ -8973,6 +8820,8 @@ with pkgs; hyphen = callPackage ../development/libraries/hyphen { }; + hyphenDicts = recurseIntoAttrs (callPackages ../development/libraries/hyphen/dictionaries.nix {}); + i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; i2pd = callPackage ../tools/networking/i2pd { }; @@ -9048,8 +8897,6 @@ with pkgs; packages = config.ihaskell.packages or (_: []); }; - ijq = callPackage ../development/tools/ijq { }; - iruby = callPackage ../applications/editors/jupyter-kernels/iruby { }; ike-scan = callPackage ../tools/security/ike-scan { }; @@ -9213,8 +9060,8 @@ with pkgs; jadx = callPackage ../tools/security/jadx { }; - jamesdsp = libsForQt5.callPackage ../applications/audio/jamesdsp { }; - jamesdsp-pulse = libsForQt5.callPackage ../applications/audio/jamesdsp { + jamesdsp = qt6Packages.callPackage ../applications/audio/jamesdsp { }; + jamesdsp-pulse = qt6Packages.callPackage ../applications/audio/jamesdsp { usePipewire = false; usePulseaudio = true; }; @@ -9227,8 +9074,6 @@ with pkgs; jc = with python3Packages; toPythonApplication jc; - jcli = callPackage ../development/tools/misc/jcli { }; - jd-cli = callPackage ../tools/security/jd-cli { }; jd-diff-patch = callPackage ../development/tools/jd-diff-patch { }; @@ -9334,8 +9179,6 @@ with pkgs; jrnl = callPackage ../applications/misc/jrnl { }; - jsawk = callPackage ../tools/text/jsawk { }; - jsbeautifier = with python3Packages; toPythonApplication jsbeautifier; jscoverage = callPackage ../development/tools/misc/jscoverage { }; @@ -9470,8 +9313,6 @@ with pkgs; jdk = jdk11; }; - kluctl = callPackage ../applications/networking/cluster/kluctl { }; - kibi = callPackage ../applications/editors/kibi { }; kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { }; @@ -9555,7 +9396,9 @@ with pkgs; last-resort = callPackage ../data/fonts/last-resort { }; ligo = - let ocaml_p = ocaml-ng.ocamlPackages_4_14; in + let ocaml_p = ocaml-ng.ocamlPackages_4_14.overrideScope (self: super: { + zarith = super.zarith.override { version = "1.13"; }; + }); in callPackage ../development/compilers/ligo { coq = coq_8_13.override { customOCamlPackages = ocaml_p; @@ -9682,8 +9525,6 @@ with pkgs; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; - ma1sd = callPackage ../servers/ma1sd { }; - mailcatcher = callPackage ../development/web/mailcatcher { }; makebootfat = callPackage ../tools/misc/makebootfat { }; @@ -9738,15 +9579,11 @@ with pkgs; mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; - mcfly = callPackage ../tools/misc/mcfly { }; - m2r = with python3Packages; toPythonApplication m2r; md2gemini = with python3.pkgs; toPythonApplication md2gemini; - mdbook = callPackage ../tools/text/mdbook { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + md2pdf = with python3Packages; toPythonApplication md2pdf; mdbook-emojicodes = callPackage ../tools/text/mdbook-emojicodes { }; @@ -9756,8 +9593,6 @@ with pkgs; mdbook-cmdrun = callPackage ../tools/text/mdbook-cmdrun { }; - mdbook-d2 = callPackage ../tools/text/mdbook-d2 { }; - mdbook-pagetoc = callPackage ../tools/text/mdbook-pagetoc { }; mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz { @@ -9967,9 +9802,9 @@ with pkgs; importNpmLock = callPackages ../build-support/node/import-npm-lock { }; - nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs // { __attrsFailEvaluation = true; }; + nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs; - nodePackages = dontRecurseIntoAttrs nodejs.pkgs // { __attrsFailEvaluation = true; }; + nodePackages = dontRecurseIntoAttrs nodejs.pkgs; node2nix = nodePackages.node2nix; @@ -10033,6 +9868,8 @@ with pkgs; l3afpad = callPackage ../applications/editors/l3afpad { }; + leanblueprint = with python3Packages; toPythonApplication leanblueprint; + leanify = callPackage ../tools/misc/leanify { }; leatherman = callPackage ../development/libraries/leatherman { }; @@ -10218,10 +10055,6 @@ with pkgs; libzmf = callPackage ../development/libraries/libzmf { }; - libreddit = callPackage ../servers/libreddit { - inherit (darwin.apple_sdk.frameworks) Security; - }; - librespeed-cli = callPackage ../tools/misc/librespeed-cli { }; libreswan = callPackage ../tools/networking/libreswan { }; @@ -10368,7 +10201,7 @@ with pkgs; bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { }; mailpit = callPackage ../servers/mail/mailpit { - libtool = if stdenv.isDarwin then darwin.cctools else libtool; + libtool = if stdenv.isDarwin then cctools else libtool; }; mailsend = callPackage ../tools/networking/mailsend { }; @@ -10410,8 +10243,6 @@ with pkgs; mars-mips = callPackage ../development/tools/mars-mips { }; - maui-shell = libsForQt5.callPackage ../applications/window-managers/maui-shell { }; - mawk = callPackage ../tools/text/mawk { }; mb2md = callPackage ../tools/text/mb2md { }; @@ -10472,8 +10303,6 @@ with pkgs; microbin = callPackage ../servers/microbin { }; - microdnf = callPackage ../tools/package-management/microdnf { }; - microplane = callPackage ../tools/misc/microplane { }; microserver = callPackage ../servers/microserver { }; @@ -10835,8 +10664,6 @@ with pkgs; ngrep = callPackage ../tools/networking/ngrep { }; - ngrok = callPackage ../tools/networking/ngrok { }; - nifi = callPackage ../servers/web-apps/nifi { }; noip = callPackage ../tools/networking/noip { }; @@ -10979,16 +10806,10 @@ with pkgs; npapi_sdk = callPackage ../development/libraries/npapi-sdk { }; - npiet = callPackage ../development/interpreters/npiet { }; - npth = callPackage ../development/libraries/npth { }; - nmap = callPackage ../tools/security/nmap { }; - nmap-formatter = callPackage ../tools/security/nmap-formatter { }; - nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; - noise-repellent = callPackage ../applications/audio/noise-repellent { }; noisetorch = callPackage ../applications/audio/noisetorch { }; @@ -11068,13 +10889,6 @@ with pkgs; nzbget = callPackage ../tools/networking/nzbget { }; - nzbhydra2 = callPackage ../servers/nzbhydra2 { - # You need Java (at least 8, at most 15) - # https://github.com/theotherp/nzbhydra2/issues/697 - # https://github.com/theotherp/nzbhydra2/#how-to-run - jre = openjdk11; - }; - oapi-codegen = callPackage ../tools/networking/oapi-codegen { }; oath-toolkit = callPackage ../tools/security/oath-toolkit { }; @@ -11176,20 +10990,15 @@ with pkgs; opendht = callPackage ../development/libraries/opendht { inherit (darwin.apple_sdk.frameworks) Security; - restinio = restinio_0_6; }; opendkim = callPackage ../development/libraries/opendkim { }; - opendylan = callPackage ../development/compilers/opendylan { - opendylan-bootstrap = opendylan_bin; - }; - openfec = callPackage ../development/libraries/openfec { }; - ophis = python3Packages.callPackage ../development/compilers/ophis { }; + ophcrack-cli = ophcrack.override { enableGui = false; }; - opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; + ophis = python3Packages.callPackage ../development/compilers/ophis { }; open-ecard = callPackage ../tools/security/open-ecard { }; @@ -11257,6 +11066,8 @@ with pkgs; etcDir = "/etc/ssh"; }; + opensshTest = openssh.tests.openssh; + opensshWithKerberos = openssh.override { withKerberos = true; }; @@ -11334,6 +11145,7 @@ with pkgs; opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; openvswitch-lts = callPackage ../by-name/op/openvswitch/lts.nix { }; + openvswitch-dpdk = callPackage ../by-name/op/openvswitch/package.nix { withDPDK = true; }; ovn-lts = callPackage ../by-name/ov/ovn/lts.nix { }; @@ -11400,8 +11212,6 @@ with pkgs; oxlint = callPackage ../development/tools/oxlint { }; - ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; - ovito = libsForQt5.callPackage ../applications/graphics/ovito { inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; }; @@ -11569,7 +11379,7 @@ with pkgs; otpauth = callPackage ../tools/security/otpauth { }; pcsclite = callPackage ../tools/security/pcsclite { - inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) Foundation IOKit; }; pcscliteWithPolkit = pcsclite.override { @@ -11609,8 +11419,6 @@ with pkgs; pdf-quench = callPackage ../applications/misc/pdf-quench { }; - pdfarranger = callPackage ../applications/misc/pdfarranger { }; - briss = callPackage ../tools/graphics/briss { }; brickd = callPackage ../servers/brickd { }; @@ -11805,7 +11613,7 @@ with pkgs; pngquant = callPackage ../tools/graphics/pngquant { }; - inherit (callPackages ../development/tools/pnpm { }) + inherit (callPackage ../development/tools/pnpm { }) pnpm_8 pnpm_9; pnpm = pnpm_9; @@ -11823,8 +11631,6 @@ with pkgs; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose { }; - podman-tui = callPackage ../applications/virtualization/podman-tui { }; - podman-desktop = callPackage ../applications/virtualization/podman-desktop {}; pods = callPackage ../applications/virtualization/pods { }; @@ -11883,8 +11689,6 @@ with pkgs; pretender = callPackage ../tools/security/pretender { }; - prettierd = callPackage ../development/tools/prettierd { }; - pretty-simple = callPackage ../development/tools/pretty-simple { }; prettyping = callPackage ../tools/networking/prettyping { }; @@ -11983,8 +11787,6 @@ with pkgs; pure-prompt = callPackage ../shells/zsh/pure-prompt { }; - pv = callPackage ../tools/misc/pv { }; - pwgen = callPackage ../tools/security/pwgen { }; pwgen-secure = callPackage ../tools/security/pwgen-secure { }; @@ -12017,7 +11819,10 @@ with pkgs; pythonPackages = python3Packages; }; - py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy { }; + py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy { + # https://github.com/benfred/py-spy/issues/633 + python3 = python311; + }; pydeps = with python3Packages; toPythonApplication pydeps; @@ -12095,8 +11900,6 @@ with pkgs; qlog = qt6Packages.callPackage ../applications/radio/qlog { }; - qnial = callPackage ../development/interpreters/qnial { }; - quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; q-text-as-data = callPackage ../tools/misc/q-text-as-data { }; @@ -12121,8 +11924,6 @@ with pkgs; qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { }; - qodem = callPackage ../tools/networking/qodem { }; - qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; qovery-cli = callPackage ../tools/admin/qovery-cli { }; @@ -12163,10 +11964,6 @@ with pkgs; raider = callPackage ../applications/misc/raider { }; - railway = callPackage ../development/tools/railway { - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; - }; - quota = if stdenv.isLinux then linuxquota else unixtools.quota; qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; @@ -12282,8 +12079,6 @@ with pkgs; rtss = callPackage ../development/tools/misc/rtss { }; - realvnc-vnc-viewer = callPackage ../tools/admin/realvnc-vnc-viewer { }; - re-isearch = callPackage ../applications/search/re-isearch { }; reason-shell = callPackage ../applications/science/misc/reason-shell { }; @@ -12314,8 +12109,6 @@ with pkgs; relic = callPackage ../development/tools/relic { }; - remind = callPackage ../tools/misc/remind { }; - remmina = darwin.apple_sdk_11_0.callPackage ../applications/networking/remote/remmina { }; rename = callPackage ../tools/misc/rename { }; @@ -12398,11 +12191,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.libs) simd; }; - rnote = callPackage ../applications/graphics/rnote { - inherit (gst_all_1) gstreamer; - inherit (darwin.apple_sdk.frameworks) AudioUnit; - }; - rnp = callPackage ../tools/security/rnp { }; rnr = callPackage ../tools/text/rnr { }; @@ -12458,8 +12246,6 @@ with pkgs; rpmextract = callPackage ../tools/archivers/rpmextract { }; - rrdtool = callPackage ../tools/misc/rrdtool { }; - rscw = callPackage ../applications/radio/rscw { }; rset = callPackage ../tools/admin/rset { }; @@ -12516,8 +12302,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - rustdesk = callPackage ../applications/networking/remote/rustdesk { }; - rustfilt = callPackage ../development/tools/rust/rustfilt { }; rustscan = callPackage ../tools/security/rustscan { @@ -12604,8 +12388,6 @@ with pkgs; sanctity = callPackage ../tools/misc/sanctity { }; - sanjuuni = callPackage ../tools/graphics/sanjuuni { }; - sasquatch = callPackage ../tools/filesystems/sasquatch { }; sasview = libsForQt5.callPackage ../applications/science/misc/sasview { }; @@ -12626,8 +12408,6 @@ with pkgs; inherit (darwin.apple_sdk.libs) utmp; }; - scrcpy = callPackage ../misc/scrcpy { }; - screen-message = callPackage ../tools/X11/screen-message { }; screenkey = callPackage ../applications/video/screenkey { }; @@ -12650,8 +12430,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - sd-mux-ctrl = callPackage ../tools/misc/sd-mux-ctrl { }; - sd-switch = callPackage ../os-specific/linux/sd-switch { }; sdate = callPackage ../tools/misc/sdate { }; @@ -12680,11 +12458,11 @@ with pkgs; seehecht = callPackage ../tools/text/seehecht { }; + segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; }; + selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { }; - semantic-release = callPackage ../development/tools/semantic-release { - inherit (darwin) cctools; - }; + semantic-release = callPackage ../development/tools/semantic-release { }; semgrep = python3.pkgs.callPackage ../tools/security/semgrep { }; semgrep-core = callPackage ../tools/security/semgrep/semgrep-core.nix { }; @@ -12759,8 +12537,6 @@ with pkgs; shocco = callPackage ../tools/text/shocco { }; - shopify-cli = callPackage ../development/web/shopify-cli { }; - shopify-themekit = callPackage ../development/web/shopify-themekit { }; shorewall = callPackage ../tools/networking/shorewall { }; @@ -12988,8 +12764,6 @@ with pkgs; solvespace = callPackage ../applications/graphics/solvespace { }; - sonarr = callPackage ../servers/sonarr { }; - sonata = callPackage ../applications/audio/sonata { }; sony-headphones-client = callPackage ../applications/audio/sony-headphones-client { }; @@ -13109,8 +12883,6 @@ with pkgs; structorizer = callPackage ../applications/graphics/structorizer { }; - su-exec = callPackage ../tools/security/su-exec { }; - subberthehut = callPackage ../tools/misc/subberthehut { }; subedit = callPackage ../tools/text/subedit { }; @@ -13171,8 +12943,6 @@ with pkgs; staticjinja = with python3.pkgs; toPythonApplication staticjinja; - stevenblack-blocklist = callPackage ../tools/networking/stevenblack-blocklist { }; - stress = callPackage ../tools/system/stress { }; stress-ng = callPackage ../tools/system/stress-ng { }; @@ -13361,7 +13131,7 @@ with pkgs; inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }) teleport_14 teleport_15 teleport; + }) teleport_14 teleport_15 teleport_16 teleport; telepresence = callPackage ../tools/networking/telepresence { pythonPackages = python3Packages; @@ -13410,18 +13180,16 @@ with pkgs; thelounge = callPackage ../applications/networking/irc/thelounge { }; - theLoungePlugins = with lib; let - pkgs = filterAttrs (name: _: hasPrefix "thelounge-" name) nodePackages; - getPackagesWithPrefix = prefix: mapAttrs' (name: pkg: nameValuePair (removePrefix ("thelounge-" + prefix + "-") name) pkg) - (filterAttrs (name: _: hasPrefix ("thelounge-" + prefix + "-") name) pkgs); + theLoungePlugins = let + pkgs = lib.filterAttrs (name: _: lib.hasPrefix "thelounge-" name) nodePackages; + getPackagesWithPrefix = prefix: lib.mapAttrs' (name: pkg: lib.nameValuePair (lib.removePrefix ("thelounge-" + prefix + "-") name) pkg) + (lib.filterAttrs (name: _: lib.hasPrefix ("thelounge-" + prefix + "-") name) pkgs); in - recurseIntoAttrs { - plugins = recurseIntoAttrs (getPackagesWithPrefix "plugin"); - themes = recurseIntoAttrs (getPackagesWithPrefix "theme"); + lib.recurseIntoAttrs { + plugins = lib.recurseIntoAttrs (getPackagesWithPrefix "plugin"); + themes = lib.recurseIntoAttrs (getPackagesWithPrefix "theme"); }; - thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; - theme-sh = callPackage ../tools/misc/theme-sh { }; thiefmd = callPackage ../applications/editors/thiefmd { }; @@ -13482,8 +13250,6 @@ with pkgs; timer = callPackage ../tools/misc/timer { }; - tio = callPackage ../tools/misc/tio { }; - tiv = callPackage ../applications/misc/tiv { }; tkman = callPackage ../tools/misc/tkman { }; @@ -13508,8 +13274,6 @@ with pkgs; tmux = callPackage ../tools/misc/tmux { }; - tmux-cssh = callPackage ../tools/misc/tmux-cssh { }; - tmuxp = callPackage ../tools/misc/tmuxp { }; tmuxinator = callPackage ../tools/misc/tmuxinator { }; @@ -13558,8 +13322,6 @@ with pkgs; tor = callPackage ../tools/security/tor { }; - tor-browser = callPackage ../applications/networking/browsers/tor-browser { }; - touchegg = callPackage ../tools/inputmethods/touchegg { }; torrent7z = callPackage ../tools/archivers/torrent7z { }; @@ -13714,8 +13476,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - txtpbfmt = callPackage ../development/tools/txtpbfmt { }; - ipbt = callPackage ../tools/misc/ipbt { }; tuckr = callPackage ../applications/misc/tuckr { }; @@ -13738,12 +13498,6 @@ with pkgs; tuptime = callPackage ../tools/system/tuptime { }; - turbo = callPackage ../tools/misc/turbo/wrapper.nix { }; - - turbo-unwrapped = callPackage ../tools/misc/turbo { - inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreServices CoreFoundation; - }; - turses = callPackage ../applications/networking/instant-messengers/turses { }; tutanota-desktop = callPackage ../applications/networking/mailreaders/tutanota-desktop { }; @@ -13822,6 +13576,11 @@ with pkgs; uftrace = callPackage ../development/tools/uftrace { }; + uftraceFull = uftrace.override { + withLuaJIT = true; + withPython = true; + }; + uftpd = callPackage ../servers/ftp/uftpd {}; uget = callPackage ../tools/networking/uget { }; @@ -13956,8 +13715,6 @@ with pkgs; verilator = callPackage ../applications/science/electronics/verilator { }; - verilog = callPackage ../applications/science/electronics/verilog { }; - versus = callPackage ../applications/networking/versus { }; vexctl = callPackage ../tools/security/vexctl { }; @@ -13980,7 +13737,7 @@ with pkgs; viking = callPackage ../applications/misc/viking { }; - vikunja = callPackage ../by-name/vi/vikunja/package.nix { pnpm = pnpm_8; }; + vikunja = callPackage ../by-name/vi/vikunja/package.nix { pnpm = pnpm_9; }; vim-vint = callPackage ../development/tools/vim-vint { }; @@ -14050,6 +13807,9 @@ with pkgs; sssd = callPackage ../os-specific/linux/sssd { inherit (perlPackages) Po4a; + # python312Packages.python-ldap is broken + # https://github.com/NixOS/nixpkgs/issues/326296 + python3 = python311; }; sentry-cli = callPackage ../development/tools/sentry-cli { @@ -14295,7 +14055,6 @@ with pkgs; unicorn = callPackage ../development/libraries/unicorn { inherit (darwin.apple_sdk.frameworks) IOKit; - inherit (darwin) cctools; }; unittest-cpp = callPackage ../development/libraries/unittest-cpp { }; @@ -14493,11 +14252,7 @@ with pkgs; wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { }; - - wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { - openssl = openssl_1_1; - }; + wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { }; wml = callPackage ../development/web/wml { }; @@ -14569,8 +14324,6 @@ with pkgs; xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { }; - xen-guest-agent = callPackage ../tools/virtualization/xen-guest-agent { }; - xflux = callPackage ../tools/misc/xflux { }; xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { }; @@ -14625,20 +14378,6 @@ with pkgs; xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; - - # xvfb-run is used by a bunch of things to run tests - # and doesn't support hardware accelerated rendering - # so remove it from the rebuild heavy path for mesa - xorgserver = xorg.xorgserver.overrideAttrs(old: { - buildInputs = lib.filter (pkg: lib.getName pkg != "mesa") old.buildInputs; - configureFlags = old.configureFlags ++ [ - "--disable-glamor" - "--disable-glx" - "--disable-dri" - "--disable-dri2" - "--disable-dri3" - ]; - }); }; xvkbd = callPackage ../tools/X11/xvkbd { }; @@ -14732,8 +14471,6 @@ with pkgs; nvidiaSupport = true; }; - zerotierone = callPackage ../tools/networking/zerotierone { }; - zerofree = callPackage ../tools/filesystems/zerofree { }; zet = callPackage ../tools/text/zet { }; @@ -14876,8 +14613,6 @@ with pkgs; agdsn-zsh-config = callPackage ../shells/zsh/agdsn-zsh-config { }; - any-nix-shell = callPackage ../shells/any-nix-shell { }; - nix-your-shell = callPackage ../shells/nix-your-shell { }; bash = lowPrio (callPackage ../shells/bash/5.nix { }); @@ -14956,36 +14691,27 @@ with pkgs; ### DEVELOPMENT / COMPILERS + temurin-bin-22 = javaPackages.compiler.temurin-bin.jdk-22; + temurin-jre-bin-22 = javaPackages.compiler.temurin-bin.jre-22; + temurin-bin-21 = javaPackages.compiler.temurin-bin.jdk-21; temurin-jre-bin-21 = javaPackages.compiler.temurin-bin.jre-21; - temurin-bin-20 = javaPackages.compiler.temurin-bin.jdk-20; - temurin-jre-bin-20 = javaPackages.compiler.temurin-bin.jre-20; - - temurin-bin-19 = javaPackages.compiler.temurin-bin.jdk-19; - temurin-jre-bin-19 = javaPackages.compiler.temurin-bin.jre-19; - - temurin-bin-18 = javaPackages.compiler.temurin-bin.jdk-18; - temurin-jre-bin-18 = javaPackages.compiler.temurin-bin.jre-18; - temurin-bin-17 = javaPackages.compiler.temurin-bin.jdk-17; temurin-jre-bin-17 = javaPackages.compiler.temurin-bin.jre-17; - temurin-bin-16 = javaPackages.compiler.temurin-bin.jdk-16; temurin-bin-11 = javaPackages.compiler.temurin-bin.jdk-11; temurin-jre-bin-11 = javaPackages.compiler.temurin-bin.jre-11; temurin-bin-8 = javaPackages.compiler.temurin-bin.jdk-8; temurin-jre-bin-8 = javaPackages.compiler.temurin-bin.jre-8; - temurin-bin = temurin-bin-21; - temurin-jre-bin = temurin-jre-bin-21; + temurin-bin = temurin-bin-22; + temurin-jre-bin = temurin-jre-bin-22; 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; - semeru-jre-bin-16 = javaPackages.compiler.semeru-bin.jre-16; semeru-bin-11 = javaPackages.compiler.semeru-bin.jdk-11; semeru-jre-bin-11 = javaPackages.compiler.semeru-bin.jre-11; semeru-bin-8 = javaPackages.compiler.semeru-bin.jdk-8; @@ -14994,32 +14720,6 @@ with pkgs; 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; }; - - adoptopenjdk-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-hotspot; - adoptopenjdk-jre-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-hotspot; - adoptopenjdk-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-openj9; - adoptopenjdk-jre-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-openj9; - - adoptopenjdk-hotspot-bin-15 = javaPackages.compiler.adoptopenjdk-15.jdk-hotspot; - adoptopenjdk-jre-hotspot-bin-15 = javaPackages.compiler.adoptopenjdk-15.jre-hotspot; - adoptopenjdk-openj9-bin-15 = javaPackages.compiler.adoptopenjdk-15.jdk-openj9; - adoptopenjdk-jre-openj9-bin-15 = javaPackages.compiler.adoptopenjdk-15.jre-openj9; - - adoptopenjdk-hotspot-bin-11 = javaPackages.compiler.adoptopenjdk-11.jdk-hotspot; - adoptopenjdk-jre-hotspot-bin-11 = javaPackages.compiler.adoptopenjdk-11.jre-hotspot; - adoptopenjdk-openj9-bin-11 = javaPackages.compiler.adoptopenjdk-11.jdk-openj9; - adoptopenjdk-jre-openj9-bin-11 = javaPackages.compiler.adoptopenjdk-11.jre-openj9; - - adoptopenjdk-hotspot-bin-8 = javaPackages.compiler.adoptopenjdk-8.jdk-hotspot; - adoptopenjdk-jre-hotspot-bin-8 = javaPackages.compiler.adoptopenjdk-8.jre-hotspot; - adoptopenjdk-openj9-bin-8 = javaPackages.compiler.adoptopenjdk-8.jdk-openj9; - adoptopenjdk-jre-openj9-bin-8 = javaPackages.compiler.adoptopenjdk-8.jre-openj9; - - adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; - adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; - adoptopenjdk-icedtea-web = callPackage ../development/compilers/adoptopenjdk-icedtea-web { jdk = jdk8; }; @@ -15113,9 +14813,7 @@ with pkgs; stdenv = gccStdenv; }; - chez = callPackage ../development/compilers/chez { - inherit (darwin) cctools; - }; + chez = callPackage ../development/compilers/chez { }; chez-racket = callPackage ../development/compilers/chez-racket { }; @@ -15199,7 +14897,6 @@ with pkgs; corretto11 = javaPackages.compiler.corretto11; corretto17 = javaPackages.compiler.corretto17; - corretto19 = javaPackages.compiler.corretto19; corretto21 = javaPackages.compiler.corretto21; cotton = callPackage ../development/tools/cotton { @@ -15434,103 +15131,6 @@ with pkgs; gcc_latest = gcc14; - # Use the same GCC version as the one from stdenv by default - gfortran = wrapCC (gcc.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran48 = wrapCC (gcc48.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran49 = wrapCC (gcc49.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran6 = wrapCC (gcc6.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran7 = wrapCC (gcc7.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran8 = wrapCC (gcc8.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran9 = wrapCC (gcc9.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran10 = wrapCC (gcc10.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran11 = wrapCC (gcc11.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran12 = wrapCC (gcc12.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran13 = wrapCC (gcc13.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - 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; @@ -15713,13 +15313,11 @@ with pkgs; meta.broken = stdenv.hostPlatform.isDarwin; }); - ghdl = ghdl-mcode; + ghdl-mcode = callPackage ../by-name/gh/ghdl/package.nix { backend = "mcode"; }; - ghdl-mcode = callPackage ../development/compilers/ghdl { - backend = "mcode"; - }; + ghdl-gcc = callPackage ../by-name/gh/ghdl/package.nix { backend = "gcc"; }; - ghdl-llvm = callPackage ../development/compilers/ghdl { + ghdl-llvm = callPackage ../by-name/gh/ghdl/package.nix { backend = "llvm"; inherit (llvmPackages_15) llvm; }; @@ -15854,9 +15452,7 @@ with pkgs; hop = callPackage ../development/compilers/hop { }; - hop-cli = callPackage ../tools/admin/hop-cli { - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; - }; + hop-cli = throw "hop-cli has been removed as the service has been shut-down"; #Added 2024-08-13 falcon = callPackage ../development/interpreters/falcon { stdenv = gcc10Stdenv; @@ -15936,7 +15532,7 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21 openjfx22; + inherit (javaPackages) openjfx11 openjfx17 openjfx21 openjfx22; openjfx = openjfx17; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; @@ -15959,16 +15555,6 @@ with pkgs; jdk17 = openjdk17; jdk17_headless = openjdk17_headless; - openjdk19 = javaPackages.compiler.openjdk19; - openjdk19_headless = javaPackages.compiler.openjdk19.headless; - jdk19 = openjdk19; - jdk19_headless = openjdk19_headless; - - openjdk20 = javaPackages.compiler.openjdk20; - openjdk20_headless = javaPackages.compiler.openjdk20.headless; - jdk20 = openjdk20; - jdk20_headless = openjdk20_headless; - openjdk21 = javaPackages.compiler.openjdk21; openjdk21_headless = javaPackages.compiler.openjdk21.headless; jdk21 = openjdk21; @@ -16007,7 +15593,9 @@ with pkgs; graalvmDrv = graalvm-ce; }).override; - openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; + openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { + python3 = python311; + }; lingua-franca = callPackage ../development/compilers/lingua-franca { }; @@ -16145,10 +15733,10 @@ with pkgs; # assumption is that or any later version is good. choose = platform: /**/ if platform.isDarwin then 16 - else if platform.isFreeBSD then 16 + else if platform.isFreeBSD then 18 else if platform.isOpenBSD then 18 else if platform.isAndroid then 12 - else if platform.isLinux then 17 + else if platform.isLinux then 18 else if platform.isWasm then 16 # For unknown systems, assume the latest version is required. else 18; @@ -16166,61 +15754,43 @@ with pkgs; targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm; })); - llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_13.tools; - targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries; - targetLlvm = targetPackages.llvmPackages_13.llvm or llvmPackages_13.llvm; - stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 - })); - - llvmPackages_14 = recurseIntoAttrs (callPackage ../development/compilers/llvm/14 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_14.tools; - targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries; - targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm; - })); - - llvmPackages_15 = recurseIntoAttrs (callPackage ../development/compilers/llvm/15 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_15.tools; - targetLlvmLibraries = targetPackages.llvmPackages_15.libraries or llvmPackages_15.libraries; - targetLlvm = targetPackages.llvmPackages_15.llvm or llvmPackages_15.llvm; - })); - - llvmPackages_16 = recurseIntoAttrs (callPackage ../development/compilers/llvm/16 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_16.tools; - targetLlvmLibraries = targetPackages.llvmPackages_16.libraries or llvmPackages_16.libraries; - targetLlvm = targetPackages.llvmPackages_16.llvm or llvmPackages_16.llvm; - })); - - llvmPackages_17 = recurseIntoAttrs (callPackage ../development/compilers/llvm/17 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_17.tools; - targetLlvmLibraries = targetPackages.llvmPackages_17.libraries or llvmPackages_17.libraries; - targetLlvm = targetPackages.llvmPackages_17.llvm or llvmPackages_17.llvm; - })); - - inherit - (rec { - llvmPackages_18 = recurseIntoAttrs (callPackage ../development/compilers/llvm/18 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_18.tools; - targetLlvmLibraries = targetPackages.llvmPackages_18.libraries or llvmPackages_18.libraries; - targetLlvm = targetPackages.llvmPackages_18.llvm or llvmPackages_18.llvm; - })); - - clang_18 = llvmPackages_18.clang; - lld_18 = llvmPackages_18.lld; - lldb_18 = llvmPackages_18.lldb; - llvm_18 = llvmPackages_18.llvm; - }) - llvmPackages_18 - clang_18 - lld_18 - lldb_18 - llvm_18; + inherit (rec { + llvmPackagesSet = recurseIntoAttrs (callPackages ../development/compilers/llvm { }); + + llvmPackages_13 = llvmPackagesSet."13"; + llvmPackages_14 = llvmPackagesSet."14"; + llvmPackages_15 = llvmPackagesSet."15"; + llvmPackages_16 = llvmPackagesSet."16"; + llvmPackages_17 = llvmPackagesSet."17"; + + llvmPackages_18 = llvmPackagesSet."18"; + clang_18 = llvmPackages_18.clang; + lld_18 = llvmPackages_18.lld; + lldb_18 = llvmPackages_18.lldb; + llvm_18 = llvmPackages_18.llvm; + + llvmPackages_19 = llvmPackagesSet."19"; + clang_19 = llvmPackages_19.clang; + lld_19 = llvmPackages_19.lld; + lldb_19 = llvmPackages_19.lldb; + llvm_19 = llvmPackages_19.llvm; + bolt_19 = llvmPackages_19.bolt; + }) llvmPackages_13 + llvmPackages_14 + llvmPackages_15 + llvmPackages_16 + llvmPackages_17 + llvmPackages_18 + clang_18 + lld_18 + lldb_18 + llvm_18 + llvmPackages_19 + clang_19 + lld_19 + lldb_19 + llvm_19 + bolt_19; lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -16412,11 +15982,11 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_78 = callPackage ../development/compilers/rust/1_78.nix { + rust_1_80 = callPackage ../development/compilers/rust/1_80.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_18 = llvmPackages_18.libllvm; }; - rust = rust_1_78; + rust = rust_1_80; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -16424,8 +15994,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_78 = rust_1_78.packages.stable; - rustPackages = rustPackages_1_78; + rustPackages_1_80 = rust_1_80.packages.stable; + rustPackages = rustPackages_1_80; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -16637,9 +16207,6 @@ with pkgs; leptosfmt = callPackage ../development/tools/rust/leptosfmt { }; - maturin = callPackage ../development/tools/rust/maturin { - inherit (darwin.apple_sdk.frameworks) Security; - }; panamax = callPackage ../development/tools/rust/panamax { }; ograc = callPackage ../development/tools/rust/ograc { }; @@ -16758,12 +16325,8 @@ with pkgs; svd2rust = callPackage ../development/tools/rust/svd2rust { }; - svdtools = callPackage ../development/embedded/svdtools { }; - swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { }); - inherit (swiftPackages) swift swiftpm sourcekit-lsp swift-format; - - swiftpm2nix = callPackage ../development/tools/swiftpm2nix { }; + inherit (swiftPackages) swift swiftpm sourcekit-lsp swift-format swiftpm2nix; swiProlog = callPackage ../development/compilers/swi-prolog { inherit (darwin.apple_sdk.frameworks) Security; @@ -16792,7 +16355,7 @@ with pkgs; tinycc = darwin.apple_sdk_11_0.callPackage ../development/compilers/tinycc { }; tinygo = callPackage ../development/compilers/tinygo { - llvmPackages = llvmPackages_17; + llvmPackages = llvmPackages_18; }; tinyscheme = callPackage ../development/interpreters/tinyscheme { }; @@ -16801,8 +16364,6 @@ with pkgs; typescript = callPackage ../development/compilers/typescript { }; - bupc = callPackage ../development/compilers/bupc { }; - ubports-click = python3Packages.callPackage ../development/tools/click { }; uasm = callPackage ../development/compilers/uasm { }; @@ -16861,6 +16422,8 @@ with pkgs; isGNU = cc.isGNU or false; isClang = cc.isClang or false; + isArocc = cc.isArocc or false; + isZig = cc.isZig or false; inherit cc bintools libc libcxx extraPackages nixSupport zlib; } // extraArgs; in self); @@ -16882,7 +16445,6 @@ with pkgs; noLibc = (self.libc == null); inherit bintools libc; - inherit (darwin) postLinkSignHook signingUtils; } // extraArgs; in self); yaml-language-server = callPackage ../development/tools/language-servers/yaml-language-server { }; @@ -17096,10 +16658,10 @@ with pkgs; groovy = callPackage ../development/interpreters/groovy { }; inherit (callPackages ../applications/networking/cluster/hadoop {}) + hadoop_3_4 hadoop_3_3 - hadoop_3_2 hadoop2; - hadoop3 = hadoop_3_3; + hadoop3 = hadoop_3_4; hadoop = hadoop3; hashlink = callPackage ../development/interpreters/hashlink { }; @@ -17134,8 +16696,6 @@ with pkgs; kona = callPackage ../development/interpreters/kona { }; - konf = callPackage ../development/tools/konf { }; - lambda-lisp = callPackage ../development/interpreters/lambda-lisp { }; lambda-lisp-blc = lambda-lisp; @@ -17235,6 +16795,16 @@ with pkgs; phpExtensions = php.extensions; phpPackages = php.packages; + # Import PHP84 interpreter, extensions and packages + php84 = callPackage ../development/interpreters/php/8.4.nix { + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + pcre2 = pcre2.override { + withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 + }; + }; + php84Extensions = recurseIntoAttrs php84.extensions; + php84Packages = recurseIntoAttrs php84.packages; + # Import PHP83 interpreter, extensions and packages php83 = callPackage ../development/interpreters/php/8.3.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; @@ -17277,11 +16847,11 @@ with pkgs; # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python2 = python27; - python3 = python311; + python3 = python312; # pythonPackages further below, but assigned here because they need to be in sync python2Packages = dontRecurseIntoAttrs python27Packages; - python3Packages = dontRecurseIntoAttrs python311Packages; + python3Packages = dontRecurseIntoAttrs python312Packages; pypy = pypy2; pypy2 = pypy27; @@ -17336,24 +16906,31 @@ with pkgs; x11Support = true; }; + # https://py-free-threading.github.io + python313FreeThreading = python313.override { + pythonAttr = "python313FreeThreading"; + enableGIL = false; + }; + pythonInterpreters = callPackage ./../development/interpreters/python { }; inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; + # Python package sets. - python27Packages = python27.pkgs // { __attrsFailEvaluation = true; }; - python39Packages = python39.pkgs // { __attrsFailEvaluation = true; }; - python310Packages = python310.pkgs // { __attrsFailEvaluation = true; }; - python311Packages = recurseIntoAttrs python311.pkgs // { pythonPackages = python311.pkgs // { __attrsFailEvaluation = true; }; }; - python312Packages = recurseIntoAttrs python312.pkgs // { pythonPackages = python312.pkgs // { __attrsFailEvaluation = true; }; }; - python313Packages = python313.pkgs // { __attrsFailEvaluation = true; }; - pypyPackages = pypy.pkgs // { __attrsFailEvaluation = true; }; - pypy2Packages = pypy2.pkgs // { __attrsFailEvaluation = true; }; - pypy27Packages = pypy27.pkgs // { __attrsFailEvaluation = true; }; - pypy3Packages = pypy3.pkgs // { __attrsFailEvaluation = true; }; - pypy39Packages = pypy39.pkgs // { __attrsFailEvaluation = true; }; - pypy310Packages = pypy310.pkgs // { __attrsFailEvaluation = true; }; + python27Packages = python27.pkgs; + python39Packages = python39.pkgs; + python310Packages = python310.pkgs; + python311Packages = recurseIntoAttrs python311.pkgs; + python312Packages = recurseIntoAttrs python312.pkgs; + python313Packages = python313.pkgs; + pypyPackages = pypy.pkgs; + pypy2Packages = pypy2.pkgs; + pypy27Packages = pypy27.pkgs; + pypy3Packages = pypy3.pkgs; + pypy39Packages = pypy39.pkgs; + pypy310Packages = pypy310.pkgs; py3c = callPackage ../development/libraries/py3c { }; @@ -17398,7 +16975,6 @@ with pkgs; ffmpeg = ffmpeg-headless; }; - pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix { }; wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { }; pw-volume = callPackage ../tools/audio/pw-volume { }; @@ -17434,10 +17010,9 @@ with pkgs; inherit (darwin) libobjc; }; defaultGemConfig = callPackage ../development/ruby-modules/gem-config { - inherit (darwin) DarwinTools cctools autoSignDarwinBinariesHook; + inherit (darwin) DarwinTools autoSignDarwinBinariesHook; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - bundix = callPackage ../development/ruby-modules/bundix { }; bundler = callPackage ../development/ruby-modules/bundler { }; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; @@ -17492,20 +17067,26 @@ with pkgs; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { - inherit (darwin) libobjc; - }; - spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { - inherit (darwin) libobjc; - }; - spidermonkey_102 = callPackage ../development/interpreters/spidermonkey/102.nix { - inherit (darwin) libobjc; - }; - spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix { - inherit (darwin) libobjc; - }; - - ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; + inherit + ({ + spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { + inherit (darwin) libobjc; + }; + spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { + inherit (darwin) libobjc; + }; + spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix { + inherit (darwin) libobjc; + }; + spidermonkey_128 = callPackage ../development/interpreters/spidermonkey/128.nix { + inherit (darwin) libobjc; + }; + }) + spidermonkey_78 + spidermonkey_91 + spidermonkey_115 + spidermonkey_128 + ; starlark-rust = callPackage ../development/interpreters/starlark-rust { }; @@ -17657,8 +17238,6 @@ with pkgs; srandrd = callPackage ../tools/X11/srandrd { }; - sratoolkit = callPackage ../applications/science/biology/sratoolkit { }; - srecord = callPackage ../development/tools/misc/srecord { }; srelay = callPackage ../tools/networking/srelay { }; @@ -17720,8 +17299,6 @@ with pkgs; ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { }; - ansible-navigator = with python3Packages; toPythonApplication ansible-navigator; - dbus-test-runner = callPackage ../development/tools/dbus-test-runner { }; doq = callPackage ../development/tools/misc/doq { }; @@ -17762,8 +17339,6 @@ with pkgs; glslls = callPackage ../development/tools/language-servers/glslls { }; - gopls = callPackage ../development/tools/language-servers/gopls { }; - helm-ls = callPackage ../development/tools/language-servers/helm-ls { }; javascript-typescript-langserver = callPackage ../development/tools/language-servers/javascript-typescript-langserver { }; @@ -17783,8 +17358,6 @@ with pkgs; neocmakelsp = callPackage ../development/tools/language-servers/neocmakelsp { }; - nil = callPackage ../development/tools/language-servers/nil { }; - inherit (callPackages ../development/tools/language-servers/nixd { llvmPackages = llvmPackages_16; nix = nixVersions.nix_2_19; @@ -17796,10 +17369,6 @@ with pkgs; postgres-lsp = callPackage ../development/tools/language-servers/postgres-lsp { }; - pylyzer = callPackage ../development/tools/language-servers/pylyzer { }; - - ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { }; - rune-languageserver = callPackage ../development/tools/language-servers/rune-languageserver { }; svls = callPackage ../development/tools/language-servers/svls { }; @@ -17808,8 +17377,6 @@ with pkgs; vala-language-server = callPackage ../development/tools/language-servers/vala-language-server { }; - verible = callPackage ../development/tools/language-servers/verible { }; - vscode-langservers-extracted = callPackage ../development/tools/language-servers/vscode-langservers-extracted { }; zls = callPackage ../development/tools/language-servers/zls { }; @@ -17883,6 +17450,11 @@ with pkgs; electron_29-bin electron_30-bin; + inherit (callPackages ../development/tools/electron/chromedriver { }) + electron-chromedriver_29 + electron-chromedriver_30 + electron-chromedriver_31; + electron_24 = electron_24-bin; electron_27 = electron_27-bin; electron_28 = electron_28-bin; @@ -17890,6 +17462,7 @@ with pkgs; 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; + electron-chromedriver = electron-chromedriver_30; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -17924,7 +17497,7 @@ with pkgs; bazel = bazel_6; bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 { - inherit (darwin) cctools sigtool; + inherit (darwin) sigtool; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; runJdk = jdk11_headless; @@ -17935,7 +17508,7 @@ with pkgs; }; bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 { - inherit (darwin) cctools sigtool; + inherit (darwin) sigtool; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; runJdk = jdk11_headless; @@ -17947,7 +17520,7 @@ with pkgs; }; bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 { - inherit (darwin) cctools sigtool; + inherit (darwin) sigtool; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation IOKit; buildJdk = jdk17_headless; runJdk = jdk17_headless; @@ -17984,11 +17557,13 @@ with pkgs; binutils-unwrapped = callPackage ../development/tools/misc/binutils { autoreconfHook = autoreconfHook269; + inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils { autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook; + inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; withAllTargets = true; @@ -18111,8 +17686,6 @@ with pkgs; bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; - buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; - buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; @@ -18440,8 +18013,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - dwfv = callPackage ../applications/science/electronics/dwfv { }; - dwz = callPackage ../development/tools/misc/dwz { }; easypdkprog = callPackage ../development/embedded/easypdkprog { }; @@ -18534,9 +18105,6 @@ with pkgs; fly = callPackage ../development/tools/continuous-integration/fly { }; - foreman = callPackage ../tools/system/foreman { }; - goreman = callPackage ../tools/system/goreman { }; - fprettify = callPackage ../development/tools/fprettify { }; framac = callPackage ../development/tools/analysis/frama-c { }; @@ -18651,10 +18219,17 @@ with pkgs; inherit jdk11 jdk17 jdk21; }; gradleGen = gradle-packages.gen; - gradle_6 = callPackage gradle-packages.gradle_6 { }; - gradle_7 = callPackage gradle-packages.gradle_7 { }; - gradle_8 = callPackage gradle-packages.gradle_8 { }; - gradle = gradle_8; + wrapGradle = callPackage gradle-packages.wrapGradle { }; + + gradle_6-unwrapped = callPackage gradle-packages.gradle_6 { }; + gradle_7-unwrapped = callPackage gradle-packages.gradle_7 { }; + gradle_8-unwrapped = callPackage gradle-packages.gradle_8 { }; + gradle-unwrapped = gradle_8-unwrapped; + + gradle_6 = wrapGradle gradle_6-unwrapped; + gradle_7 = wrapGradle gradle_7-unwrapped; + gradle_8 = wrapGradle gradle_8-unwrapped; + gradle = wrapGradle gradle-unwrapped; grcov = callPackage ../development/tools/misc/grcov { }; @@ -18676,9 +18251,7 @@ with pkgs; gtranslator = callPackage ../tools/text/gtranslator { }; - gtree = callPackage ../tools/text/gtree { - buildGoModule = buildGo122Module; - }; + gtree = callPackage ../tools/text/gtree { }; guff = callPackage ../tools/graphics/guff { }; @@ -18697,8 +18270,6 @@ with pkgs; hcloud = callPackage ../development/tools/hcloud { }; - hclfmt = callPackage ../development/tools/hclfmt { }; - help2man = callPackage ../development/tools/misc/help2man { }; heroku = callPackage ../development/tools/heroku { }; @@ -18860,8 +18431,6 @@ with pkgs; kythe = callPackage ../development/tools/kythe { }; - lazygit = callPackage ../development/tools/lazygit { }; - laminar = callPackage ../development/tools/continuous-integration/laminar { }; lcov = callPackage ../development/tools/analysis/lcov { }; @@ -18986,6 +18555,8 @@ with pkgs; moon = callPackage ../development/tools/build-managers/moon/default.nix { }; + mopsa = ocamlPackages.mopsa.bin; + msgpack-tools = callPackage ../development/tools/msgpack-tools { }; msgpuck = callPackage ../development/libraries/msgpuck { }; @@ -19016,12 +18587,9 @@ with pkgs; nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; - nexus = callPackage ../development/tools/repository-managers/nexus { - jre_headless = jre8_headless; - }; - - nexusmods-app-unfree = callPackage ../by-name/ne/nexusmods-app/package.nix { - enableUnfree = true; + nexusmods-app-unfree = nexusmods-app.override { + pname = "nexusmods-app-unfree"; + _7zz = _7zz-rar; }; nmrpflash = callPackage ../development/embedded/nmrpflash { }; @@ -19324,11 +18892,6 @@ with pkgs; sca2d = callPackage ../development/tools/sca2d { }; - scons = scons_4_5_2; - scons_3_1_2 = callPackage ../development/tools/build-managers/scons/3.1.2.nix { }; - scons_4_1_0 = callPackage ../development/tools/build-managers/scons/4.1.0.nix { }; - scons_4_5_2 = callPackage ../development/tools/build-managers/scons/4.5.2.nix { }; - mill = callPackage ../development/tools/build-managers/mill { }; sbt = callPackage ../development/tools/build-managers/sbt { }; @@ -19542,9 +19105,7 @@ with pkgs; terracognita = callPackage ../development/tools/misc/terracognita { }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; - terraform-ls = callPackage ../development/tools/misc/terraform-ls { - buildGoModule = buildGo122Module; - }; + terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; terraformer = callPackage ../development/tools/misc/terraformer { }; @@ -19556,13 +19117,16 @@ with pkgs; tesh = callPackage ../tools/text/tesh {}; - texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; - texinfo4 = texinfo413; - texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; - texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro - texinfo6_7 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; # needed for gpm, iksemel and fwknop - texinfo6 = callPackage ../development/tools/misc/texinfo/6.8.nix { }; - texinfo7 = callPackage ../development/tools/misc/texinfo/7.0.nix { }; + texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { }; + inherit (texinfoPackages) + texinfo413 + texinfo5 # needed for gcc48 + texinfo6_5 # needed for allegro + texinfo6_7 # needed for gpm, iksemel and fwknop + texinfo6 + texinfo7 + ; + texinfo4= texinfo413; # needed for eukleides and singular texinfo = texinfo7; texinfoInteractive = texinfo.override { interactive = true; }; @@ -19617,7 +19181,7 @@ with pkgs; # tests fail on old version doCheck = false; meta = libgit2.meta // { - maintainers = []; + maintainers = [ ]; knownVulnerabilities = [ "CVE-2024-24575" "CVE-2024-24577" "CVE-2022-29187" "CVE 2022-24765" ]; }; }; @@ -19670,12 +19234,14 @@ with pkgs; jhiccup = callPackage ../development/tools/java/jhiccup { }; valgrind = callPackage ../development/tools/analysis/valgrind { - inherit (buildPackages.darwin) xnu bootstrap_cmds cctools; + inherit (buildPackages.darwin) xnu bootstrap_cmds; }; valgrind-light = res.valgrind.override { gdb = null; }; qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind { }; + vcpkg-tool-unwrapped = callPackage ../by-name/vc/vcpkg-tool/package.nix { doWrap = false; }; + visualvm = callPackage ../development/tools/java/visualvm { }; volta = callPackage ../development/tools/volta { }; @@ -19804,7 +19370,13 @@ with pkgs; then overrideSDK stdenv { darwinMinVersion = "10.13"; } else stdenv; }; - abseil-cpp = abseil-cpp_202401; + abseil-cpp_202407 = callPackage ../development/libraries/abseil-cpp/202407.nix { + # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. + stdenv = if stdenv.isDarwin && stdenv.isx86_64 + then overrideSDK stdenv { darwinMinVersion = "10.13"; } + else stdenv; + }; + abseil-cpp = abseil-cpp_202407; accountsservice = callPackage ../development/libraries/accountsservice { }; @@ -19842,8 +19414,6 @@ with pkgs; allegro4 = callPackage ../development/libraries/allegro { }; allegro5 = callPackage ../development/libraries/allegro/5.nix { }; - amdvlk = callPackage ../development/libraries/amdvlk { }; - amf-headers = callPackage ../development/libraries/amf-headers { }; aml = callPackage ../development/libraries/aml { }; @@ -19888,8 +19458,6 @@ with pkgs; cudaPackages = cudaPackages_12; }; - arrow-glib = callPackage ../development/libraries/arrow-glib { }; - arsenal = callPackage ../tools/security/arsenal { }; assimp = callPackage ../development/libraries/assimp { }; @@ -19997,11 +19565,11 @@ with pkgs; bicpl = callPackage ../development/libraries/science/biology/bicpl { }; - bicgl = callPackage ../development/libraries/science/biology/bicgl { inherit (darwin.apple_sdk.frameworks) GLUT; }; + bicgl = callPackage ../development/libraries/science/biology/bicgl { }; # TODO(@Ericson2314): Build bionic libc from source bionic = if stdenv.hostPlatform.useAndroidPrebuilt - then pkgs."androidndkPkgs_${stdenv.hostPlatform.ndkVer}".libraries + then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVer}".libraries else callPackage ../os-specific/linux/bionic-prebuilt { }; boolstuff = callPackage ../development/libraries/boolstuff { }; @@ -20017,6 +19585,7 @@ with pkgs; boost183 boost184 boost185 + boost186 ; boost = boost181; @@ -20171,8 +19740,6 @@ with pkgs; clipper = callPackage ../development/libraries/clipper { }; - clipper2 = callPackage ../development/libraries/clipper2 { }; - cln = callPackage ../development/libraries/cln { }; clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; @@ -20409,11 +19976,11 @@ with pkgs; eigenmath = callPackage ../applications/science/math/eigenmath { }; - vapoursynth = callPackage ../development/libraries/vapoursynth { + vapoursynth = callPackage ../by-name/va/vapoursynth/package.nix { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - vapoursynth-editor = libsForQt5.callPackage ../development/libraries/vapoursynth/editor.nix { }; + vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { }; vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { }; @@ -20434,7 +20001,9 @@ with pkgs; # TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013 emanote = haskellPackages.emanote; - enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; + enchant2 = callPackage ../development/libraries/enchant/2.x.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; enchant = enchant2; enet = callPackage ../development/libraries/enet { }; @@ -20483,12 +20052,8 @@ with pkgs; fb303 = darwin.apple_sdk_11_0.callPackage ../development/libraries/fb303 { }; - fcgi = callPackage ../development/libraries/fcgi { }; - fcl = callPackage ../development/libraries/fcl { }; - febio = callPackage ../development/libraries/febio { }; - ffcast = callPackage ../tools/X11/ffcast { }; fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { }; @@ -20501,9 +20066,6 @@ with pkgs; ffmpeg_4 ffmpeg_4-headless ffmpeg_4-full - ffmpeg_5 - ffmpeg_5-headless - ffmpeg_5-full ffmpeg_6 ffmpeg_6-headless ffmpeg_6-full @@ -20545,8 +20107,6 @@ with pkgs; flint3 = callPackage ../development/libraries/flint/3.nix { }; - flite = callPackage ../development/libraries/flite { }; - fltk13 = callPackage ../development/libraries/fltk { inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL; }; @@ -20572,7 +20132,7 @@ with pkgs; flyway = callPackage ../development/tools/flyway { }; - inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9 fmt_10; + inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9 fmt_10 fmt_11; fmt = fmt_10; @@ -20675,8 +20235,6 @@ with pkgs; gdome2 = callPackage ../development/libraries/gdome2 { }; - gdbm = callPackage ../development/libraries/gdbm { }; - gecode_3 = callPackage ../development/libraries/gecode/3.nix { }; gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; @@ -20708,8 +20266,6 @@ with pkgs; geogram = callPackage ../development/libraries/geogram { }; - geographiclib = callPackage ../development/libraries/geographiclib { }; - geoip = callPackage ../development/libraries/geoip { }; geoipjava = callPackage ../development/libraries/java/geoipjava { }; @@ -20796,16 +20352,11 @@ with pkgs; glew110 = callPackage ../development/libraries/glew/1.10.nix { inherit (darwin.apple_sdk.frameworks) AGL OpenGL; }; - glew-egl = callPackage ../development/libraries/glew { - inherit (darwin.apple_sdk.frameworks) OpenGL; - enableEGL = true; - }; - glfw = glfw3; glfw-wayland-minecraft = callPackage ../development/libraries/glfw/3.x-wayland-minecraft.nix {}; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; }; glibc = callPackage ../development/libraries/glibc { @@ -20892,12 +20443,21 @@ with pkgs; # Only supported on Linux and only on glibc glibcLocales = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu - then callPackage ../development/libraries/glibc/locales.nix { } - else null; + then callPackage ../development/libraries/glibc/locales.nix { + stdenv = if (!stdenv.cc.isGNU) then + gccStdenv + else stdenv; + withLinuxHeaders = !stdenv.cc.isGNU; + } else null; glibcLocalesUtf8 = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu - then callPackage ../development/libraries/glibc/locales.nix { allLocales = false; } - else null; + then callPackage ../development/libraries/glibc/locales.nix { + stdenv = if (!stdenv.cc.isGNU) then + gccStdenv + else stdenv; + withLinuxHeaders = !stdenv.cc.isGNU; + allLocales = false; + } else null; glibcInfo = callPackage ../development/libraries/glibc/info.nix { }; @@ -20957,7 +20517,6 @@ with pkgs; gobject-introspection-unwrapped = callPackage ../development/libraries/gobject-introspection { nixStoreDir = config.nix.storeDir or builtins.storeDir; - inherit (darwin) cctools; }; goocanvas = callPackage ../development/libraries/goocanvas { }; @@ -21004,7 +20563,9 @@ with pkgs; autoconf = buildPackages.autoconf269; }; - gpac = callPackage ../applications/video/gpac { }; + gpac = callPackage ../applications/video/gpac { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; gpgme = callPackage ../development/libraries/gpgme { }; @@ -21281,7 +20842,7 @@ with pkgs; hwloc = callPackage ../development/libraries/hwloc { }; - hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_20; }; + hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_22; }; hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; @@ -21306,9 +20867,10 @@ with pkgs; icu72 icu73 icu74 + icu75 ; - icu = icu73; + icu = icu74; id3lib = callPackage ../development/libraries/id3lib { }; @@ -21387,14 +20949,19 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL IOKit; }; - irrlichtmt = callPackage ../development/libraries/irrlichtmt { - inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; - }; - isocodes = callPackage ../development/libraries/iso-codes { }; iso-flags = callPackage ../data/icons/iso-flags { }; + iso-flags-png-320x240 = iso-flags.overrideAttrs (oldAttrs: { + buildFlags = [ "png-country-320x240-fancy" ]; + installPhase = '' + runHook preInstall + mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png + runHook postInstall + ''; + }); + isoimagewriter = libsForQt5.callPackage ../tools/misc/isoimagewriter {}; isort = with python3Packages; toPythonApplication isort; @@ -21420,8 +20987,6 @@ with pkgs; jama = callPackage ../development/libraries/jama { }; - jansson = callPackage ../development/libraries/jansson { }; - jarowinkler-cpp = callPackage ../development/libraries/jarowinkler-cpp { }; jbig2dec = callPackage ../development/libraries/jbig2dec { }; @@ -21447,8 +21012,6 @@ with pkgs; json2hcl = callPackage ../development/tools/json2hcl { }; - json2tsv = callPackage ../development/tools/json2tsv { }; - json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml; json-glib = callPackage ../development/libraries/json-glib { }; @@ -21819,10 +21382,6 @@ with pkgs; libdeflate = darwin.apple_sdk_11_0.callPackage ../development/libraries/libdeflate { }; - libdeltachat = callPackage ../development/libraries/libdeltachat { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - }; - libdevil = callPackage ../development/libraries/libdevil { inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -22423,11 +21982,13 @@ with pkgs; inherit ({ libmicrohttpd_0_9_77 = callPackage ../development/libraries/libmicrohttpd/0.9.77.nix { }; + libmicrohttpd_1_0 = callPackage ../development/libraries/libmicrohttpd/1.0.nix { }; }) libmicrohttpd_0_9_77 + libmicrohttpd_1_0 ; - libmicrohttpd = libmicrohttpd_0_9_77; + libmicrohttpd = libmicrohttpd_1_0; libmikmod = callPackage ../development/libraries/libmikmod { inherit (darwin.apple_sdk.frameworks) CoreAudio; @@ -22457,8 +22018,6 @@ with pkgs; libmp3splt = callPackage ../development/libraries/libmp3splt { }; - libmrss = callPackage ../development/libraries/libmrss { }; - libmspack = callPackage ../development/libraries/libmspack { }; libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { }; @@ -22495,8 +22054,6 @@ with pkgs; libnova = callPackage ../development/libraries/science/astronomy/libnova { }; - libnxml = callPackage ../development/libraries/libnxml { }; - libodfgen = callPackage ../development/libraries/libodfgen { }; libofa = callPackage ../development/libraries/libofa { }; @@ -22679,8 +22236,6 @@ with pkgs; libthai = callPackage ../development/libraries/libthai { }; - libtheora = callPackage ../development/libraries/libtheora { }; - libthreadar = callPackage ../development/libraries/libthreadar { }; libticables2 = callPackage ../development/libraries/libticables2 { }; @@ -22708,16 +22263,6 @@ with pkgs; libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; - libtorrent-rasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - python = python3; - }; - - libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - python = python3; - }; - libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; libtpms = callPackage ../tools/security/libtpms { }; @@ -22790,8 +22335,6 @@ with pkgs; libusbgx = callPackage ../development/libraries/libusbgx { }; - libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; - libusbsio = callPackage ../development/libraries/libusbsio { }; libucontext = callPackage ../development/libraries/libucontext { }; @@ -22866,7 +22409,6 @@ with pkgs; libviperfx = callPackage ../development/libraries/libviperfx { }; libvpx = callPackage ../development/libraries/libvpx { }; - libvpx_1_8 = callPackage ../development/libraries/libvpx/1_8.nix { }; libvterm = callPackage ../development/libraries/libvterm { }; libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { }; @@ -23006,7 +22548,7 @@ with pkgs; lirc = callPackage ../development/libraries/lirc { }; liquid-dsp = callPackage ../development/libraries/liquid-dsp { - inherit (darwin) autoSignDarwinBinariesHook cctools; + inherit (darwin) autoSignDarwinBinariesHook; }; liquidfun = callPackage ../development/libraries/liquidfun { }; @@ -23119,26 +22661,59 @@ with pkgs; ## libGL/libGLU/Mesa stuff - # Default libGL implementation, should provide headers and - # libGL.so/libEGL.so/... to link agains them. Android NDK provides - # an OpenGL implementation, we can just use that. - libGL = if stdenv.hostPlatform.useAndroidPrebuilt then stdenv - else callPackage ../development/libraries/mesa/stubs.nix { - inherit (darwin.apple_sdk.frameworks) OpenGL; - }; + # Default libGL implementation. + # + # Android NDK provides an OpenGL implementation, we can just use that. + # + # On macOS, we use the OpenGL framework. Packages that still need GLX + # specifically can pull in libGLX instead. If you have a package that + # should work without X11 but it can’t find the library, it may help + # to add the path to `NIX_CFLAGS_COMPILE`: + # + # -L${libGL}/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries + # + # If you still can’t get it working, please don’t hesitate to ping + # @NixOS/darwin-maintainers to ask an expert to take a look. + libGL = + if stdenv.hostPlatform.useAndroidPrebuilt then + stdenv + else if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk.frameworks.OpenGL + else + libglvnd; - # Default libGLU - libGLU = mesa_glu; + # On macOS, we use the OpenGL framework. Packages that use libGLX on + # macOS may need to depend on mesa_glu directly if this doesn’t work. + libGLU = + if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk.frameworks.OpenGL + else + mesa_glu; + + # libglvnd does not work (yet?) on macOS. + libGLX = + if stdenv.hostPlatform.isDarwin then + mesa + else + libglvnd; + + # On macOS, we use the GLUT framework. Packages that use libGLX on + # macOS may need to depend on freeglut directly if this doesn’t work. + libglut = + if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk.frameworks.GLUT + else + freeglut; + + mesa = if stdenv.isDarwin + then darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/darwin.nix { + inherit (darwin.apple_sdk_11_0.libs) Xplugin; + } + else callPackage ../development/libraries/mesa {}; - mesa = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa { - inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; - inherit (darwin.apple_sdk_11_0.libs) Xplugin; - }; mesa_i686 = pkgsi686Linux.mesa; # make it build on Hydra - mesa_glu = callPackage ../development/libraries/mesa-glu { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + mesa_glu = callPackage ../development/libraries/mesa-glu {}; ## End libGL/libGLU/Mesa stuff @@ -23335,7 +22910,9 @@ with pkgs; nntp-proxy = callPackage ../applications/networking/nntp-proxy { }; - non = callPackage ../applications/audio/non { }; + non = callPackage ../applications/audio/non { + wafHook = (waf.override { extraTools = [ "gccdeps" ]; }).hook; + }; ntl = callPackage ../development/libraries/ntl { }; @@ -23361,16 +22938,10 @@ with pkgs; nuspell = callPackage ../development/libraries/nuspell { }; nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; }; - # splicing magic - nv-codec-headers-versions = callPackages ../development/libraries/nv-codec-headers { }; - inherit (nv-codec-headers-versions) - nv-codec-headers-9 - nv-codec-headers-10 - nv-codec-headers-11 - nv-codec-headers-12 - ; - # A default nv-codec-headers to make people happy - nv-codec-headers = nv-codec-headers-versions.nv-codec-headers-9; + nv-codec-headers-9 = nv-codec-headers.override { majorVersion = "9"; }; + nv-codec-headers-10 = nv-codec-headers.override { majorVersion = "10"; }; + nv-codec-headers-11 = nv-codec-headers.override { majorVersion = "11"; }; + nv-codec-headers-12 = nv-codec-headers.override { majorVersion = "12"; }; nvidiaCtkPackages = callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix @@ -23518,11 +23089,16 @@ with pkgs; openslp = callPackage ../development/libraries/openslp { }; - openstackclient = with python3Packages; toPythonApplication python-openstackclient; - glanceclient = with python3Packages; toPythonApplication python-glanceclient; - heatclient = with python3Packages; toPythonApplication python-heatclient; - ironicclient = with python3Packages; toPythonApplication python-ironicclient; - manilaclient = with python3Packages; toPythonApplication python-manilaclient; + openstackclient = with python311Packages; toPythonApplication python-openstackclient; + openstackclient-full = openstackclient.overridePythonAttrs (oldAttrs: { + dependencies = oldAttrs.dependencies ++ oldAttrs.passthru.optional-dependencies.cli-plugins; + }); + barbicanclient = with python311Packages; toPythonApplication python-barbicanclient; + glanceclient = with python311Packages; toPythonApplication python-glanceclient; + heatclient = with python311Packages; toPythonApplication python-heatclient; + ironicclient = with python311Packages; toPythonApplication python-ironicclient; + manilaclient = with python311Packages; toPythonApplication python-manilaclient; + swiftclient = with python311Packages; toPythonApplication python-swiftclient; openvdb = callPackage ../development/libraries/openvdb { }; @@ -23734,6 +23310,7 @@ with pkgs; protozero = callPackage ../development/libraries/protozero { }; flatbuffers = callPackage ../development/libraries/flatbuffers { }; + flatbuffers_23 = callPackage ../development/libraries/flatbuffers/23.nix { }; nanopbMalloc = callPackage ../by-name/na/nanopb/package.nix { enableMalloc = true; }; @@ -23838,8 +23415,6 @@ with pkgs; rapidjson = callPackage ../development/libraries/rapidjson { }; - rapidjson-unstable = callPackage ../development/libraries/rapidjson/unstable.nix { }; - rapidxml = callPackage ../development/libraries/rapidxml { }; rapidyaml = callPackage ../development/libraries/rapidyaml {}; @@ -23983,8 +23558,6 @@ with pkgs; round = callPackage ../applications/graphics/round { }; - ronn = callPackage ../development/tools/ronn { }; - router = callPackage ../servers/http/router { }; rover = callPackage ../development/tools/rover { }; @@ -24005,10 +23578,6 @@ with pkgs; rustc-demangle = callPackage ../development/libraries/rustc-demangle { }; - rustls-ffi = callPackage ../development/libraries/rustls-ffi { - inherit (darwin.apple_sdk.frameworks) Security; - }; - s2geometry = callPackage ../development/libraries/s2geometry { }; safefile = callPackage ../development/libraries/safefile { }; @@ -24039,27 +23608,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; - SDL2_image = callPackage ../development/libraries/SDL2_image { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; - # Pinned for pygame, toppler - SDL2_image_2_0 = SDL2_image.overrideAttrs (oldAttrs: { - version = "2.0.5"; - src = fetchurl { - inherit (oldAttrs.src) url; - hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; - }; - }); - # Pinned for hedgewars: - # https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 - SDL2_image_2_6 = SDL2_image.overrideAttrs (oldAttrs: { - version = "2.6.3"; - src = fetchurl { - inherit (oldAttrs.src) url; - hash = "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw="; - }; - }); - sdrplay = callPackage ../applications/radio/sdrplay { }; sdr-j-fm = libsForQt5.callPackage ../applications/radio/sdr-j-fm { }; @@ -24113,8 +23661,6 @@ with pkgs; }; csfml = callPackage ../development/libraries/csfml { }; - shapelib = callPackage ../development/libraries/shapelib { }; - sharness = callPackage ../development/libraries/sharness { }; shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; @@ -24262,6 +23808,17 @@ with pkgs; speechd = callPackage ../development/libraries/speechd { }; + speechd-minimal = speechd.override { + withLibao = false; + withPulse = false; + withAlsa = false; + withOss = false; + withFlite = false; + withEspeak = false; + withPico = false; + libsOnly = true; + }; + speech-tools = callPackage ../development/libraries/speech-tools { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; @@ -24362,8 +23919,6 @@ with pkgs; subdl = callPackage ../applications/video/subdl { }; - subtitleedit = callPackage ../applications/video/subtitleedit { }; - subtitleeditor = callPackage ../applications/video/subtitleeditor { }; subxt = callPackage ../development/tools/subxt { }; @@ -24380,8 +23935,6 @@ with pkgs; svxlink = libsForQt5.callPackage ../applications/radio/svxlink { }; - swiftclient = with python3Packages; toPythonApplication python-swiftclient; - biblesync = callPackage ../development/libraries/biblesync { }; szip = callPackage ../development/libraries/szip { }; @@ -24590,8 +24143,6 @@ 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; }; @@ -24600,8 +24151,6 @@ with pkgs; hdf5 = hdf5.override { usev110Api = true; }; }; - vkd3d-proton = callPackage ../development/libraries/vkd3d-proton {}; - vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { }; vkdt = callPackage ../applications/graphics/vkdt { }; @@ -24635,6 +24184,9 @@ with pkgs; vtk_9_withQt5 = vtk_9.override { enableQt = true; }; vtk = vtk_9; + + vtk_9_egl = vtk_9.override { enableEgl = true; }; + vtkWithQt5 = vtk_9_withQt5; vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; @@ -24791,8 +24343,6 @@ with pkgs; xlslib = callPackage ../development/libraries/xlslib { }; - xsimd = callPackage ../development/libraries/xsimd { }; - xtensor = callPackage ../development/libraries/xtensor { }; xtl = callPackage ../development/libraries/xtl { }; @@ -24837,8 +24387,6 @@ with pkgs; yyjson = callPackage ../development/libraries/yyjson { }; - zchunk = callPackage ../development/libraries/zchunk { }; - zeitgeist = callPackage ../development/libraries/zeitgeist { }; zlib = callPackage ../development/libraries/zlib { }; @@ -24882,6 +24430,13 @@ with pkgs; }; zig = zig_0_13; + zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv; + + aroccPackages = recurseIntoAttrs (callPackage ../development/compilers/arocc {}); + arocc = aroccPackages.latest; + + aroccStdenv = if stdenv.cc.isArocc then stdenv else lowPrio arocc.cc.passthru.stdenv; + zimlib = callPackage ../development/libraries/zimlib { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; @@ -24942,8 +24497,6 @@ with pkgs; commonsMath = callPackage ../development/libraries/java/commons/math { }; - fastjar = callPackage ../development/tools/java/fastjar { }; - httpunit = callPackage ../development/libraries/java/httpunit { }; javaCup = callPackage ../development/libraries/java/cup { @@ -24980,8 +24533,7 @@ with pkgs; smack = callPackage ../development/libraries/java/smack { }; - swt = callPackage ../development/libraries/java/swt { }; - swt_jdk8 = callPackage ../development/libraries/java/swt { + swt_jdk8 = callPackage ../by-name/sw/swt/package.nix { jdk = jdk8; }; @@ -25130,17 +24682,17 @@ with pkgs; }; # Steel Bank Common Lisp - sbcl_2_4_5 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.5"; }; + sbcl_2_4_6 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.6"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_6 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.6"; }; + sbcl_2_4_7 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.7"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_6; + sbcl = sbcl_2_4_7; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -25504,9 +25056,7 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; - grafana-agent = callPackage ../servers/monitoring/grafana-agent { - buildGoModule = buildGo122Module; - }; + grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; grafana-loki = callPackage ../servers/monitoring/loki { }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; @@ -25539,8 +25089,8 @@ with pkgs; hasura-cli = callPackage ../servers/hasura/cli.nix { }; - inherit (callPackage ../servers/hbase {}) hbase_2_4 hbase_2_5 hbase_3_0; - hbase2 = hbase_2_5; + inherit (callPackage ../servers/hbase {}) hbase_2_4 hbase_2_5 hbase_2_6 hbase_3_0; + hbase2 = hbase_2_6; hbase3 = hbase_3_0; hbase = hbase2; # when updating, point to the latest stable release @@ -25572,12 +25122,6 @@ with pkgs; https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { }; - hydron = callPackage ../servers/hydron { }; - - hyprspace = callPackage ../applications/networking/hyprspace { - inherit (darwin) iproute2mac; - }; - ic-keysmith = callPackage ../tools/security/ic-keysmith { }; icecream = callPackage ../servers/icecream { }; @@ -25674,7 +25218,11 @@ with pkgs; mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { }; - mailmanPackages = callPackage ../servers/mail/mailman { }; + mailmanPackages = callPackage ../servers/mail/mailman { + # Hyperkitty test fails with 3.12: + # https://gitlab.com/mailman/hyperkitty/-/issues/514 + python3 = python311; + }; inherit (mailmanPackages) mailman mailman-hyperkitty; mailman-web = mailmanPackages.web; @@ -25744,8 +25292,6 @@ with pkgs; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - mullvad-browser = callPackage ../applications/networking/browsers/mullvad-browser { }; - mullvad-closest = with python3Packages; toPythonApplication mullvad-closest; mycorrhiza = callPackage ../servers/mycorrhiza { }; @@ -25857,7 +25403,11 @@ with pkgs; openxr-loader = callPackage ../development/libraries/openxr-loader { }; - osrm-backend = callPackage ../servers/osrm-backend { }; + osrm-backend = callPackage ../servers/osrm-backend { + tbb = tbb_2021_11; + # https://github.com/Project-OSRM/osrm-backend/issues/6503 + boost = boost179; + }; oven-media-engine = callPackage ../servers/misc/oven-media-engine { }; @@ -25891,8 +25441,6 @@ with pkgs; postgrey = callPackage ../servers/mail/postgrey { }; - pshs = callPackage ../servers/http/pshs { }; - quark = callPackage ../servers/http/quark { }; smtprelay = callPackage ../servers/mail/smtprelay { }; @@ -25933,11 +25481,6 @@ with pkgs; libcardiacarrest = callPackage ../misc/libcardiacarrest { }; - easyeffects = callPackage ../applications/audio/easyeffects { - # Fix crashes with speexdsp effects - speexdsp = speexdsp.override { withFftw3 = false; }; - }; - pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { }; tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; @@ -25957,8 +25500,6 @@ with pkgs; mariadb-connector-c_3_2 = callPackage ../servers/sql/mariadb/connector-c/3_2.nix { }; mariadb-connector-c_3_3 = callPackage ../servers/sql/mariadb/connector-c/3_3.nix { }; - mariadb-galera = callPackage ../servers/sql/mariadb/galera { }; - inherit (import ../servers/sql/mariadb pkgs) mariadb_105 mariadb_106 @@ -25973,14 +25514,12 @@ with pkgs; mongodb-5_0 = callPackage ../servers/nosql/mongodb/5.0.nix { sasl = cyrus_sasl; boost = boost179.override { enableShared = false; }; - inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; mongodb-6_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/6.0.nix { sasl = cyrus_sasl; boost = boost178.override { enableShared = false; }; - inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv.override (old: { @@ -26004,7 +25543,7 @@ with pkgs; influxdb2 = callPackage ../servers/nosql/influxdb2/combined.nix { }; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { - inherit (darwin) cctools developer_cmds DarwinTools; + inherit (darwin) developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost177; # Configure checks for specific version. icu = icu69; @@ -26018,9 +25557,7 @@ with pkgs; azuredatastudio = callPackage ../applications/misc/azuredatastudio { }; - miniflux = callPackage ../servers/miniflux { - buildGoModule = buildGo122Module; - }; + miniflux = callPackage ../servers/miniflux { }; inherit (callPackage ../servers/mir { }) mir @@ -26130,20 +25667,20 @@ with pkgs; postgresql_15_jit postgresql_16_jit ; - postgresql = postgresql_15; - postgresql_jit = postgresql_15_jit; + postgresql = postgresql_16; + postgresql_jit = postgresql_16_jit; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs; postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs; - postgresql16Packages = recurseIntoAttrs postgresql_16.pkgs; + postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs; postgresql12JitPackages = recurseIntoAttrs postgresql_12_jit.pkgs; postgresql13JitPackages = recurseIntoAttrs postgresql_13_jit.pkgs; postgresql14JitPackages = recurseIntoAttrs postgresql_14_jit.pkgs; postgresql15JitPackages = recurseIntoAttrs postgresql_15_jit.pkgs; postgresql16JitPackages = recurseIntoAttrs postgresql_16_jit.pkgs; - postgresql15Packages = postgresqlPackages; + postgresql16Packages = postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; @@ -26155,8 +25692,6 @@ with pkgs; liquibase_redshift_extension = callPackage ../development/java-modules/liquibase_redshift_extension { }; - promql-cli = callPackage ../tools/misc/promql-cli { }; - prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; @@ -26201,9 +25736,6 @@ with pkgs; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; - prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; - }; prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { }; prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { } ; prometheus-pgbouncer-exporter = callPackage ../servers/monitoring/prometheus/pgbouncer-exporter.nix { }; @@ -26292,7 +25824,7 @@ with pkgs; rethinkdb = callPackage ../servers/nosql/rethinkdb { stdenv = clangStdenv; - libtool = darwin.cctools; + libtool = cctools; protobuf = protobuf_21; }; @@ -26308,7 +25840,7 @@ with pkgs; roon-server = callPackage ../servers/roon-server { }; - rustic-rs = callPackage ../tools/backup/rustic-rs { + rustic = callPackage ../by-name/ru/rustic/package.nix { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -26412,9 +25944,7 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo122Module; - }; + tailscale = callPackage ../servers/tailscale { }; tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; @@ -26448,8 +25978,6 @@ with pkgs; shiori = callPackage ../servers/web-apps/shiori { }; - slskd = callPackage ../servers/web-apps/slskd { }; - inherit (callPackages ../servers/web-apps/matomo {}) matomo matomo_5 @@ -26561,6 +26089,7 @@ with pkgs; }; zabbix60 = recurseIntoAttrs (zabbixFor "v60"); + zabbix64 = recurseIntoAttrs (zabbixFor "v64"); zabbix50 = recurseIntoAttrs (zabbixFor "v50"); zabbix = zabbix60; @@ -26571,14 +26100,8 @@ with pkgs; fit-trackee = callPackage ../servers/geospatial/fit-trackee { }; - geoserver = callPackage ../servers/geospatial/geoserver { }; - - mapcache = callPackage ../servers/geospatial/mapcache { }; - mapproxy = callPackage ../servers/geospatial/mapproxy { }; - mapserver = callPackage ../servers/geospatial/mapserver { }; - martin = callPackage ../servers/geospatial/martin { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -26607,8 +26130,6 @@ with pkgs; acpitool = callPackage ../os-specific/linux/acpitool { }; - aldente = callPackage ../os-specific/darwin/aldente { }; - alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { }; alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; @@ -26696,7 +26217,12 @@ with pkgs; bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; - busybox = callPackage ../os-specific/linux/busybox { }; + busybox = callPackage ../os-specific/linux/busybox { + # Fixes libunwind from being dynamically linked to a static binary. + stdenv = if (stdenv.targetPlatform.useLLVM or false) then + overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx + else stdenv; + }; busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { # musl roadmap has RISC-V support projected for 1.1.20 busybox = if !stdenv.hostPlatform.isRiscV && !stdenv.hostPlatform.isLoongArch64 && stdenv.hostPlatform.libc != "bionic" @@ -26742,7 +26268,7 @@ with pkgs; criu = callPackage ../os-specific/linux/criu { }; cryptomator = callPackage ../tools/security/cryptomator { - jdk = jdk21.override { enableJavaFX = true; }; + jdk = jdk22.override { enableJavaFX = true; }; }; cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; @@ -26836,7 +26362,8 @@ with pkgs; fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt5.callPackage ../os-specific/linux/ffado { }; + ffado = callPackage ../os-specific/linux/ffado { }; + ffado-mixer = callPackage ../os-specific/linux/ffado { withMixer = true; }; libffado = ffado; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -27025,8 +26552,6 @@ with pkgs; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; - linux-wifi-hotspot = callPackage ../os-specific/linux/linux-wifi-hotspot { }; - linthesia = callPackage ../games/linthesia/default.nix { }; libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { }; @@ -27127,10 +26652,6 @@ 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; @@ -27329,7 +26850,6 @@ with pkgs; ocf-resource-agents = callPackage ../os-specific/linux/ocf-resource-agents { }; - open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; oxtools = callPackage ../os-specific/linux/oxtools { }; @@ -27338,8 +26858,6 @@ with pkgs; delve = callPackage ../development/tools/delve { }; - dep2nix = callPackage ../development/tools/dep2nix { }; - easyjson = callPackage ../development/tools/easyjson { }; iferr = callPackage ../development/tools/iferr { }; @@ -27402,9 +26920,7 @@ with pkgs; goverview = callPackage ../tools/security/goverview { }; - go-tools = callPackage ../development/tools/go-tools { - buildGoModule = buildGo122Module; - }; + go-tools = callPackage ../development/tools/go-tools { }; gotest = callPackage ../development/tools/gotest { }; @@ -27454,7 +26970,7 @@ with pkgs; octomap = callPackage ../development/libraries/octomap { }; - odin = callPackage ../development/compilers/odin { + odin = callPackage ../by-name/od/odin/package.nix { inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; llvmPackages = llvmPackages_18; @@ -27470,8 +26986,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - openpam = callPackage ../development/libraries/openpam { }; - openbsm = callPackage ../development/libraries/openbsm { }; pagemon = callPackage ../os-specific/linux/pagemon { }; @@ -27561,14 +27075,19 @@ with pkgs; prototool = callPackage ../development/tools/prototool { }; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); - qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; glusterfsSupport = true; }); + qemu_full = lowPrio (qemu.override { + smbdSupport = lib.meta.availableOn stdenv.hostPlatform samba; + cephSupport = lib.meta.availableOn stdenv.hostPlatform ceph; + glusterfsSupport = lib.meta.availableOn stdenv.hostPlatform glusterfs && lib.meta.availableOn stdenv.hostPlatform libuuid; + }); # See `xenPackages` source for explanations. # Building with `xen` instead of `xen-slim` is possible, but makes no sense. qemu_xen = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-slim; }); - qemu_xen-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-light; }); - qemu_xen_4_15 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_15-slim; }); - qemu_xen_4_15-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_15-light; }); + qemu_xen_4_19 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_19-slim; }); + qemu_xen_4_18 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_18-slim; }); + qemu_xen_4_17 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_17-slim; }); + qemu_xen_4_16 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_16-slim; }); qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); @@ -27591,8 +27110,6 @@ with pkgs; reap = callPackage ../os-specific/linux/reap { }; - rectangle = callPackage ../os-specific/darwin/rectangle { }; - regionset = callPackage ../os-specific/linux/regionset { }; rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; @@ -27617,8 +27134,6 @@ with pkgs; rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { }; - rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { }; - rvvm = callPackage ../applications/virtualization/rvvm { }; s3ql = callPackage ../tools/backup/s3ql { }; @@ -27633,6 +27148,8 @@ with pkgs; schedtool = callPackage ../os-specific/linux/schedtool { }; + sddm-astronaut = qt6Packages.callPackage ../data/themes/sddm-astronaut { }; + sddm-chili-theme = libsForQt5.callPackage ../data/themes/chili-sddm { }; sddm-sugar-dark = libsForQt5.callPackage ../data/themes/sddm-sugar-dark { }; @@ -27751,6 +27268,7 @@ with pkgs; withPasswordQuality = false; withVmspawn = false; withQrencode = false; + withLibarchive = false; }; systemdLibs = systemdMinimal.override { pname = "systemd-minimal-libs"; @@ -27793,8 +27311,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - trust-dns = callPackage ../servers/dns/trust-dns { }; - trustymail = callPackage ../tools/security/trustymail { }; tunctl = callPackage ../os-specific/linux/tunctl { }; @@ -27831,6 +27347,7 @@ with pkgs; ubootOrangePiZeroPlus2H5 ubootOrangePiZero ubootOrangePiZero2 + ubootOrangePiZero3 ubootPcduino3Nano ubootPine64 ubootPine64LTS @@ -27937,10 +27454,6 @@ with pkgs; wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; - wpa_supplicant_ro_ssids = wpa_supplicant.override { - readOnlyModeSSIDs = true; - }; - wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { }; @@ -27949,8 +27462,6 @@ with pkgs; xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { }; - xilinx-bootgen = callPackage ../tools/misc/xilinx-bootgen { }; - xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { }; @@ -28043,6 +27554,8 @@ with pkgs; dracula-theme = callPackage ../data/themes/dracula-theme { }; + dracula-qt5-theme = callPackage ../data/themes/dracula-qt5-theme { }; + ant-nebula-theme = callPackage ../data/themes/ant-theme/ant-nebula.nix { }; arc-icon-theme = callPackage ../data/icons/arc-icon-theme { }; @@ -28071,7 +27584,6 @@ with pkgs; bgnet = callPackage ../data/documentation/bgnet { }; - bibata-extra-cursors = callPackage ../data/icons/bibata-cursors/extra.nix { }; bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { }; apple-cursor = callPackage ../data/icons/apple-cursor { }; @@ -28118,9 +27630,7 @@ with pkgs; clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; - cnspec = callPackage ../tools/security/cnspec { - buildGoModule = buildGo122Module; - }; + cnspec = callPackage ../tools/security/cnspec { }; cnstrokeorder = callPackage ../data/fonts/cnstrokeorder { }; @@ -28591,20 +28101,12 @@ with pkgs; martian-mono = callPackage ../data/fonts/martian-mono { }; - marwaita = callPackage ../data/themes/marwaita { }; - marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix { inherit (kdePackages) breeze-icons; }; - marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; - - marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { }; - marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { }; - marwaita-ubuntu = callPackage ../data/themes/marwaita-ubuntu { }; - matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; @@ -28708,8 +28210,6 @@ with pkgs; ''; }; - nuclear = callPackage ../applications/audio/nuclear { }; - nuclei = callPackage ../tools/security/nuclei { }; nullmailer = callPackage ../servers/mail/nullmailer { @@ -28887,7 +28387,7 @@ with pkgs; session-desktop = callPackage ../applications/networking/instant-messengers/session-desktop { }; shaderc = callPackage ../development/compilers/shaderc { - inherit (darwin) autoSignDarwinBinariesHook cctools; + inherit (darwin) autoSignDarwinBinariesHook; }; shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; @@ -28900,8 +28400,6 @@ with pkgs; skeu = callPackage ../data/themes/skeu { }; - sweet = callPackage ../data/themes/sweet { }; - sweet-nova = callPackage ../data/themes/sweet-nova { }; shared-mime-info = callPackage ../data/misc/shared-mime-info { }; @@ -29110,8 +28608,6 @@ with pkgs; ubuntu-themes = callPackage ../data/themes/ubuntu-themes { }; - ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; - ucs-fonts = callPackage ../data/fonts/ucs-fonts { }; bront_fonts = callPackage ../data/fonts/bront { }; @@ -29447,12 +28943,11 @@ with pkgs; aucatctl = callPackage ../applications/audio/aucatctl { }; - audacious = libsForQt5.callPackage ../applications/audio/audacious { }; - audacious-plugins = libsForQt5.callPackage ../applications/audio/audacious/plugins.nix { + audacious = qt6Packages.callPackage ../applications/audio/audacious { }; + audacious-plugins = qt6Packages.callPackage ../applications/audio/audacious/plugins.nix { # Avoid circular dependency audacious = audacious.override { audacious-plugins = null; }; }; - audaciousQt5 = audacious; audacity = callPackage ../applications/audio/audacity { inherit (darwin.apple_sdk.frameworks) AppKit CoreAudioKit; @@ -29581,8 +29076,6 @@ with pkgs; bashSnippets = callPackage ../applications/misc/bashSnippets { }; - batik = callPackage ../applications/graphics/batik { }; - batsignal = callPackage ../applications/misc/batsignal { }; baudline = callPackage ../applications/audio/baudline { }; @@ -29603,9 +29096,7 @@ with pkgs; bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; - bino3d = libsForQt5.callPackage ../applications/video/bino3d { - glew = glew110; - }; + bino3d = qt6Packages.callPackage ../applications/video/bino3d { }; bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { }; @@ -29647,6 +29138,7 @@ with pkgs; blender = callPackage ../applications/misc/blender { openexr = openexr_3; + python3Packages = python311Packages; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; @@ -29728,7 +29220,7 @@ with pkgs; cardo = callPackage ../data/fonts/cardo { }; cage = callPackage ../applications/window-managers/cage { - wlroots = wlroots_0_16; + wlroots = wlroots_0_17; }; calf = callPackage ../applications/audio/calf { @@ -29745,8 +29237,6 @@ with pkgs; podofo = podofo010; }; - calibre-web = callPackage ../servers/calibre-web { }; - # calico-felix and calico-node have not been packaged due to libbpf, linking issues inherit (callPackage ../applications/networking/cluster/calico {}) calico-apiserver @@ -29811,7 +29301,9 @@ with pkgs; chatty = callPackage ../applications/networking/instant-messengers/chatty { }; - chirp = callPackage ../applications/radio/chirp { }; + chirp = callPackage ../applications/radio/chirp { + python3 = python311; + }; browsh = callPackage ../applications/networking/browsers/browsh { }; @@ -30081,7 +29573,7 @@ with pkgs; inherit (callPackage ../applications/virtualization/docker {}) docker_24 docker_25 docker_26 docker_27; - docker = docker_24; + docker = docker_27; docker-client = docker.override { clientOnly = true; }; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; @@ -30094,7 +29586,6 @@ with pkgs; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; docker-compose = callPackage ../applications/virtualization/docker/compose.nix { }; - docker-compose_1 = python3Packages.callPackage ../applications/virtualization/docker/compose_1.nix { }; docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { }; @@ -30163,7 +29654,7 @@ with pkgs; dyff = callPackage ../development/tools/dyff { }; - dwl = callPackage ../applications/window-managers/dwl { + dwl = callPackage ../by-name/dw/dwl/package.nix { wlroots = wlroots_0_17; }; @@ -30205,9 +29696,6 @@ with pkgs; ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; - inherit (recurseIntoAttrs (callPackage ../applications/editors/ed { })) - ed edUnstable; - edlin = callPackage ../applications/editors/edlin { }; oed = callPackage ../applications/editors/oed { }; @@ -30236,7 +29724,7 @@ with pkgs; em = callPackage ../applications/editors/em { }; - inherit (recurseIntoAttrs (darwin.apple_sdk_11_0.callPackage ../applications/editors/emacs { })) + inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) emacs28 emacs28-gtk2 emacs28-gtk3 @@ -30313,7 +29801,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; - etebase-server = with python3Packages; toPythonApplication etebase-server; + etebase-server = callPackage ../servers/etebase {}; etesync-dav = callPackage ../applications/misc/etesync-dav { }; @@ -30443,8 +29931,6 @@ with pkgs; flamp = callPackage ../applications/radio/flamp { }; - flexget = callPackage ../applications/networking/flexget { }; - fldigi = callPackage ../applications/radio/fldigi { hamlib = hamlib_4; }; @@ -30483,7 +29969,7 @@ with pkgs; font-manager = callPackage ../by-name/fo/font-manager/package.nix { libsoup = libsoup_3; - webkitgtk = webkitgtk_4_1; + webkitgtk = webkitgtk_6_0; }; fontfinder = callPackage ../applications/misc/fontfinder { }; @@ -30548,7 +30034,7 @@ with pkgs; gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { unwrapped = callPackage ../applications/radio/gnuradio { inherit (darwin.apple_sdk.frameworks) CoreAudio; - python = python3; + python = python311; }; }; gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; @@ -30578,43 +30064,11 @@ with pkgs; }; }; }; - gnuradio3_9 = callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = callPackage ../applications/radio/gnuradio/3.9.nix { - inherit (darwin.apple_sdk.frameworks) CoreAudio; - python = python3; - }; - }; - gnuradio3_9Packages = lib.recurseIntoAttrs gnuradio3_9.pkgs; - # A build without gui components and other utilites not needed for end user - # libraries - gnuradio3_9Minimal = gnuradio.override { - doWrap = false; - unwrapped = gnuradio.unwrapped.override { - volk = volk.override { - # So it will not reference python - enableModTool = false; - }; - uhd = uhdMinimal; - features = { - gnuradio-companion = false; - python-support = false; - examples = false; - gr-qtgui = false; - gr-utils = false; - gr-modtool = false; - gr-blocktool = false; - sphinx = false; - doxygen = false; - # Doesn't make it reference python eventually, but makes reverse - # depdendencies require python to use cmake files of GR. - gr-ctrlport = false; - }; - }; - }; gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix ({ inherit (darwin.apple_sdk.frameworks) CoreAudio; - python = python3; + python = python311; + volk = volk_2; } // lib.optionalAttrs stdenv.isLinux { stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv; }); @@ -30625,7 +30079,7 @@ with pkgs; gnuradio3_8Minimal = gnuradio3_8.override { doWrap = false; unwrapped = gnuradio3_8.unwrapped.override { - volk = volk.override { + volk = volk_2.override { enableModTool = false; }; uhd = uhdMinimal; @@ -30650,7 +30104,7 @@ with pkgs; }; greetd = recurseIntoAttrs { - dlm = callPackage ../applications/display-managers/greetd/dlm.nix { }; + dlm = throw "greetd.dlm has been removed as it is broken and abandoned upstream"; #Added 2024-07-15 greetd = callPackage ../applications/display-managers/greetd { }; gtkgreet = callPackage ../applications/display-managers/greetd/gtkgreet.nix { }; regreet = callPackage ../applications/display-managers/greetd/regreet.nix { }; @@ -30717,8 +30171,6 @@ with pkgs; gjay = callPackage ../applications/audio/gjay { }; - sherlock = callPackage ../tools/security/sherlock { }; - stratovirt = callPackage ../applications/virtualization/stratovirt { }; rhythmbox = callPackage ../applications/audio/rhythmbox { }; @@ -30765,8 +30217,6 @@ with pkgs; imlib2 = imlib2Full; }; - feishin = callPackage ../applications/audio/feishin { }; - feishu = callPackage ../applications/networking/instant-messengers/feishu { }; filezilla = darwin.apple_sdk_11_0.callPackage ../applications/networking/ftp/filezilla { @@ -30786,7 +30236,8 @@ with pkgs; firefox-beta-unwrapped = firefoxPackages.firefox-beta; firefox-devedition-unwrapped = firefoxPackages.firefox-devedition; firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115; - firefox-esr-unwrapped = firefoxPackages.firefox-esr-115; + firefox-esr-128-unwrapped = firefoxPackages.firefox-esr-128; + firefox-esr-unwrapped = firefoxPackages.firefox-esr-128; firefox = wrapFirefox firefox-unwrapped { }; firefox-beta = wrapFirefox firefox-beta-unwrapped { @@ -30804,13 +30255,19 @@ with pkgs; firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; - firefox-esr = firefox-esr-115; + firefox-esr-128 = wrapFirefox firefox-esr-128-unwrapped { + nameSuffix = "-esr"; + desktopName = "Firefox ESR"; + wmClass = "firefox-esr"; + icon = "firefox-esr"; + }; firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { nameSuffix = "-esr"; desktopName = "Firefox ESR"; wmClass = "firefox-esr"; icon = "firefox-esr"; }; + firefox-esr = firefox-esr-128; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; @@ -30855,8 +30312,6 @@ with pkgs; redoflacs = callPackage ../applications/audio/redoflacs { }; - flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; - flex-ncat = callPackage ../applications/radio/flex-ncat { }; flex-ndax = callPackage ../applications/radio/flex-ndax { }; @@ -30942,10 +30397,6 @@ with pkgs; freerdpUnstable = freerdp; - friture = libsForQt5.callPackage ../applications/audio/friture { - python3Packages = python39Packages; - }; - g933-utils = callPackage ../tools/misc/g933-utils { }; gavrasm = callPackage ../development/compilers/gavrasm { }; @@ -31039,8 +30490,6 @@ with pkgs; deadd-notification-center = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../applications/misc/deadd-notification-center { }); - lollypop = callPackage ../applications/audio/lollypop { }; - losslessaudiochecker = callPackage ../applications/audio/losslessaudiochecker { }; m32edit = callPackage ../applications/audio/midas/m32edit.nix { }; @@ -31053,7 +30502,9 @@ with pkgs; } ); - manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; + manuskript = libsForQt5.callPackage ../applications/editors/manuskript { + python3Packages = python311Packages; + }; metacubexd = callPackage ../by-name/me/metacubexd/package.nix { pnpm = callPackage ../development/tools/pnpm/generic.nix { @@ -31086,8 +30537,6 @@ with pkgs; svox = callPackage ../applications/audio/svox { }; - g4music = callPackage ../applications/audio/g4music { }; - genesys = callPackage ../applications/misc/genesys { }; giada = callPackage ../applications/audio/giada { }; @@ -31264,8 +30713,6 @@ with pkgs; hex-a-hop = callPackage ../games/hex-a-hop { }; - hexchat = callPackage ../applications/networking/irc/hexchat { }; - hexcurse = callPackage ../applications/editors/hexcurse { }; hexdino = callPackage ../applications/editors/hexdino { }; @@ -31383,10 +30830,6 @@ with pkgs; meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { }; - musikcube = callPackage ../applications/audio/musikcube { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio SystemConfiguration; - }; - libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { }; @@ -31417,8 +30860,6 @@ with pkgs; pixelnuke = callPackage ../applications/graphics/pixelnuke { }; - pixelorama = callPackage ../applications/editors/pixelorama { }; - pixeluvo = callPackage ../applications/graphics/pixeluvo { }; pixinsight = qt6Packages.callPackage ../applications/graphics/pixinsight { }; @@ -31466,25 +30907,15 @@ with pkgs; spectrwm = callPackage ../applications/window-managers/spectrwm { }; - spot = callPackage ../applications/audio/spot { }; - spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { }; - spotifyd = callPackage ../applications/audio/spotifyd { - withALSA = stdenv.isLinux; - withPulseAudio = config.pulseaudio or stdenv.isLinux; - withPortAudio = stdenv.isDarwin; - withMpris = stdenv.isLinux; - }; - srain = callPackage ../applications/networking/irc/srain { }; super-productivity = callPackage ../applications/office/super-productivity { }; inherit (callPackages ../development/libraries/wlroots {}) - wlroots_0_16 wlroots_0_17 - wlroots; + wlroots_0_18; sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { }); @@ -31558,8 +30989,6 @@ with pkgs; i3nator = callPackage ../tools/misc/i3nator { }; - i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; - i3status = callPackage ../applications/window-managers/i3/status.nix { }; i3status-rust = callPackage ../applications/window-managers/i3/status-rust.nix { }; @@ -31590,8 +31019,6 @@ with pkgs; id3v2 = callPackage ../applications/audio/id3v2 { }; - identity = callPackage ../applications/graphics/identity { }; - ifenslave = callPackage ../os-specific/linux/ifenslave { }; ii = callPackage ../applications/networking/irc/ii { @@ -31825,10 +31252,7 @@ with pkgs; buildGoModule = buildGo121Module; 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; + inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_30; k3s = k3s_1_30; k3sup = callPackage ../applications/networking/cluster/k3sup { }; @@ -31991,8 +31415,6 @@ with pkgs; kubectl-cnpg = callPackage ../applications/networking/cluster/kubectl-cnpg { }; - kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; - kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { }; kubectl-explore = callPackage ../applications/networking/cluster/kubectl-explore { }; @@ -32212,6 +31634,11 @@ with pkgs; }); libreoffice-still-unwrapped = libreoffice-still.unwrapped; + libreoffice-collabora = callPackage ../applications/office/libreoffice { + variant = "collabora"; + withFonts = true; + }; + libresprite = callPackage ../applications/editors/libresprite { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; }; @@ -32238,8 +31665,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - ledger-autosync = callPackage ../applications/office/ledger-autosync { }; - ledger-web = callPackage ../applications/office/ledger-web { }; ledger2beancount = callPackage ../tools/text/ledger2beancount { }; @@ -32260,8 +31685,6 @@ with pkgs; lls = callPackage ../applications/networking/lls { }; - localsend = callPackage ../applications/networking/localsend { }; - lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; libsoundio = null; @@ -32276,7 +31699,7 @@ with pkgs; lrzsz = callPackage ../tools/misc/lrzsz { }; - lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php81; }; + lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php82; }; ltex-ls = callPackage ../tools/text/ltex-ls { }; @@ -32342,7 +31765,7 @@ with pkgs; mac = callPackage ../development/libraries/mac { }; - macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; }; + macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { }; magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; @@ -32393,6 +31816,8 @@ with pkgs; mbrola = callPackage ../applications/audio/mbrola { }; + mbrola-voices = callPackage ../applications/audio/mbrola/voices.nix { }; + mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; @@ -32405,7 +31830,7 @@ with pkgs; mediaelch-qt5 = libsForQt5.callPackage ../applications/misc/mediaelch { }; mediaelch-qt6 = qt6Packages.callPackage ../applications/misc/mediaelch { }; - mediathekview = callPackage ../applications/video/mediathekview { jre = temurin-bin-20; }; + mediathekview = callPackage ../applications/video/mediathekview { }; meteo = callPackage ../applications/networking/weather/meteo { }; @@ -32541,8 +31966,6 @@ with pkgs; monitorcontrol = callPackage ../applications/misc/monitorcontrol { }; - xmr-stak = callPackage ../applications/misc/xmr-stak { }; - xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { }; xmrig-mo = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/moneroocean.nix { }; @@ -32571,13 +31994,6 @@ with pkgs; moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; - moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - SDL2 = buildPackages.SDL2.override { - drmSupport = stdenv.isLinux; - }; - }; - mooSpace = callPackage ../applications/audio/mooSpace { }; mop = callPackage ../applications/misc/mop { }; @@ -32668,7 +32084,12 @@ with pkgs; rofi-calc = callPackage ../applications/science/math/rofi-calc { }; - rofi-emoji = callPackage ../applications/misc/rofi-emoji { }; + rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3; + rofi-emoji-wayland = ( + callPackage ../applications/misc/rofi-emoji { + rofi-unwrapped = rofi-wayland-unwrapped; + } + ).v4; rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { }; @@ -32850,8 +32271,6 @@ with pkgs; odin2 = callPackage ../applications/audio/odin2 { }; - okteto = callPackage ../development/tools/okteto { }; - onmetal-image = callPackage ../tools/virtualization/onmetal-image { }; opcr-policy = callPackage ../development/tools/opcr-policy { }; @@ -32876,7 +32295,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Foundation Security; }; p4d = callPackage ../applications/version-management/p4d { }; - p4v = callPackage ../applications/version-management/p4v { }; + p4v = qt6Packages.callPackage ../applications/version-management/p4v { }; parson = callPackage ../development/libraries/parson { }; @@ -32937,10 +32356,6 @@ with pkgs; polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; - portfolio = callPackage ../applications/office/portfolio { - jre = openjdk17; - }; - psi-notify = callPackage ../applications/misc/psi-notify { }; ptex = callPackage ../development/libraries/ptex { }; @@ -32962,10 +32377,6 @@ with pkgs; shod = callPackage ../applications/window-managers/shod { }; - shotcut = qt6Packages.callPackage ../applications/video/shotcut { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - shogun = callPackage ../applications/science/machine-learning/shogun { protobuf = protobuf_21; }; @@ -33073,8 +32484,6 @@ with pkgs; mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; - micro = callPackage ../applications/editors/micro { }; - mle = callPackage ../applications/editors/mle { }; namaka = callPackage ../development/tools/misc/namaka { }; @@ -33150,8 +32559,6 @@ with pkgs; nvpy = callPackage ../applications/editors/nvpy { }; - obconf = callPackage ../tools/X11/obconf { }; - gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { inherit (darwin.apple_sdk.frameworks) Foundation; }; @@ -33183,7 +32590,7 @@ with pkgs; omxplayer = callPackage ../applications/video/omxplayer { }; - inherit (python3Packages.callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui; + inherit (callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui; openambit = qt5.callPackage ../applications/misc/openambit { }; @@ -33413,7 +32820,9 @@ with pkgs; phantomsocks = callPackage ../tools/networking/phantomsocks { }; - photoqt = qt6Packages.callPackage ../applications/graphics/photoqt { }; + photoqt = callPackage ../by-name/ph/photoqt/package.nix { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; @@ -33441,10 +32850,7 @@ with pkgs; picosnitch = callPackage ../tools/networking/picosnitch { }; - pidginPackages = - let pidgin-plugins = - recurseIntoAttrs (callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { }); - in pidgin-plugins // { pidginPackages = pidgin-plugins.pidginPackages // { __attrsFailEvaluation = true; }; }; + pidginPackages = recurseIntoAttrs (callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { }); inherit (pidginPackages) pidgin; @@ -33466,8 +32872,6 @@ with pkgs; pinpoint = callPackage ../applications/office/pinpoint { }; - pinta = callPackage ../applications/graphics/pinta { }; - pistol = callPackage ../tools/misc/pistol { }; piston-cli = callPackage ../tools/misc/piston-cli { }; @@ -33619,6 +33023,11 @@ with pkgs; toolsOnly = true; }; + # variant of qemu building user space emulator only - intended to be used from pkgsStatic + qemu-user = qemu.override { + userOnly = true; + }; + canokey-qemu = callPackage ../applications/virtualization/qemu/canokey-qemu.nix { }; wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; @@ -33631,7 +33040,8 @@ with pkgs; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; - qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { }; + qmplay2-qt5 = qmplay2.override { qtVersion = "5"; }; + qmplay2-qt6 = qmplay2.override { qtVersion = "6"; }; qmidiarp = callPackage ../applications/audio/qmidiarp { }; @@ -33733,7 +33143,6 @@ with pkgs; withDbusPython = true; withMusicBrainzNgs = true; withPahoMqtt = true; - withPyInotify = true; withPypresence = true; withSoco = true; }; @@ -33755,8 +33164,6 @@ with pkgs; qxw = callPackage ../applications/editors/qxw { }; - rabbitvcs = callPackage ../applications/version-management/rabbitvcs { }; - rakarrack = callPackage ../applications/audio/rakarrack { fltk = fltk13; }; @@ -33818,8 +33225,6 @@ with pkgs; rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; - remnote = callPackage ../applications/misc/remnote { }; - remotebox = callPackage ../applications/virtualization/remotebox { }; restique = libsForQt5.callPackage ../applications/backup/restique { }; @@ -33849,10 +33254,7 @@ with pkgs; buildGoModule = buildGo121Module; go = go_1_21; }) rke2_stable; - inherit (callPackage ../applications/networking/cluster/rke2 { - buildGoModule = buildGo122Module; - go = go_1_22; - }) rke2_latest rke2_testing; + inherit (callPackage ../applications/networking/cluster/rke2 { }) rke2_latest rke2_testing; rke2 = rke2_stable; rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { }; @@ -33998,15 +33400,7 @@ with pkgs; siproxd = callPackage ../applications/networking/siproxd { }; - sish = callPackage ../tools/networking/sish { - buildGoModule = buildGo122Module; - }; - - sky = libsForQt5.callPackage ../applications/networking/instant-messengers/sky { - libjpeg_turbo = libjpeg8; - }; - - skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; + sish = callPackage ../tools/networking/sish { }; slingshot = callPackage ../tools/misc/slingshot { }; @@ -34066,7 +33460,7 @@ with pkgs; viber = callPackage ../applications/networking/instant-messengers/viber { }; - wavebox = libsForQt5.callPackage ../applications/networking/instant-messengers/wavebox { }; + wavebox = callPackage ../applications/networking/instant-messengers/wavebox { }; sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; @@ -34159,7 +33553,10 @@ with pkgs; printrun = callPackage ../applications/misc/printrun { }; prusa-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer { - stdenv = if stdenv.isDarwin then overrideSDK llvmPackages_14.stdenv "11.0" else stdenv; + # Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory + # on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds + # with --cores 32 on clang). + stdenv = if stdenv.isDarwin then overrideSDK llvmPackages.stdenv "11.0" else llvmPackages.stdenv; }; super-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; @@ -34171,8 +33568,6 @@ with pkgs; bambu-studio = callPackage ../applications/misc/bambu-studio { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good; - glew = glew-egl; - wxGTK31 = wxGTK31.override { withCurl = true; withPrivateFonts = true; @@ -34400,16 +33795,12 @@ with pkgs; taskjuggler = callPackage ../applications/misc/taskjuggler { }; - tabula = callPackage ../applications/misc/tabula { }; - tabula-java = callPackage ../applications/misc/tabula-java { }; tasknc = callPackage ../applications/misc/tasknc { }; tasktimer = callPackage ../applications/misc/tasktimer { }; - taskwarrior = callPackage ../applications/misc/taskwarrior { }; - taskwarrior-tui = callPackage ../applications/misc/taskwarrior-tui { }; dstask = callPackage ../applications/misc/dstask { }; @@ -34513,6 +33904,9 @@ with pkgs; thunderbird-unwrapped = thunderbirdPackages.thunderbird; thunderbird = wrapThunderbird thunderbird-unwrapped { }; + thunderbird-115 = wrapThunderbird thunderbirdPackages.thunderbird-115 { }; + thunderbird-128 = wrapThunderbird thunderbirdPackages.thunderbird-128 { }; + thunderbird-bin = wrapThunderbird thunderbird-bin-unwrapped { applicationName = "thunderbird"; pname = "thunderbird-bin"; @@ -34538,11 +33932,16 @@ with pkgs; timelimit = callPackage ../tools/misc/timelimit { }; - timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapp; }; - - timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2; }; - - timeshift-minimal = callPackage ../applications/backup/timeshift/minimal.nix { }; + inherit + ({ + timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { }; + timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2; }; + timeshift-minimal = callPackage ../applications/backup/timeshift/minimal.nix { }; + }) + timeshift-unwrapped + timeshift + timeshift-minimal + ; timewarrior = callPackage ../applications/misc/timewarrior { }; @@ -34587,10 +33986,6 @@ with pkgs; tofi = callPackage ../applications/misc/tofi { }; - tokyonight-gtk-theme = tokyonight-gtk-theme-variants.full; - - tokyonight-gtk-theme-variants = recurseIntoAttrs (callPackage ../data/themes/tokyonight-gtk-theme { }); - topydo = callPackage ../applications/misc/topydo { }; torrential = callPackage ../applications/networking/p2p/torrential { }; @@ -34661,7 +34056,9 @@ with pkgs; trayer = callPackage ../applications/window-managers/trayer { }; - tinywl = callPackage ../applications/window-managers/tinywl { }; + tinywl = callPackage ../applications/window-managers/tinywl { + wlroots = wlroots_0_18; + }; tree-from-tags = callPackage ../applications/audio/tree-from-tags { }; @@ -34688,11 +34085,7 @@ with pkgs; tudu = callPackage ../applications/office/tudu { }; - tumpa = callPackage ../applications/misc/tumpa { - inherit (pkgs.libsForQt5) wrapQtAppsHook; - }; - - tuna = python3Packages.callPackage ../os-specific/linux/tuna { }; + tuna = callPackage ../os-specific/linux/tuna { }; tunefish = callPackage ../applications/audio/tunefish { stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4 @@ -35001,8 +34394,6 @@ with pkgs; vpv = callPackage ../applications/graphics/vpv { }; - vsce = callPackage ../development/tools/vsce { }; - vscode = callPackage ../applications/editors/vscode/vscode.nix { }; vscode-fhs = vscode.fhs; vscode-fhsWithPackages = vscode.fhsWithPackages; @@ -35024,15 +34415,11 @@ with pkgs; openvscode-server = callPackage ../servers/openvscode-server { nodejs = nodejs_18; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; - inherit (darwin) cctools; - inherit (nodePackages) node-gyp; }; code-server = callPackage ../servers/code-server { - nodejs = nodejs_18; + nodejs = nodejs_20; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security; - inherit (darwin) cctools; - inherit (nodePackages) node-gyp; }; vue = callPackage ../applications/misc/vue { }; @@ -35354,19 +34741,10 @@ with pkgs; xdotool = callPackage ../tools/X11/xdotool { }; - xed-editor = callPackage ../applications/editors/xed-editor { - xapp = cinnamon.xapp; - }; - xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); - xen = xenPackages.xen-vanilla; + xen = xenPackages.xen; xen-slim = xenPackages.xen-slim; - xen-light = xenPackages.xen-light; - - xen_4_15 = xenPackages.xen_4_15-vanilla; - xen_4_15-slim = xenPackages.xen_4_15-slim; - xen_4_15-light = xenPackages.xen_4_15-light; xkbset = callPackage ../tools/X11/xkbset { }; @@ -35454,13 +34832,6 @@ with pkgs; }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; - - xplayer = callPackage ../applications/video/xplayer { - inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; - inherit (cinnamon) xapp; - }; - libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { }; - xrectsel = callPackage ../tools/X11/xrectsel { }; xrestop = callPackage ../tools/X11/xrestop { }; @@ -35557,9 +34928,11 @@ with pkgs; youki = callPackage ../applications/virtualization/youki { }; - yt-dlp = with python3Packages; toPythonApplication yt-dlp; - - yt-dlp-light = with python3Packages; toPythonApplication yt-dlp-light; + yt-dlp-light = yt-dlp.override { + atomicparsleySupport = false; + ffmpegSupport = false; + rtmpSupport = false; + }; youtube-viewer = perlPackages.WWWYoutubeViewer; @@ -35652,8 +35025,6 @@ with pkgs; ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS - aeon = callPackage ../applications/blockchains/aeon { }; - alfis = callPackage ../applications/blockchains/alfis { inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit; }; @@ -35703,15 +35074,6 @@ with pkgs; withGui = false; }; - bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited { - inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; - withGui = true; - }; - bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited { - inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; - withGui = false; - }; - btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; btcpayserver-altcoins = callPackage ../applications/blockchains/btcpayserver { altcoinSupport = true; }; @@ -35758,7 +35120,7 @@ with pkgs; fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { }; - go-ethereum = callPackage ../applications/blockchains/go-ethereum { + go-ethereum = callPackage ../by-name/go/go-ethereum/package.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -35815,8 +35177,6 @@ with pkgs; monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { }; - masari = callPackage ../applications/blockchains/masari { }; - napari = with python3Packages; toPythonApplication napari; nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; @@ -35825,15 +35185,6 @@ with pkgs; nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; - pivx = libsForQt5.callPackage ../applications/blockchains/pivx { withGui = true; }; - pivxd = callPackage ../applications/blockchains/pivx { - withGui = false; - qtbase = null; - qttools = null; - wrapQtAppsHook = null; - autoreconfHook = buildPackages.autoreconfHook269; - }; - ethabi = callPackage ../applications/blockchains/ethabi { }; pycoin = with python3Packages; toPythonApplication pycoin; @@ -35916,8 +35267,6 @@ with pkgs; conceal = callPackage ../applications/misc/conceal { }; - confd = callPackage ../tools/system/confd { }; - conmon = callPackage ../applications/virtualization/conmon { }; conmon-rs = callPackage ../applications/virtualization/conmon-rs { }; @@ -35928,8 +35277,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - fava = callPackage ../applications/office/fava { }; - nux = callPackage ../tools/misc/nux { }; phonemizer = with python3Packages; toPythonApplication phonemizer; @@ -36024,10 +35371,6 @@ with pkgs; doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { }; - doomretro = callPackage ../games/doom-ports/doomretro { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - doomrunner = qt5.callPackage ../games/doom-ports/doomrunner { }; chocolate-doom = callPackage ../games/doom-ports/chocolate-doom { }; @@ -36173,6 +35516,10 @@ with pkgs; arena = callPackage ../games/arena { }; + art = callPackage ../by-name/ar/art/package.nix { + fftw = fftwSinglePrec; + }; + arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; asc = callPackage ../games/asc { @@ -36264,11 +35611,11 @@ with pkgs; construoBase = lowPrio (callPackage ../games/construo { libGL = null; libGLU = null; - freeglut = null; + libglut = null; }); construo = construoBase.override { - inherit libGL libGLU freeglut; + inherit libGL libGLU libglut; }; crack_attack = callPackage ../games/crack-attack { }; @@ -36354,8 +35701,6 @@ with pkgs; eidolon = callPackage ../games/eidolon { }; - EmptyEpsilon = callPackage ../games/empty-epsilon { }; - endgame-singularity = callPackage ../games/endgame-singularity { }; endless-sky = callPackage ../games/endless-sky { }; @@ -36407,6 +35752,8 @@ with pkgs; forge-mtg = callPackage ../games/forge-mtg { }; + freecad-wayland = freecad.override { withWayland = true; }; + freeciv = callPackage ../games/freeciv { sdl2Client = false; gtkClient = true; @@ -36445,9 +35792,7 @@ with pkgs; garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; - gargoyle = callPackage ../games/gargoyle { - inherit (darwin) cctools; - }; + gargoyle = callPackage ../games/gargoyle { }; gav = callPackage ../games/gav { }; @@ -36657,10 +36002,9 @@ with pkgs; moon-buggy = callPackage ../games/moon-buggy { }; minetest = callPackage ../games/minetest { - inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; + inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa Kernel; }; minetestclient = minetest.override { buildServer = false; }; - minetest-touch = minetest.override { buildServer = false; withTouchSupport = true; }; minetestserver = minetest.override { buildClient = false; }; mnemosyne = callPackage ../games/mnemosyne { @@ -36832,8 +36176,6 @@ with pkgs; pysolfc = python3Packages.callPackage ../games/pysolfc { }; - qq = callPackage ../applications/networking/instant-messengers/qq { }; - qqwing = callPackage ../games/qqwing { }; quake3wrapper = callPackage ../games/quake3/wrapper { }; @@ -36913,7 +36255,6 @@ with pkgs; scid-vs-pc = callPackage ../games/scid-vs-pc { }; scummvm = callPackage ../games/scummvm { - inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit; }; @@ -36940,11 +36281,11 @@ with pkgs; }; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; - rkpd2 = callPackage ../games/shattered-pixel-dungeon/rkpd2.nix { }; - rat-king-adventure = callPackage ../games/shattered-pixel-dungeon/rat-king-adventure.nix { }; - experienced-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix { }; - summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix { }; - shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix { }; + rkpd2 = callPackage ../games/shattered-pixel-dungeon/rkpd2 { }; + rat-king-adventure = callPackage ../games/shattered-pixel-dungeon/rat-king-adventure { }; + experienced-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon { }; + summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon { }; + shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon { }; shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { }; @@ -36985,8 +36326,6 @@ with pkgs; stardust = callPackage ../games/stardust { }; - starspace = callPackage ../applications/science/machine-learning/starspace { }; - stockfish = callPackage ../games/stockfish { }; steamPackages = recurseIntoAttrs (callPackage ../games/steam { }); @@ -37046,8 +36385,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - theforceengine = callPackage ../games/theforceengine { }; - tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; tbls = callPackage ../tools/misc/tbls { }; @@ -37300,13 +36637,9 @@ with pkgs; appls = [ prio ]; }; - budgie = recurseIntoAttrs (callPackage ../desktops/budgie { }); - budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { }); - cdesktopenv = callPackage ../desktops/cdesktopenv { }; cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); - inherit (cinnamon) mint-x-icons mint-y-icons; deepin = recurseIntoAttrs (callPackage ../desktops/deepin { }); @@ -37443,14 +36776,6 @@ with pkgs; octopus = callPackage ../applications/science/chemistry/octopus { }; - openlp = libsForQt5.callPackage ../applications/misc/openlp { }; - openlpFull = openlp.override { - pdfSupport = true; - presentationSupport = true; - vlcSupport = true; - gstreamerSupport = true; - }; - autodock-vina = callPackage ../applications/science/chemistry/autodock-vina { }; dkh = callPackage ../applications/science/chemistry/dkh { }; @@ -37459,7 +36784,9 @@ with pkgs; pdb2pqr = with python3Packages; toPythonApplication pdb2pqr; - pymol = callPackage ../applications/science/chemistry/pymol { }; + pymol = callPackage ../applications/science/chemistry/pymol { + python3Packages = python311Packages; + }; quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso { hdf5 = hdf5-fortran; @@ -37580,8 +36907,6 @@ with pkgs; fastp = callPackage ../applications/science/biology/fastp { }; - febio-studio = libsForQt5.callPackage ../applications/science/biology/febio-studio { }; - flywheel-cli = callPackage ../applications/science/biology/flywheel-cli { }; hh-suite = callPackage ../applications/science/biology/hh-suite { @@ -37726,8 +37051,6 @@ with pkgs; svaba = callPackage ../applications/science/biology/svaba { }; - tandem-aligner = callPackage ../applications/science/biology/tandem-aligner { }; - tebreak = callPackage ../applications/science/biology/tebreak { }; treemix = callPackage ../applications/science/biology/treemix { }; @@ -37862,8 +37185,6 @@ with pkgs; rankwidth = callPackage ../development/libraries/science/math/rankwidth { }; - latte-integrale = callPackage ../development/libraries/science/math/latte-integrale { }; - lcalc = callPackage ../development/libraries/science/math/lcalc { }; lrcalc = callPackage ../applications/science/math/lrcalc { }; @@ -37927,10 +37248,10 @@ with pkgs; inherit (darwin) DarwinTools; stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; - protobuf = protobuf_21; + protobuf = protobuf_23; # or-tools builds with -std=c++20, so abseil-cpp must # also be built that way - abseil-cpp = abseil-cpp.override { + abseil-cpp = abseil-cpp_202301.override { static = true; cxxStandard = "20"; }; @@ -38206,23 +37527,23 @@ with pkgs; ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; - isabelle = callPackage ../applications/science/logic/isabelle { + isabelle = callPackage ../by-name/is/isabelle/package.nix { polyml = polyml.overrideAttrs { pname = "polyml-for-isabelle"; - version = "2023"; + version = "2024"; configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; buildFlags = [ "compiler" ]; src = fetchFromGitHub { owner = "polyml"; repo = "polyml"; - rev = "219e0a248f705b770d45699755d00f05b82a9391"; - hash = "sha256-HtT3MGtHrqVhynmx73L7NC12AW9N7gkkOi7MKbF4k6Y="; + rev = "v5.9.1"; + hash = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; }; }; - java = openjdk17; + java = openjdk21; }; - isabelle-components = recurseIntoAttrs (callPackage ../applications/science/logic/isabelle/components { }); + isabelle-components = recurseIntoAttrs (callPackage ../by-name/is/isabelle/components { }); iprover = callPackage ../applications/science/logic/iprover { }; @@ -38324,7 +37645,8 @@ with pkgs; inherit (callPackages ../applications/science/logic/z3 { python = python3; }) z3_4_12 z3_4_11 - z3_4_8 + z3_4_8; + inherit (callPackages ../applications/science/logic/z3 { python = python311; }) z3_4_8_5; z3 = z3_4_8; z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix { }; @@ -38385,11 +37707,6 @@ with pkgs; csxcad = callPackage ../applications/science/electronics/csxcad { }; - dataexplorer = callPackage ../applications/science/electronics/dataexplorer { - # executable fails at startup for jdk > 17 - jdk = jdk17; - }; - degate = libsForQt5.callPackage ../applications/science/electronics/degate { }; diylc = callPackage ../applications/science/electronics/diylc { }; @@ -38794,12 +38111,8 @@ with pkgs; brightnessctl = callPackage ../misc/brightnessctl { }; - cached-nix-shell = callPackage ../tools/nix/cached-nix-shell { }; - calaos_installer = libsForQt5.callPackage ../misc/calaos/installer { }; - civo = callPackage ../applications/networking/cluster/civo { }; - click = callPackage ../applications/networking/cluster/click { }; clinfo = callPackage ../tools/system/clinfo { @@ -38894,8 +38207,6 @@ with pkgs; cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; - darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; - depotdownloader = callPackage ../tools/misc/depotdownloader { }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -38912,8 +38223,6 @@ with pkgs; eiciel = callPackage ../tools/filesystems/eiciel { }; - apx = callPackage ../tools/package-management/apx { }; - dpkg = callPackage ../tools/package-management/dpkg { }; dumb = callPackage ../misc/dumb { }; @@ -39113,7 +38422,7 @@ with pkgs; jacktrip = callPackage ../applications/audio/jacktrip { }; - j2cli = with python3Packages; toPythonApplication j2cli; + j2cli = with python311Packages; toPythonApplication j2cli; jq-lsp = callPackage ../development/tools/language-servers/jq-lsp { }; @@ -39209,8 +38518,6 @@ with pkgs; narrowlink = callPackage ../tools/networking/narrowlink { }; - nar-serve = callPackage ../tools/nix/nar-serve { }; - neo = callPackage ../applications/misc/neo { }; networkd-dispatcher = callPackage ../tools/networking/networkd-dispatcher { }; @@ -39348,7 +38655,7 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_22; + nix = nixVersions.nix_2_24; }; nix-doc = callPackage ../tools/package-management/nix-doc { }; @@ -39399,10 +38706,6 @@ with pkgs; nix-query-tree-viewer = callPackage ../tools/nix/nix-query-tree-viewer { }; - nix-update = callPackage ../tools/package-management/nix-update { - python3 = python311; - }; - nix-update-source = callPackage ../tools/package-management/nix-update-source { }; nix-script = callPackage ../tools/nix/nix-script { }; @@ -39415,8 +38718,6 @@ with pkgs; nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng; - nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { }; - nix-visualize = python3.pkgs.callPackage ../tools/package-management/nix-visualize { }; alejandra = callPackage ../tools/nix/alejandra { }; @@ -39427,12 +38728,12 @@ with pkgs; nixfmt-classic = haskellPackages.nixfmt.bin; - nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; - nixpkgs-hammering = callPackage ../tools/nix/nixpkgs-hammering { }; nixpkgs-lint-community = callPackage ../tools/nix/nixpkgs-lint { }; + nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { }; + rnix-hashes = callPackage ../tools/nix/rnix-hashes { }; nixos-artwork = callPackage ../data/misc/nixos-artwork { }; @@ -39505,8 +38806,6 @@ with pkgs; rucksack = callPackage ../development/tools/rucksack { }; - ruff = callPackage ../development/tools/ruff { }; - sam-ba = callPackage ../tools/misc/sam-ba { }; sndio = callPackage ../misc/sndio { }; @@ -39823,8 +39122,6 @@ with pkgs; terraform-backend-git = callPackage ../applications/networking/cluster/terraform-backend-git { }; - terraform-docs = callPackage ../applications/networking/cluster/terraform-docs { }; - terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory { }; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { }; @@ -39851,16 +39148,6 @@ with pkgs; tewi-font = callPackage ../data/fonts/tewi { }; - ib-tws = callPackage ../applications/office/ib/tws { jdk=oraclejdk8; }; - - ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; - - vcluster = callPackage ../applications/networking/cluster/vcluster { - buildGoModule = buildGo122Module; - }; - - vnote = libsForQt5.callPackage ../applications/office/vnote { }; - sshportal = callPackage ../servers/sshportal { }; ssh-audit = callPackage ../tools/security/ssh-audit { }; @@ -40012,8 +39299,6 @@ with pkgs; wcalc = callPackage ../applications/misc/wcalc { }; - webfs = callPackage ../servers/http/webfs { }; - webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { }; websocketd = callPackage ../applications/networking/websocketd { }; @@ -40077,7 +39362,7 @@ with pkgs; wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; inherit (callPackage ../servers/web-apps/wordpress {}) - wordpress wordpress6_3 wordpress6_4 wordpress6_5; + wordpress wordpress_6_5 wordpress_6_6; wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages { plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json; @@ -40158,8 +39443,6 @@ with pkgs; xva-img = callPackage ../tools/virtualization/xva-img { }; - xwiimote = callPackage ../misc/drivers/xwiimote { }; - xzoom = callPackage ../tools/X11/xzoom { }; yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { }; @@ -40242,8 +39525,6 @@ with pkgs; mg = callPackage ../applications/editors/mg { }; - mpvc = callPackage ../applications/misc/mpvc { }; - # Overriding does not work when using callPackage on discord using import instead. (https://github.com/NixOS/nixpkgs/pull/179906) discord = import ../applications/networking/instant-messengers/discord { inherit lib stdenv; @@ -40280,7 +39561,7 @@ with pkgs; linkchecker = callPackage ../tools/networking/linkchecker { }; - tomb = callPackage ../os-specific/linux/tomb { + tomb = callPackage ../by-name/to/tomb/package.nix { pinentry = pinentry-curses; }; @@ -40306,8 +39587,6 @@ with pkgs; wtf = callPackage ../applications/misc/wtf { }; - zk-shell = callPackage ../applications/misc/zk-shell { }; - tora = libsForQt5.callPackage ../development/tools/tora { }; xrq = callPackage ../applications/misc/xrq { }; @@ -40324,7 +39603,7 @@ with pkgs; check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { }; - ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; + ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { }; vdr = callPackage ../applications/video/vdr { }; vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { }); @@ -40363,6 +39642,10 @@ with pkgs; }; }; + compressDrv = callPackage ../build-support/compress-drv { }; + + compressDrvWeb = callPackage ../build-support/compress-drv/web.nix { }; + duti = callPackage ../os-specific/darwin/duti { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; @@ -40493,12 +39776,6 @@ with pkgs; _3proxy = callPackage ../applications/networking/3proxy { }; - pigeon = callPackage ../development/tools/pigeon { }; - - verifpal = callPackage ../tools/security/verifpal { }; - - nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy { }; - weasis = callPackage ../by-name/we/weasis/package.nix { jre = jdk21; }; @@ -40511,10 +39788,6 @@ with pkgs; qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen { }; - coz = callPackage ../development/tools/analysis/coz { }; - - keycard-cli = callPackage ../tools/security/keycard-cli { }; - sieveshell = with python3.pkgs; toPythonApplication managesieve; gortr = callPackage ../servers/gortr { }; @@ -40553,7 +39826,6 @@ with pkgs; # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; jack = libjack2; - restinio = restinio_0_6; }; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; @@ -40562,8 +39834,6 @@ with pkgs; ryzenadj = callPackage ../os-specific/linux/ryzenadj { }; - vpsfree-client = callPackage ../tools/virtualization/vpsfree-client { }; - gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; zalgo = callPackage ../tools/misc/zalgo { }; |