diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 803 |
1 files changed, 286 insertions, 517 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea3026e649160..b8f517dd18fa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -697,11 +697,6 @@ 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 { }; @@ -837,9 +832,11 @@ with pkgs; grsync = callPackage ../applications/misc/grsync { }; + devShellTools = callPackage ../build-support/dev-shell-tools { }; + dockerTools = callPackage ../build-support/docker { writePython3 = buildPackages.writers.writePython3; - } // { __attrsFailEvaluation = true; }; + }; fakeNss = callPackage ../build-support/fake-nss { }; @@ -853,9 +850,7 @@ with pkgs; 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 { }; @@ -922,7 +917,9 @@ with pkgs; diswall = callPackage ../applications/networking/diswall { }; - dupeguru = callPackage ../applications/misc/dupeguru { }; + dupeguru = callPackage ../applications/misc/dupeguru { + python3Packages = python311Packages; + }; dump1090 = callPackage ../applications/radio/dump1090 { }; @@ -984,6 +981,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 { }; @@ -1073,14 +1072,14 @@ with pkgs; fetchpatch = callPackage ../build-support/fetchpatch { # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 - patchutils = buildPackages.patchutils_0_3_3; + patchutils = __splicedPackages.patchutils_0_3_3; } // { tests = pkgs.tests.fetchpatch; version = 1; }; fetchpatch2 = callPackage ../build-support/fetchpatch { - patchutils = buildPackages.patchutils_0_4_2; + patchutils = __splicedPackages.patchutils_0_4_2; } // { tests = pkgs.tests.fetchpatch2; version = 2; @@ -1227,8 +1226,6 @@ with pkgs; libredirect = callPackage ../build-support/libredirect { }; - livecaptions = callPackage ../applications/misc/livecaptions { }; - madonctl = callPackage ../applications/misc/madonctl { }; copyDesktopItems = makeSetupHook { @@ -1288,7 +1285,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 { }; @@ -1361,7 +1361,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; @@ -1391,6 +1391,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; }; @@ -1530,6 +1534,7 @@ with pkgs; admin-fe = callPackage ../servers/akkoma/admin-fe { nodejs = nodejs_18; yarn = yarn.override { nodejs = nodejs_18; }; + python3 = python311; }; }; akkoma-emoji = recurseIntoAttrs { @@ -1546,8 +1551,6 @@ with pkgs; wxGTK = wxGTK32; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { }; - aerospike = callPackage ../servers/nosql/aerospike { }; aespipe = callPackage ../tools/security/aespipe { }; @@ -1598,8 +1601,6 @@ with pkgs; 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 { }; @@ -1641,11 +1642,11 @@ with pkgs; aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { - inherit (gnome) zenity; inherit (plasma5Packages) kdialog; }; - akku = callPackage ../tools/package-management/akku { }; + inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { })) + akku akkuPackages; albert = qt6Packages.callPackage ../applications/misc/albert { }; @@ -1689,10 +1690,6 @@ with pkgs; btc-rpc-explorer = callPackage ../tools/misc/btc-rpc-explorer { }; - butler = callPackage ../by-name/bu/butler/package.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { }; cf-vault = callPackage ../tools/admin/cf-vault { }; @@ -2081,8 +2078,6 @@ with pkgs; vitess = callPackage ../development/tools/database/vitess { }; - voms = callPackage ../tools/networking/voms { }; - vopono = callPackage ../tools/networking/vopono { }; vprof = with python3Packages; toPythonApplication vprof; @@ -2191,9 +2186,7 @@ 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 { }; @@ -2352,8 +2345,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 { }; @@ -2774,14 +2765,10 @@ with pkgs; vice = callPackage ../applications/emulators/vice { }; - winetricks = callPackage ../applications/emulators/wine/winetricks.nix { - inherit (gnome) zenity; - }; + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { }; 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 { }; @@ -2852,7 +2839,7 @@ with pkgs; x16-run = x16.run; yabause = libsForQt5.callPackage ../applications/emulators/yabause { - freeglut = null; + libglut = null; openal = null; }; @@ -3283,7 +3270,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 { }; @@ -3309,8 +3299,6 @@ 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 { }; @@ -3321,8 +3309,6 @@ with pkgs; 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 { }; @@ -3337,8 +3323,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 { @@ -3475,8 +3459,6 @@ with pkgs; bkyml = callPackage ../tools/misc/bkyml { }; - blackmagic-desktop-video = callPackage ../tools/video/blackmagic-desktop-video { }; - blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; bmap-tools = callPackage ../tools/misc/bmap-tools { }; @@ -3932,8 +3914,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 { }; @@ -4269,9 +4249,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 { }; @@ -4729,8 +4707,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 { }; @@ -4885,10 +4861,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 { @@ -5129,6 +5101,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 { }; @@ -5750,6 +5724,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 { }; @@ -5825,7 +5801,7 @@ with pkgs; monetdb = callPackage ../servers/sql/monetdb { }; - monado = callPackage ../applications/graphics/monado { + monado = callPackage ../by-name/mo/monado/package.nix { inherit (gst_all_1) gstreamer gst-plugins-base; }; @@ -5871,8 +5847,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 { }; @@ -5929,8 +5903,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 { }; @@ -6585,9 +6557,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 { }; @@ -6756,9 +6726,7 @@ with pkgs; libsbsms_2_3_0 ; - libskk = callPackage ../development/libraries/libskk { - inherit (gnome) gnome-common; - }; + libskk = callPackage ../development/libraries/libskk { }; m17-cxx-demod = callPackage ../applications/radio/m17-cxx-demod { }; @@ -6810,6 +6778,8 @@ with pkgs; openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { withIbusSupport = true; }; + pinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-pinyin { }; + rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; @@ -6843,8 +6813,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; }; @@ -7454,8 +7422,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 { }; @@ -7550,8 +7516,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 { }; @@ -7598,8 +7563,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; }; @@ -7659,7 +7622,7 @@ with pkgs; easeprobe = callPackage ../tools/misc/easeprobe { }; emscripten = callPackage ../development/compilers/emscripten { - llvmPackages = llvmPackages_17; + llvmPackages = llvmPackages_18; }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); @@ -7785,8 +7748,6 @@ with pkgs; expliot = callPackage ../tools/security/expliot { }; - f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; - Fabric = with python3Packages; toPythonApplication fabric; fail2ban = callPackage ../tools/security/fail2ban { }; @@ -8018,9 +7979,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; @@ -8637,8 +8596,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 { }; @@ -8980,6 +8937,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 { }; @@ -9458,7 +9417,7 @@ with pkgs; # 2. the rest are added from here: https://github.com/keybase/client/blob/68bb8c893c5214040d86ea36f2f86fbb7fac8d39/go/chat/attachments/preview_darwin.go#L7 # #cgo LDFLAGS: -framework AVFoundation -framework CoreFoundation -framework ImageIO -framework CoreMedia -framework Foundation -framework CoreGraphics -lobjc # with the exception of CoreFoundation, due to the warning in https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-sdk/frameworks.nix#L25 - inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; }; kbfs = callPackage ../tools/security/keybase/kbfs.nix { }; @@ -9469,8 +9428,6 @@ with pkgs; keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - keymapp = callPackage ../applications/misc/keymapp { }; - keyscope = callPackage ../tools/security/keyscope { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit Security; }; @@ -9564,7 +9521,9 @@ with pkgs; last-resort = callPackage ../data/fonts/last-resort { }; ligo = - let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; 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; @@ -9691,8 +9650,6 @@ with pkgs; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; - ma1sd = callPackage ../servers/ma1sd { }; - mailcatcher = callPackage ../development/web/mailcatcher { }; makebootfat = callPackage ../tools/misc/makebootfat { }; @@ -10141,9 +10098,7 @@ with pkgs; libite = callPackage ../development/libraries/libite { }; - liblangtag = callPackage ../development/libraries/liblangtag { - inherit (gnome) gnome-common; - }; + liblangtag = callPackage ../development/libraries/liblangtag { }; liblouis = callPackage ../development/libraries/liblouis { }; @@ -11080,10 +11035,8 @@ 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; + # Requires Java 17, not lower, not higher + jre = openjdk17; }; oapi-codegen = callPackage ../tools/networking/oapi-codegen { }; @@ -11187,7 +11140,6 @@ with pkgs; opendht = callPackage ../development/libraries/opendht { inherit (darwin.apple_sdk.frameworks) Security; - restinio = restinio_0_6; }; opendkim = callPackage ../development/libraries/opendkim { }; @@ -11268,6 +11220,8 @@ with pkgs; etcDir = "/etc/ssh"; }; + opensshTest = openssh.tests.openssh; + opensshWithKerberos = openssh.override { withKerberos = true; }; @@ -11620,8 +11574,6 @@ with pkgs; pdf-quench = callPackage ../applications/misc/pdf-quench { }; - pdfarranger = callPackage ../applications/misc/pdfarranger { }; - briss = callPackage ../tools/graphics/briss { }; brickd = callPackage ../servers/brickd { }; @@ -11894,8 +11846,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 { }; @@ -12132,8 +12082,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 { }; @@ -12293,8 +12241,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 { }; @@ -12615,8 +12561,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 { }; @@ -12691,6 +12635,8 @@ 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 { @@ -12770,8 +12716,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 { }; @@ -12999,8 +12943,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 { }; @@ -13182,8 +13124,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 { }; @@ -13372,7 +13312,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; @@ -13431,8 +13371,6 @@ with pkgs; themes = recurseIntoAttrs (getPackagesWithPrefix "theme"); }; - thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; - theme-sh = callPackage ../tools/misc/theme-sh { }; thiefmd = callPackage ../applications/editors/thiefmd { }; @@ -13569,8 +13507,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 { }; @@ -13833,6 +13769,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 { }; @@ -13991,7 +13932,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 { }; @@ -14061,6 +14002,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 { @@ -14636,20 +14580,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 { }; @@ -14967,6 +14897,9 @@ 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; @@ -14988,8 +14921,8 @@ with pkgs; 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; @@ -15724,13 +15657,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; }; @@ -16012,14 +15943,15 @@ with pkgs; openjdk = jdk; openjdk_headless = jdk_headless; - graalvmCEPackages = - recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); + graalvmCEPackages = callPackage ../development/compilers/graalvm/community-edition { }; graalvm-ce = graalvmCEPackages.graalvm-ce; buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { 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 { }; @@ -16178,61 +16110,33 @@ 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_git = llvmPackagesSet.git; + }) llvmPackages_13 + llvmPackages_14 + llvmPackages_15 + llvmPackages_16 + llvmPackages_17 + llvmPackages_18 + clang_18 + lld_18 + lldb_18 + llvm_18 + llvmPackages_git; lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -16641,8 +16545,6 @@ with pkgs; cauwugo = callPackage ../development/tools/rust/cauwugo { }; - crate2nix = callPackage ../development/tools/rust/crate2nix { }; - critcmp = callPackage ../development/tools/rust/critcmp { }; devspace = callPackage ../development/tools/misc/devspace { }; @@ -16651,9 +16553,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 { }; @@ -17291,11 +17190,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; @@ -17350,6 +17249,12 @@ 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; @@ -17998,11 +17903,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; @@ -18665,10 +18572,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 { }; @@ -18690,9 +18604,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 { }; @@ -18874,8 +18786,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 { }; @@ -19030,10 +18940,6 @@ 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; }; @@ -19556,9 +19462,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 { }; @@ -20011,7 +19915,7 @@ 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 @@ -20448,7 +20352,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 { }; @@ -20497,8 +20403,6 @@ 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 { }; @@ -20559,8 +20463,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; }; @@ -20819,7 +20721,7 @@ with pkgs; 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 { @@ -21018,7 +20920,10 @@ with pkgs; autoconf = buildPackages.autoconf269; }; - gpac = callPackage ../applications/video/gpac { }; + gpac = callPackage ../applications/video/gpac { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) Carbon; + }; gpgme = callPackage ../development/libraries/gpgme { }; @@ -21322,7 +21227,7 @@ with pkgs; icu74 ; - icu = icu73; + icu = icu74; id3lib = callPackage ../development/libraries/id3lib { }; @@ -21968,9 +21873,6 @@ with pkgs; libglibutil = callPackage ../development/libraries/libglibutil { }; - libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome-keyring3 = gnome.libgnome-keyring; - libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { }; libgnome-games-support_2_0 = callPackage ../development/libraries/libgnome-games-support/2.0.nix { }; @@ -22725,16 +22627,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 { }; @@ -23136,26 +23028,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 @@ -23535,11 +23460,12 @@ 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; + 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 { }; @@ -24056,27 +23982,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 { }; @@ -24397,8 +24302,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 { }; @@ -24607,8 +24510,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; }; @@ -24652,6 +24553,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 { }; @@ -24808,8 +24712,6 @@ with pkgs; xlslib = callPackage ../development/libraries/xlslib { }; - xsimd = callPackage ../development/libraries/xsimd { }; - xtensor = callPackage ../development/libraries/xtensor { }; xtl = callPackage ../development/libraries/xtl { }; @@ -24982,6 +24884,7 @@ with pkgs; mockobjects = callPackage ../development/libraries/java/mockobjects { }; saxonb = saxonb_8_8; + saxon-he = saxon_12-he; inherit (callPackages ../development/libraries/java/saxon { jre = jre_headless; @@ -24991,12 +24894,12 @@ with pkgs; saxonb_8_8 saxonb_9_1 saxon_9-he - saxon-he; + saxon_11-he + saxon_12-he; 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; }; @@ -25253,39 +25156,26 @@ with pkgs; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; - mod_auth_mellon = callPackage ../servers/http/apache-modules/mod_auth_mellon { }; - - # Redwax collection mod_ca = callPackage ../servers/http/apache-modules/mod_ca { }; mod_crl = callPackage ../servers/http/apache-modules/mod_crl { }; - mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; mod_cspnonce = callPackage ../servers/http/apache-modules/mod_cspnonce { }; - mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp{ }; - mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; - mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; - mod_spkac= callPackage ../servers/http/apache-modules/mod_spkac { }; - mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; - + mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; - - - mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; - mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; - + mod_itk = callPackage ../servers/http/apache-modules/mod_itk { }; + mod_jk = callPackage ../servers/http/apache-modules/mod_jk { }; + mod_mbtiles = callPackage ../servers/http/apache-modules/mod_mbtiles { }; + mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp { }; + mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; + mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; mod_python = callPackage ../servers/http/apache-modules/mod_python { }; - + mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; + mod_spkac = callPackage ../servers/http/apache-modules/mod_spkac { }; mod_tile = callPackage ../servers/http/apache-modules/mod_tile { }; - + mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { }; - - mod_itk = callPackage ../servers/http/apache-modules/mod_itk { }; - - mod_mbtiles = callPackage ../servers/http/apache-modules/mod_mbtiles { }; - php = pkgs.php.override { inherit apacheHttpd; }; - subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; } // lib.optionalAttrs config.allowAliases { mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4"; @@ -25505,6 +25395,7 @@ with pkgs; freeradius = callPackage ../servers/freeradius { }; freshrss = callPackage ../servers/web-apps/freshrss { }; + freshrss-extensions = recurseIntoAttrs (callPackage ../servers/web-apps/freshrss/extensions { }); freeswitch = callPackage ../servers/sip/freeswitch { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; @@ -25531,9 +25422,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 { }; @@ -25771,8 +25660,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 { }; @@ -25918,8 +25805,6 @@ with pkgs; postgrey = callPackage ../servers/mail/postgrey { }; - pshs = callPackage ../servers/http/pshs { }; - quark = callPackage ../servers/http/quark { }; smtprelay = callPackage ../servers/mail/smtprelay { }; @@ -25960,15 +25845,8 @@ 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_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; - tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; pies = callPackage ../servers/pies { }; @@ -26047,9 +25925,7 @@ with pkgs; azuredatastudio = callPackage ../applications/misc/azuredatastudio { }; - miniflux = callPackage ../servers/miniflux { - buildGoModule = buildGo122Module; - }; + miniflux = callPackage ../servers/miniflux { }; inherit (callPackage ../servers/mir { }) mir @@ -26230,9 +26106,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 { }; @@ -26441,9 +26314,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 { }; @@ -26771,7 +26642,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 { }; @@ -27431,9 +27302,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 { }; @@ -27483,7 +27352,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; @@ -27662,8 +27531,12 @@ 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 { }; + sdparm = callPackage ../os-specific/linux/sdparm { }; sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { @@ -28070,6 +27943,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 { }; @@ -28145,9 +28020,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 { }; @@ -28500,7 +28373,6 @@ with pkgs; kopia = callPackage ../tools/backup/kopia { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { - inherit (gnome) adwaita-icon-theme; inherit (libsForQt5.kdeFrameworks) breeze-icons; }; @@ -28619,16 +28491,12 @@ with pkgs; martian-mono = callPackage ../data/fonts/martian-mono { }; - marwaita = callPackage ../data/themes/marwaita { }; - - marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; - - marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { }; + marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix { + inherit (kdePackages) breeze-icons; + }; 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 { }; @@ -28741,7 +28609,6 @@ with pkgs; }; numix-icon-theme = callPackage ../data/icons/numix-icon-theme { - inherit (gnome) adwaita-icon-theme; inherit (plasma5Packages) breeze-icons; }; @@ -28848,9 +28715,7 @@ with pkgs; pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; - pop-icon-theme = callPackage ../data/icons/pop-icon-theme { - inherit (gnome) adwaita-icon-theme; - }; + pop-icon-theme = callPackage ../data/icons/pop-icon-theme { }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; @@ -28927,8 +28792,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 { }; @@ -29008,9 +28871,7 @@ with pkgs; recursive = callPackage ../data/fonts/recursive { }; - reversal-icon-theme = callPackage ../data/icons/reversal-icon-theme { - inherit (gnome) adwaita-icon-theme; - }; + reversal-icon-theme = callPackage ../data/icons/reversal-icon-theme { }; rubik = callPackage ../data/fonts/rubik { }; @@ -29094,7 +28955,6 @@ with pkgs; the-neue-black = callPackage ../data/fonts/the-neue-black { }; tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { - inherit (gnome) adwaita-icon-theme; inherit (libsForQt5) breeze-icons; }; @@ -29402,6 +29262,10 @@ with pkgs; android-studio = androidStudioPackages.stable; android-studio-full = android-studio.full; + androidStudioForPlatformPackages = recurseIntoAttrs + (callPackage ../applications/editors/android-studio-for-platform { }); + android-studio-for-platform = androidStudioForPlatformPackages.stable; + antfs-cli = callPackage ../applications/misc/antfs-cli { }; antimony = libsForQt5.callPackage ../applications/graphics/antimony { }; @@ -29473,12 +29337,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; @@ -29589,8 +29452,6 @@ with pkgs; awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { }; - inherit (gnome) baobab; - badwolf = callPackage ../applications/networking/browsers/badwolf { }; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; @@ -29609,8 +29470,6 @@ with pkgs; bashSnippets = callPackage ../applications/misc/bashSnippets { }; - batik = callPackage ../applications/graphics/batik { }; - batsignal = callPackage ../applications/misc/batsignal { }; baudline = callPackage ../applications/audio/baudline { }; @@ -29675,6 +29534,7 @@ with pkgs; blender = callPackage ../applications/misc/blender { openexr = openexr_3; + python3Packages = python311Packages; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; @@ -29773,8 +29633,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 @@ -29928,10 +29786,6 @@ with pkgs; coreth = callPackage ../applications/networking/coreth { }; - coriander = callPackage ../applications/video/coriander { - inherit (gnome2) libgnomeui GConf; - }; - cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { }; csa = callPackage ../applications/audio/csa { }; @@ -30191,9 +30045,7 @@ with pkgs; dvd-slideshow = callPackage ../applications/video/dvd-slideshow { }; - dvdstyler = callPackage ../applications/video/dvdstyler { - inherit (gnome2) libgnomeui; - }; + dvdstyler = callPackage ../applications/video/dvdstyler { }; dyff = callPackage ../development/tools/dyff { }; @@ -30270,7 +30122,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 @@ -30318,8 +30170,6 @@ with pkgs; epgstation = callPackage ../applications/video/epgstation { }; - inherit (gnome) epiphany; - ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; epic5 = callPackage ../applications/networking/irc/epic5 { }; @@ -30407,8 +30257,6 @@ with pkgs; keeweb = callPackage ../applications/misc/keeweb { }; - inherit (gnome) evince; - evolution-data-server = gnome.evolution-data-server; evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; }; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; @@ -30586,7 +30434,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; @@ -30619,7 +30467,7 @@ 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; + python = python311; }; }; gnuradio3_9Packages = lib.recurseIntoAttrs gnuradio3_9.pkgs; @@ -30652,7 +30500,7 @@ with pkgs; 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; } // lib.optionalAttrs stdenv.isLinux { stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv; }); @@ -30745,8 +30593,6 @@ with pkgs; gthumb = callPackage ../applications/graphics/gthumb { }; - inherit (gnome) gucharmap; - guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; }; @@ -30757,8 +30603,6 @@ with pkgs; gjay = callPackage ../applications/audio/gjay { }; - sherlock = callPackage ../tools/security/sherlock { }; - stratovirt = callPackage ../applications/virtualization/stratovirt { }; rhythmbox = callPackage ../applications/audio/rhythmbox { }; @@ -30826,6 +30670,7 @@ with pkgs; firefox-beta-unwrapped = firefoxPackages.firefox-beta; firefox-devedition-unwrapped = firefoxPackages.firefox-devedition; firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115; + firefox-esr-128-unwrapped = firefoxPackages.firefox-esr-128; firefox-esr-unwrapped = firefoxPackages.firefox-esr-115; firefox = wrapFirefox firefox-unwrapped { }; @@ -30844,16 +30689,21 @@ 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-115; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - inherit (gnome) adwaita-icon-theme; channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; }; @@ -30863,7 +30713,6 @@ with pkgs; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { - inherit (gnome) adwaita-icon-theme; channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; }; @@ -30874,7 +30723,6 @@ with pkgs; }; firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - inherit (gnome) adwaita-icon-theme; channel = "developer-edition"; generated = import ../applications/networking/browsers/firefox-bin/developer-edition_sources.nix; }; @@ -30985,8 +30833,8 @@ with pkgs; freerdpUnstable = freerdp; - friture = libsForQt5.callPackage ../applications/audio/friture { - python3Packages = python39Packages; + friture = callPackage ../by-name/fr/friture/package.nix { + python3Packages = python311Packages; }; g933-utils = callPackage ../tools/misc/g933-utils { }; @@ -31023,8 +30871,6 @@ with pkgs; gitolite = callPackage ../applications/version-management/gitolite { }; - inherit (gnome) gitg; - gmrun = callPackage ../applications/misc/gmrun { }; gnucash = callPackage ../applications/office/gnucash { }; @@ -31102,8 +30948,8 @@ with pkgs; metacubexd = callPackage ../by-name/me/metacubexd/package.nix { pnpm = callPackage ../development/tools/pnpm/generic.nix { - version = "9.1.4"; - hash = "sha256-MKGAGsTnI3ee/tE6IfTDn562yfu0ztEBvOBrQiWT18k="; + version = "9.4.0"; + hash = "sha256-tv0L/aVV5+WErX5WswxosB1aBPnuk5ifS5PKhHPEnHQ="; }; }; @@ -31206,9 +31052,7 @@ with pkgs; gnomecast = callPackage ../applications/video/gnomecast { }; - gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome) gnome-autoar; - }; + gnome-recipes = callPackage ../applications/misc/gnome-recipes { }; gollum = callPackage ../applications/misc/gollum { }; @@ -31311,8 +31155,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 { }; @@ -31430,10 +31272,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 { }; @@ -31637,8 +31475,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 { @@ -31872,10 +31708,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 { }; @@ -31969,23 +31802,10 @@ with pkgs; kondo = callPackage ../applications/misc/kondo { }; - kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreFoundation CoreServices CoreText CoreGraphics - CoreMedia OpenGL AudioUnit ApplicationServices Foundation AGL Security SystemConfiguration - Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo - CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit; - + kotatogram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { stdenv = if stdenv.isDarwin - then overrideSDK llvmPackages_14.stdenv "11.0" + then overrideSDK stdenv "11.0" else stdenv; - - # telegram-desktop has random crashes when jemalloc is built with gcc. - # Apparently, it triggers some bug due to usage of gcc's builtin - # functions like __builtin_ffsl by jemalloc when it's built with gcc. - jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs { - # no idea how to fix the tests :( - doCheck = false; - }; }; kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix { }; @@ -32503,9 +32323,7 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; - mepo = callPackage ../applications/misc/mepo { - inherit (gnome) zenity; - }; + mepo = callPackage ../applications/misc/mepo { }; meshcentral = callPackage ../tools/admin/meshcentral { }; @@ -32633,13 +32451,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 { }; @@ -32938,7 +32749,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 { }; @@ -32999,10 +32810,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 { }; @@ -33764,7 +33571,6 @@ with pkgs; quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss { }; quodlibet = callPackage ../applications/audio/quodlibet { - inherit (gnome) adwaita-icon-theme; kakasi = null; keybinder3 = null; libappindicator-gtk3 = null; @@ -33810,10 +33616,12 @@ with pkgs; qutebrowser = callPackage ../applications/networking/browsers/qutebrowser { inherit (__splicedPackages.qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland; + python3 = python311; }; qutebrowser-qt5 = callPackage ../applications/networking/browsers/qutebrowser { inherit (__splicedPackages.libsForQt5) qtbase qtwebengine wrapQtAppsHook qtwayland; + python3 = python311; }; qxw = callPackage ../applications/editors/qxw { }; @@ -33881,8 +33689,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 { }; @@ -33912,10 +33718,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 { }; @@ -33976,9 +33779,7 @@ with pkgs; rusty-psn-gui = rusty-psn.override { withGui = true; }; - rymcast = callPackage ../applications/audio/rymcast { - inherit (gnome) zenity; - }; + rymcast = callPackage ../applications/audio/rymcast { }; rymdport = callPackage ../applications/networking/rymdport { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; @@ -34059,22 +33860,16 @@ with pkgs; sic-image-cli = callPackage ../tools/graphics/sic-image-cli { }; - simple-scan = gnome.simple-scan; - sioyek = libsForQt5.callPackage ../applications/misc/sioyek { }; siproxd = callPackage ../applications/networking/siproxd { }; - sish = callPackage ../tools/networking/sish { - buildGoModule = buildGo122Module; - }; + sish = callPackage ../tools/networking/sish { }; sky = libsForQt5.callPackage ../applications/networking/instant-messengers/sky { libjpeg_turbo = libjpeg8; }; - skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; - slingshot = callPackage ../tools/misc/slingshot { }; slop = callPackage ../tools/misc/slop { }; @@ -34358,7 +34153,6 @@ with pkgs; surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; surge = callPackage ../applications/audio/surge { - inherit (gnome) zenity; git = gitMinimal; }; @@ -34587,7 +34381,6 @@ with pkgs; desktopName = "Thunderbird"; }; thunderbird-bin-unwrapped = callPackage ../applications/networking/mailreaders/thunderbird-bin { - inherit (gnome) adwaita-icon-theme; generated = import ../applications/networking/mailreaders/thunderbird-bin/release_sources.nix; }; @@ -34656,10 +34449,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 { }; @@ -34882,9 +34671,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL; }; - verbiste = callPackage ../applications/misc/verbiste { - inherit (gnome2) libgnomeui; - }; + verbiste = callPackage ../applications/misc/verbiste { }; veusz = libsForQt5.callPackage ../applications/graphics/veusz { }; @@ -34894,7 +34681,11 @@ with pkgs; vimiv-qt = callPackage ../applications/graphics/vimiv-qt { }; - macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; }; + macvim = let + macvimUtils = callPackage ../applications/editors/vim/macvim-configurable.nix { }; + in macvimUtils.makeCustomizable (callPackage ../applications/editors/vim/macvim.nix { + stdenv = clangStdenv; + }); vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/full.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; @@ -35600,8 +35391,6 @@ with pkgs; yeetgif = callPackage ../applications/graphics/yeetgif { }; - inherit (gnome) yelp; - yelp-tools = callPackage ../development/misc/yelp-tools { }; yewtube = callPackage ../applications/misc/yewtube { }; @@ -35725,7 +35514,6 @@ with pkgs; alfis = callPackage ../applications/blockchains/alfis { inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit; - inherit (gnome) zenity; }; alfis-nogui = alfis.override { withGui = false; @@ -35828,7 +35616,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; }; @@ -35885,8 +35673,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 { }; @@ -36334,11 +36120,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 { }; @@ -36567,10 +36353,6 @@ with pkgs; graphwar = callPackage ../games/graphwar { }; - gtetrinet = callPackage ../games/gtetrinet { - inherit (gnome2) GConf libgnome libgnomeui; - }; - gtypist = callPackage ../games/gtypist { }; gweled = callPackage ../games/gweled { }; @@ -37014,11 +36796,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 { }; @@ -37476,8 +37258,6 @@ with pkgs; latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; - gnome-themes-extra = gnome.gnome-themes-extra; - xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; ### SCIENCE/CHEMISTY @@ -38026,8 +37806,6 @@ with pkgs; p4est-sc = p4est-sc-dbg; }; - petsc = callPackage ../development/libraries/science/math/petsc { }; - parmetis = callPackage ../development/libraries/science/math/parmetis { }; QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { }; @@ -38284,23 +38062,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 { }; @@ -38872,8 +38650,6 @@ 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 { }; @@ -39191,7 +38967,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 { }; @@ -39933,11 +39709,7 @@ with pkgs; ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; - vcluster = callPackage ../applications/networking/cluster/vcluster { - buildGoModule = buildGo122Module; - }; - - vnote = libsForQt5.callPackage ../applications/office/vnote { }; + vcluster = callPackage ../applications/networking/cluster/vcluster { }; sshportal = callPackage ../servers/sshportal { }; @@ -40308,8 +40080,6 @@ with pkgs; dart = callPackage ../development/compilers/dart { }; - dart-sass = callPackage ../development/tools/misc/dart-sass { }; - pub2nix = recurseIntoAttrs (callPackage ../build-support/dart/pub2nix { }); buildDartApplication = callPackage ../build-support/dart/build-dart-application { }; @@ -40633,7 +40403,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 { }; |