diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 343 | ||||
| -rw-r--r-- | pkgs/top-level/coq-packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/packages-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/python-aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 80 | ||||
| -rw-r--r-- | pkgs/top-level/release-attrpaths-superset.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/release-cross.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/release-haskell.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/splice.nix | 22 |
12 files changed, 247 insertions, 260 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 23949c22c4701..2e93af4f8d26a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -181,6 +181,7 @@ mapAliases ({ clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 + clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 collada-dom = opencollada; # added 2024-02-21 composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12 @@ -586,6 +587,7 @@ mapAliases ({ kube3d = k3d; # Added 2022-0705 kafkacat = kcat; # Added 2021-10-07 kak-lsp = kakoune-lsp; # Added 2024-04-01 + kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 @@ -656,6 +658,9 @@ mapAliases ({ libxkbcommon_7 = throw "libxkbcommon_7 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libxkbcommon'"; # Added 2023-01-03 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; + lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + lispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 llama = walk; # Added 2023-01-23 # Linux kernels @@ -1061,12 +1066,22 @@ mapAliases ({ qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12 quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23 + quicklispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesABCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesCCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesClisp = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesECL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesGCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesSBCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19 quvi = throw "'quvi' has been removed, as it was broken and unmaintained"; # Added 2023-11-25 ### R ### radare2-cutter = cutter; # Added 2021-03-30 + radicle-cli = throw "'radicle-cli' was removed in favor of 'radicle-node'"; # Added 2024-05-04 + radicle-upstream = throw "'radicle-upstream' was sunset, see <https://community.radworks.org/t/2962>"; # Added 2024-05-04 railway-travel = diebahn; # Added 2024-04-01 rambox-pro = rambox; # Added 2022-12-12 rarian = throw "rarian has been removed as unused"; # Added 2023-07-05 @@ -1329,7 +1344,9 @@ mapAliases ({ wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10 wordpress6_2 = throw "'wordpress6_2' has been removed in favor of the latest version"; # Added 2023-10-10 wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name + wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 wmii_hg = wmii; + wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26 wxGTK30 = throw "wxGTK30 has been removed from nixpkgs as it has reached end of life"; # Added 2023-03-22 wxGTK30-gtk2 = wxGTK30; # Added 2022-12-03 wxGTK30-gtk3 = wxGTK30; # Added 2022-12-03 @@ -1370,6 +1387,7 @@ mapAliases ({ zinc = zincsearch; # Added 2023-05-28 zkg = throw "'zkg' has been replaced by 'zeek'"; zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06 + zz = throw "'zz' has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10 ### UNSORTED ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f2fefff2bb4c..a7aa15fb1b272 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -231,8 +231,6 @@ with pkgs; # Post 24.11 branch-off, this should throw an error in aliases.nix. addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; - quickemu = callPackage ../development/quickemu { }; - quickgui = callPackage ../applications/virtualization/quickgui { }; adcli = callPackage ../os-specific/linux/adcli { }; @@ -311,8 +309,6 @@ with pkgs; asn1c = callPackage ../development/compilers/asn1c { }; - assemblyscript = callPackage ../development/compilers/assemblyscript { }; - authz0 = callPackage ../tools/security/authz0 { }; auth0-cli = callPackage ../tools/admin/auth0-cli { }; @@ -422,8 +418,6 @@ with pkgs; castget = callPackage ../applications/networking/feedreaders/castget { }; - castxml = callPackage ../development/tools/castxml { }; - catatonit = callPackage ../applications/virtualization/catatonit { }; catppuccin-catwalk = callPackage ../development/tools/misc/catppuccin-catwalk { }; @@ -546,8 +540,6 @@ with pkgs; coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); - coost = callPackage ../development/libraries/coost { }; - confetty = callPackage ../applications/misc/confetty { }; confy = callPackage ../applications/misc/confy { }; @@ -769,8 +761,6 @@ with pkgs; protoc-gen-prost-serde = callPackage ../development/tools/protoc-gen-prost-serde { }; - protoc-gen-rust = callPackage ../development/tools/protoc-gen-rust { }; - protoc-gen-tonic = callPackage ../development/tools/protoc-gen-tonic { }; protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; @@ -1308,7 +1298,9 @@ with pkgs; makeBinaryWrapper = callPackage ../build-support/setup-hooks/make-binary-wrapper { }; - compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware-xz.nix { }; + compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware.nix { type = "xz"; }; + + compressFirmwareZstd = callPackage ../build-support/kernel/compress-firmware.nix { type = "zstd"; }; makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: callPackage ../build-support/kernel/modules-closure.nix { @@ -1434,13 +1426,18 @@ with pkgs; name = "find-xml-catalogs-hook"; } ../build-support/setup-hooks/find-xml-catalogs.sh; - wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { - makeWrapper = makeBinaryWrapper; + wrapGAppsHook3 = wrapGAppsNoGuiHook.override { + isGraphical = true; }; - wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = __splicedPackages.gtk4; }; + wrapGAppsHook4 = wrapGAppsNoGuiHook.override { + isGraphical = true; + gtk3 = __splicedPackages.gtk4; + }; - wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; + wrapGAppsNoGuiHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { + makeWrapper = makeBinaryWrapper; + }; separateDebugInfo = makeSetupHook { name = "separate-debug-info-hook"; @@ -2020,8 +2017,6 @@ with pkgs; ronin = callPackage ../tools/security/ronin { }; - s0ix-selftest-tool = callPackage ../tools/system/s0ix-selftest-tool { }; - scarab = callPackage ../tools/games/scarab { }; sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { }; @@ -2561,13 +2556,6 @@ with pkgs; qgit = qt5.callPackage ../applications/version-management/qgit { }; - radicle-cli = callPackage ../applications/version-management/radicle-cli { - inherit (darwin) DarwinTools; - inherit (darwin.apple_sdk.frameworks) AppKit; - }; - - radicle-upstream = callPackage ../applications/version-management/radicle-upstream { }; - rs-git-fsmonitor = callPackage ../applications/version-management/rs-git-fsmonitor { }; scmpuff = callPackage ../applications/version-management/scmpuff { }; @@ -2754,20 +2742,38 @@ with pkgs; pcsxr = callPackage ../applications/emulators/pcsxr { }; - ppsspp-sdl = ppsspp.override { - enableQt = false; - enableVulkan = true; - }; - - ppsspp-sdl-wayland = ppsspp.override { - forceWayland = true; - enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/13845 - }; - - ppsspp-qt = ppsspp.override { - enableQt = true; - enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628 - }; + ppsspp-sdl = let + argset = { + ffmpeg = ffmpeg_4; + glew = glew.override { enableEGL = argset.forceWayland; }; + enableQt = false; + enableVulkan = true; + forceWayland = false; + }; + in + ppsspp.override argset; + + ppsspp-sdl-wayland = let + argset = { + ffmpeg = ffmpeg_4; + glew = glew.override { enableEGL = argset.forceWayland; }; + enableQt = false; + enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/13845 + forceWayland = true; + }; + in + ppsspp.override argset; + + ppsspp-qt = let + argset = { + ffmpeg = ffmpeg_4; + glew = glew.override { enableEGL = argset.forceWayland; }; + enableQt = true; + enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628 + forceWayland = false; + }; + in + ppsspp.override argset; proton-caller = callPackage ../applications/emulators/proton-caller { }; @@ -2781,6 +2787,10 @@ with pkgs; ripes = qt6Packages.callPackage ../applications/emulators/ripes { }; + rmg-wayland = callPackage ../by-name/rm/rmg/package.nix { + withWayland = true; + }; + rpcemu = callPackage ../applications/emulators/rpcemu { }; ruffle = callPackage ../applications/emulators/ruffle { }; @@ -2977,8 +2987,6 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - darklua = callPackage ../development/tools/darklua { }; - darktile = callPackage ../applications/terminal-emulators/darktile { }; dterm = callPackage ../applications/terminal-emulators/dterm { }; @@ -3291,8 +3299,6 @@ with pkgs; async = callPackage ../development/tools/async { }; - async-profiler = callPackage ../development/tools/async-profiler { }; - atheme = callPackage ../servers/irc/atheme { }; atinout = callPackage ../tools/networking/atinout { }; @@ -3389,8 +3395,6 @@ with pkgs; bitwise = callPackage ../tools/misc/bitwise { }; - blanket = callPackage ../applications/audio/blanket { }; - blisp = darwin.apple_sdk_11_0.callPackage ../development/embedded/blisp { inherit (darwin.apple_sdk_11_0.frameworks) IOKit; }; @@ -4135,8 +4139,6 @@ with pkgs; aptdec = callPackage ../development/libraries/aptdec { }; - argc = callPackage ../development/tools/argc { }; - aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4426,8 +4428,6 @@ with pkgs; bundletool = callPackage ../development/tools/bundletool { }; - bustle = haskellPackages.bustle; - bwm_ng = callPackage ../tools/networking/bwm-ng { }; bwbasic = callPackage ../development/interpreters/bwbasic { }; @@ -4772,8 +4772,6 @@ with pkgs; wob = callPackage ../tools/wayland/wob { }; - wpaperd = callPackage ../tools/wayland/wpaperd { }; - wshowkeys = callPackage ../tools/wayland/wshowkeys { }; wtype = callPackage ../tools/wayland/wtype { }; @@ -4790,9 +4788,7 @@ with pkgs; clipster = callPackage ../tools/misc/clipster { }; - clockify = callPackage ../applications/office/clockify { - electron = electron_24; - }; + clockify = callPackage ../applications/office/clockify { }; contrast = callPackage ../applications/accessibility/contrast { }; @@ -4860,8 +4856,6 @@ with pkgs; csv2latex = callPackage ../tools/misc/csv2latex { }; - csvq = callPackage ../development/tools/csvq { }; - csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { }; cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { }; @@ -4882,8 +4876,6 @@ with pkgs; dante = callPackage ../servers/dante { }; - dapr-cli = callPackage ../development/tools/dapr/cli { }; - dasel = callPackage ../applications/misc/dasel { }; dasher = callPackage ../applications/accessibility/dasher { }; @@ -4958,8 +4950,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - refinery-cli = callPackage ../development/tools/refinery-cli { }; - digitemp = callPackage ../tools/misc/digitemp { }; dijo = callPackage ../tools/misc/dijo { @@ -5026,8 +5016,6 @@ with pkgs; dolibarr = callPackage ../servers/web-apps/dolibarr { }; - doppler = callPackage ../tools/security/doppler { }; - dosage = callPackage ../applications/graphics/dosage { }; dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { @@ -5551,8 +5539,6 @@ with pkgs; hr = callPackage ../applications/misc/hr { }; - humioctl = callPackage ../applications/logging/humioctl { }; - huniq = callPackage ../tools/text/huniq { }; hunt = callPackage ../tools/misc/hunt { }; @@ -5560,10 +5546,7 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; - hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - wlroots-hyprland = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; - udis86-hyprland = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; - }; + hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { }; hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { }; @@ -6126,8 +6109,6 @@ with pkgs; poweralertd = callPackage ../tools/misc/poweralertd { }; - ps_mem = callPackage ../tools/system/ps_mem { }; - pscale = callPackage ../development/tools/pscale { }; pulsarctl = callPackage ../tools/admin/pulsarctl { }; @@ -6611,8 +6592,6 @@ with pkgs; ccze = callPackage ../tools/misc/ccze { }; - cdecl = callPackage ../development/tools/cdecl { }; - cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { }; cdist = python3Packages.callPackage ../tools/admin/cdist { }; @@ -7030,7 +7009,8 @@ with pkgs; ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; - clamav = darwin.apple_sdk_11_0.callPackage ../tools/security/clamav { + clamav = callPackage ../tools/security/clamav { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }; @@ -7456,8 +7436,6 @@ with pkgs; dorkscout = callPackage ../tools/security/dorkscout { }; - downonspot = callPackage ../applications/misc/downonspot { }; - sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; drive = callPackage ../applications/networking/drive { }; @@ -8109,8 +8087,6 @@ with pkgs; fim = callPackage ../tools/graphics/fim { }; - flac123 = callPackage ../applications/audio/flac123 { }; - flamegraph = callPackage ../development/tools/flamegraph { }; flawfinder = callPackage ../development/tools/flawfinder { }; @@ -8930,8 +8906,6 @@ with pkgs; haste-server = callPackage ../servers/haste-server { }; - hatch = python3Packages.callPackage ../development/tools/hatch { }; - hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; @@ -9258,10 +9232,7 @@ with pkgs; internetarchive = with python3Packages; toPythonApplication internetarchive; - invidious = callPackage ../servers/invidious { - # normally video.js is downloaded at build time - videojs = callPackage ../servers/invidious/videojs.nix { }; - }; + invidious = callPackage ../servers/invidious { }; invoice2data = callPackage ../tools/text/invoice2data { }; @@ -9588,8 +9559,6 @@ with pkgs; kdoctor = callPackage ../development/tools/kdoctor { }; - kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; - kdigger = callPackage ../tools/security/kdigger { }; kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { }; @@ -11330,8 +11299,6 @@ with pkgs; ogdf = callPackage ../development/libraries/ogdf { }; - oh-my-posh = callPackage ../development/tools/oh-my-posh { }; - oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; ola = callPackage ../applications/misc/ola { @@ -13952,7 +13919,9 @@ with pkgs; tuptime = callPackage ../tools/system/tuptime { }; - turbo = callPackage ../tools/misc/turbo { + turbo = callPackage ../tools/misc/turbo/wrapper.nix { }; + + turbo-unwrapped = callPackage ../tools/misc/turbo { inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreServices CoreFoundation; }; @@ -14078,8 +14047,6 @@ with pkgs; up = callPackage ../tools/misc/up { }; - upbound = callPackage ../development/tools/upbound { }; - upterm = callPackage ../tools/misc/upterm { }; upx = callPackage ../tools/compression/upx { }; @@ -14617,9 +14584,9 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish74; + varnish60 varnish74 varnish75; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages varnish74Packages; + varnish60Packages varnish74Packages varnish75Packages; varnishPackages = varnish74Packages; varnish = varnishPackages.varnish; @@ -14765,7 +14732,9 @@ with pkgs; clipboard-jh = callPackage ../tools/misc/clipboard-jh { }; - clipbuzz = callPackage ../tools/misc/clipbuzz { }; + clipbuzz = callPackage ../tools/misc/clipbuzz { + zig = zig_0_12; + }; xclip = callPackage ../tools/misc/xclip { }; @@ -15806,6 +15775,13 @@ with pkgs; && stdenv.buildPlatform == stdenv.hostPlatform then buildPackages.gnat-bootstrap11 else buildPackages.gnat11; + stdenv = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + && stdenv.buildPlatform.isDarwin + && stdenv.buildPlatform.isx86_64 + then overrideCC stdenv gnat-bootstrap11 + else stdenv; }); gnat12 = wrapCC (gcc12.cc.override { @@ -16764,6 +16740,7 @@ with pkgs; }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { + zig = zig_0_12; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; @@ -16780,7 +16757,6 @@ with pkgs; cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; - cargo-profiler = callPackage ../development/tools/rust/cargo-profiler { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -16818,9 +16794,6 @@ with pkgs; cargo-vet = callPackage ../development/tools/rust/cargo-vet { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-wasi = callPackage ../development/tools/rust/cargo-wasi { - inherit (darwin.apple_sdk.frameworks) Security; - }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { inherit (darwin.apple_sdk.frameworks) Foundation Cocoa; }; @@ -16836,7 +16809,9 @@ with pkgs; cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { }; - cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { }; + cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { + zig = zig_0_12; + }; cauwugo = callPackage ../development/tools/rust/cauwugo { }; @@ -17753,10 +17728,6 @@ with pkgs; waagent = callPackage ../applications/networking/cluster/waagent { }; - wapm-cli = callPackage ../tools/package-management/wapm/cli { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - wasm = ocamlPackages.wasm; wasm3 = callPackage ../development/interpreters/wasm3 { }; @@ -18092,17 +18063,19 @@ with pkgs; electron-source = callPackage ../development/tools/electron { }; inherit (callPackages ../development/tools/electron/binary { }) - electron-bin electron_24-bin electron_27-bin electron_28-bin - electron_29-bin; + electron_29-bin + electron_30-bin; electron_24 = electron_24-bin; electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin; electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin; electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin; + electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron = electron_29; + electron-bin = electron_29-bin; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -18642,15 +18615,7 @@ with pkgs; doclifter = callPackage ../development/tools/misc/doclifter { }; - docutils = with python3Packages; toPythonApplication ( - docutils.overridePythonAttrs (attrs: rec { - version = "0.20.1"; - src = attrs.src.override { - inherit version; - hash = "sha256-8IpOJ2w6FYOobc4+NKuj/gTQK7ot1R7RYQYkToqSPjs="; - }; - }) - ); + docutils = with python3Packages; toPythonApplication docutils; doctl = callPackage ../development/tools/doctl { }; @@ -18685,8 +18650,6 @@ with pkgs; easypdkprog = callPackage ../development/embedded/easypdkprog { }; - eclint = callPackage ../development/tools/eclint { }; - editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; @@ -19211,7 +19174,7 @@ with pkgs; modd = callPackage ../development/tools/modd { }; - mold = callPackage ../development/tools/mold { + mold = callPackage ../by-name/mo/mold/package.nix { stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; tbb = tbb_2021_11; }; @@ -20210,6 +20173,10 @@ with pkgs; babl = callPackage ../development/libraries/babl { }; + backlight-auto = callPackage ../by-name/ba/backlight-auto/package.nix { + zig = zig_0_11; + }; + backward-cpp = callPackage ../development/libraries/backward-cpp { }; bamf = callPackage ../development/libraries/bamf { }; @@ -20597,12 +20564,6 @@ with pkgs; digiham = callPackage ../applications/radio/digiham { }; - dillo = callPackage ../applications/networking/browsers/dillo { - fltk = fltk13; - }; - - dillong = callPackage ../applications/networking/browsers/dillong { }; - directfb = callPackage ../development/libraries/directfb { }; discord-gamesdk = callPackage ../development/libraries/discord-gamesdk { }; @@ -21242,7 +21203,7 @@ with pkgs; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg-headless; }); - inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL Security VideoToolbox; + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL Security SystemConfiguration VideoToolbox; }); gusb = callPackage ../development/libraries/gusb { }; @@ -23783,7 +23744,7 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb { }; - openvr = callPackage ../development/libraries/openvr { + openvr = callPackage ../by-name/op/openvr/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation AppKit; }; @@ -23817,10 +23778,6 @@ with pkgs; opensupaplex = callPackage ../games/opensupaplex { }; - openturns = callPackage ../development/libraries/openturns { - inherit (darwin.apple_sdk.frameworks) Accelerate; - }; - open-wbo = callPackage ../applications/science/logic/open-wbo { }; openwsman = callPackage ../development/libraries/openwsman { }; @@ -24331,14 +24288,6 @@ with pkgs; }; }); - SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; - }; - # SDL2_mixer_2_0 pinned for lzwolf - SDL2_mixer_2_0 = callPackage ../development/libraries/SDL2_mixer/2_0.nix { }; - - SDL2_net = callPackage ../development/libraries/SDL2_net { }; - SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; SDL2_sound = callPackage ../development/libraries/SDL2_sound { @@ -24832,8 +24781,6 @@ with pkgs; unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { }); - ustr = callPackage ../development/libraries/ustr { }; - usrsctp = callPackage ../development/libraries/usrsctp { }; usbredir = callPackage ../development/libraries/usbredir { }; @@ -24998,7 +24945,7 @@ with pkgs; whereami = callPackage ../development/libraries/whereami { }; wildmidi = callPackage ../development/libraries/wildmidi { - inherit (darwin.apple_sdk.frameworks) OpenAL; + inherit (darwin.apple_sdk.frameworks) OpenAL CoreAudioKit; }; wiredtiger = callPackage ../development/libraries/wiredtiger { }; @@ -25080,8 +25027,6 @@ with pkgs; xml-security-c = callPackage ../development/libraries/xml-security-c { }; - xml-tooling-c = callPackage ../development/libraries/xml-tooling-c { }; - xlslib = callPackage ../development/libraries/xlslib { }; xsimd = callPackage ../development/libraries/xsimd { }; @@ -25169,7 +25114,7 @@ with pkgs; zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12.nix { llvmPackages = llvmPackages_17; }; - zig = zig_0_11; + zig = zig_0_12; zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { }; @@ -25185,8 +25130,6 @@ with pkgs; zix = callPackage ../development/libraries/audio/zix { }; - zz = callPackage ../development/compilers/zz { }; - zziplib = callPackage ../development/libraries/zziplib { }; glpng = callPackage ../development/libraries/glpng { }; @@ -25341,36 +25284,6 @@ with pkgs; texLive = null; }; - ## DEPRECATED, will be removed in a future release - - clwrapperFunction = callPackage ../development/lisp-modules-obsolete/clwrapper; - - wrapLisp_old = lisp: clwrapperFunction { inherit lisp; }; - - lispPackagesFor = clwrapper: callPackage ../development/lisp-modules-obsolete/lisp-packages.nix { - inherit clwrapper; - }; - - lispPackages = quicklispPackages // - (lispPackagesFor (wrapLisp_old sbcl)) // { __attrsFailEvaluation = true; }; - - quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules-obsolete/quicklisp-to-nix.nix { - inherit clwrapper; - } // { __attrsFailEvaluation = true; }; - quicklispPackagesClisp = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old clisp)); - quicklispPackagesSBCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old sbcl)); - quicklispPackagesECL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old ecl)); - quicklispPackagesCCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old ccl)); - quicklispPackagesABCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old abcl)); - quicklispPackagesGCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old gcl)); - quicklispPackages = quicklispPackagesSBCL; - - # Alternative lisp-modules implementation - lispPackages_new = callPackage ../development/lisp-modules-new-obsolete/lisp-packages.nix {} - // { __attrsFailEvaluation = true; }; - - ## End of DEPRECATED - wrapLisp = callPackage ../development/lisp-modules/nix-cl.nix {}; # Armed Bear Common Lisp @@ -26593,9 +26506,7 @@ with pkgs; }; radicale2 = callPackage ../servers/radicale/2.x.nix { }; - radicale3 = callPackage ../servers/radicale/3.x.nix { }; - - radicale = radicale3; + radicale3 = radicale; qcal = callPackage ../tools/networking/qcal/default.nix { }; @@ -27170,9 +27081,7 @@ with pkgs; fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt5.callPackage ../os-specific/linux/ffado { - inherit (linuxPackages) kernel; - }; + ffado = libsForQt5.callPackage ../os-specific/linux/ffado { }; libffado = ffado; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -28362,8 +28271,6 @@ with pkgs; ananicy-cpp = callPackage ../misc/ananicy-cpp { }; - ananicy-rules-cachyos = callPackage ../misc/ananicy-rules-cachyos { }; - andagii = callPackage ../data/fonts/andagii { }; andika = callPackage ../data/fonts/andika { }; @@ -29746,10 +29653,6 @@ with pkgs; appgate-sdp = callPackage ../applications/networking/appgate-sdp { }; - apostrophe = callPackage ../applications/editors/apostrophe { - pythonPackages = python3Packages; - }; - ardour = callPackage ../applications/audio/ardour { }; ardour_7 = callPackage ../applications/audio/ardour/7.nix { }; @@ -30207,6 +30110,8 @@ with pkgs; clight = callPackage ../applications/misc/clight { }; + clight-gui = libsForQt5.callPackage ../applications/misc/clight/clight-gui.nix { }; + clightd = callPackage ../applications/misc/clight/clightd.nix { }; clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { }; @@ -30702,12 +30607,6 @@ with pkgs; expenses = callPackage ../applications/misc/expenses { }; - flowtime = callPackage ../applications/misc/flowtime { }; - - furnace = callPackage ../applications/audio/furnace { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - furtherance = callPackage ../applications/misc/furtherance { }; gigalixir = callPackage ../tools/misc/gigalixir { }; @@ -31272,8 +31171,6 @@ with pkgs; fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - fragments = callPackage ../applications/networking/p2p/fragments { }; - freedv = callPackage ../applications/radio/freedv { inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia; codec2 = codec2.override { @@ -31316,10 +31213,20 @@ with pkgs; pulseaudio-module-xrdp = callPackage ../applications/networking/remote/xrdp/pulseaudio-module-xrdp { }; - freerdp = callPackage ../applications/networking/remote/freerdp { - inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; - inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; - }; + inherit + ({ + freerdp = callPackage ../applications/networking/remote/freerdp { + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; + }; + freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; + }; + }) + freerdp + freerdp3 + ; freerdpUnstable = freerdp; @@ -31434,6 +31341,8 @@ with pkgs; manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; + minari = python3Packages.toPythonApplication python3Packages.minari; + mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; mi2ly = callPackage ../applications/audio/mi2ly { }; @@ -31891,8 +31800,6 @@ with pkgs; waylevel = callPackage ../tools/misc/waylevel { }; - wbg = callPackage ../applications/misc/wbg { }; - i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; @@ -32212,6 +32119,7 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo121Module; + go = go_1_21; }) k3s_1_26 k3s_1_27 k3s_1_28 k3s_1_29; k3s = k3s_1_29; @@ -32820,8 +32728,6 @@ with pkgs; meld = callPackage ../applications/version-management/meld { }; - meli = callPackage ../applications/networking/mailreaders/meli { }; - melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; melody = callPackage ../tools/misc/melody { }; @@ -33670,10 +33576,6 @@ with pkgs; oranda = callPackage ../applications/misc/oranda { }; - orca = python3Packages.callPackage ../applications/misc/orca { - inherit pkg-config; - }; - orca-c = callPackage ../applications/audio/orca-c { }; organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { }; @@ -35323,7 +35225,7 @@ with pkgs; # so expect breakage. use wrapNeovim instead if you want a stable alternative wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); - neovim-unwrapped = callPackage ../applications/editors/neovim { + neovim-unwrapped = callPackage ../by-name/ne/neovim-unwrapped/package.nix { CoreServices = darwin.apple_sdk.frameworks.CoreServices; lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1; }; @@ -35342,8 +35244,6 @@ with pkgs; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; - neovide = callPackage ../applications/editors/neovim/neovide { }; - neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; viw = callPackage ../applications/editors/viw { }; @@ -35580,9 +35480,7 @@ with pkgs; webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; - webcord = callPackage ../applications/networking/instant-messengers/webcord { }; - - webcord-vencord = callPackage ../applications/networking/instant-messengers/webcord/webcord-vencord { }; + webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_30; }; webex = callPackage ../applications/networking/instant-messengers/webex { }; @@ -37517,8 +37415,8 @@ with pkgs; tcl2048 = callPackage ../games/tcl2048 { }; - the-powder-toy = callPackage ../games/the-powder-toy { - lua = lua5_1; + the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix { + lua = lua5_2; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -37805,6 +37703,7 @@ with pkgs; gnome43Extensions gnome44Extensions gnome45Extensions + gnome46Extensions ; gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { }; @@ -40078,7 +39977,7 @@ with pkgs; rfc-bibtex = callPackage ../tools/typesetting/rfc-bibtex { }; pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { - inherit glib gtk3 gobject-introspection wrapGAppsHook; + inherit glib gtk3 gobject-introspection wrapGAppsHook3; }; rpl = callPackage ../tools/text/rpl { }; @@ -40378,8 +40277,6 @@ with pkgs; twitch-cli = callPackage ../development/tools/twitch-cli { }; - twiggy = callPackage ../development/tools/twiggy { }; - uacme = callPackage ../tools/admin/uacme { }; ufiformat = callPackage ../tools/system/ufiformat { }; @@ -40548,8 +40445,6 @@ with pkgs; with-shell = callPackage ../applications/misc/with-shell { }; - wizer = darwin.apple_sdk_11_0.callPackage ../development/tools/wizer { }; - wmutils-core = callPackage ../tools/X11/wmutils-core { }; wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { }; @@ -40898,10 +40793,8 @@ with pkgs; name = "bsd-setup-hook"; } ../os-specific/bsd/setup-hook.sh; - freebsd = callPackage ../os-specific/bsd/freebsd { }; - freebsdCross = callPackage ../os-specific/bsd/freebsd { - stdenv = crossLibcStdenv; - }; + inherit (callPackage ../os-specific/bsd/freebsd { }) + freebsd freebsdCross; netbsd = callPackage ../os-specific/bsd/netbsd { }; netbsdCross = callPackage ../os-specific/bsd/netbsd { @@ -41056,8 +40949,6 @@ with pkgs; gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; - navidrome = callPackage ../servers/misc/navidrome { }; - zalgo = callPackage ../tools/misc/zalgo { }; inherit (callPackage ../applications/misc/zettlr { }) zettlr; @@ -41207,4 +41098,8 @@ with pkgs; insulator2 = callPackage ../applications/misc/insulator2 {}; animdl = python3Packages.callPackage ../applications/video/animdl { }; + + dillo = callPackage ../by-name/di/dillo/package.nix { + fltk = fltk13; + }; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 1964f666a86ba..5cea3d663b421 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -117,6 +117,7 @@ let simple-io = callPackage ../development/coq-modules/simple-io { }; smpl = callPackage ../development/coq-modules/smpl { }; smtcoq = callPackage ../development/coq-modules/smtcoq { }; + ssprove = callPackage ../development/coq-modules/ssprove {}; stdpp = callPackage ../development/coq-modules/stdpp { }; StructTact = callPackage ../development/coq-modules/StructTact {}; tlc = callPackage ../development/coq-modules/tlc {}; @@ -135,7 +136,7 @@ let (lib.versionAtLeast self.coq.version "8.14") { compcert = self.compcert.override { version = with lib.versions; lib.switch self.coq.version [ - { case = range "8.15" "8.17"; out = "3.13.1"; } + { case = range "8.15" "8.19"; out = "3.13.1"; } { case = isEq "8.14"; out = "3.11"; } ] null; }; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index cd148cd6df10e..bd88c98df9604 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -18,8 +18,6 @@ nodePackages nodePackages_latest platformioPackages - quicklispPackagesClisp - quicklispPackagesSBCL rPackages roundcubePlugins sourceHanPackages diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 65902b3249278..acce6d00aac08 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3312,6 +3312,9 @@ with self; { "-Wno-error=implicit-int" "-Wno-error=int-conversion" ]); + postPatch = '' + substituteInPlace Makefile.PL --replace pkg-config $PKG_CONFIG + ''; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.pcsclite}/lib -lpcsclite"; # tests fail; look unfinished doCheck = false; @@ -10394,10 +10397,10 @@ with self; { FinanceQuote = buildPerlPackage rec { pname = "Finance-Quote"; - version = "1.60"; + version = "1.61"; src = fetchurl { url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz"; - hash = "sha256-UXrYQNvOhzdVjnMxNJ/fa7J5u7sMobV+3SN7T5jVw34="; + hash = "sha256-Qw7p3yLcqjLrYwpNf7V6KFQvn+UHsmawo39nVLTzWgg="; }; buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ]; propagatedBuildInputs = [ DateManip DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies HTTPCookieJar JSON IOCompress IOString LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ]; @@ -16598,16 +16601,16 @@ with self; { Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "9.35"; + version = "9.36"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.35.tar.gz"; - hash = "sha256-akpEbuB/ynxtty9dgXVA1oMwCcuN58zkxvskoV7n1Gs="; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.36.tar.gz"; + hash = "sha256-UX7Pb9hqC3xhadVRAiOL+YUWGNt2L7ANTPDZTGJSAV8="; }; meta = { description = "Real-time web framework"; homepage = "https://mojolicious.org"; license = with lib.licenses; [ artistic2 ]; - maintainers = with maintainers; [ thoughtpolice sgo ]; + maintainers = with maintainers; [ marcusramberg sgo thoughtpolice ]; mainProgram = "mojo"; }; }; @@ -29042,10 +29045,10 @@ with self; { YAMLLibYAML = buildPerlPackage { pname = "YAML-LibYAML"; - version = "0.88"; + version = "0.89"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/YAML-LibYAML-0.88.tar.gz"; - hash = "sha256-qKJzjMzDMqj3VJxMJ/PgCQyasR7vD2yFZEUXc5gTVng="; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.89.tar.gz"; + hash = "sha256-FVq4NnU0XFCt0DMRrPndkVlVcH+Qmiq9ixfXeShZsuw="; }; meta = { description = "Perl YAML Serialization using XS and libyaml"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 62ffa53e54ead..e5bcc7ba3c59f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -46,15 +46,18 @@ , fetchpatch }: -lib.makeScope pkgs.newScope (self: with self; { +lib.makeScope pkgs.newScope (self: let + inherit (self) buildPecl callPackage mkExtension php; + + builders = import ../build-support/php/builders { + inherit callPackages callPackage buildPecl; + }; +in { buildPecl = callPackage ../build-support/php/build-pecl.nix { php = php.unwrapped; }; - composerHooks = callPackages ../build-support/php/hooks { }; - - mkComposerRepository = callPackage ../build-support/php/build-composer-repository.nix { }; - buildComposerProject = callPackage ../build-support/php/build-composer-project.nix { }; + inherit (builders.v1) buildComposerProject composerHooks mkComposerRepository; # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e75f863bbcbce..940a7ef8b771c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -331,6 +331,7 @@ mapAliases ({ pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23 pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 + pyjet = throw "pyjet is deprecated, use fastjet instead"; # added 2023-05-10 pygame_sdl2 = pygame-sdl2; # added 2024-01-07 pygbm = throw "pygbm has been removed, since it is abandoned and broken"; # added 2023-06-20 PyGithub = pygithub; # added 2023-02-19 @@ -343,7 +344,6 @@ mapAliases ({ pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 PyICU = pyicu; # Added 2022-12-22 - pyjson5 = json5; # added 2022-08-28 pyhs100 = throw "pyhs100 has been removed in favor of python-kasa."; # added 2024-01-05 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 754a18310412c..9a75182c3603b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -249,6 +249,8 @@ self: super: with self; { aiohttp-fast-url-dispatcher = callPackage ../development/python-modules/aiohttp-fast-url-dispatcher { }; + aiohttp-isal = callPackage ../development/python-modules/aiohttp-isal { }; + aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; aiohttp-oauthlib = callPackage ../development/python-modules/aiohttp-oauthlib { }; @@ -259,6 +261,8 @@ self: super: with self; { aiohttp-retry = callPackage ../development/python-modules/aiohttp-retry { }; + aiohttp-session = callPackage ../development/python-modules/aiohttp-session { }; + aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; @@ -307,6 +311,8 @@ self: super: with self; { aiolyric = callPackage ../development/python-modules/aiolyric { }; + aiomcache = callPackage ../development/python-modules/aiomcache { }; + aiomisc = callPackage ../development/python-modules/aiomisc { }; aiomisc-pytest = callPackage ../development/python-modules/aiomisc-pytest { }; @@ -925,6 +931,8 @@ self: super: with self; { atsim-potentials = callPackage ../development/python-modules/atsim-potentials { }; + attacut = callPackage ../development/python-modules/attacut { }; + attrdict = callPackage ../development/python-modules/attrdict { }; attrs = callPackage ../development/python-modules/attrs { }; @@ -1523,6 +1531,8 @@ self: super: with self; { binwalk-full = self.binwalk.override { visualizationSupport = true; }; + biom-format = callPackage ../development/python-modules/biom-format { }; + biopandas = callPackage ../development/python-modules/biopandas { }; biopython = callPackage ../development/python-modules/biopython { }; @@ -2615,6 +2625,8 @@ self: super: with self; { cu2qu = callPackage ../development/python-modules/cu2qu { }; + customtkinter = callPackage ../development/python-modules/customtkinter { }; + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; cufflinks = callPackage ../development/python-modules/cufflinks { }; @@ -2626,6 +2638,8 @@ self: super: with self; { curlify = callPackage ../development/python-modules/curlify { }; + curl-cffi = callPackage ../development/python-modules/curl-cffi { }; + curtsies = callPackage ../development/python-modules/curtsies { }; curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; @@ -3024,6 +3038,8 @@ self: super: with self; { dissect = callPackage ../development/python-modules/dissect { }; + dissect-archive = callPackage ../development/python-modules/dissect-archive { }; + dissect-btrfs = callPackage ../development/python-modules/dissect-btrfs { }; dissect-cim = callPackage ../development/python-modules/dissect-cim { }; @@ -3408,6 +3424,8 @@ self: super: with self; { dmenu-python = callPackage ../development/python-modules/dmenu { }; + dm-control = callPackage ../development/python-modules/dm-control { }; + dm-env = callPackage ../development/python-modules/dm-env { }; dm-haiku = callPackage ../development/python-modules/dm-haiku { }; @@ -3530,6 +3548,8 @@ self: super: with self; { drawilleplot = callPackage ../development/python-modules/drawilleplot { }; + drawsvg = callPackage ../development/python-modules/drawsvg { }; + dremel3dpy = callPackage ../development/python-modules/dremel3dpy { }; drf-jwt = callPackage ../development/python-modules/drf-jwt { }; @@ -5515,6 +5535,8 @@ self: super: with self; { httpx-sse = callPackage ../development/python-modules/httpx-sse { }; + httpx-ws = callPackage ../development/python-modules/httpx-ws { }; + huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { }; huey = callPackage ../development/python-modules/huey { }; @@ -5895,9 +5917,13 @@ self: super: with self; { irctokens = callPackage ../development/python-modules/irctokens { }; + isal = callPackage ../development/python-modules/isal { }; + isbnlib = callPackage ../development/python-modules/isbnlib { }; - islpy = callPackage ../development/python-modules/islpy { }; + islpy = callPackage ../development/python-modules/islpy { + isl = pkgs.isl_0_24; + }; iso3166 = callPackage ../development/python-modules/iso3166 { }; @@ -5931,6 +5957,8 @@ self: super: with self; { itemloaders = callPackage ../development/python-modules/itemloaders { }; + iterable-io = callPackage ../development/python-modules/iterable-io { }; + iteration-utilities = callPackage ../development/python-modules/iteration-utilities { }; iterative-telemetry = callPackage ../development/python-modules/iterative-telemetry { }; @@ -6562,6 +6590,8 @@ self: super: with self; { pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; + lib4sbom = callPackage ../development/python-modules/lib4sbom { }; + libais = callPackage ../development/python-modules/libais { }; libarchive-c = callPackage ../development/python-modules/libarchive-c { @@ -6616,6 +6646,8 @@ self: super: with self; { inherit (pkgs.config) cudaSupport; }; + libgravatar = callPackage ../development/python-modules/libgravatar { }; + libiio = (toPythonModule (pkgs.libiio.override { pythonSupport = true; inherit python; @@ -7229,7 +7261,8 @@ self: super: with self; { maya = callPackage ../development/python-modules/maya { }; mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { - inherit (self) buildPythonPackage pythonOlder pythonAtLeast pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5; + inherit buildPythonPackage pythonOlder pythonAtLeast; + inherit (self) pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5; }; mayim = callPackage ../development/python-modules/mayim { }; @@ -7409,6 +7442,8 @@ self: super: with self; { millheater = callPackage ../development/python-modules/millheater { }; + minari = callPackage ../development/python-modules/minari { }; + mindsdb-evaluator = callPackage ../development/python-modules/mindsdb-evaluator { }; minexr = callPackage ../development/python-modules/minexr { }; @@ -7658,6 +7693,8 @@ self: super: with self; { mpd2 = callPackage ../development/python-modules/mpd2 { }; + mpegdash = callPackage ../development/python-modules/mpegdash { }; + mpi4py = callPackage ../development/python-modules/mpi4py { }; mpldatacursor = callPackage ../development/python-modules/mpldatacursor { }; @@ -8612,6 +8649,8 @@ self: super: with self; { nbformat = callPackage ../development/python-modules/nbformat { }; + nbmake = callPackage ../development/python-modules/nbmake { }; + nbmerge = callPackage ../development/python-modules/nbmerge { }; nbsmoke = callPackage ../development/python-modules/nbsmoke { }; @@ -8710,10 +8749,9 @@ self: super: with self; { nfcpy = callPackage ../development/python-modules/nfcpy { }; - nftables = toPythonModule (pkgs.nftables.override { - python3 = python; - withPython = true; - }); + nftables = callPackage ../os-specific/linux/nftables/python.nix { + inherit (pkgs) nftables; + }; nh3 = callPackage ../development/python-modules/nh3 { }; @@ -8835,6 +8873,8 @@ self: super: with self; { nose-warnings-filters = callPackage ../development/python-modules/nose-warnings-filters { }; + nose-xunitmp = callPackage ../development/python-modules/nose-xunitmp { }; + nosexcover = callPackage ../development/python-modules/nosexcover { }; notebook = callPackage ../development/python-modules/notebook { }; @@ -9565,6 +9605,8 @@ self: super: with self; { peco = callPackage ../development/python-modules/peco { }; + pettingzoo = callPackage ../development/python-modules/pettingzoo { }; + peewee = callPackage ../development/python-modules/peewee { }; peewee-migrate = callPackage ../development/python-modules/peewee-migrate { }; @@ -9719,6 +9761,8 @@ self: super: with self; { phpserialize = callPackage ../development/python-modules/phpserialize { }; + phunspell = callPackage ../development/python-modules/phunspell { }; + phx-class-registry = callPackage ../development/python-modules/phx-class-registry { }; pi1wire = callPackage ../development/python-modules/pi1wire { }; @@ -9871,6 +9915,8 @@ self: super: with self; { pycketcasts = callPackage ../development/python-modules/pycketcasts { }; + pycomm3 = callPackage ../development/python-modules/pycomm3 { }; + pycomposefile = callPackage ../development/python-modules/pycomposefile { }; pycontrol4 = callPackage ../development/python-modules/pycontrol4 { }; @@ -10225,6 +10271,8 @@ self: super: with self; { portend = callPackage ../development/python-modules/portend { }; + portion = callPackage ../development/python-modules/portion { }; + port-for = callPackage ../development/python-modules/port-for { }; portpicker = callPackage ../development/python-modules/portpicker { }; @@ -10285,6 +10333,8 @@ self: super: with self; { pretend = callPackage ../development/python-modules/pretend { }; + pretty-errors = callPackage ../development/python-modules/pretty-errors { }; + prettytable = callPackage ../development/python-modules/prettytable { }; primecountpy = callPackage ../development/python-modules/primecountpy { }; @@ -10471,6 +10521,8 @@ self: super: with self; { pweave = callPackage ../development/python-modules/pweave { }; + pwkit = callPackage ../development/python-modules/pwkit { }; + pwlf = callPackage ../development/python-modules/pwlf { }; pwndbg = callPackage ../development/python-modules/pwndbg { }; @@ -11109,12 +11161,12 @@ self: super: with self; { pyisbn = callPackage ../development/python-modules/pyisbn { }; - pyjet = callPackage ../development/python-modules/pyjet { }; - pyjks = callPackage ../development/python-modules/pyjks { }; pyjnius = callPackage ../development/python-modules/pyjnius { }; + pyjson5 = callPackage ../development/python-modules/pyjson5 { }; + pyjsparser = callPackage ../development/python-modules/pyjsparser { }; pyjwkest = callPackage ../development/python-modules/pyjwkest { }; @@ -12097,6 +12149,8 @@ self: super: with self; { pytest-logdog = callPackage ../development/python-modules/pytest-logdog { }; + pytest-markdown-docs = callPackage ../development/python-modules/pytest-markdown-docs { }; + pytest-md-report = callPackage ../development/python-modules/pytest-md-report { }; pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; @@ -13102,6 +13156,8 @@ self: super: with self; { reportlab = callPackage ../development/python-modules/reportlab { }; + reportlab-qrcode = callPackage ../development/python-modules/reportlab-qrcode { }; + repoze-lru = callPackage ../development/python-modules/repoze-lru { }; repoze-sphinx-autointerface = callPackage ../development/python-modules/repoze-sphinx-autointerface { }; @@ -13262,6 +13318,8 @@ self: super: with self; { rlax = callPackage ../development/python-modules/rlax { }; + rlcard = callPackage ../development/python-modules/rlcard { }; + rlp = callPackage ../development/python-modules/rlp { }; rmcl = callPackage ../development/python-modules/rmcl { }; @@ -13796,6 +13854,8 @@ self: super: with self; { inherit (pkgs) cmake llvmPackages; }); + shimmy = callPackage ../development/python-modules/shimmy { }; + shippai = callPackage ../development/python-modules/shippai { }; shiv = callPackage ../development/python-modules/shiv { }; @@ -14388,6 +14448,8 @@ self: super: with self; { sqlglot = callPackage ../development/python-modules/sqlglot { }; + sqlite-anyio = callPackage ../development/python-modules/sqlite-anyio { }; + sqlitedict = callPackage ../development/python-modules/sqlitedict { }; sqlite-migrate = callPackage ../development/python-modules/sqlite-migrate { }; @@ -15194,6 +15256,8 @@ self: super: with self; { openai-triton = self.openai-triton-bin; }; + torchsnapshot = callPackage ../development/python-modules/torchsnapshot { }; + torchWithCuda = self.torch.override { openai-triton = self.openai-triton-cuda; cudaSupport = true; diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index cd48453fa0eea..a80b40d360605 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -76,6 +76,7 @@ let buildHaskellPackages = true; buildPackages = true; + buildFreebsd = true; generateOptparseApplicativeCompletions = true; callPackage = true; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 93d1eaa9a83ae..d6896155c920e 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -93,7 +93,6 @@ let windowsCommon = recursiveUpdate gnuCommon { boehmgc = nativePlatforms; - guile_1_8 = nativePlatforms; libffi = nativePlatforms; libtool = nativePlatforms; libunistring = nativePlatforms; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 5ebc1c78a89fe..0706e5e5a09f8 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -266,7 +266,6 @@ let agda arion bench - bustle blucontrol cabal-install cabal2nix diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 9ac0fe2200f92..c477d797795ae 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -148,17 +148,23 @@ in makeScopeWithSplicing' = lib.makeScopeWithSplicing' { inherit splicePackages; inherit (pkgs) newScope; }; # generate 'otherSplices' for 'makeScopeWithSplicing' - generateSplicesForMkScope = attr: + generateSplicesForMkScope = attrs: let - split = X: lib.splitString "." "${X}.${attr}"; + split = X: [ X ] ++ ( + if builtins.isList attrs + then attrs + else if builtins.isString attrs + then lib.splitString "." attrs + else throw "generateSplicesForMkScope must be passed a list of string or string" + ); + bad = throw "attribute should be found"; in { - # nulls should never be reached - selfBuildBuild = lib.attrByPath (split "pkgsBuildBuild") null pkgs; - selfBuildHost = lib.attrByPath (split "pkgsBuildHost") null pkgs; - selfBuildTarget = lib.attrByPath (split "pkgsBuildTarget") null pkgs; - selfHostHost = lib.attrByPath (split "pkgsHostHost") null pkgs; - selfHostTarget = lib.attrByPath (split "pkgsHostTarget") null pkgs; + selfBuildBuild = lib.attrByPath (split "pkgsBuildBuild") bad pkgs; + selfBuildHost = lib.attrByPath (split "pkgsBuildHost") bad pkgs; + selfBuildTarget = lib.attrByPath (split "pkgsBuildTarget") bad pkgs; + selfHostHost = lib.attrByPath (split "pkgsHostHost") bad pkgs; + selfHostTarget = lib.attrByPath (split "pkgsHostTarget") bad pkgs; selfTargetTarget = lib.attrByPath (split "pkgsTargetTarget") { } pkgs; }; |