diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/all-packages.nix')
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 790 |
1 files changed, 237 insertions, 553 deletions
diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 1ea476d022e0..e7462b38e409 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -107,7 +107,7 @@ with pkgs; Please be informed that this pseudo-package is not the only part of Nixpkgs that fails to evaluate. You should not evaluate entire Nixpkgs without some special measures to handle failing - packages, like using pkgs/top-level/release-attrpaths.nix. + packages, like using pkgs/top-level/release-attrpaths-superset.nix. ''; tests = callPackages ../test { }; @@ -212,11 +212,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - canonicalize-jar = callPackage ../build-support/java/canonicalize-jar.nix { }; - canonicalize-jars-hook = makeSetupHook { - name = "canonicalize-jars-hook"; - substitutions = { canonicalize_jar = canonicalize-jar; }; - } ../build-support/setup-hooks/canonicalize-jars.sh; + stripJavaArchivesHook = makeSetupHook { + name = "strip-java-archives-hook"; + propagatedBuildInputs = [ strip-nondeterminism ]; + } ../build-support/setup-hooks/strip-java-archives.sh; ensureNewerSourcesHook = { year }: makeSetupHook { name = "ensure-newer-sources-hook"; @@ -278,8 +277,6 @@ with pkgs; asitop = pkgs.python3Packages.callPackage ../os-specific/darwin/asitop { }; - asn = callPackage ../applications/networking/asn { }; - asnmap = callPackage ../tools/security/asnmap { }; astrolog = callPackage ../applications/science/astronomy/astrolog { }; @@ -891,7 +888,7 @@ with pkgs; tarsum = callPackage ../build-support/docker/tarsum.nix { }; - snapTools = callPackage ../build-support/snap { }; + 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 { }; @@ -1087,6 +1084,8 @@ with pkgs; ruler = callPackage ../tools/security/ruler { }; + magika = with python3Packages; toPythonApplication magika; + mblock-mlink = callPackage ../development/tools/mblock-mlink { }; mod = callPackage ../development/tools/mod { }; @@ -1736,7 +1735,6 @@ with pkgs; butler = callPackage ../by-name/bu/butler/package.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - buildGoModule = buildGo120Module; }; carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { }; @@ -1785,8 +1783,6 @@ with pkgs; dysk = callPackage ../tools/filesystems/dysk { }; - etlegacy = callPackage ../games/etlegacy { lua = lua5_4; }; - fastfetch = callPackage ../tools/misc/fastfetch { stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; @@ -1865,8 +1861,6 @@ with pkgs; gofu = callPackage ../applications/misc/gofu { }; - godns = callPackage ../tools/networking/godns { }; - godspeed = callPackage ../tools/networking/godspeed { }; goodhosts = callPackage ../tools/networking/goodhosts { }; @@ -1943,6 +1937,8 @@ with pkgs; linux-router-without-wifi = linux-router.override { useWifiDependencies = false; }; + makehuman = libsForQt5.callPackage ../applications/misc/makehuman { }; + markdownlint-cli = callPackage ../tools/text/markdownlint-cli { }; markdownlint-cli2 = callPackage ../tools/text/markdownlint-cli2 { }; @@ -2001,6 +1997,11 @@ with pkgs; openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; + openusd = python3Packages.openusd.override { + withTools = true; + withUsdView = true; + }; + osquery = callPackage ../tools/system/osquery { }; paperview = callPackage ../tools/X11/paperview { }; @@ -2552,9 +2553,7 @@ with pkgs; lab = callPackage ../applications/version-management/lab { }; - labctl = callPackage ../tools/networking/labctl { - buildGoModule = buildGo120Module; - }; + labctl = callPackage ../tools/networking/labctl { }; legit = callPackage ../applications/version-management/legit { }; @@ -2687,10 +2686,6 @@ with pkgs; fsrx = callPackage ../tools/misc/fsrx { }; - fsuae = callPackage ../applications/emulators/fs-uae { }; - - fsuae-launcher = libsForQt5.callPackage ../applications/emulators/fs-uae/launcher.nix { }; - fuc = callPackage ../tools/misc/fuc { }; fuse-emulator = callPackage ../applications/emulators/fuse-emulator { }; @@ -2934,8 +2929,6 @@ with pkgs; felix-fm = callPackage ../applications/file-managers/felix-fm { }; - joshuto = callPackage ../applications/file-managers/joshuto { }; - krusader = libsForQt5.callPackage ../applications/file-managers/krusader { }; lesscpy = callPackage ../development/compilers/lesscpy { }; @@ -3555,8 +3548,6 @@ with pkgs; blackmagic-desktop-video = callPackage ../tools/video/blackmagic-desktop-video { }; - blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; - blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; bmap-tools = callPackage ../tools/misc/bmap-tools { }; @@ -3581,8 +3572,8 @@ with pkgs; bucklespring-libinput = callPackage ../applications/audio/bucklespring { }; bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; }; - inherit (python3.pkgs.callPackage ../development/tools/continuous-integration/buildbot {}) - buildbot buildbot-ui buildbot-full buildbot-plugins buildbot-worker; + buildbotPackages = recurseIntoAttrs (python3.pkgs.callPackage ../development/tools/continuous-integration/buildbot { }); + inherit (buildbotPackages) buildbot buildbot-ui buildbot-full buildbot-plugins buildbot-worker; bunyan-rs = callPackage ../development/tools/bunyan-rs { }; @@ -4029,15 +4020,25 @@ with pkgs; go-audit = callPackage ../tools/system/go-audit { }; - gopass = callPackage ../tools/security/gopass { }; + gopass = callPackage ../tools/security/gopass { + buildGoModule = buildGo122Module; + }; - gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { }; + gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { + buildGoModule = buildGo122Module; + }; - gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; + gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { + buildGoModule = buildGo122Module; + }; - git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { + buildGoModule = buildGo122Module; + }; - gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; + gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { + buildGoModule = buildGo122Module; + }; gosh = callPackage ../tools/security/gosh { }; @@ -4640,8 +4641,6 @@ with pkgs; clash-geoip = callPackage ../data/misc/clash-geoip { }; - clash-verge = callPackage ../applications/networking/clash-verge { }; - clevercsv = with python3Packages; toPythonApplication clevercsv; clevis = callPackage ../tools/security/clevis { @@ -4667,7 +4666,7 @@ with pkgs; cloudflared = callPackage ../applications/networking/cloudflared { # https://github.com/cloudflare/cloudflared/issues/1151#issuecomment-1888819250 buildGoModule = buildGoModule.override { - go = go.overrideAttrs { + go = go_1_21.overrideAttrs { pname = "cloudflare-go"; version = "0-unstable-2023-12-06"; src = fetchFromGitHub { @@ -4780,8 +4779,6 @@ with pkgs; swaytools = python3Packages.callPackage ../tools/wayland/swaytools { }; - swww = callPackage ../tools/wayland/swww { }; - wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { @@ -4930,8 +4927,6 @@ with pkgs; csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { }; - cucumber = callPackage ../development/tools/cucumber { }; - cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { }; dab_lib = callPackage ../development/libraries/dab_lib { }; @@ -5406,9 +5401,7 @@ with pkgs; texlive = callPackage ../tools/typesetting/tex/texlive { }; inherit (texlive.schemes) texliveBasic texliveBookPub texliveConTeXt texliveFull texliveGUST texliveInfraOnly texliveMedium texliveMinimal texliveSmall texliveTeTeX; - fop = callPackage ../tools/typesetting/fop { - jdk = openjdk8; - }; + fop = callPackage ../tools/typesetting/fop { }; fondu = callPackage ../tools/misc/fondu { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -5528,8 +5521,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; - gpg-tui = callPackage ../tools/security/gpg-tui { inherit (darwin.apple_sdk.frameworks) AppKit Foundation; inherit (darwin) libobjc libresolv; @@ -5639,11 +5630,9 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; - hyprdim = callPackage ../applications/misc/hyprdim { }; - hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; - udis86 = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; + wlroots-hyprland = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; + udis86-hyprland = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; }; hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { }; @@ -5652,8 +5641,6 @@ with pkgs; hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { }; - hyprnome = callPackage ../applications/misc/hyprnome { }; - hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { @@ -5973,11 +5960,7 @@ with pkgs; mlarchive2maildir = callPackage ../applications/networking/mailreaders/mlarchive2maildir { }; - mmctl = callPackage ../tools/misc/mmctl { - # mmctl tests currently fail with go1.21. See - # https://mattermost.atlassian.net/browse/MM-55465 - buildGoModule = buildGo120Module; - }; + mmctl = callPackage ../tools/misc/mmctl { }; moar = callPackage ../tools/misc/moar { }; @@ -6132,8 +6115,6 @@ with pkgs; optar = callPackage ../tools/graphics/optar { }; - obinskit = callPackage ../applications/misc/obinskit { }; - ockam = callPackage ../tools/networking/ockam { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -6149,10 +6130,6 @@ with pkgs; opam-publish = callPackage ../development/tools/ocaml/opam-publish { }; - opencomposite = callPackage ../development/libraries/opencomposite { }; - - opencomposite-helper = callPackage ../development/libraries/opencomposite/helper.nix { }; - osdlyrics = callPackage ../applications/audio/osdlyrics { }; ossutil = callPackage ../tools/admin/ossutil { }; @@ -6275,8 +6252,6 @@ with pkgs; reg = callPackage ../tools/virtualization/reg { }; - retool = callPackage ../applications/misc/retool { }; - rex = callPackage ../tools/system/rex { }; river = callPackage ../applications/window-managers/river { }; @@ -6792,7 +6767,9 @@ with pkgs; cicero-tui = callPackage ../tools/misc/cicero-tui { }; - cilium-cli = callPackage ../applications/networking/cluster/cilium { }; + cilium-cli = callPackage ../applications/networking/cluster/cilium { + buildGoModule = buildGo122Module; + }; cjdns = callPackage ../tools/networking/cjdns { }; cjdns-tools = callPackage ../tools/admin/cjdns-tools { }; @@ -6820,12 +6797,11 @@ with pkgs; cirrusgo = callPackage ../tools/security/cirrusgo { }; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) - citrix_workspace_23_02_0 - citrix_workspace_23_07_0 citrix_workspace_23_09_0 citrix_workspace_23_11_0 + citrix_workspace_24_02_0 ; - citrix_workspace = citrix_workspace_23_11_0; + citrix_workspace = citrix_workspace_24_02_0; clima = callPackage ../tools/text/clima { }; @@ -7104,6 +7080,8 @@ with pkgs; certstrap = callPackage ../tools/security/certstrap { }; + cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert; + cfssl = callPackage ../tools/security/cfssl { }; cfs-zen-tweaks = callPackage ../os-specific/linux/cfs-zen-tweaks { }; @@ -7293,11 +7271,9 @@ with pkgs; curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; - curl-impersonate = - builtins.mapAttrs (_: pin-to-gcc12-if-gcc13) - (darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }); - curl-impersonate-ff = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-ff; - curl-impersonate-chrom = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-chrome; + curl-impersonate = darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }; + curl-impersonate-ff = curl-impersonate.curl-impersonate-ff; + curl-impersonate-chrome = curl-impersonate.curl-impersonate-chrome; curlie = callPackage ../tools/networking/curlie { }; @@ -7602,7 +7578,7 @@ with pkgs; }; dump_syms = callPackage ../development/tools/dump_syms { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; dumpasn1 = callPackage ../tools/security/dumpasn1 { }; @@ -7721,8 +7697,9 @@ with pkgs; rar2fs = callPackage ../tools/filesystems/rar2fs { }; - rocmPackages = rocmPackages_5; + rocmPackages = rocmPackages_6; rocmPackages_5 = recurseIntoAttrs (callPackage ../development/rocm-modules/5 { }); + rocmPackages_6 = recurseIntoAttrs (callPackage ../development/rocm-modules/6 { }); rune = callPackage ../development/interpreters/rune { }; @@ -7738,8 +7715,6 @@ with pkgs; sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - soupault = callPackage ../tools/typesetting/soupault { }; - stratisd = callPackage ../tools/filesystems/stratisd { }; stratis-cli = callPackage ../tools/filesystems/stratis-cli { }; @@ -7957,10 +7932,6 @@ with pkgs; esshader = callPackage ../tools/graphics/esshader { }; - etcher = callPackage ../tools/misc/etcher { - electron = electron_19; - }; - ethercalc = callPackage ../servers/web-apps/ethercalc { }; ethtool = callPackage ../tools/misc/ethtool { }; @@ -8402,6 +8373,8 @@ with pkgs; gauge = callPackage ../development/tools/gauge { }; + gawd = python3Packages.toPythonApplication python3Packages.gawd; + gawk = callPackage ../tools/text/gawk { inherit (darwin) locale; }; @@ -8504,9 +8477,7 @@ with pkgs; gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { }; - gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { - buildGoModule = buildGo120Module; - }; + gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; @@ -8727,9 +8698,7 @@ with pkgs; goreplay = callPackage ../tools/networking/goreplay { }; - gost = callPackage ../tools/networking/gost { - buildGoModule = buildGo120Module; # go 1.21 build failure - }; + gost = callPackage ../tools/networking/gost { }; gource = callPackage ../applications/version-management/gource { }; @@ -9090,7 +9059,10 @@ with pkgs; hdf5_1_10 = callPackage ../tools/misc/hdf5/1.10.nix { }; - hdf5-mpi = hdf5.override { mpiSupport = true; }; + hdf5-mpi = hdf5.override { + mpiSupport = true; + cppSupport = false; + }; hdf5-cpp = hdf5.override { cppSupport = true; }; @@ -9382,6 +9354,8 @@ with pkgs; iocextract = with python3Packages; toPythonApplication iocextract; + iocsearcher = with python3Packages; toPythonApplication iocsearcher; + ioping = callPackage ../tools/system/ioping { }; ior = callPackage ../tools/system/ior { }; @@ -9552,8 +9526,6 @@ with pkgs; junkie = callPackage ../tools/networking/junkie { }; - just = callPackage ../development/tools/just { }; - go-jira = callPackage ../applications/misc/go-jira { }; jogl = callPackage ../by-name/jo/jogl/package.nix { @@ -9774,9 +9746,7 @@ with pkgs; kool = callPackage ../development/tools/misc/kool { }; - kore = callPackage ../development/web/kore { - openssl = openssl_1_1; - }; + kore = callPackage ../development/web/kore { }; krakenx = callPackage ../tools/system/krakenx { }; @@ -9802,9 +9772,7 @@ with pkgs; kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; - kube-router = callPackage ../applications/networking/cluster/kube-router { - buildGoModule = buildGo120Module; - }; + kube-router = callPackage ../applications/networking/cluster/kube-router { }; kubedock = callPackage ../development/tools/kubedock { }; @@ -10627,7 +10595,9 @@ with pkgs; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd/wrapper.nix { }; - lxd-unwrapped = callPackage ../tools/admin/lxd { }; + lxd-unwrapped = callPackage ../tools/admin/lxd { + buildGoModule = buildGo122Module; + }; lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { }; @@ -10714,6 +10684,8 @@ with pkgs; inherit (python3Packages) mako; }; + marimo = with python3Packages; toPythonApplication marimo; + marktext = callPackage ../applications/misc/marktext { }; mars-mips = callPackage ../development/tools/mars-mips { }; @@ -10919,7 +10891,7 @@ with pkgs; metasploit = callPackage ../tools/security/metasploit { }; mhost = callPackage ../applications/networking/mhost { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; ms-sys = callPackage ../tools/misc/ms-sys { }; @@ -11185,7 +11157,12 @@ with pkgs; numberstation = callPackage ../applications/misc/numberstation { }; - nvchecker = with python3Packages; toPythonApplication nvchecker; + nvchecker = with python3Packages; toPythonApplication ( + nvchecker.overridePythonAttrs (oldAttrs: { + propagatedBuildInputs = oldAttrs.propagatedBuildInputs + ++ lib.flatten (builtins.attrValues oldAttrs.optional-dependencies); + }) + ); nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher; @@ -11581,6 +11558,8 @@ with pkgs; ssh-copy-id = callPackage ../tools/networking/openssh/copyid.nix { }; + sshd-openpgp-auth = callPackage ../by-name/ss/ssh-openpgp-auth/daemon.nix { }; + opensp = callPackage ../tools/text/sgml/opensp { }; opentofu = callPackage ../applications/networking/cluster/opentofu { }; @@ -11990,13 +11969,14 @@ with pkgs; piknik = callPackage ../tools/networking/piknik { }; - pinentry = libsForQt5.callPackage ../tools/security/pinentry { }; - - pinentry-curses = (lib.getOutput "curses" pinentry); - pinentry-emacs = (lib.getOutput "emacs" pinentry); - pinentry-gtk2 = (lib.getOutput "gtk2" pinentry); - pinentry-qt = (lib.getOutput "qt" pinentry); - pinentry-gnome = (lib.getOutput "gnome3" pinentry); + inherit (callPackages ../tools/security/pinentry { }) + pinentry-curses + pinentry-emacs + pinentry-gtk2 + pinentry-gnome3 + pinentry-qt + pinentry-tty + pinentry-all; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -12224,7 +12204,8 @@ with pkgs; prototypejs = callPackage ../development/libraries/prototypejs { }; proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { - inherit (darwin.apple_sdk.frameworks) Foundation AppKit; + inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; proxychains = callPackage ../tools/networking/proxychains { }; @@ -13265,6 +13246,8 @@ with pkgs; sockdump = callPackage ../tools/networking/sockdump { }; + specup = haskellPackages.specup.bin; + spglib = callPackage ../development/libraries/spglib { inherit (llvmPackages) openmp; }; @@ -13328,7 +13311,7 @@ with pkgs; sparrow-unwrapped = callPackage ../applications/blockchains/sparrow { openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix {}; - openjdk = openjdk.override { enableJavaFX = true; }; + openjdk = openjdk21.override { enableJavaFX = true; }; }; sparrow = callPackage ../applications/blockchains/sparrow/fhsenv.nix { }; @@ -13950,7 +13933,6 @@ with pkgs; trezord = callPackage ../servers/trezord { inherit (darwin.apple_sdk.frameworks) AppKit; - buildGoModule = buildGo120Module; }; trezor-agent = with python3Packages; toPythonApplication trezor-agent; @@ -14129,8 +14111,6 @@ with pkgs; typos = callPackage ../development/tools/typos { }; - typstfmt = callPackage ../tools/typesetting/typstfmt { }; - typst-live = callPackage ../tools/typesetting/typst-live { }; tz = callPackage ../tools/misc/tz { }; @@ -14664,8 +14644,6 @@ with pkgs; unnaturalscrollwheels = callPackage ../tools/inputmethods/unnaturalscrollwheels { }; - unrar = callPackage ../tools/archivers/unrar { }; - unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; uptime-kuma = callPackage ../servers/monitoring/uptime-kuma { }; @@ -15130,9 +15108,7 @@ with pkgs; zip = callPackage ../tools/archivers/zip { }; - zincsearch = callPackage ../servers/search/zincsearch { - buildGoModule = buildGo120Module; - }; + zincsearch = callPackage ../servers/search/zincsearch { }; zkfuse = callPackage ../tools/filesystems/zkfuse { }; @@ -15221,8 +15197,6 @@ with pkgs; zsv = callPackage ../development/tools/zsv { }; - zsync = callPackage ../tools/compression/zsync { }; - zxing = callPackage ../tools/graphics/zxing { }; zkar = callPackage ../tools/security/zkar { }; @@ -15346,8 +15320,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-19; - temurin-jre-bin = temurin-jre-bin-19; + temurin-bin = temurin-bin-21; + temurin-jre-bin = temurin-jre-bin-21; semeru-bin-17 = javaPackages.compiler.semeru-bin.jdk-17; semeru-jre-bin-17 = javaPackages.compiler.semeru-bin.jre-17; @@ -15504,7 +15478,6 @@ with pkgs; clang = llvmPackages.clang; clang_9 = llvmPackages_9.clang; - clang_11 = llvmPackages_11.clang; clang_12 = llvmPackages_12.clang; clang_13 = llvmPackages_13.clang; clang_14 = llvmPackages_14.clang; @@ -15518,10 +15491,6 @@ with pkgs; llvmPackages = llvmPackages_9; }; - clang-tools_11 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_11; - }; - clang-tools_12 = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_12; }; @@ -15575,7 +15544,7 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - inherit (coqPackages_8_17) compcert; + inherit (coqPackages) compcert; computecpp-unwrapped = callPackage ../development/compilers/computecpp { }; computecpp = wrapCCWith rec { @@ -15706,15 +15675,6 @@ with pkgs; gccFun = callPackage ../development/compilers/gcc; gcc-unwrapped = gcc.cc; - disable-warnings-if-gcc13 = pkg: - if (pkg.stdenv.cc.cc.isGNU or false && lib.versionAtLeast pkg.stdenv.cc.cc.version "13.0") - then pkg.overrideAttrs(previousAttrs: previousAttrs // { - env = previousAttrs.env or {} // { - NIX_CFLAGS_COMPILE = (previousAttrs.env.NIX_CFLAGS_COMPILE or "") + " -Wno-error"; - }; - }) - else pkg; - pin-to-gcc12-if-gcc13 = pkg: if !(lib.isDerivation pkg) || !(pkg?override) then pkg else pkg.override (previousArgs: @@ -15754,9 +15714,6 @@ with pkgs; gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12; gcc13Stdenv = overrideCC gccStdenv buildPackages.gcc13; - # Meant for packages that fail with newer than gcc10. - gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; - # This is not intended for use in nixpkgs but for providing a faster-running # compiler to nixpkgs users by building gcc with reproducibility-breaking # profile-guided optimizations @@ -16126,13 +16083,13 @@ with pkgs; haskell = callPackage ./haskell-packages.nix { }; haskellPackages = dontRecurseIntoAttrs - # JS backend is only available for GHC >= 9.6 - (if stdenv.hostPlatform.isGhcjs - then haskell.packages.native-bignum.ghc96 - # Prefer native-bignum to avoid linking issues with gmp - else if stdenv.hostPlatform.isStatic - then haskell.packages.native-bignum.ghc94 - else haskell.packages.ghc94) + # Prefer native-bignum to avoid linking issues with gmp + # GHC 9.6 rts can't be built statically with hadrian, so we need to use 9.4 + # until 9.8 is ready + (if stdenv.hostPlatform.isStatic then haskell.packages.native-bignum.ghc94 + # JS backend can't use gmp + else if stdenv.hostPlatform.isGhcjs then haskell.packages.native-bignum.ghc96 + else haskell.packages.ghc96) // { __recurseIntoDerivationForReleaseJobs = true; }; # haskellPackages.ghc is build->host (it exposes the compiler used to build the @@ -16145,9 +16102,11 @@ with pkgs; # plain, cross-compiled compiler (which is only theoretical at the moment). ghc = targetPackages.haskellPackages.ghc or # Prefer native-bignum to avoid linking issues with gmp - (if stdenv.targetPlatform.isStatic - then haskell.compiler.native-bignum.ghc94 - else haskell.compiler.ghc94); + # Use 9.4 for static over broken 9.6 + (if stdenv.targetPlatform.isStatic then haskell.compiler.native-bignum.ghc94 + # JS backend can't use GMP + else if stdenv.targetPlatform.isGhcjs then haskell.compiler.native-bignum.ghc96 + else haskell.compiler.ghc96); alex = haskell.lib.compose.justStaticExecutables haskellPackages.alex; @@ -16344,8 +16303,8 @@ with pkgs; jdk21_headless = openjdk21_headless; /* default JDK */ - jdk = jdk19; - jdk_headless = jdk19_headless; + jdk = jdk21; + jdk_headless = jdk21_headless; # Since the introduction of the Java Platform Module System in Java 9, Java # no longer ships a separate JRE package. @@ -16479,7 +16438,6 @@ with pkgs; lld = llvmPackages.lld; lld_9 = llvmPackages_9.lld; - lld_11 = llvmPackages_11.lld; lld_12 = llvmPackages_12.lld; lld_13 = llvmPackages_13.lld; lld_14 = llvmPackages_14.lld; @@ -16489,7 +16447,6 @@ with pkgs; lldb = llvmPackages.lldb; lldb_9 = llvmPackages_9.lldb; - lldb_11 = llvmPackages_11.lldb; lldb_12 = llvmPackages_12.lldb; lldb_13 = llvmPackages_13.lldb; lldb_14 = llvmPackages_14.lldb; @@ -16499,7 +16456,6 @@ with pkgs; llvm = llvmPackages.llvm; llvm_9 = llvmPackages_9.llvm; - llvm_11 = llvmPackages_11.llvm; llvm_12 = llvmPackages_12.llvm; llvm_13 = llvmPackages_13.llvm; llvm_14 = llvmPackages_14.llvm; @@ -16539,20 +16495,11 @@ with pkgs; stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 }); - llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_11.tools; - targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries; - targetLlvm = targetPackages.llvmPackages_11.llvm or llvmPackages_11.llvm; - stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 - })); - llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_12.tools; targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries; targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm; - stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # .libcxxabi does not build with gcc13 })); llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({ @@ -16568,7 +16515,6 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_14.tools; targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries; targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm; - stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 })); llvmPackages_15 = recurseIntoAttrs (callPackage ../development/compilers/llvm/15 ({ @@ -16694,7 +16640,7 @@ with pkgs; nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; obliv-c = callPackage ../development/compilers/obliv-c { - stdenv = gcc10StdenvCompat; + stdenv = gcc10Stdenv; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; @@ -16763,7 +16709,7 @@ with pkgs; rasm = callPackage ../development/compilers/rasm { }; replibyte = callPackage ../development/tools/database/replibyte { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; rgbds = callPackage ../development/compilers/rgbds { }; @@ -16858,7 +16804,6 @@ with pkgs; }; cargo-leptos = callPackage ../development/tools/rust/cargo-leptos { }; cargo-kcov = callPackage ../development/tools/rust/cargo-kcov { }; - cargo-graph = callPackage ../development/tools/rust/cargo-graph { }; cargo-guppy = callPackage ../development/tools/rust/cargo-guppy { }; cargo-hack = callPackage ../development/tools/rust/cargo-hack { }; cargo-license = callPackage ../development/tools/rust/cargo-license { }; @@ -16883,9 +16828,13 @@ with pkgs; buildPgxExtension = callPackage ../development/tools/rust/cargo-pgx/buildPgxExtension.nix { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-pgrx = callPackage ../development/tools/rust/cargo-pgrx/default.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + inherit (callPackages ../development/tools/rust/cargo-pgrx { }) + cargo-pgrx_0_10_2 + cargo-pgrx_0_11_2 + cargo-pgrx_0_11_3 + ; + cargo-pgrx = cargo-pgrx_0_11_2; + buildPgrxExtension = callPackage ../development/tools/rust/cargo-pgrx/buildPgrxExtension.nix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -17142,10 +17091,6 @@ with pkgs; stalin = callPackage ../development/compilers/stalin { }; - stanc = callPackage ../development/compilers/stanc { - ocamlPackages = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; - }; - metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { }; svd2rust = callPackage ../development/tools/rust/svd2rust { }; @@ -18200,10 +18145,6 @@ with pkgs; pylyzer = callPackage ../development/tools/language-servers/pylyzer { }; - rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { - nix = nixVersions.nix_2_15; - }; - ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { }; rune-languageserver = callPackage ../development/tools/language-servers/rune-languageserver { }; @@ -18277,46 +18218,16 @@ with pkgs; inherit (callPackages ../development/tools/electron/binary { }) electron-bin - electron_10-bin - electron_11-bin - electron_12-bin - electron_13-bin - electron_14-bin - electron_15-bin - electron_16-bin - electron_17-bin - electron_18-bin - electron_19-bin - electron_20-bin - electron_21-bin - electron_22-bin - electron_23-bin electron_24-bin - electron_25-bin - electron_26-bin electron_27-bin - electron_28-bin; - - electron_10 = electron_10-bin; - electron_11 = electron_11-bin; - electron_12 = electron_12-bin; - electron_13 = electron_13-bin; - electron_14 = electron_14-bin; - electron_15 = electron_15-bin; - electron_16 = electron_16-bin; - electron_17 = electron_17-bin; - electron_18 = electron_18-bin; - electron_19 = electron_19-bin; - electron_20 = electron_20-bin; - electron_21 = electron_21-bin; - electron_22 = electron_22-bin; - electron_23 = electron_23-bin; + electron_28-bin + electron_29-bin; + electron_24 = electron_24-bin; - electron_25 = electron_25-bin; - electron_26 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_26 then electron-source.electron_26 else electron_26-bin; electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin; electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin; - electron = electron_28; + electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin; + electron = electron_29; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -18352,35 +18263,28 @@ with pkgs; bazel = bazel_6; - bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 { - inherit (darwin) cctools; - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk11_headless; - buildJdkName = "java11"; - runJdk = jdk11_headless; - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else gcc10StdenvCompat; - bazel_self = bazel_4; - }; - - bazel_5 = pin-to-gcc12-if-gcc13 (callPackage ../development/tools/build-managers/bazel/bazel_5 { + bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 { inherit (darwin) cctools sigtool; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; runJdk = jdk11_headless; - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv + else if stdenv.cc.isGNU then gcc12Stdenv + else stdenv; bazel_self = bazel_5; - }); + }; - bazel_6 = pin-to-gcc12-if-gcc13 (darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 { + bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 { inherit (darwin) cctools; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; runJdk = jdk11_headless; - stdenv = if stdenv.isDarwin then - darwin.apple_sdk_11_0.stdenv else - if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv + else if stdenv.cc.isClang then llvmPackages.stdenv + else if stdenv.cc.isGNU then gcc12Stdenv + else stdenv; bazel_self = bazel_6; - }); + }; bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 { inherit (darwin) cctools sigtool; @@ -18780,7 +18684,6 @@ with pkgs; devbox = callPackage ../development/tools/devbox { }; libcxx = llvmPackages.libcxx; - libcxxabi = llvmPackages.libcxxabi; librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; @@ -18820,8 +18723,6 @@ with pkgs; devtodo = callPackage ../development/tools/devtodo { }; - dfeet = callPackage ../development/tools/misc/d-feet { }; - d-spy = callPackage ../development/tools/misc/d-spy { }; dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { }; @@ -20014,7 +19915,9 @@ with pkgs; terracognita = callPackage ../development/tools/misc/terracognita { }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; - terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; + terraform-ls = callPackage ../development/tools/misc/terraform-ls { + buildGoModule = buildGo122Module; + }; terraformer = callPackage ../development/tools/misc/terraformer { }; @@ -20250,8 +20153,6 @@ with pkgs; ### DEVELOPMENT / LIBRARIES - a52dec = callPackage ../development/libraries/a52dec { }; - aalib = callPackage ../development/libraries/aalib { }; abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { @@ -20480,9 +20381,6 @@ with pkgs; then pkgs."androidndkPkgs_${stdenv.hostPlatform.ndkVer}".libraries else callPackage ../os-specific/linux/bionic-prebuilt { }; - - boehmgc = callPackage ../development/libraries/boehm-gc { }; - boolstuff = callPackage ../development/libraries/boolstuff { }; inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; }) @@ -20843,8 +20741,6 @@ with pkgs; directfb = callPackage ../development/libraries/directfb { }; - discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { }; - discord-gamesdk = callPackage ../development/libraries/discord-gamesdk { }; discord-rpc = callPackage ../development/libraries/discord-rpc { @@ -20994,50 +20890,19 @@ with pkgs; linbox = callPackage ../development/libraries/linbox { }; - ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { - inherit (darwin.apple_sdk.frameworks) - Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox - VideoDecodeAcceleration VideoToolbox; - }; - ffmpeg_4-headless = ffmpeg_4.override { - ffmpegVariant = "headless"; - }; - ffmpeg_4-full = ffmpeg_4.override { - ffmpegVariant = "full"; - }; - - ffmpeg_5 = callPackage ../development/libraries/ffmpeg/5.nix { - inherit (darwin.apple_sdk.frameworks) - Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox - VideoDecodeAcceleration VideoToolbox; - }; - ffmpeg_5-headless = ffmpeg_5.override { - ffmpegVariant = "headless"; - }; - ffmpeg_5-full = ffmpeg_5.override { - ffmpegVariant = "full"; - }; - - ffmpeg_6 = callPackage ../development/libraries/ffmpeg/6.nix { - inherit (darwin.apple_sdk.frameworks) - Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox - VideoDecodeAcceleration VideoToolbox; - }; - ffmpeg_6-headless = ffmpeg_6.override { - ffmpegVariant = "headless"; - }; - ffmpeg_6-full = ffmpeg_6.override { - ffmpegVariant = "full"; - }; - - # Aliases - # Please make sure this is updated to the latest version on the next major - # update to ffmpeg - # Packages which use ffmpeg as a library, should pin to the relevant major - # version number which the upstream support. - ffmpeg = ffmpeg_6; - ffmpeg-headless = ffmpeg_6-headless; - ffmpeg-full = ffmpeg_6-full; + inherit (callPackage ../development/libraries/ffmpeg { }) + ffmpeg_4 + ffmpeg_4-headless + ffmpeg_4-full + ffmpeg_5 + ffmpeg_5-headless + ffmpeg_5-full + ffmpeg_6 + ffmpeg_6-headless + ffmpeg_6-full + ffmpeg + ffmpeg-headless + ffmpeg-full; ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; @@ -21118,9 +20983,7 @@ with pkgs; }; }; - freetts = callPackage ../development/libraries/freetts { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + freetts = callPackage ../development/libraries/freetts { }; frog = res.languageMachines.frog; @@ -21824,7 +21687,7 @@ with pkgs; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; - hydra-check = with python310.pkgs; toPythonApplication hydra-check; + hydra-check = with python3.pkgs; toPythonApplication hydra-check; hyena = callPackage ../development/libraries/hyena { }; @@ -22214,8 +22077,6 @@ with pkgs; libbs2b = callPackage ../development/libraries/audio/libbs2b { }; - libbson = callPackage ../development/libraries/libbson { }; - libbytesize = callPackage ../development/libraries/libbytesize { }; libcaca = callPackage ../development/libraries/libcaca { }; @@ -23523,8 +23384,6 @@ with pkgs; yas = callPackage ../development/libraries/yas { }; - libyang = callPackage ../development/libraries/libyang { }; - libcyaml = callPackage ../development/libraries/libcyaml { }; rang = callPackage ../development/libraries/rang { }; @@ -23945,31 +23804,7 @@ with pkgs; nvitop = callPackage ../tools/system/nvitop { }; - nvtop = callPackage ../tools/system/nvtop { }; - nvtop-amd = (callPackage ../tools/system/nvtop { - amd = true; - intel = false; - msm = false; - nvidia = false; - }).overrideAttrs { pname = "nvtop-amd"; }; - nvtop-intel = (callPackage ../tools/system/nvtop { - amd = false; - intel = true; - msm = false; - nvidia = false; - }).overrideAttrs { pname = "nvtop-intel"; }; - nvtop-msm = (callPackage ../tools/system/nvtop { - amd = false; - intel = false; - msm = true; - nvidia = false; - }).overrideAttrs { pname = "nvtop-msm"; }; - nvtop-nvidia = (callPackage ../tools/system/nvtop { - amd = false; - intel = false; - msm = false; - nvidia = true; - }).overrideAttrs { pname = "nvtop-nvidia"; }; + nvtopPackages = recurseIntoAttrs (import ../tools/system/nvtop { inherit callPackage; }); ocl-icd = callPackage ../development/libraries/ocl-icd { }; @@ -24111,7 +23946,7 @@ with pkgs; libressl = libressl_3_8; - boringssl = disable-warnings-if-gcc13 (callPackage ../development/libraries/boringssl { }); + boringssl = callPackage ../development/libraries/boringssl { }; wolfssl = darwin.apple_sdk_11_0.callPackage ../development/libraries/wolfssl { inherit (darwin.apple_sdk_11_0.frameworks) Security; @@ -24263,10 +24098,6 @@ with pkgs; prime-server = callPackage ../development/libraries/prime-server { }; - primecount = callPackage ../applications/science/math/primecount { }; - - primesieve = callPackage ../applications/science/math/primesieve { }; - proj = callPackage ../development/libraries/proj { stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv; }; @@ -24286,7 +24117,9 @@ with pkgs; protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { }; protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { }; - protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { }; + protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { + abseil-cpp = abseil-cpp_202301; + }; protobuf_21 = callPackage ../development/libraries/protobuf/21.nix { abseil-cpp = abseil-cpp_202103; }; @@ -24509,7 +24342,7 @@ with pkgs; rlottie = callPackage ../development/libraries/rlottie { }; - rocksdb = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/rocksdb { }); + rocksdb = callPackage ../development/libraries/rocksdb { }; rocksdb_7_10 = rocksdb.overrideAttrs rec { pname = "rocksdb"; @@ -25050,8 +24883,6 @@ with pkgs; thrift = callPackage ../development/libraries/thrift { }; - thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { }; - tidyp = callPackage ../development/libraries/tidyp { }; tidal-hifi = callPackage ../applications/audio/tidal-hifi { }; @@ -25151,7 +24982,7 @@ with pkgs; ucommon = callPackage ../development/libraries/ucommon { }; - v8 = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/v8 ( + v8 = callPackage ../development/libraries/v8 ( let stdenv' = if stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "16" then overrideLibcxx llvmPackages_15.stdenv @@ -25160,7 +24991,7 @@ with pkgs; { stdenv = if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; } - )); + ); intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; @@ -25418,7 +25249,9 @@ with pkgs; yojimbo = callPackage ../development/libraries/yojimbo { }; - yubico-pam = callPackage ../development/libraries/yubico-pam { }; + yubico-pam = callPackage ../development/libraries/yubico-pam { + inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; + }; yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { inherit (darwin.apple_sdk.frameworks) PCSC; @@ -25602,20 +25435,9 @@ with pkgs; ### DEVELOPMENT / GO # the unversioned attributes should always point to the same go version - go = go_1_21; - buildGoModule = buildGo121Module; - buildGoPackage = buildGo121Package; - - # requires a newer Apple SDK - go_1_20 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.20.nix { - inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; - }; - buildGo120Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix { - go = buildPackages.go_1_20; - }; - buildGo120Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix { - go = buildPackages.go_1_20; - }; + go = go_1_22; + buildGoModule = buildGo122Module; + buildGoPackage = buildGo122Package; # requires a newer Apple SDK go_1_21 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.21.nix { @@ -26050,13 +25872,12 @@ with pkgs; dspam = callPackage ../servers/mail/dspam { }; - engelsystem = callPackage ../servers/web-apps/engelsystem { php = php81; }; + engelsystem = callPackage ../servers/web-apps/engelsystem { }; - envoy = pin-to-gcc12-if-gcc13 (callPackage ../servers/http/envoy { - go = go_1_20; + envoy = callPackage ../servers/http/envoy { jdk = openjdk11_headless; gn = gn1924; - }); + }; ergochat = callPackage ../servers/irc/ergochat { }; @@ -26147,7 +25968,9 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; - grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; + grafana-agent = callPackage ../servers/monitoring/grafana-agent { + buildGoModule = buildGo122Module; + }; grafana-loki = callPackage ../servers/monitoring/loki { }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; @@ -26552,8 +26375,6 @@ with pkgs; sympa = callPackage ../servers/mail/sympa { }; - syncstorage-rs = callPackage ../servers/syncstorage-rs { }; - system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { }); # PulseAudio daemons @@ -26682,7 +26503,9 @@ with pkgs; azuredatastudio = callPackage ../applications/misc/azuredatastudio { }; - miniflux = callPackage ../servers/miniflux { }; + miniflux = callPackage ../servers/miniflux { + buildGoModule = buildGo122Module; + }; mir = callPackage ../servers/mir { }; @@ -26790,8 +26613,8 @@ with pkgs; postgresql_15_jit postgresql_16_jit ; - postgresql = postgresql_15.override { this = postgresql; }; - postgresql_jit = postgresql_15_jit.override { this = postgresql_jit; }; + postgresql = postgresql_15; + postgresql_jit = postgresql_15_jit; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; @@ -26947,8 +26770,6 @@ with pkgs; redstore = callPackage ../servers/http/redstore { }; - reproxy = callPackage ../servers/reproxy { }; - repro-get = callPackage ../tools/package-management/repro-get { }; restic = callPackage ../tools/backup/restic { }; @@ -27037,11 +26858,9 @@ with pkgs; sipwitch = callPackage ../servers/sip/sipwitch { }; - slimserver = callPackage ../servers/slimserver { }; - smcroute = callPackage ../servers/smcroute { }; - snipe-it = callPackage ../servers/web-apps/snipe-it { + snipe-it = callPackage ../by-name/sn/snipe-it/package.nix { php = php81; }; @@ -27068,10 +26887,6 @@ with pkgs; storm = callPackage ../servers/computing/storm { }; - surrealdb = callPackage ../servers/nosql/surrealdb { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - }; - switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { }; slurm = callPackage ../servers/computing/slurm { }; @@ -27266,10 +27081,6 @@ with pkgs; pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; - t-rex = callPackage ../servers/geospatial/t-rex { - inherit (darwin.apple_sdk.frameworks) Security; - }; - tegola = callPackage ../servers/geospatial/tegola { }; tile38 = callPackage ../servers/geospatial/tile38 { }; @@ -27314,6 +27125,7 @@ with pkgs; armTrustedFirmwareQemu armTrustedFirmwareRK3328 armTrustedFirmwareRK3399 + armTrustedFirmwareRK3588 armTrustedFirmwareS905 ; @@ -27402,8 +27214,6 @@ with pkgs; cpustat = callPackage ../os-specific/linux/cpustat { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { }; - cockroachdb-bin = callPackage ../servers/sql/cockroachdb/cockroachdb-bin.nix { }; coconutbattery = callPackage ../os-specific/darwin/coconutbattery { }; @@ -27452,8 +27262,6 @@ with pkgs; disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; - displaycal = callPackage ../applications/graphics/displaycal { }; - displaylink = callPackage ../os-specific/linux/displaylink { inherit (linuxPackages) evdi; }; @@ -27749,8 +27557,6 @@ with pkgs; smemstat = callPackage ../os-specific/linux/smemstat { }; - tgpt = callPackage ../tools/misc/tgpt { }; - tgt = callPackage ../tools/networking/tgt { }; lkl = callPackage ../applications/virtualization/lkl { }; @@ -27847,9 +27653,7 @@ with pkgs; cryptodev = linuxPackages.cryptodev; - dpdk = callPackage ../os-specific/linux/dpdk { - kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod - }; + dpdk = callPackage ../os-specific/linux/dpdk { }; keyutils = callPackage ../os-specific/linux/keyutils { }; @@ -28066,9 +27870,7 @@ with pkgs; goconst = callPackage ../development/tools/goconst { }; - goconvey = callPackage ../development/tools/goconvey { - buildGoModule = buildGo120Module; - }; + goconvey = callPackage ../development/tools/goconvey { }; go-callvis = callPackage ../development/tools/go-callvis { }; @@ -28102,7 +27904,9 @@ with pkgs; goverview = callPackage ../tools/security/goverview { }; - go-tools = callPackage ../development/tools/go-tools { }; + go-tools = callPackage ../development/tools/go-tools { + buildGoModule = buildGo122Module; + }; gotest = callPackage ../development/tools/gotest { }; @@ -28122,9 +27926,7 @@ with pkgs; go-mod-graph-chart = callPackage ../development/tools/go-mod-graph-chart { }; - gomacro = callPackage ../development/tools/gomacro { - buildGoModule = buildGo120Module; - }; + gomacro = callPackage ../development/tools/gomacro { }; gomodifytags = callPackage ../development/tools/gomodifytags { }; @@ -28527,6 +28329,7 @@ with pkgs; ubootOlimexA64Olinuxino ubootOlimexA64Teres1 ubootOrangePi3 + ubootOrangePi5 ubootOrangePiPc ubootOrangePiZeroPlus2H5 ubootOrangePiZero @@ -28547,6 +28350,7 @@ with pkgs; ubootRaspberryPi4_32bit ubootRaspberryPi4_64bit ubootRaspberryPiZero + ubootRock5ModelB ubootRock64 ubootRock64v2 ubootRockPi4 @@ -28731,6 +28535,8 @@ with pkgs; android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { }; + andromeda-gtk-theme = libsForQt5.callPackage ../data/themes/andromeda-gtk-theme { }; + ankacoder = callPackage ../data/fonts/ankacoder { }; ankacoder-condensed = callPackage ../data/fonts/ankacoder/condensed.nix { }; @@ -28919,8 +28725,6 @@ with pkgs; commit-mono = callPackage ../data/fonts/commit-mono { }; - conway_polynomials = callPackage ../data/misc/conway_polynomials { }; - cooper-hewitt = callPackage ../data/fonts/cooper-hewitt { }; d2coding = callPackage ../data/fonts/d2coding { }; @@ -29447,9 +29251,9 @@ with pkgs; open-sans = callPackage ../data/fonts/open-sans { }; - openmoji-color = callPackage ../data/fonts/openmoji { variant = "color"; }; + openmoji-color = callPackage ../data/fonts/openmoji { fontFormats = ["glyf_colr_0"]; }; - openmoji-black = callPackage ../data/fonts/openmoji { variant = "black"; }; + openmoji-black = callPackage ../data/fonts/openmoji { fontFormats = ["glyf"]; }; openzone-cursors = callPackage ../data/themes/openzone { }; @@ -29573,8 +29377,6 @@ with pkgs; sarabun-font = callPackage ../data/fonts/sarabun { }; - sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { }; - savepagenow = callPackage ../tools/misc/savepagenow { }; scheme-manpages = callPackage ../data/documentation/scheme-manpages { }; @@ -29949,11 +29751,6 @@ with pkgs; qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; - saga = callPackage ../applications/gis/saga { - inherit (darwin.apple_sdk.frameworks) Cocoa; - inherit (libsForQt5) dxflib; - }; - spatialite_gui = callPackage ../applications/gis/spatialite-gui { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; wxGTK = wxGTK32; @@ -30071,8 +29868,6 @@ with pkgs; amarok = libsForQt5.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility - amfora = callPackage ../applications/networking/browsers/amfora { }; - AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; @@ -30354,7 +30149,9 @@ with pkgs; bgpq4 = callPackage ../tools/networking/bgpq4 { }; - blackbox = callPackage ../applications/version-management/blackbox { }; + blackbox = callPackage ../applications/version-management/blackbox { + pinentry = pinentry-curses; + }; bleachbit = callPackage ../applications/misc/bleachbit { }; @@ -30718,9 +30515,8 @@ with pkgs; daktilo = callPackage ../tools/misc/daktilo { }; - darcs = haskell.lib.compose.overrideCabal (drv: { - configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; - }) (haskell.lib.compose.justStaticExecutables haskellPackages.darcs); + darcs = haskell.lib.compose.disableCabalFlag "library" + (haskell.lib.compose.justStaticExecutables haskell.packages.ghc94.darcs); darkman = callPackage ../applications/misc/darkman { }; @@ -30812,7 +30608,7 @@ with pkgs; dnglab = callPackage ../tools/graphics/dnglab { }; inherit (callPackage ../applications/virtualization/docker {}) - docker_20_10 docker_24 docker_25; + docker_24 docker_25; docker = docker_24; docker-client = docker.override { clientOnly = true; }; @@ -30857,7 +30653,9 @@ with pkgs; drawing = callPackage ../applications/graphics/drawing { }; - drawio = callPackage ../applications/graphics/drawio { }; + drawio = callPackage ../applications/graphics/drawio { + inherit (darwin) autoSignDarwinBinariesHook; + }; drawio-headless = callPackage ../applications/graphics/drawio/headless.nix { }; drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; @@ -31084,9 +30882,7 @@ with pkgs; gigalixir = callPackage ../tools/misc/gigalixir { }; - go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { - buildGoModule = buildGo120Module; - }; + go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; go-motion = callPackage ../development/tools/go-motion { }; @@ -31103,8 +30899,6 @@ with pkgs; gspeech = callPackage ../applications/audio/gspeech { }; - gtkcord4 = callPackage ../applications/audio/gtkcord4 { }; - haruna = libsForQt5.callPackage ../applications/video/haruna { }; hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { }; @@ -31652,22 +31446,6 @@ with pkgs; fragments = callPackage ../applications/networking/p2p/fragments { }; - freecad = libsForQt5.callPackage ../applications/graphics/freecad { - boost = python3Packages.boost; - inherit (python3Packages) - gitpython - matplotlib - pivy - ply - pycollada - pyside2 - pyside2-tools - python - pyyaml - scipy - shiboken2; - }; - freedv = callPackage ../applications/radio/freedv { inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia; codec2 = codec2.override { @@ -31899,8 +31677,6 @@ with pkgs; gscreenshot = callPackage ../applications/graphics/gscreenshot { }; - gtkpod = callPackage ../applications/audio/gtkpod { }; - guacamole-client = callPackage ../servers/guacamole-client { }; guacamole-server = callPackage ../servers/guacamole-server { }; @@ -32128,20 +31904,6 @@ with pkgs; hydroxide = callPackage ../applications/networking/hydroxide { }; - hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix { - inherit (haskellPackages) ghcWithPackages; - packages = self: with self; []; - }; - - hyper-haskell = callPackage ../development/tools/haskell/hyper-haskell { - hyper-haskell-server = hyper-haskell-server-with-packages.override { - packages = self: with self; [ - hyper-extra diagrams csound-catalog - ]; - }; - extra-packages = [ csound ]; - }; - hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { protobuf = protobuf_21; }; @@ -32150,10 +31912,6 @@ with pkgs; hypnotix = callPackage ../applications/video/hypnotix { }; - indiepass-desktop = callPackage ../by-name/in/indiepass-desktop/package.nix { - electron = electron_19; - }; - jackline = callPackage ../applications/networking/instant-messengers/jackline { ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; @@ -32637,17 +32395,9 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 { - buildGoModule = buildGo120Module; - }; - k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 { - buildGoModule = buildGo120Module; - }; inherit (callPackage ../applications/networking/cluster/k3s { - buildGoModule = buildGo120Module; - }) k3s_1_26 k3s_1_27 k3s_1_28; - inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_29; - + buildGoModule = buildGo121Module; + }) k3s_1_26 k3s_1_27 k3s_1_28 k3s_1_29; k3s = k3s_1_29; k3sup = callPackage ../applications/networking/cluster/k3sup { }; @@ -32738,8 +32488,6 @@ with pkgs; kondo = callPackage ../applications/misc/kondo { }; - kooha = callPackage ../applications/video/kooha { }; - 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 @@ -32927,9 +32675,7 @@ with pkgs; kupfer = callPackage ../applications/misc/kupfer { }; - kuro = callPackage ../applications/misc/kuro { - electron = electron_22; - }; + kuro = callPackage ../applications/misc/kuro { }; timoni = callPackage ../applications/networking/cluster/timoni { }; @@ -32953,8 +32699,9 @@ with pkgs; ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; - ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { + ladybird = darwin.apple_sdk_11_0.callPackage ../applications/networking/browsers/ladybird { stdenv = if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_16.stdenv else stdenv; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation OpenGL; }; lazpaint = callPackage ../applications/graphics/lazpaint { }; @@ -33207,20 +32954,12 @@ with pkgs; markscribe = callPackage ../tools/text/markscribe { }; - magnetico = callPackage ../applications/networking/p2p/magnetico { - buildGoModule = buildGo120Module; - }; + magnetico = callPackage ../applications/networking/p2p/magnetico { }; mastodon-bot = nodePackages.mastodon-bot; matchbox = callPackage ../applications/window-managers/matchbox { }; - matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli { - inherit (python3Packages) buildPythonApplication buildPythonPackage - pygobject3 pytest-runner requests responses pytest python-olm - canonicaljson; - }; - matrix-commander = python3Packages.callPackage ../applications/networking/instant-messengers/matrix-commander { }; matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { }; @@ -33560,11 +33299,7 @@ with pkgs; normalize = callPackage ../applications/audio/normalize { }; - norouter = callPackage ../tools/networking/norouter { - # doesn't build with go 1.21 - # https://github.com/norouter/norouter/issues/165 - buildGoModule = buildGo120Module; - }; + norouter = callPackage ../tools/networking/norouter { }; nqptp = callPackage ../tools/networking/nqptp { }; @@ -33673,8 +33408,6 @@ with pkgs; webkitgtk = webkitgtk_6_0; }; - nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { }; - nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { }; nixos-shell = callPackage ../tools/virtualization/nixos-shell { }; @@ -33831,7 +33564,9 @@ with pkgs; shod = callPackage ../applications/window-managers/shod { }; - shotcut = qt6Packages.callPackage ../applications/video/shotcut { }; + shotcut = qt6Packages.callPackage ../applications/video/shotcut { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; shogun = callPackage ../applications/science/machine-learning/shogun { protobuf = protobuf_21; @@ -34099,12 +33834,7 @@ with pkgs; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client { }; - opentoonz = let - opentoonz-libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; - in qt5.callPackage ../applications/graphics/opentoonz { - libtiff = opentoonz-libtiff; - opencv = opencv.override { libtiff = opentoonz-libtiff; }; - }; + opentoonz = libsForQt5.callPackage ../applications/graphics/opentoonz { }; opentabletdriver = callPackage ../tools/X11/opentabletdriver { }; @@ -34214,9 +33944,9 @@ with pkgs; paprefs = callPackage ../applications/audio/paprefs { }; - pantalaimon = python3Packages.callPackage ../applications/networking/instant-messengers/pantalaimon { }; + pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { }; - pantalaimon-headless = python3Packages.callPackage ../applications/networking/instant-messengers/pantalaimon { + pantalaimon-headless = callPackage ../applications/networking/instant-messengers/pantalaimon { enableDbusUi = false; }; @@ -34488,8 +34218,6 @@ with pkgs; eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { }; - qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat { }; - qemu = callPackage ../applications/virtualization/qemu { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor vmnet; inherit (darwin.stubs) rez setfile; @@ -34721,10 +34449,6 @@ with pkgs; rgp = libsForQt5.callPackage ../development/tools/rgp { }; - ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { - protobuf = protobuf_21; - }; - ries = callPackage ../applications/science/math/ries { }; ripcord = if stdenv.isLinux then @@ -34760,10 +34484,6 @@ with pkgs; rofi-systemd = callPackage ../tools/system/rofi-systemd { }; - rofimoji = callPackage ../applications/misc/rofimoji { - inherit (python3Packages) buildPythonApplication configargparse; - }; - rootlesskit = callPackage ../tools/virtualization/rootlesskit { }; rsclock = callPackage ../applications/misc/rsclock { }; @@ -34890,7 +34610,9 @@ with pkgs; siproxd = callPackage ../applications/networking/siproxd { }; - sish = callPackage ../tools/networking/sish { }; + sish = callPackage ../tools/networking/sish { + buildGoModule = buildGo122Module; + }; sky = libsForQt5.callPackage ../applications/networking/instant-messengers/sky { libjpeg_turbo = libjpeg8; @@ -34940,10 +34662,6 @@ with pkgs; spotify-tray = callPackage ../applications/misc/spotify-tray { }; - spotify-tui = callPackage ../applications/audio/spotify-tui { - inherit (darwin.apple_sdk.frameworks) AppKit Security; - }; - sptlrx = callPackage ../applications/audio/sptlrx { }; sptk = callPackage ../development/libraries/sptk { }; @@ -35093,8 +34811,6 @@ with pkgs; skrooge = libsForQt5.callPackage ../applications/office/skrooge { }; - smartgithg = callPackage ../applications/version-management/smartgithg { }; - smartdeblur = libsForQt5.callPackage ../applications/graphics/smartdeblur { }; snapper = callPackage ../tools/misc/snapper { }; @@ -35358,8 +35074,6 @@ with pkgs; telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle { }; - teleprompter = callPackage ../applications/misc/teleprompter { }; - tempo = callPackage ../servers/tracing/tempo { }; temporal = callPackage ../applications/networking/cluster/temporal { }; @@ -35451,10 +35165,6 @@ with pkgs; tijolo = callPackage ../applications/editors/tijolo { }; - tilemaker = callPackage ../applications/misc/tilemaker { - protobuf = protobuf_21; - }; - timbreid = callPackage ../applications/audio/pd-plugins/timbreid { fftw = fftwSinglePrec; }; @@ -35849,6 +35559,7 @@ with pkgs; virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; + jdk = openjdk17; }; virtualboxKvm = lowPrio (virtualbox.override { @@ -35912,6 +35623,8 @@ with pkgs; vkeybd = callPackage ../applications/audio/vkeybd { }; + vlc-bin-universal = vlc-bin.override { variant = "universal"; }; + libvlc = vlc.override { withQt5 = false; onlyLibVLC = true; @@ -36105,7 +35818,7 @@ with pkgs; wgnord = callPackage ../applications/networking/wgnord/default.nix { }; whalebird = callPackage ../applications/misc/whalebird { - electron = electron_21; + electron = electron_27; }; windowlab = callPackage ../applications/window-managers/windowlab { }; @@ -36243,7 +35956,7 @@ with pkgs; kodi-cli = callPackage ../tools/misc/kodi-cli { }; - xca = libsForQt5.callPackage ../applications/misc/xca { }; + xca = qt6Packages.callPackage ../applications/misc/xca { }; xcalib = callPackage ../tools/X11/xcalib { }; @@ -36279,8 +35992,6 @@ with pkgs; xdg-desktop-portal-xapp = callPackage ../development/libraries/xdg-desktop-portal-xapp { }; - xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; - xdg-utils = callPackage ../tools/X11/xdg-utils {}; xdgmenumaker = callPackage ../applications/misc/xdgmenumaker { }; @@ -36333,7 +36044,7 @@ with pkgs; inherit (gnome2) libgnomecanvas; }; - xournalpp = callPackage ../applications/graphics/xournalpp { + xournalpp = darwin.apple_sdk_11_0.callPackage ../applications/graphics/xournalpp { lua = lua5_3; }; @@ -36533,7 +36244,7 @@ with pkgs; zerobin = callPackage ../applications/networking/zerobin { }; - zeroc-ice = disable-warnings-if-gcc13 (callPackage ../development/libraries/zeroc-ice { }); + zeroc-ice = callPackage ../development/libraries/zeroc-ice { }; zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; @@ -36666,16 +36377,7 @@ with pkgs; dcrctl = callPackage ../applications/blockchains/dcrctl { }; dcrd = callPackage ../applications/blockchains/dcrd { }; - dcrwallet = callPackage ../applications/blockchains/dcrwallet { - buildGoModule = buildGo120Module; - }; - - dogecoin = libsForQt5.callPackage ../applications/blockchains/dogecoin { - withGui = true; - }; - dogecoind = callPackage ../applications/blockchains/dogecoin { - withGui = false; - }; + dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; eclair = callPackage ../applications/blockchains/eclair { }; @@ -36874,8 +36576,6 @@ with pkgs; conmon-rs = callPackage ../applications/virtualization/conmon-rs { }; - digikam = libsForQt5.callPackage ../applications/graphics/digikam { }; - drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; eureka-ideas = callPackage ../applications/misc/eureka-ideas { @@ -37044,16 +36744,6 @@ with pkgs; zdoom = callPackage ../games/doom-ports/zdoom { }; - ### GAMES/LGAMES - - barrage = callPackage ../games/lgames/barrage { }; - - lbreakout2 = callPackage ../games/lgames/lbreakout2 { }; - - lbreakouthd = callPackage ../games/lgames/lbreakouthd { }; - - lpairs2 = callPackage ../games/lgames/lpairs2 { }; - maelstrom = callPackage ../games/maelstrom { }; mar1d = callPackage ../games/mar1d { } ; @@ -37204,7 +36894,7 @@ with pkgs; chiaki = libsForQt5.callPackage ../games/chiaki { }; - chiaki4deck = libsForQt5.callPackage ../games/chiaki4deck { }; + chiaki4deck = qt6Packages.callPackage ../games/chiaki4deck { }; chromium-bsu = callPackage ../games/chromium-bsu { }; @@ -37766,7 +37456,9 @@ with pkgs; pacvim = callPackage ../games/pacvim { }; - papermc = callPackage ../games/papermc { }; + papermcServers = callPackages ../games/papermc { }; + + papermc = papermcServers.papermc; path-of-building = qt6Packages.callPackage ../games/path-of-building {}; @@ -37966,8 +37658,6 @@ with pkgs; srb2 = callPackage ../games/srb2 { }; - srb2kart = callPackage ../games/srb2kart { }; - ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { }; stardust = callPackage ../games/stardust { }; @@ -38114,8 +37804,6 @@ with pkgs; umoria = callPackage ../games/umoria { }; - unciv = callPackage ../games/unciv { }; - unnethack = callPackage ../games/unnethack { }; uqm = callPackage ../games/uqm { }; @@ -38795,7 +38483,9 @@ with pkgs; getdp = callPackage ../applications/science/math/getdp { }; - gurobi = callPackage ../applications/science/math/gurobi { }; + gurobi = callPackage ../applications/science/math/gurobi { + python3 = python310; + }; jags = callPackage ../applications/science/math/jags { }; @@ -39352,8 +39042,6 @@ with pkgs; jflap = callPackage ../applications/science/engineering/jflap { }; - strictdoc = python3.pkgs.callPackage ../applications/science/engineering/strictdoc { }; - ### SCIENCE / ELECTRONICS adms = callPackage ../applications/science/electronics/adms { }; @@ -40477,10 +40165,6 @@ with pkgs; jre = openjdk19; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); - owmods-cli = callPackage ../applications/misc/owmods-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; - r128gain = callPackage ../applications/audio/r128gain { }; resp-app = libsForQt5.callPackage ../applications/misc/resp-app { }; @@ -40738,10 +40422,6 @@ with pkgs; sct = callPackage ../tools/X11/sct { }; - scylladb = callPackage ../servers/scylladb { - thrift = thrift-0_10; - }; - seafile-server = callPackage ../servers/seafile-server { }; seafile-shared = callPackage ../misc/seafile-shared { }; @@ -40861,7 +40541,9 @@ with pkgs; ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; - vcluster = callPackage ../applications/networking/cluster/vcluster { }; + vcluster = callPackage ../applications/networking/cluster/vcluster { + buildGoModule = buildGo122Module; + }; vnote = libsForQt5.callPackage ../applications/office/vnote { }; @@ -41291,7 +40973,9 @@ with pkgs; linkchecker = callPackage ../tools/networking/linkchecker { }; - tomb = callPackage ../os-specific/linux/tomb { }; + tomb = callPackage ../os-specific/linux/tomb { + pinentry = pinentry-curses; + }; sccache = callPackage ../development/tools/misc/sccache { }; |