diff --git a/README.md b/README.md index 6714aa90e1cb..531af2643e5d 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@

- - - NixOS logo + + + NixOS logo

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index f5763f58ab34..19dc364e3482 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -239,6 +239,8 @@ - [`homebox` 0.20.0](https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0) changed how assets are stored and hashed. It is recommended to back up your database before this update. +- GIMP now defaults to version 3. Use `gimp2` for the old version. + - `installShellCompletion`: now supports Nushell completion files - New hardening flags, `strictflexarrays1` and `strictflexarrays3` were made available, corresponding to the gcc/clang options `-fstrict-flex-arrays=1` and `-fstrict-flex-arrays=3` respectively. @@ -282,6 +284,8 @@ recommendation](https://clickhouse.com/docs/faq/operations/production). Users can continue to use the `clickhouse-lts` package if desired. +- `emacs` now disables the GC mark trace buffer by default. This improves GC performance by 5%, but can make GC issues harder to debug. This is configurable with `withGcMarkTrace`. + - `buildPythonPackage` and `buildPythonApplication` now default to `nix-update-script` as their default `updateScript`. This should improve automated updates, since nix-update is better maintained than the in-tree update script and has more robust fetcher support. ## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ad85243714b2..ae324fbeec5e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15889,6 +15889,12 @@ githubId = 33522919; name = "Marshall Arruda"; }; + mart-mihkel = { + email = "mart.mihkel.aun@gmail.com"; + github = "mart-mihkel"; + githubId = 73405010; + name = "Mart-Mihkel Aun"; + }; martijnvermaat = { email = "martijn@vermaat.name"; github = "martijnvermaat"; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 30d0278f45e7..8f98a9fd1442 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -467,7 +467,7 @@ in PrivateTmp = true; ProcSubset = "pid"; ProtectClock = true; - ProtectControlGroups = true; + ProtectControlGroups = "strict"; ProtectHome = true; ProtectHostname = true; ProtectKernelLogs = true; diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index c1958ffffd2e..5d89a2757863 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -377,7 +377,7 @@ in IMMICH_MEDIA_LOCATION = cfg.mediaLocation; IMMICH_MACHINE_LEARNING_URL = "http://localhost:3003"; } - // lib.optionalAttrs (cfg.settings != null || cfg.settingsFile != null) { + // lib.optionalAttrs (cfg.settings != null) { IMMICH_CONFIG_FILE = "/run/immich/config.json"; }; diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 0487894564a8..361db3c008ad 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-0cFsRMcQtzOM0tApmBRMhTR5J3Ohvm+ykChCvygpOQM="; + sha256 = "sha256-zhp6Mkb8iQF8tGXkYu+lgbMUNN/fk/gWBhzeDS4myJ0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-airshare/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-airshare/package.nix index 9160cf770e39..5a5012750cf5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-airshare/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-airshare/package.nix @@ -33,7 +33,6 @@ melpaBuild { qrcode ] ++ ps.qrcode.optional-dependencies.pil; - eafOtherDeps = [ ]; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix index e3053b614a4c..f804b2a65d32 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix @@ -36,6 +36,12 @@ melpaBuild (finalAttrs: { npmHooks.npmConfigHook ]; + postPatch = '' + substituteInPlace buffer.py \ + --replace-fail "aria2_args = [\"aria2c\"]" \ + "aria2_args = [\"${lib.getExe aria2}\"]" + ''; + files = '' ("*.el" "*.py" @@ -55,9 +61,6 @@ melpaBuild (finalAttrs: { ps: with ps; [ pysocks ]; - eafOtherDeps = [ - aria2 - ]; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-camera/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-camera/package.nix index 13bc0a7706cc..2f4fbba74e83 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-camera/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-camera/package.nix @@ -55,7 +55,6 @@ melpaBuild (finalAttrs: { passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; eafPythonDeps = ps: [ ]; - eafOtherDeps = [ ]; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-file-manager/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-file-manager/package.nix index a338e66c610e..8d0c4ef415fc 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-file-manager/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-file-manager/package.nix @@ -36,6 +36,14 @@ melpaBuild (finalAttrs: { npmHooks.npmConfigHook ]; + postPatch = '' + substituteInPlace buffer.py \ + --replace-fail "shutil.which(\"fd\")" \ + "shutil.which(\"${lib.getExe fd}\")" \ + --replace-fail "return \"fd\"" \ + "return \"${lib.getExe fd}\"" + ''; + postBuild = '' npm run build ''; @@ -62,9 +70,6 @@ melpaBuild (finalAttrs: { pygments exif ]; - eafOtherDeps = [ - fd - ]; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-git/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-git/default.nix index 5b134cfc2f28..2295c988bbcb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-git/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-git/default.nix @@ -37,6 +37,16 @@ melpaBuild (finalAttrs: { npmHooks.npmConfigHook ]; + postPatch = '' + substituteInPlace eaf-git.el \ + --replace-fail "(defcustom eaf-git-delta-executable \"delta\"" \ + "(defcustom eaf-git-delta-executable \"${lib.getExe delta}\"" + + substituteInPlace buffer.py \ + --replace-fail "command = \"rg '{}' {}" \ + "command = \"${lib.getExe ripgrep} '{}' {}" + ''; + postBuild = '' npm run build ''; @@ -65,10 +75,6 @@ melpaBuild (finalAttrs: { pygments unidiff ]; - eafOtherDeps = [ - delta - ripgrep - ]; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-image-viewer/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-image-viewer/package.nix index 836e25dcbc2e..cb1f1ab14bff 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-image-viewer/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-image-viewer/package.nix @@ -49,7 +49,6 @@ melpaBuild (finalAttrs: { passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; eafPythonDeps = ps: [ ]; - eafOtherDeps = [ ]; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-js-video-player/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-js-video-player/package.nix index cfc740a74d25..519afd342d06 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-js-video-player/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-js-video-player/package.nix @@ -55,7 +55,6 @@ melpaBuild (finalAttrs: { passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; eafPythonDeps = ps: [ ]; - eafOtherDeps = [ ]; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix index 682f622a3ffd..e0f38b15c604 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix @@ -60,7 +60,6 @@ melpaBuild (finalAttrs: { pycurl python-tsp ]; - eafOtherDeps = [ ]; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pdf-viewer/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pdf-viewer/package.nix index 152a573fef87..35dc987dbaae 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pdf-viewer/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pdf-viewer/package.nix @@ -31,7 +31,6 @@ melpaBuild { packaging pymupdf ]; - eafOtherDeps = [ ]; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pyqterminal/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pyqterminal/package.nix index 0a2c88784518..d60787854748 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pyqterminal/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pyqterminal/package.nix @@ -31,7 +31,6 @@ melpaBuild { pyte psutil ]; - eafOtherDeps = [ ]; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix index 6630a5e6b6ac..09acf5c1c472 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix @@ -10,7 +10,6 @@ # Emacs dependencies all-the-icons, # Other dependencies - nodejs, wmctrl, xdotool, # Updater @@ -22,7 +21,6 @@ let appPythonDeps = map (item: item.eafPythonDeps) enabledApps; - appOtherDeps = map (item: item.eafOtherDeps) enabledApps; pythonPackageLists = [ ( @@ -41,26 +39,15 @@ let pythonPkgs = ps: builtins.concatLists (map (f: f ps) pythonPackageLists); pythonEnv = python3.withPackages pythonPkgs; - otherPackageLists = [ - ( - [ - nodejs - wmctrl - ] - ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform xdotool) [ xdotool ] - ) - ] - ++ appOtherDeps; - otherPkgs = builtins.concatLists otherPackageLists; + wmctrlExe = lib.getExe wmctrl; + xdotoolExe = lib.optionalString (lib.meta.availableOn stdenv.hostPlatform xdotool) ( + lib.getExe xdotool + ); appsDrv = symlinkJoin { name = "emacs-application-framework-apps"; paths = enabledApps; }; - depsBin = symlinkJoin { - name = "emacs-application-framework-deps-bin"; - paths = otherPkgs; - }; in @@ -84,6 +71,20 @@ melpaBuild (finalAttrs: { substituteInPlace eaf.el \ --replace-fail "\"python.exe\" \"python3\"" \ "\"python.exe\" \"${pythonEnv.interpreter}\"" + + substituteInPlace eaf.el \ + --replace-fail "(executable-find \"wmctrl\")" \ + "(executable-find \"${wmctrlExe}\")" \ + --replace-fail "(shell-command-to-string \"wmctrl -m\")" \ + "(shell-command-to-string \"${wmctrlExe} -m\")" \ + --replace-fail "\"wmctrl -i -a \$(wmctrl -lp | awk -vpid=\$PID '\$3==%s {print \$1; exit}')\"" \ + "\"${wmctrlExe} -i -a \$(${wmctrlExe} -lp | awk -vpid=\$PID '\$3==%s {print \$1; exit}')\"" + + substituteInPlace eaf.el \ + --replace-fail "(executable-find \"xdotool\")" \ + "(executable-find \"${xdotoolExe}\")" \ + --replace-fail "(shell-command-to-string \"xdotool getactivewindow getwindowname\")" \ + "(shell-command-to-string \"${xdotoolExe} getactivewindow getwindowname\")" ''; files = '' @@ -112,13 +113,6 @@ melpaBuild (finalAttrs: { cp -r $APPNATDIR/. \ $NATDIR/ fi - - mkdir -p $out/bin/ - for item in ${depsBin}/bin/*; do - # Some symbolic links point to another symbolic link - ln -s $(readlink -f $item) \ - $out/bin/$(basename $item) - done ''; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index e74e21254b71..944250b8b15e 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -74,6 +74,7 @@ withCairo ? withX, withCsrc ? true, withDbus ? stdenv.hostPlatform.isLinux, + withGcMarkTrace ? false, # increase gc performance for reduced debugability withGTK3 ? withPgtk && !noGui, withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets), withGpm ? stdenv.hostPlatform.isLinux, @@ -408,6 +409,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeature withNS "ns") ] ++ [ + (lib.enableFeature withGcMarkTrace "gc-mark-trace") (lib.withFeature withCompressInstall "compress-install") (lib.withFeature withToolkitScrollBars "toolkit-scroll-bars") (lib.withFeature withNativeCompilation "native-compilation") diff --git a/pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix b/pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix index c51b510a7a81..cc8fbb270ddd 100644 --- a/pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix +++ b/pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix @@ -2,7 +2,6 @@ lib, vscode-utils, gemini-cli, - vsce, }: vscode-utils.buildVscodeExtension (finalAttrs: { pname = "gemini-cli-vscode-ide-companion"; @@ -15,8 +14,6 @@ vscode-utils.buildVscodeExtension (finalAttrs: { src = gemini-cli.overrideAttrs (oldAttrs: { pname = "gemini-cli-vscode-ide-companion-vsix"; - nativeBuildInputs = gemini-cli.nativeBuildInputs ++ [ vsce ]; - installPhase = '' runHook preInstall diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index aa1fffc8daf4..1d52812f13a1 100644 --- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "0-unstable-2025-09-27"; + version = "0-unstable-2025-09-28"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "92d9fbb8111bbb9e8be491315f0e50075036cf0b"; - hash = "sha256-9MAche3fVHXiUQzhspHTConwkyJCAuRIRaWfEmo8Fko="; + rev = "150a8e02ec53bfd5fc571587dab902c075f9e291"; + hash = "sha256-3l566sa5sCjeppUD06chpTZ21CnfEzdRpZKM7jxkS2M="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index e52003ee3f14..ab9d5f5c667f 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-09-26"; + version = "0-unstable-2025-10-06"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "6a635bd7cac75adb5af85cb3458ecf29f4baeeac"; - hash = "sha256-loLaqa9tmX3oYd/xXNVLAS1Xq+FDWsQ6gcEl/iP9M9E="; + rev = "252a94c0c40047b52d9ecced567846a9dd5b2020"; + hash = "sha256-Eys3iDJfi3bRuPjWRK34CEAN5o5MC+of1ktT7z2DdAI="; }; meta = { diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 4c3ffd097304..6dce5c9a6320 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "organicmaps"; - version = "2025.09.25-5"; + version = "2025.10.05-7"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; tag = "${finalAttrs.version}-android"; - hash = "sha256-WRr4zLlzGiFnTDuqr+gpnE92f/BZY/c0Ij6x40Rr1LM="; + hash = "sha256-U7CGXwClKByLVn2LAgEavZ96+AyvUlrZlB3HQLaQYH0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 0cd0d2ab33ba..64b4b4563509 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -38,14 +38,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.0.1"; + version = "2.0.2"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-57Mq6zdSqPIK88E/CQkfwQe+Rf4kFTZ2o2shtPBWgRE="; + hash = "sha256-FZruyQ3ckWp9nUmCet4uTeU7TKukmW1D73Rx8EUUsVI="; }; buildInputs = [ diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 4b28ee5cb398..b2c3592845fb 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -18,16 +18,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "soapysdr"; # Don't forget to change passthru.abiVersion - version = "0.8.1-unstable-2025-03-30-03"; + version = "0.8.1-unstable-2025-10-05-03"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapySDR"; - # Instead of applying several patches for Python 3.12 compat, just take the latest, from: - # use old get python lib for v2 (#437) - rev = "fbf9f3c328868f46029284716df49095ab7b99a6"; - hash = "sha256-W4915c6hV/GR5PZRRXZJW3ERsZmQQQ08EA9wYp2tAVk="; + # update to include latest patch for newer cmake support + rev = "1667b4e6301d7ad47b340dcdcd6e9969bf57d843"; + hash = "sha256-UCpYBUb2k1bHy1z2Mvmv+1ZX1BloSsPrTydFV3Ga3Os="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix index e861befe2f92..8690a64d5509 100644 --- a/pkgs/by-name/am/amazon-q-cli/package.nix +++ b/pkgs/by-name/am/amazon-q-cli/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "amazon-q-cli"; - version = "1.14.1"; + version = "1.17.1"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-q-developer-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-RZUe08hPcfPuovfDqndytjz+OVwd3SGvAhWp5XMm+jU="; + hash = "sha256-bRin4JKnBsWLvk+dIwHWAf4KKD1n6FOf2wICYNZpHd4="; }; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - cargoHash = "sha256-qcuxJf038260hr/1Mi5hgWC4Nwmj2xkt4XFkdfgs4QQ="; + cargoHash = "sha256-Isa7kxnov4D+Sd7b4LJW52TIR864CDFkAjAHJoVQRcA="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/as/ashell/package.nix b/pkgs/by-name/as/ashell/package.nix index b11517fd94d8..2d543163899b 100644 --- a/pkgs/by-name/as/ashell/package.nix +++ b/pkgs/by-name/as/ashell/package.nix @@ -14,16 +14,16 @@ }: rustPlatform.buildRustPackage rec { pname = "ashell"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "MalpenZibo"; repo = "ashell"; tag = version; - hash = "sha256-4OJHnYy3LcABDaSraqoXdTpdfcjRQd+B4hc2AOM/oi8="; + hash = "sha256-1PqK+jq0ZioTluwQtEp8rpB/ZNsrvQhLgJiyIM9PQ0k="; }; - cargoHash = "sha256-6NNWdAUZQY2yPW8OGeQUjOCV+REI+LU2wpJGitqq5hI="; + cargoHash = "sha256-L8RxsDxL8oyR3kz+F/NckGikfNLg+Pa1DI2nFgHL5VM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch b/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch new file mode 100644 index 000000000000..0b65d6552040 --- /dev/null +++ b/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch @@ -0,0 +1,567 @@ +diff --git a/package-lock.json b/package-lock.json +index 1b4fe5f40e..fe3166797e 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -230,51 +230,6 @@ + "bw": "build/bw.js" + } + }, +- "apps/cli/node_modules/define-lazy-prop": { +- "version": "2.0.0", +- "license": "MIT", +- "engines": { +- "node": ">=8" +- } +- }, +- "apps/cli/node_modules/is-docker": { +- "version": "2.2.1", +- "license": "MIT", +- "bin": { +- "is-docker": "cli.js" +- }, +- "engines": { +- "node": ">=8" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, +- "apps/cli/node_modules/is-wsl": { +- "version": "2.2.0", +- "license": "MIT", +- "dependencies": { +- "is-docker": "^2.0.0" +- }, +- "engines": { +- "node": ">=8" +- } +- }, +- "apps/cli/node_modules/open": { +- "version": "8.4.2", +- "license": "MIT", +- "dependencies": { +- "define-lazy-prop": "^2.0.0", +- "is-docker": "^2.1.1", +- "is-wsl": "^2.2.0" +- }, +- "engines": { +- "node": ">=12" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, + "apps/desktop": { + "name": "@bitwarden/desktop", + "version": "2025.9.0", +@@ -4913,33 +4868,6 @@ + } + } + }, +- "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/schematics/node_modules/chokidar": { +- "version": "3.6.0", +- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", +- "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "dependencies": { +- "anymatch": "~3.1.2", +- "braces": "~3.0.2", +- "glob-parent": "~5.1.2", +- "is-binary-path": "~2.1.0", +- "is-glob": "~4.0.1", +- "normalize-path": "~3.0.0", +- "readdirp": "~3.6.0" +- }, +- "engines": { +- "node": ">= 8.10.0" +- }, +- "funding": { +- "url": "https://paulmillr.com/funding/" +- }, +- "optionalDependencies": { +- "fsevents": "~2.3.2" +- } +- }, + "node_modules/@compodoc/compodoc/node_modules/@babel/core": { + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz", +@@ -5122,21 +5050,6 @@ + "dev": true, + "license": "MIT" + }, +- "node_modules/@compodoc/compodoc/node_modules/glob-parent": { +- "version": "5.1.2", +- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", +- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", +- "dev": true, +- "license": "ISC", +- "optional": true, +- "peer": true, +- "dependencies": { +- "is-glob": "^4.0.1" +- }, +- "engines": { +- "node": ">= 6" +- } +- }, + "node_modules/@compodoc/compodoc/node_modules/magic-string": { + "version": "0.30.11", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", +@@ -5147,36 +5060,6 @@ + "@jridgewell/sourcemap-codec": "^1.5.0" + } + }, +- "node_modules/@compodoc/compodoc/node_modules/readdirp": { +- "version": "3.6.0", +- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", +- "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "dependencies": { +- "picomatch": "^2.2.1" +- }, +- "engines": { +- "node": ">=8.10.0" +- } +- }, +- "node_modules/@compodoc/compodoc/node_modules/readdirp/node_modules/picomatch": { +- "version": "2.3.1", +- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", +- "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "engines": { +- "node": ">=8.6" +- }, +- "funding": { +- "url": "https://github.com/sponsors/jonschlinkert" +- } +- }, + "node_modules/@compodoc/live-server": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@compodoc/live-server/-/live-server-1.2.3.tgz", +@@ -5908,28 +5791,6 @@ + "node": ">=16.4" + } + }, +- "node_modules/@electron/windows-sign": { +- "version": "1.2.2", +- "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.2.tgz", +- "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==", +- "dev": true, +- "license": "BSD-2-Clause", +- "optional": true, +- "peer": true, +- "dependencies": { +- "cross-dirname": "^0.1.0", +- "debug": "^4.3.4", +- "fs-extra": "^11.1.1", +- "minimist": "^1.2.8", +- "postject": "^1.0.0-alpha.6" +- }, +- "bin": { +- "electron-windows-sign": "bin/electron-windows-sign.js" +- }, +- "engines": { +- "node": ">=14.14" +- } +- }, + "node_modules/@emnapi/core": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz", +@@ -8285,21 +8146,6 @@ + "@msgpack/msgpack": "^2.7.0" + } + }, +- "node_modules/@microsoft/signalr/node_modules/utf-8-validate": { +- "version": "5.0.10", +- "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", +- "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", +- "hasInstallScript": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "dependencies": { +- "node-gyp-build": "^4.3.0" +- }, +- "engines": { +- "node": ">=6.14.2" +- } +- }, + "node_modules/@microsoft/signalr/node_modules/ws": { + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", +@@ -11310,21 +11156,6 @@ + "linux" + ] + }, +- "node_modules/@rollup/rollup-linux-riscv64-musl": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz", +- "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==", +- "cpu": [ +- "riscv64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz", +@@ -18997,15 +18828,6 @@ + "integrity": "sha512-vQOuWmBgsgG1ovGeDi8m6Zeu1JaqH/JncrxKmaqMbv/LunyOQdLiQhPHtOsNlbUI05TocR5nod/Mbs3HYtr6sQ==", + "license": "MIT" + }, +- "node_modules/cross-dirname": { +- "version": "0.1.0", +- "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz", +- "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true +- }, + "node_modules/cross-env": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.0.0.tgz", +@@ -33661,36 +33483,6 @@ + "dev": true, + "license": "MIT" + }, +- "node_modules/postject": { +- "version": "1.0.0-alpha.6", +- "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz", +- "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "dependencies": { +- "commander": "^9.4.0" +- }, +- "bin": { +- "postject": "dist/cli.js" +- }, +- "engines": { +- "node": ">=14.0.0" +- } +- }, +- "node_modules/postject/node_modules/commander": { +- "version": "9.5.0", +- "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", +- "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "engines": { +- "node": "^12.20.0 || >=14" +- } +- }, + "node_modules/prebuild-install": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", +@@ -39330,291 +39122,6 @@ + } + } + }, +- "node_modules/vite/node_modules/@rollup/rollup-android-arm-eabi": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz", +- "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==", +- "cpu": [ +- "arm" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "android" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-android-arm64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz", +- "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "android" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-darwin-arm64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz", +- "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "darwin" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-darwin-x64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz", +- "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "darwin" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-freebsd-arm64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz", +- "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "freebsd" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-freebsd-x64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz", +- "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "freebsd" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-arm-gnueabihf": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz", +- "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==", +- "cpu": [ +- "arm" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-arm-musleabihf": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz", +- "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==", +- "cpu": [ +- "arm" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz", +- "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-musl": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz", +- "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-loongarch64-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz", +- "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==", +- "cpu": [ +- "loong64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-powerpc64le-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz", +- "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==", +- "cpu": [ +- "ppc64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-riscv64-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz", +- "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==", +- "cpu": [ +- "riscv64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-s390x-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz", +- "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==", +- "cpu": [ +- "s390x" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-x64-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz", +- "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-x64-musl": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz", +- "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-win32-arm64-msvc": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz", +- "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "win32" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-win32-ia32-msvc": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz", +- "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==", +- "cpu": [ +- "ia32" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "win32" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-win32-x64-msvc": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz", +- "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "win32" +- ], +- "peer": true +- }, + "node_modules/vite/node_modules/rollup": { + "version": "4.44.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz", diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 85ee2cb8631f..99fe107c25f7 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -2,37 +2,41 @@ lib, stdenv, buildNpmPackage, - nodejs_20, fetchFromGitHub, - cctools, - nix-update-script, - nixosTests, + nodejs_22, perl, xcbuild, + writableTmpDirAsHomeHook, + versionCheckHook, + nixosTests, + nix-update-script, }: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "bitwarden-cli"; - version = "2025.5.0"; + version = "2025.9.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; - tag = "cli-v${version}"; - hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY="; + tag = "cli-v${finalAttrs.version}"; + hash = "sha256-vxGyDYtv0O5U4pnVrQm/BOIpDtpcDUOyFFdBDehQ2to="; }; + patches = [ + ./fix-lockfile.patch + ]; + postPatch = '' # remove code under unfree license rm -r bitwarden_license ''; - nodejs = nodejs_20; + nodejs = nodejs_22; - npmDepsHash = "sha256-0IoBPRGdtkMeTrT5cqZLHB/WrUCONtsJ6YHh0y4K5Ls="; + npmDepsHash = "sha256-bn39QlZXNUa/GEZhJsjLiG3PRYdQ/Y36Tvef2fXH8yQ="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - cctools perl xcbuild.xcrun ]; @@ -61,9 +65,6 @@ buildNpmPackage rec { rm -r node_modules/**/prebuilds shopt -u globstar - # FIXME one of the esbuild versions fails to download @esbuild/linux-x64 - rm -r node_modules/esbuild node_modules/vite/node_modules/esbuild - npm rebuild --verbose ''; @@ -84,6 +85,14 @@ buildNpmPackage rec { installShellCompletion --cmd bw --zsh <($out/bin/bw completion --shell zsh) ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook + versionCheckHook + ]; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgramArg = "--version"; + passthru = { tests = { vaultwarden = nixosTests.vaultwarden.sqlite; @@ -97,13 +106,14 @@ buildNpmPackage rec { }; meta = { - # https://github.com/NixOS/nixpkgs/issues/339576 - broken = stdenv.hostPlatform.isDarwin; - changelog = "https://github.com/bitwarden/clients/releases/tag/${src.tag}"; + changelog = "https://github.com/bitwarden/clients/releases/tag/${finalAttrs.src.tag}"; description = "Secure and free password manager for all of your devices"; homepage = "https://bitwarden.com"; license = lib.licenses.gpl3Only; mainProgram = "bw"; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ + xiaoxiangmoe + dotlambda + ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock index d8acc72693fc..db75a59c33ba 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock +++ b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "autocfg" @@ -25,9 +25,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "bitflags" -version = "2.9.1" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" [[package]] name = "bstr" @@ -42,25 +42,25 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.10" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab" +checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" [[package]] name = "cargo-config2" -version = "0.1.34" +version = "0.1.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82de3b1a1dd72252c6d456247864ffe52110d109da949f579eeb16349e0eb5d" +checksum = "2bf2da6c8158a7ad35217e3187ac07db64d19719a934ffaf9b7591cda1f31964" dependencies = [ "serde", "serde_derive", - "toml_edit", - "windows-sys 0.60.2", + "toml", + "windows-sys 0.61.2", ] [[package]] name = "cargo-llvm-cov" -version = "0.6.17" +version = "0.6.20" dependencies = [ "anyhow", "camino", @@ -88,15 +88,15 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "duct" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6ce170a0e8454fa0f9b0e5ca38a6ba17ed76a50916839d217eb5357e05cdfde" +checksum = "d7478638a31d1f1f3d6c9f5e57c76b906a04ac4879d6fd0fb6245bc88f73fd0b" dependencies = [ "libc", "os_pipe", @@ -104,20 +104,14 @@ dependencies = [ "shared_thread", ] -[[package]] -name = "equivalent" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" - [[package]] name = "errno" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -128,46 +122,30 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "filetime" -version = "0.2.25" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed" dependencies = [ "cfg-if", "libc", "libredox", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] name = "fs-err" -version = "3.1.1" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d7be93788013f265201256d58f04936a8079ad5dc898743aa20525f503b683" +checksum = "6ad492b2cf1d89d568a43508ab24f98501fe03f2f31c01e1d0fe7366a71745d2" dependencies = [ "autocfg", ] [[package]] name = "glob" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" - -[[package]] -name = "hashbrown" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" - -[[package]] -name = "indexmap" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" -dependencies = [ - "equivalent", - "hashbrown", -] +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "itoa" @@ -195,15 +173,15 @@ checksum = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7" [[package]] name = "libc" -version = "0.2.174" +version = "0.2.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "libredox" -version = "0.1.4" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ "bitflags", "libc", @@ -212,23 +190,23 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "normpath" -version = "1.3.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" +checksum = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -239,13 +217,13 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "opener" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771b9704f8cd8b424ec747a320b30b47517a6966ba2c7da90047c16f4a962223" +checksum = "cb9024962ab91e00c89d2a14352a8d0fc1a64346bf96f1839b45c09149564e47" dependencies = [ "bstr", "normpath", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -260,9 +238,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] @@ -278,27 +256,27 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.5.13" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" dependencies = [ "aho-corasick", "memchr", @@ -308,9 +286,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" dependencies = [ "aho-corasick", "memchr", @@ -319,34 +297,34 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" [[package]] name = "rustc-demangle" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" [[package]] name = "rustix" -version = "1.0.7" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "rustversion" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ruzstd" @@ -371,18 +349,27 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -391,23 +378,24 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] name = "serde_spanned" -version = "0.6.9" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +checksum = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -417,15 +405,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7" dependencies = [ "libc", - "sigchld", "windows-sys 0.60.2", ] [[package]] name = "shared_thread" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7a6f98357c6bb0ebace19b22220e5543801d9de90ffe77f8abb27c056bac064" +checksum = "52b86057fcb5423f5018e331ac04623e32d6b5ce85e33300f92c79a1973928b0" [[package]] name = "shell-escape" @@ -433,41 +420,11 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" -[[package]] -name = "sigchld" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47106eded3c154e70176fc83df9737335c94ce22f821c32d17ed1db1f83badb1" -dependencies = [ - "libc", - "os_pipe", - "signal-hook", -] - -[[package]] -name = "signal-hook" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" -dependencies = [ - "libc", -] - [[package]] name = "syn" -version = "2.0.104" +version = "2.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" dependencies = [ "proc-macro2", "quote", @@ -487,14 +444,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.20.0" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -515,32 +472,41 @@ dependencies = [ ] [[package]] -name = "toml_datetime" -version = "0.6.11" +name = "toml" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +checksum = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0" dependencies = [ - "serde", + "serde_core", + "serde_spanned", + "toml_datetime", + "toml_parser", + "winnow", ] [[package]] -name = "toml_edit" -version = "0.22.27" +name = "toml_datetime" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_parser" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627" dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", "winnow", ] [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" [[package]] name = "walkdir" @@ -554,13 +520,19 @@ dependencies = [ [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + [[package]] name = "windows-sys" version = "0.59.0" @@ -576,7 +548,16 @@ version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.2", + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", ] [[package]] @@ -597,18 +578,19 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.53.2" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -619,9 +601,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" @@ -631,9 +613,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_aarch64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" @@ -643,9 +625,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" @@ -655,9 +637,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" @@ -667,9 +649,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_i686_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" @@ -679,9 +661,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" @@ -691,9 +673,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" @@ -703,24 +685,21 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "windows_x86_64_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.11" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd" -dependencies = [ - "memchr", -] +checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" [[package]] name = "xattr" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", "rustix", diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index e5f08c4c2e30..a620b5d61ef4 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -24,7 +24,7 @@ let pname = "cargo-llvm-cov"; - version = "0.6.17"; + version = "0.6.20"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit owner; repo = "cargo-llvm-cov"; rev = "v${version}"; - sha256 = "sha256-0Dgcl1r+j86WVhkyJNJxUnk85vrtD1fBBxfJkV0mcAI="; + sha256 = "sha256-LAiN9Opc0XQVepQ9IhK9JFWGoeRR3U6V680jgGiaDGo="; }; # Upstream doesn't include the lockfile so we need to add it back diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix index 15227629d5db..d9bf09e84f5e 100644 --- a/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/pkgs/by-name/ca/cargo-rdme/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-rdme"; - version = "1.4.8"; + version = "1.4.9"; src = fetchCrate { inherit pname version; - hash = "sha256-lVu9w8l3+SeqiMoQ8Bjoslf7tWz49jrrE4g/pDU1axI="; + hash = "sha256-ostDwjj93WhDfBKJY9xpKd74knQi9z9UFb5Q84waHuM="; }; - cargoHash = "sha256-W800jepxDv6OjbcxRKphAnDU2OuBGGGSLELe8gAfTr8="; + cargoHash = "sha256-pk7tYvN2Drn+Gpk170ITsAF38dVWjk+RBfrnb0YpZc4="; meta = { description = "Cargo command to create the README.md from your crate's documentation"; diff --git a/pkgs/by-name/cl/clapboard/package.nix b/pkgs/by-name/cl/clapboard/package.nix index 5523b7b2439f..a808323b4a06 100644 --- a/pkgs/by-name/cl/clapboard/package.nix +++ b/pkgs/by-name/cl/clapboard/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "clapboard"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "bjesus"; repo = "clapboard"; rev = "v${version}"; - hash = "sha256-1y2tG4ajnsstNkPTE3eBr8QJJF6Qq/HCQzJoj1ETuUY="; + hash = "sha256-vRIwdbt8f9/K7QAfFtBXrr4ezymlnzarq08W7J3aRiU="; }; - cargoHash = "sha256-DEwipAG/zPPftYwYahRJfpXgHPXerGdn10PkS8DHWCM="; + cargoHash = "sha256-w3VR6j1ZcMQsk8r9eDqMtRJrGS6+XRM8t/pf5GpTVFA="; meta = with lib; { description = "Wayland clipboard manager that will make you clap"; diff --git a/pkgs/by-name/cl/cld2/package.nix b/pkgs/by-name/cl/cld2/package.nix index 0c9b5c6a0b37..5be7109400b9 100644 --- a/pkgs/by-name/cl/cld2/package.nix +++ b/pkgs/by-name/cl/cld2/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, cmake, fetchpatch, + fetchDebianPatch, }: stdenv.mkDerivation { @@ -18,10 +19,17 @@ stdenv.mkDerivation { }; patches = [ + (fetchDebianPatch { + pname = "cld2"; + version = "0.0.0-git20150806"; + debianRevision = "10"; + patch = "add-cmake-file.patch"; + hash = "sha256-iLacWD4jQxid76pzGpDW3ZJ8Dyaksfj1pNTrU7qSBQM="; + }) (fetchpatch { - name = "add-cmakelists.txt"; - url = "https://github.com/CLD2Owners/cld2/pull/65/commits/9cfac02c2ac7802ab7079560b38a474473c45f51.patch"; - hash = "sha256-uOjmUk8kMFl+wED44ErXoLRyblhgDwFx9K1Wj65Omh8="; + name = "fix-narrowing-errors.txt"; + url = "https://github.com/ripjar/cld2/pull/1/commits/79be1adea78f0d376cb793f4dae8e70b100dadcc.patch"; + hash = "sha256-i4WWYBx16kYXZ5IQPACWbS/HGsQysXre1SngYlAfNaM="; }) ]; diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index 4e2644b37018..03748090ae21 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -36,7 +36,7 @@ let }; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { inherit version; pname = "cloudflare-warp" + lib.optionalString headless "-headless"; @@ -130,7 +130,6 @@ stdenv.mkDerivation rec { ''; doInstallCheck = true; - versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; versionCheckProgramArg = "--version"; passthru = { @@ -156,22 +155,23 @@ stdenv.mkDerivation rec { rg '([^/]+)\.0\.yaml\b' --only-matching --replace '$1' )" - for platform in ${lib.escapeShellArgs meta.platforms}; do - update-source-version "${pname}" "$new_version" --ignore-same-version --source-key="sources.$platform" + for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do + update-source-version "${finalAttrs.pname}" "$new_version" --ignore-same-version --source-key="sources.$platform" done ''; }); }; - meta = with lib; { + meta = { + changelog = "https://github.com/cloudflare/cloudflare-docs/blob/production/src/content/warp-releases/linux/ga/${finalAttrs.version}.0.yaml"; description = "Replaces the connection between your device and the Internet with a modern, optimized, protocol" + lib.optionalString headless " (headless version)"; homepage = "https://pkg.cloudflareclient.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; mainProgram = "warp-cli"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ marcusramberg ]; platforms = [ @@ -179,4 +179,4 @@ stdenv.mkDerivation rec { "aarch64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/cm/cmake-language-server/package.nix b/pkgs/by-name/cm/cmake-language-server/package.nix index c9efc80dbe2b..d03a6abe72bd 100644 --- a/pkgs/by-name/cm/cmake-language-server/package.nix +++ b/pkgs/by-name/cm/cmake-language-server/package.nix @@ -45,11 +45,11 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ cmake cmake-format + versionCheckHook ] ++ (with python3Packages; [ pytest-datadir pytestCheckHook - versionCheckHook ]); versionCheckProgramArg = "--version"; @@ -59,6 +59,17 @@ python3Packages.buildPythonApplication rec { echo "__version__ = \"$PDM_BUILD_SCM_VERSION\"" > cmake_language_server/version.py ''; + disabledTests = [ + # AssertionError: CTEST_SCP_COMMAND not found + "test_parse_variables" + + # AssertionError: AddFileDependencies not found + "test_parse_modules" + + # AssertionError: assert 'Boost' in [... + "test_completions_triggercharacter" + ]; + meta = { description = "CMake LSP Implementation"; homepage = "https://github.com/regen100/cmake-language-server"; diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 7e3b689f4567..3f099d56c7f9 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-sp9vGXM6oiS3djUHoQikJ+1Ixojh+vIrKcROHDBUkoI="; + hash = "sha256-ZD8EGCt7oyOrMfUm94UTT7ecujGIqFIgbvBHP+4oKhU="; }; patches = [ @@ -80,9 +80,6 @@ stdenv.mkDerivation (finalAttrs: { }) ] ++ [ - # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11134 - ./fix-curl-8.16.patch - # Remove references to non‐Nix search paths. ./remove-impure-search-paths.patch ]; diff --git a/pkgs/by-name/ct/ctagdrc/package.nix b/pkgs/by-name/ct/ctagdrc/package.nix new file mode 100644 index 000000000000..44a0feea8879 --- /dev/null +++ b/pkgs/by-name/ct/ctagdrc/package.nix @@ -0,0 +1,95 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + alsa-lib, + fontconfig, + freetype, + libX11, + libXcomposite, + libXcursor, + libXdmcp, + libXext, + libXinerama, + libXrandr, + libXtst, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ctagdrc"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "BillyDM"; + repo = "CTAGDRC"; + tag = finalAttrs.version; + hash = "sha256-szBI8ESJz1B/JuGcZD8D53c1yJeUW1uK4GewQExtD9Q="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + alsa-lib + fontconfig + freetype + libX11 + libXcomposite + libXcursor + libXdmcp + libXext + libXinerama + libXrandr + libXtst + ]; + + enableParallelBuilding = true; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'COPY_PLUGIN_AFTER_BUILD TRUE' 'COPY_PLUGIN_AFTER_BUILD FALSE' + substituteInPlace CMakeLists.txt \ + --replace-fail 'include(cmake-include/CPM.cmake)' '# No CPM needed' + substituteInPlace CMakeLists.txt \ + --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/lib/clap $out/lib/vst3 + install -Dm755 "CTAGDRC_artefacts/Release/Standalone/CTAGDRC" $out/bin/CTAGDRC + install -Dm644 "CTAGDRC_artefacts/Release/CLAP/CTAGDRC.clap" -t $out/lib/clap + cp -r "CTAGDRC_artefacts/Release/VST3/CTAGDRC.vst3" $out/lib/vst3 + + runHook postInstall + ''; + + # JUCE dlopens these, make sure they are in rpath + # Otherwise, segfault will happen + env.NIX_LDFLAGS = toString [ + "-lX11" + "-lXext" + "-lXcomposite" + "-lXcursor" + "-lXinerama" + "-lXrandr" + "-lXrender" + "-lXtst" + "-lXdmcp" + ]; + + meta = { + description = "Audio compressor plugin created with JUCE"; + homepage = "https://github.com/BillyDM/CTAGDRC"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ magnetophon ]; + mainProgram = "CTAGDRC"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/cx/cxxopts/package.nix b/pkgs/by-name/cx/cxxopts/package.nix index ecd195a79cc9..8accbcad0630 100644 --- a/pkgs/by-name/cx/cxxopts/package.nix +++ b/pkgs/by-name/cx/cxxopts/package.nix @@ -2,9 +2,12 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, cmake, icu74, pkg-config, + testers, + validatePkgConfig, enableUnicodeHelp ? true, }: @@ -19,12 +22,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-baM6EX9D0yfrKxuPXyUUV9RqdrVLyygeG6x57xN8lc4="; }; - buildInputs = lib.optionals enableUnicodeHelp [ icu74.dev ]; + propagatedBuildInputs = lib.optionals enableUnicodeHelp [ icu74.dev ]; cmakeFlags = [ "-DCXXOPTS_BUILD_EXAMPLES=OFF" ] ++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE"; - nativeBuildInputs = [ cmake ] ++ lib.optionals enableUnicodeHelp [ pkg-config ]; + nativeBuildInputs = [ + cmake + ] + ++ lib.optionals enableUnicodeHelp [ + pkg-config + validatePkgConfig + ]; doCheck = true; @@ -34,14 +43,30 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/jarro2783/cxxopts/issues/332 postPatch = '' substituteInPlace packaging/pkgconfig.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; + patches = [ + (fetchpatch2 { + url = "https://github.com/jarro2783/cxxopts/commit/e98c73d665915b292a0592bf34fcbe8522035bc1.patch?full_index=1"; + name = "fix-icu-uc-typo-in-pkgconfig.patch"; + hash = "sha256-bqd3H66Op1/EkN2HLd84Obky4Y2ndPPY8MGZ5fqtdk4="; + }) + ]; + + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + }; + meta = with lib; { homepage = "https://github.com/jarro2783/cxxopts"; description = "Lightweight C++ GNU-style option parser library"; license = licenses.mit; maintainers = [ maintainers.spease ]; + pkgConfigModules = [ "cxxopts" ]; platforms = platforms.all; }; }) diff --git a/pkgs/by-name/df/dftd4/python.nix b/pkgs/by-name/df/dftd4/python.nix new file mode 100644 index 000000000000..6ed63ca10492 --- /dev/null +++ b/pkgs/by-name/df/dftd4/python.nix @@ -0,0 +1,45 @@ +{ + buildPythonPackage, + meson-python, + ninja, + setuptools, + pkg-config, + dftd4, + cffi, + numpy, +}: + +buildPythonPackage { + inherit (dftd4) + pname + version + src + meta + ; + + pyproject = true; + + buildInputs = [ dftd4 ]; + + nativeBuildInputs = [ + pkg-config + ninja + ]; + + build-system = [ + meson-python + setuptools + ]; + + dependencies = [ + cffi + numpy + ]; + + preConfigure = '' + cd python + ''; + + pythonImportsCheck = [ "dftd4" ]; + doCheck = true; +} diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json index 798d81961ceb..bcffd1a9c494 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json @@ -37,16 +37,16 @@ "jar": "sha256-a9QQVOJuuuiLDaWNxj7BEKcO+tXxLYcESTRwx8VJcZA=", "pom": "sha256-uFQ5wq04pYG40n+nWy+zC3HN4dT8A8ZE4yMvhN8kWqE=" }, - "io/freefair/gradle#lombok-plugin/8.14.2": { - "jar": "sha256-RIQV1/8vImNj813kxhix6Tr78NdFBRUUu0cbIvm1jy4=", - "module": "sha256-QIzhHR3PUEV4oli/obkCfo0zRgScjdqxQ6wtebqKAJE=", - "pom": "sha256-l7zUYFZjH9+YzMEwgxFkf71USZWWLXAoZLGmJn9/0XQ=" + "io/freefair/gradle#lombok-plugin/9.0.0": { + "jar": "sha256-ztdLsqK5Eze6lAo1h7uXFujWXlUp49JEqlo8cOXED7Q=", + "module": "sha256-9FXPosuixaovzcBl0zcaRAKsxf/Jlfrq67a3IrQLd0Q=", + "pom": "sha256-Wx4uVjwtS7zUTDZNBfTQEV63SCsI/VA2NeyNfEW0Knk=" }, "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": { "pom": "sha256-hoEYwHzaHj3q/o0bF3HzOgyN0lEIEAu/pjFl3hzTvmg=" }, - "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14.2": { - "pom": "sha256-OKIER1//te7+8mJmN+ZtdKjo5reqEZ3SRXpwcZ3oVvU=" + "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": { + "pom": "sha256-s5rb7ywLx0jun0EFww8MhaElzsdorWrNDp+UKogG2w8=" }, "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" @@ -168,13 +168,13 @@ "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/1.0.0": { "pom": "sha256-8TMkmhh1Suah0nAdANhJsa+6ewaD3bX8GxinAHHOwvo=" }, - "org/gradlex#extra-java-module-info/1.13": { - "jar": "sha256-EIqHsSfToameWdHmEEo+kdCx/5aWGM+1s54+J/H+r20=", - "module": "sha256-1kT0XN5oN003+pNhhJWZK6ZBHyJFhklk50VlHpffJhE=", - "pom": "sha256-sYMue36yP41a32LHkXcuPp/IhIMUnKjd5QIbsQPUQlo=" + "org/gradlex#extra-java-module-info/1.13.1": { + "jar": "sha256-u7wZoNvtKQxcMt17/vhxh+Qn/yGBqKfkcA3XtXrOQbM=", + "module": "sha256-lQeTGglcI3ZzTFxnOo/zK7qBerkAQAivjFdihR1/YaY=", + "pom": "sha256-i4Q6pFeUxi2dsJOBdGrchkKKphFx++KSAqld7WzYN6A=" }, - "org/gradlex/extra-java-module-info#org.gradlex.extra-java-module-info.gradle.plugin/1.13": { - "pom": "sha256-ll4caPhrb0fP4cqP2rYTPRxz0w4eerkuTHirvGnFs4c=" + "org/gradlex/extra-java-module-info#org.gradlex.extra-java-module-info.gradle.plugin/1.13.1": { + "pom": "sha256-ho1RzTt31f/rmHPol6rnYlphPx2wP60fTiHtBti4vDQ=" }, "org/jsonschema2pojo#org.jsonschema2pojo.gradle.plugin/1.2.2": { "pom": "sha256-OS098xRtN26kokx+XtNhLennIcfT6+T3vzq5oiSVhds=" @@ -365,22 +365,15 @@ "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" }, - "com/google/errorprone#error_prone_annotations/2.36.0": { - "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=", - "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw=" - }, - "com/google/errorprone#error_prone_annotations/2.38.0": { - "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=", - "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc=" + "com/google/errorprone#error_prone_annotations/2.41.0": { + "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=", + "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4=" }, "com/google/errorprone#error_prone_parent/2.27.0": { "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" }, - "com/google/errorprone#error_prone_parent/2.36.0": { - "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw=" - }, - "com/google/errorprone#error_prone_parent/2.38.0": { - "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w=" + "com/google/errorprone#error_prone_parent/2.41.0": { + "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI=" }, "com/google/guava#failureaccess/1.0.3": { "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=", @@ -392,13 +385,13 @@ "com/google/guava#guava-parent/33.4.0-android": { "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM=" }, - "com/google/guava#guava-parent/33.4.8-jre": { - "pom": "sha256-oDxRmaG+FEQ99/1AuoZzscaq4E3u9miM59Vz6kieOiA=" + "com/google/guava#guava-parent/33.5.0-jre": { + "pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU=" }, - "com/google/guava#guava/33.4.8-jre": { - "jar": "sha256-89f1f2f9Yi9NRo391pKzpeOQkkbCgBesMmNAXw/mF+0=", - "module": "sha256-WKM1cwMGmiGTDnuf6bhk3ov7i9RgdDPb5IJjRZYgz/w=", - "pom": "sha256-BDZdS27yLIz5NJ/mKAafw+gaLIODUUAu9OlfnnV77rw=" + "com/google/guava#guava/33.5.0-jre": { + "jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=", + "module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=", + "pom": "sha256-BHj6eKkIs8Mf5td76ZeKqmIeKhgduEAH49OzdCSirGE=" }, "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", @@ -474,16 +467,16 @@ "module": "sha256-iNmRuo7VjChtey18CPn2Mg/5novWYXPDaDkhAEb8f2I=", "pom": "sha256-oYHFieNi4sRp6IRc/PIKFaiQ9ISUoPny4T9ZSglq0Kk=" }, - "io/freefair/gradle#lombok-plugin/8.14.2": { - "jar": "sha256-RIQV1/8vImNj813kxhix6Tr78NdFBRUUu0cbIvm1jy4=", - "module": "sha256-QIzhHR3PUEV4oli/obkCfo0zRgScjdqxQ6wtebqKAJE=", - "pom": "sha256-l7zUYFZjH9+YzMEwgxFkf71USZWWLXAoZLGmJn9/0XQ=" + "io/freefair/gradle#lombok-plugin/9.0.0": { + "jar": "sha256-ztdLsqK5Eze6lAo1h7uXFujWXlUp49JEqlo8cOXED7Q=", + "module": "sha256-9FXPosuixaovzcBl0zcaRAKsxf/Jlfrq67a3IrQLd0Q=", + "pom": "sha256-Wx4uVjwtS7zUTDZNBfTQEV63SCsI/VA2NeyNfEW0Knk=" }, "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": { "pom": "sha256-1C1ePfUKHTe6qhRrpb0ai7I5YZksPt9Fw6M5zqCTLd8=" }, - "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14.2": { - "pom": "sha256-KVgYYy7l/xiWwKYPuI2ghuPXyFHGxIUcQU/VSETWfYI=" + "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": { + "pom": "sha256-xWt36BjHjUZoXWbQ/2UJ85G5KE3+hrueEnARHrwBJYI=" }, "io/github/classgraph#classgraph/4.8.181": { "jar": "sha256-YqZDbWlxDvX6tuwkN4HOTFspkEftGEG1+SdGroUs5UU=", @@ -507,10 +500,10 @@ "io/projectreactor#reactor-bom/Bismuth-SR7": { "pom": "sha256-8V34qRAvk+7YOr1Aw5XxauNsUKmmB+llR0KUKr49NDk=" }, - "io/reactivex/rxjava3#rxjava/3.1.11": { - "jar": "sha256-bipWqYGdD8L+DXjv7NPXyBpjxjneM8qlY5KTvP/umXo=", - "module": "sha256-tDIZwIxsAgw+sN8lRtrqd5IZP4lgRtVcozqZhfvajuc=", - "pom": "sha256-fpMFhj0zE0zUpy0It/Evre4hda2ef3Jzi0nIptw8BVA=" + "io/reactivex/rxjava3#rxjava/3.1.12": { + "jar": "sha256-GAikM+9V3MKWVSPlEquRSl0NcnIoomg+11WdfMz0Tjc=", + "module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=", + "pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ=" }, "io/sentry#sentry/8.20.0": { "jar": "sha256-G5KZBtERVbA9gwY1XrEGlWL2elwljF0R0h0vnT1GMbQ=", @@ -558,22 +551,16 @@ "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" }, - "net/bytebuddy#byte-buddy-agent/1.17.6": { - "jar": "sha256-ioCVlGW7CYSM1BqJMBSQxVudlA3G7DDYq6wPY7Of1dA=", - "pom": "sha256-Zw0Cz7w5b05+ZhTd3PSghC+vF/l5k3PX4Mt7aq3Njm8=" + "net/bytebuddy#byte-buddy-agent/1.17.7": { + "jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=", + "pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w=" }, - "net/bytebuddy#byte-buddy-parent/1.15.11": { - "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY=" + "net/bytebuddy#byte-buddy-parent/1.17.7": { + "pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw=" }, - "net/bytebuddy#byte-buddy-parent/1.17.6": { - "pom": "sha256-3RX5X9VgUmPwZdncuOzuzEjr5NZmw3KY/0RgAUlCQL0=" - }, - "net/bytebuddy#byte-buddy/1.15.11": { - "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4=" - }, - "net/bytebuddy#byte-buddy/1.17.6": { - "jar": "sha256-0mOCqDnLJtXGKgsPBHFbzvVaUx+WrGzkDeRSocBTnnA=", - "pom": "sha256-UExH3b8VsOc8ymO52woBwSp83n+LM6DF2dW1BtGUaz4=" + "net/bytebuddy#byte-buddy/1.17.7": { + "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=", + "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M=" }, "net/java#jvnet-parent/1": { "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" @@ -584,13 +571,13 @@ "net/java#jvnet-parent/5": { "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" }, - "net/java/dev/jna#jna-platform/5.17.0": { - "jar": "sha256-t+PUbIe60utAmw5wSRa82BIGFo41cxLf3dDiU2ec2eA=", - "pom": "sha256-CjC3l622giFH75jLJJ7z+/SiQ1QqqGv59C+tnmgwWkQ=" + "net/java/dev/jna#jna-platform/5.18.0": { + "jar": "sha256-eH7Jywp2Eh/1TTVI8GKNsJAB8TVSHj7b+/rJV953qzw=", + "pom": "sha256-4zkW2g+tjn0EZgihqx3/6RzJ4trVsUqY4LpkD//iP58=" }, - "net/java/dev/jna#jna/5.17.0": { - "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=", - "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ=" + "net/java/dev/jna#jna/5.18.0": { + "jar": "sha256-/ifB5eNKasqEy0TaXxUnHNaQabHPcBq1unMgxXxVxDk=", + "pom": "sha256-SIq1HOC+VwAYcI0M0VtfpPp9Kx022BzvdTfVG9TXsDs=" }, "net/rdrei/android/buildtimetracker#gradle-plugin/0.11.1": { "jar": "sha256-VTLp3rXka/R3KpkXFRrW4TqRLj8jZH8ffuoi/DsLTsg=", @@ -698,10 +685,10 @@ "org/apache/logging#logging-parent/11.3.0": { "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" }, - "org/apache/logging/log4j#log4j-api/2.25.1": { - "jar": "sha256-ILnHfAqeVNEGOjnlUdyvmMfY56SZRkj4TQueFMcfchU=", - "module": "sha256-6tMmKCISCzyfiiDNDZnVY1lg1SeyBD1n//Zr6HeDHJo=", - "pom": "sha256-up6JUpGBShh506YMLUEReZMk64R5seASpHs1GjeIMcM=" + "org/apache/logging/log4j#log4j-api/2.25.2": { + "jar": "sha256-n9Zsn+C+oG+pZmwUeYmkbK+qkrSoh1NpfTlFzEMzjLs=", + "module": "sha256-WPeF66u6zDA/Ow5aSF91X9qzKQ9p5JsDT4lj0ngjZV4=", + "pom": "sha256-CVYJaiUCQIyVioMXTytqV9yy5bB7uRTISHMrRLirvcM=" }, "org/apache/logging/log4j#log4j-bom/2.10.0": { "pom": "sha256-8CEjRUmwLxK23xRaaw5ixrl4FCfjDjckmgX2XF3R7WY=" @@ -712,11 +699,11 @@ "org/apache/logging/log4j#log4j-bom/2.24.3": { "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg=" }, - "org/apache/logging/log4j#log4j-bom/2.25.1": { - "pom": "sha256-uKwjMoSXEbL3R0QVk3vbuWfSuTAO9M/+PzW+Oxqhik4=" + "org/apache/logging/log4j#log4j-bom/2.25.2": { + "pom": "sha256-Tym32cLZcP0qZpcXa/fd3EFQifYNaW0ov98xsk6S8Rw=" }, - "org/apache/logging/log4j#log4j/2.25.1": { - "pom": "sha256-CuZl9wnhMQboIwM2+GzYMrgbytXAWQlyXD/3dD3U/10=" + "org/apache/logging/log4j#log4j/2.25.2": { + "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w=" }, "org/apache/pdfbox#fontbox/2.0.26": { "jar": "sha256-lGdMfRDqRdmw3BA4eJJjf8jvtcadLnJpTxxm/rm7btc=", @@ -762,9 +749,9 @@ "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" }, - "org/assertj#assertj-core/3.27.4": { - "jar": "sha256-zGmqhPeTVstjXD+f8/ht/w+djufve2hKLJqZgE/0UAg=", - "pom": "sha256-nLMcgATISEPShMQCqBRTvupFCb+neP9CKmcvfny/Ygw=" + "org/assertj#assertj-core/3.27.6": { + "jar": "sha256-snhysEmryI4jyFPOWReUXdV9Q70xF12FLjlB0qb9AjE=", + "pom": "sha256-sPgJRcedY8PDPWEL2HVNXppUNpVfev1oPQFg2GErquw=" }, "org/controlsfx#controlsfx/11.2.2": { "jar": "sha256-BDwGYtUmljR9r4T8aQJ0xhIuD4CjFXo1St086oPA3qk=", @@ -913,17 +900,17 @@ "org/mockito#mockito-bom/4.11.0": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" }, - "org/mockito#mockito-core/5.19.0": { - "jar": "sha256-2HX/I0pLcuDu3+Fw3YBHl6S4e6THYgfJZZ1vRrUnh3s=", - "pom": "sha256-NlnpFp4TwLUT6D7c1R6vqlcdYMYq9YGOzQkhqi0M0Bg=" + "org/mockito#mockito-core/5.20.0": { + "jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=", + "pom": "sha256-mQPiB1XAxIh6q5xPEAYft/ERUdOp+t2WTp+6QnIm0TU=" }, "org/mockito#mockito-inline/5.2.0": { "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=", "pom": "sha256-cG00cOVtMaO1YwaY0Qeb79uYMUWwGE5LorhNo4eo9oQ=" }, - "org/mockito#mockito-junit-jupiter/5.19.0": { - "jar": "sha256-fPu3qcEZgFPGmcZjR5/Ug2rMIsJlAAPI3uIOf7xVplo=", - "pom": "sha256-x+4XLR/ALo/I/I8EPIfHGzXLfXR+kJNGQ9SSCTrXoUs=" + "org/mockito#mockito-junit-jupiter/5.20.0": { + "jar": "sha256-/WxwPCsAuRTzrbwnsYB3pwjz1pkvGSQsRE5zfGzOAk4=", + "pom": "sha256-gaVJ/8nISoefwe5k1jAHqwClOk75avtTaQ8oRWker5g=" }, "org/objenesis#objenesis-parent/3.3": { "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" @@ -1024,9 +1011,9 @@ "jar": "sha256-j4ds4qmqTpWx8ZUpUCVRA+JIdCUFCmVPMoVEe6YBwVQ=", "pom": "sha256-dVdRq2w3oaMa+1ueSllcDdLv0rUNcDshJVuCfFDtYVM=" }, - "org/projectlombok#lombok/1.18.38": { - "jar": "sha256-Hh5CfDb/Y8RP0w7yktnnc+oxVEYKtiZdP+1+b1vFD7k=", - "pom": "sha256-gWXuhymafa8GmnyYG3u4YENCE7mvyqurC0abO6v0jm0=" + "org/projectlombok#lombok/1.18.40": { + "jar": "sha256-t2TDobDIZ0jJ4ugNZOA9RUAs4+3rYx+oHjCla/+m2vM=", + "pom": "sha256-1nxojbairP4dHNGr2cCKgSec4IFnu6k5gG+CqijxcF8=" }, "org/rauschig#jarchivelib/0.6.0": { "jar": "sha256-u/9XGPF0HRYkJreWaPJKznhTPHicnEBJtbewxTF39BQ=", diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix index 9760b78020ad..e9aa6d571cf9 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix @@ -2,8 +2,8 @@ stdenv, lib, fetchFromGitHub, - gradle, - jdk24, + gradle_9, + jdk25, wrapGAppsHook3, libXxf86vm, libXtst, @@ -16,15 +16,18 @@ makeDesktopItem, writeScript, }: +let + gradle = gradle_9; +in stdenv.mkDerivation rec { pname = "ed-odyssey-materials-helper"; - version = "3.0.1"; + version = "3.0.6"; src = fetchFromGitHub { owner = "jixxed"; repo = "ed-odyssey-materials-helper"; tag = version; - hash = "sha256-tdpt0/TO7K1bK6OMCR9s5TbN1/v1ZywCzO/IvdOfsSA="; + hash = "sha256-4VxaQF1kmBo/9M0psr7jvshy1XhS02zUSMSuWvyEcoo="; }; nativeBuildInputs = [ @@ -63,7 +66,7 @@ stdenv.mkDerivation rec { }; gradleFlags = [ - "-Dorg.gradle.java.home=${jdk24}" + "-Dorg.gradle.java.home=${jdk25}" "--stacktrace" ]; diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index 0fb3df084bdd..cc0d673ec4a6 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii"; - version = "6.4.0"; + version = "6.4.2"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; tag = "v${finalAttrs.version}"; - hash = "sha256-X/rihS5iOVAFJsqTG2Bq1V/G1ITFxxJIS+YDI0TKfE4="; + hash = "sha256-nGXFFGVw0TCXSBwMExk6wn0Es0HwCnY4P+nbJki+R6A="; }; buildInputs = [ php84 ]; @@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerNoScripts = true; composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-ICoOD0cJrsSphJ9Ke86qO9/cOZst30pwAXDjerV+Ds4="; + vendorHash = "sha256-siLLtF/B2eNsRaazq5zOXnFeFPlEeoSAIXYKEsrHv28="; }; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-6SMXXc1aJiHpWloRuY6Rd6NhuS5xQ0QuInlu5fLUHvk="; + hash = "sha256-WV1MsCbYxEHUEw0yYqD8b9jracyLVbpndWuHY0ZbaEM="; }; preInstall = '' diff --git a/pkgs/by-name/fu/fuzzylite/package.nix b/pkgs/by-name/fu/fuzzylite/package.nix index 3bdc571d12c5..ac8d5ab4b268 100644 --- a/pkgs/by-name/fu/fuzzylite/package.nix +++ b/pkgs/by-name/fu/fuzzylite/package.nix @@ -5,19 +5,19 @@ cmake, ninja, useFloat ? false, + unstableGitUpdater, }: stdenv.mkDerivation rec { pname = "fuzzylite"; - version = "6.0"; + version = "6.0-unstable-2025-08-30"; src = fetchFromGitHub { owner = "fuzzylite"; repo = "fuzzylite"; - rev = "v${version}"; - hash = "sha256-i1txeUE/ZSRggwLDtpS8dd4uuZfHX9w3zRH0gBgGXnk="; + rev = "fe62b61ad0e301fbd8868d5fc3d76d7590c59636"; + hash = "sha256-p3ikdY3kfC8N7XsHHa3HzWI0blciWoxCHiEOOUt2yLY="; }; - sourceRoot = "${src.name}/fuzzylite"; outputs = [ "out" @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { "-DFL_USE_FLOAT:BOOL=${if useFloat then "ON" else "OFF"}" ]; + # use unstable as latest release does not yet support cmake-4 + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + meta = with lib; { description = "Fuzzy logic control library in C++"; mainProgram = "fuzzylite"; diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index a075a7377e82..3269b59c3702 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -1,12 +1,14 @@ { lib, + stdenv, buildNpmPackage, fetchFromGitHub, - nix-update-script, - ripgrep, jq, pkg-config, + clang_20, libsecret, + ripgrep, + nix-update-script, }: buildNpmPackage (finalAttrs: { @@ -25,7 +27,8 @@ buildNpmPackage (finalAttrs: { nativeBuildInputs = [ jq pkg-config - ]; + ] + ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optionalDependencies keytar buildInputs = [ ripgrep diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix index b228e67460c4..f3aab87e1997 100644 --- a/pkgs/by-name/gi/gildas/package.nix +++ b/pkgs/by-name/gi/gildas/package.nix @@ -24,8 +24,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "sep25a"; - version = "20250901_a"; + srcVersion = "oct25a"; + version = "20251001_a"; pname = "gildas"; src = fetchurl { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - hash = "sha256-W2l2n6W8L5Gr7taw9ZUvVVp9sZvjne56sjtUU91U0oE="; + hash = "sha256-n1IQajRXIHWkaFpLOtctlm4P+2vrxTWdyQiD3caQd3A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index 1310b45ea1fa..c352baf14319 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -50,14 +50,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-rWMLawtz4dEYrM5Fj+wb8efQ5ClTDyZo7FgvT4u3jmU="; }; - patches = [ - (fetchpatch { - name = "CVE-2025-11230.patch"; - url = "https://github.com/haproxy/haproxy/commit/06675db4bf234ed17e14305f1d59259d2fe78b06.patch"; - hash = "sha256-ULHN2gj4TZHUEDIJ6FAaRoyth/wz4VhXOf6maFfkhJA="; - }) - ]; - buildInputs = [ sslPkg zlib diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 5fbc9e98ab53..1ee656cdc5c5 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -98,8 +98,11 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SYSTEM_LLVM" true) (lib.cmakeBool "USE_SYSTEM_NLOHMANN_JSON" true) (lib.cmakeBool "USE_SYSTEM_YARA" true) + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + # Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/modules/PostprocessBundle.cmake \ @@ -139,6 +142,7 @@ stdenv.mkDerivation (finalAttrs: { kashw2 cafkafk govanify + ryand56 ]; platforms = with lib.platforms; linux ++ darwin; }; diff --git a/pkgs/by-name/ju/julius/cmake4.patch b/pkgs/by-name/ju/julius/cmake4.patch new file mode 100644 index 000000000000..40d58f3514fc --- /dev/null +++ b/pkgs/by-name/ju/julius/cmake4.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b725e9a..f5ffa5f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.10) + include(CMakeDependentOption) + + set(TARGET_PLATFORM "default" CACHE STRING "Platform to cross-compile for. Options: vita switch android ios emscripten. Leave blank for no cross compilation") diff --git a/pkgs/by-name/ju/julius/package.nix b/pkgs/by-name/ju/julius/package.nix index 9a9147c04f78..be56dc23ea97 100644 --- a/pkgs/by-name/ju/julius/package.nix +++ b/pkgs/by-name/ju/julius/package.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { }; patches = [ + # This fixes the build with cmake 4 + ./cmake4.patch # This fixes the darwin bundle generation, sets min. deployment version # and patches SDL2_mixer include ./darwin-fixes.patch diff --git a/pkgs/by-name/ku/kubectl-ai/package.nix b/pkgs/by-name/ku/kubectl-ai/package.nix index f567bda5d219..83fc62d0fdc3 100644 --- a/pkgs/by-name/ku/kubectl-ai/package.nix +++ b/pkgs/by-name/ku/kubectl-ai/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kubectl-ai"; - version = "0.0.25"; + version = "0.0.26"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubectl-ai"; tag = "v${finalAttrs.version}"; - hash = "sha256-ORCOZ0U8BEpLfKa7s8Z/7spmdKebf+F2IpP252s/vQk="; + hash = "sha256-xWZcBTYPsVlv8pywQ12YDx2S3TQ0qXnRvoG5MAV4bdA="; }; - vendorHash = "sha256-l+KHc5RJKqoXTbCIM8mAbuSWBMofgqLsYltgr0ZgfWM="; + vendorHash = "sha256-LWOJhncRZ1f9I5BtPl4LPcEMWYhl8rZDk5pWDuO+2Nk="; # Build the main command subPackages = [ "cmd" ]; diff --git a/pkgs/by-name/li/libdivsufsort/package.nix b/pkgs/by-name/li/libdivsufsort/package.nix index 9a229a015875..05f3f629fa8d 100644 --- a/pkgs/by-name/li/libdivsufsort/package.nix +++ b/pkgs/by-name/li/libdivsufsort/package.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_DIVSUFSORT64=YES" + "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix index 7ab7510f5069..a731de75f91e 100644 --- a/pkgs/by-name/li/libmediainfo/package.nix +++ b/pkgs/by-name/li/libmediainfo/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "25.07.1"; + version = "25.09"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-jm6S8gzyynzoq6U60LWJqJovp9/T55cdOFAQms1JvtU="; + hash = "sha256-hWLo6gPir4veJ/ZteaD1c4WbjxMZPsEVq/EPc1sxOhI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libversion/package.nix b/pkgs/by-name/li/libversion/package.nix index c1f1af764b0d..844ec4889c4c 100644 --- a/pkgs/by-name/li/libversion/package.nix +++ b/pkgs/by-name/li/libversion/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libversion"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "repology"; repo = "libversion"; rev = version; - hash = "sha256-REmXD0NFd7Af01EU/f2IGoTKiju6ErTI7WUinvrAzaA="; + hash = "sha256-USgSwAdRHEepq9ZTDHVWkPsZjljfh9sEWOZRfu0H7Go="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/li/libxc/package.nix b/pkgs/by-name/li/libxc/package.nix index 81e1224b31e2..85a4867882d4 100644 --- a/pkgs/by-name/li/libxc/package.nix +++ b/pkgs/by-name/li/libxc/package.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" "-DENABLE_XHOST=OFF" diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index f9b3c5caeaa7..ffadb233ea10 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.693"; + version = "0.694"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-9D6nIuRP/MyzTYDp7Uo5RcK4QrF+YMV6tTVMX/mAKY8="; + hash = "sha256-PA7wcrbGRfrMYgT9vWcpPEgZot+HNkQrptPuEArVM3Q="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 164745df9347..65730a6ec682 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -31,7 +31,8 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools_rust>=1.3,<=1.11.1" "setuptools_rust<=1.12,>=1.3" + --replace-fail "setuptools_rust>=1.3,<=1.11.1" "setuptools_rust<=1.12,>=1.3" \ + --replace-fail "poetry-core>=1.1.0,<=2.1.3" "poetry-core>=1.1.0,<=2.3.0" ''; build-system = with python3Packages; [ diff --git a/pkgs/by-name/me/mediainfo/package.nix b/pkgs/by-name/me/mediainfo/package.nix index 3276846bb06b..f9c794c55b2a 100644 --- a/pkgs/by-name/me/mediainfo/package.nix +++ b/pkgs/by-name/me/mediainfo/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "25.07"; + version = "25.09"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-UI6sHKCX9Byz/DliWs6wZS/KsArNDy68vR3GgAk26X0="; + hash = "sha256-jUug2L19QJf9CjiNQTHeQMNaxdvlKkdgt52PHSnvLmM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mx/mxnet/package.nix b/pkgs/by-name/mx/mxnet/package.nix index 47941595a72a..28635ac2745c 100644 --- a/pkgs/by-name/mx/mxnet/package.nix +++ b/pkgs/by-name/mx/mxnet/package.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") "-DUSE_MKL_IF_AVAILABLE=OFF" "-DUSE_CUDA=OFF" "-DUSE_CUDNN=OFF" diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix index 1b3b84c29b98..77df852fc292 100644 --- a/pkgs/by-name/om/omnom/package.nix +++ b/pkgs/by-name/om/omnom/package.nix @@ -13,17 +13,17 @@ buildGoModule (finalAttrs: { pname = "omnom"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "asciimoo"; repo = "omnom"; tag = "v${finalAttrs.version}"; - hash = "sha256-wFUKoM8xiuAfmBCQJ4BgX7gQ1FmU2yHSs/RkQI0WxI4="; + hash = "sha256-auujlRG3RKJYYTi/iptx0Y3Yzqmt6i9AlfjVcqn5YPc="; fetchSubmodules = true; }; - vendorHash = "sha256-Ie486oAsgsOM5hDURD+1bfnGIUqkeW2bOaIDiwWWq+0="; + vendorHash = "sha256-0usbfvGz+9chLGyHHUUStUh7x91ZGfr/+gAXXVA5iNc="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix index ca4cab8b6cba..0b15ba7706c6 100644 --- a/pkgs/by-name/op/openjfx/package.nix +++ b/pkgs/by-name/op/openjfx/package.nix @@ -36,14 +36,12 @@ jdk17_headless, jdk21_headless, jdk23_headless, - jdk24_headless, jdk25_headless, jdk-bootstrap ? { "17" = jdk17_headless; "21" = jdk21_headless; "23" = jdk23_headless; - "24" = jdk24_headless; "25" = jdk25_headless; } .${featureVersion}, diff --git a/pkgs/by-name/pa/pattypan/package.nix b/pkgs/by-name/pa/pattypan/package.nix index 7145f56a9289..bc2e164a8ea9 100644 --- a/pkgs/by-name/pa/pattypan/package.nix +++ b/pkgs/by-name/pa/pattypan/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ ant - jdk + jdk' makeWrapper wrapGAppsHook3 copyDesktopItems diff --git a/pkgs/by-name/pc/pcmsolver/package.nix b/pkgs/by-name/pc/pcmsolver/package.nix index daca5a3ce17c..2e34570f4c72 100644 --- a/pkgs/by-name/pc/pcmsolver/package.nix +++ b/pkgs/by-name/pc/pcmsolver/package.nix @@ -45,7 +45,10 @@ stdenv.mkDerivation rec { # Required for build with gcc-14 env.NIX_CFLAGS_COMPILE = "-std=c++14"; - cmakeFlags = [ "-DENABLE_OPENMP=ON" ]; + cmakeFlags = [ + "-DENABLE_OPENMP=ON" + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index b179a3e85e6f..26caf9199772 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "Pinta"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "PintaProject"; repo = "Pinta"; rev = version; - hash = "sha256-oqhRRfZXBbxQ3ojvam4Q/iuHqGQeqd27hYF9SFKc774="; + hash = "sha256-enCVn52wy42a1cXM2YYCg7RHpkzZoDHc52L6xlxQOo0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/pluginval/package.nix b/pkgs/by-name/pl/pluginval/package.nix new file mode 100644 index 000000000000..cf982a0ceabf --- /dev/null +++ b/pkgs/by-name/pl/pluginval/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + alsa-lib, + fontconfig, + freetype, + libX11, + libXcomposite, + libXcursor, + libXdmcp, + libXext, + libXinerama, + libXrandr, + libXtst, + ladspaH, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pluginval"; + version = "1.0.4"; + src = fetchFromGitHub { + owner = "Tracktion"; + repo = "pluginval"; + tag = "v${finalAttrs.version}"; + hash = "sha256-j4Lb3pcw0931o63OvTTaIm2UzvYDIjmnaCXGvKB4gwM="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + alsa-lib + fontconfig + freetype + libX11 + libXcomposite + libXcursor + libXdmcp + libXext + libXinerama + libXrandr + libXtst + ladspaH + ]; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Debug") + ]; + + installPhase = '' + runHook preInstall + install -Dm755 pluginval_artefacts/Debug/pluginval $out/bin/pluginval + runHook postInstall + ''; + + meta = { + description = "Cross-platform plugin validator and tester for AU/VST2/VST3 plugins"; + homepage = "https://github.com/Tracktion/pluginval"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ magnetophon ]; + platforms = lib.platforms.linux; + mainProgram = "pluginval"; + }; +}) diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index 73ddb2e0a951..fa9dc7be25bc 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -4,17 +4,18 @@ fetchFromGitHub, buildGoModule, testers, + nix-update-script, }: buildGoModule (finalAttrs: { pname = "podman-tui"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-lvqitz4H10ILg2b6Mlw1DoWoByFKJaDiCo5zTlzTBQ4="; + hash = "sha256-vE2GG7lDGORTuziNSoKJWNKGhskcGuEh6U2KHrGu0JQ="; }; vendorHash = null; @@ -48,11 +49,16 @@ buildGoModule (finalAttrs: { version = "v${finalAttrs.version}"; }; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/containers/podman-tui"; description = "Podman Terminal UI"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ aaronjheng ]; + maintainers = with lib.maintainers; [ + aaronjheng + iedame + ]; mainProgram = "podman-tui"; }; }) diff --git a/pkgs/by-name/po/powerdns-admin/0005-Fix-app-context-and-register-modules.patch b/pkgs/by-name/po/powerdns-admin/0005-Fix-app-context-and-register-modules.patch new file mode 100644 index 000000000000..3004134a0ac4 --- /dev/null +++ b/pkgs/by-name/po/powerdns-admin/0005-Fix-app-context-and-register-modules.patch @@ -0,0 +1,58 @@ +diff --git a/powerdnsadmin/__init__.py b/powerdnsadmin/__init__.py +index 660f96b..4d45c36 100755 +--- a/powerdnsadmin/__init__.py ++++ b/powerdnsadmin/__init__.py +@@ -72,10 +72,16 @@ def create_app(config=None): + # SMTP + app.mail = Mail(app) + ++ from powerdnsadmin.routes.index import register_modules ++ + # Load app's components + assets.init_app(app) + models.init_app(app) +- routes.init_app(app) ++ ++ with app.app_context(): ++ register_modules() ++ routes.init_app(app) ++ + services.init_app(app) + + # Register filters +diff --git a/powerdnsadmin/routes/index.py b/powerdnsadmin/routes/index.py +index 0918261..870d824 100644 +--- a/powerdnsadmin/routes/index.py ++++ b/powerdnsadmin/routes/index.py +@@ -52,11 +52,16 @@ def register_modules(): + global azure + global oidc + global saml +- google = google_oauth() +- github = github_oauth() +- azure = azure_oauth() +- oidc = oidc_oauth() +- saml = SAML() ++ ++ try: ++ google = google_oauth() ++ github = github_oauth() ++ azure = azure_oauth() ++ oidc = oidc_oauth() ++ saml = SAML() ++ except Exception: ++ # Database not ready yet, will initialize on first request ++ pass + + + @index_bp.before_request +@@ -65,6 +70,9 @@ def before_request(): + g.user = current_user + login_manager.anonymous_user = Anonymous + ++ if google is None: ++ register_modules() ++ + # Check site is in maintenance mode + maintenance = Setting().get('maintenance') + if maintenance and current_user.is_authenticated and current_user.role.name not in [ diff --git a/pkgs/by-name/po/powerdns-admin/0005-Use-app-context-to-create-routes.patch b/pkgs/by-name/po/powerdns-admin/0005-Use-app-context-to-create-routes.patch deleted file mode 100644 index b6931c25d546..000000000000 --- a/pkgs/by-name/po/powerdns-admin/0005-Use-app-context-to-create-routes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3eb1a408758b68543c73d5214b467c2905fbea2a Mon Sep 17 00:00:00 2001 -From: Flakebi -Date: Sat, 2 Dec 2023 16:32:36 +0100 -Subject: [PATCH 5/6] Use app context to create routes - -Routes creates session database tables, so it needs a context. ---- - powerdnsadmin/__init__.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/powerdnsadmin/__init__.py b/powerdnsadmin/__init__.py -index 653af33..bc6f7df 100755 ---- a/powerdnsadmin/__init__.py -+++ b/powerdnsadmin/__init__.py -@@ -73,7 +73,8 @@ def create_app(config=None): - # Load app's components - assets.init_app(app) - models.init_app(app) -- routes.init_app(app) -+ with app.app_context(): -+ routes.init_app(app) - services.init_app(app) - - # Register filters --- -2.42.0 - diff --git a/pkgs/by-name/po/powerdns-admin/0006-Fix-regex.patch b/pkgs/by-name/po/powerdns-admin/0006-Fix-regex.patch new file mode 100644 index 000000000000..2906d3709b04 --- /dev/null +++ b/pkgs/by-name/po/powerdns-admin/0006-Fix-regex.patch @@ -0,0 +1,46 @@ +diff --git a/powerdnsadmin/lib/utils.py b/powerdnsadmin/lib/utils.py +index f8cc997..0de4c5c 100644 +--- a/powerdnsadmin/lib/utils.py ++++ b/powerdnsadmin/lib/utils.py +@@ -121,7 +121,7 @@ def display_record_name(data): + if record_name == domain_name: + return '@' + else: +- return re.sub('\.{}$'.format(domain_name), '', record_name) ++ return re.sub(r'\.{}$'.format(domain_name), '', record_name) + + + def display_master_name(data): +diff --git a/powerdnsadmin/models/domain.py b/powerdnsadmin/models/domain.py +index f0b9a30..84c6d1b 100644 +--- a/powerdnsadmin/models/domain.py ++++ b/powerdnsadmin/models/domain.py +@@ -482,24 +482,24 @@ class Domain(db.Model): + if re.search('ip6.arpa', reverse_host_address): + for i in range(1, 32, 1): + address = re.search( +- '((([a-f0-9]\.){' + str(i) + '})(?P.+6.arpa)\.?)', ++ r'((([a-f0-9]\.){' + str(i) + r'})(?P.+6\.arpa)\.?)', + reverse_host_address) + if None != self.get_id_by_name(address.group('ipname')): + c = i + break + return re.search( +- '((([a-f0-9]\.){' + str(c) + '})(?P.+6.arpa)\.?)', ++ r'((([a-f0-9]\.){' + str(c) + r'})(?P.+6\.arpa)\.?)', + reverse_host_address).group('ipname') + else: + for i in range(1, 4, 1): + address = re.search( +- '((([0-9]+\.){' + str(i) + '})(?P.+r.arpa)\.?)', ++ r'((([0-9]+\.){' + str(i) + r'})(?P.+r\.arpa)\.?)', + reverse_host_address) + if None != self.get_id_by_name(address.group('ipname')): + c = i + break + return re.search( +- '((([0-9]+\.){' + str(c) + '})(?P.+r.arpa)\.?)', ++ r'((([0-9]+\.){' + str(c) + r'})(?P.+r\.arpa)\.?)', + reverse_host_address).group('ipname') + + def delete(self, domain_name): diff --git a/pkgs/by-name/po/powerdns-admin/0006-Register-modules-before-starting.patch b/pkgs/by-name/po/powerdns-admin/0006-Register-modules-before-starting.patch deleted file mode 100644 index dd552cc28403..000000000000 --- a/pkgs/by-name/po/powerdns-admin/0006-Register-modules-before-starting.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 86dcc9f308d2ca65704953f1ff9fe043d743e536 Mon Sep 17 00:00:00 2001 -From: Flakebi -Date: Sat, 2 Dec 2023 16:33:45 +0100 -Subject: [PATCH 6/6] Register modules before starting - -Fixes flask 2.3: 'Blueprint' object has no attribute 'before_app_first_request' ---- - run.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/run.py b/run.py -index 5ffcde3..52e719d 100755 ---- a/run.py -+++ b/run.py -@@ -1,6 +1,9 @@ - #!/usr/bin/env python3 - from powerdnsadmin import create_app -+from .powerdnsadmin.routes.index import register_modules - - if __name__ == '__main__': - app = create_app() -+ with app.app_context(): -+ register_modules() - app.run(debug=True, host=app.config.get('BIND_ADDRESS', '127.0.0.1'), port=app.config.get('PORT', '9191')) --- -2.42.0 - diff --git a/pkgs/by-name/po/powerdns-admin/package.nix b/pkgs/by-name/po/powerdns-admin/package.nix index d7dc896400e6..ad085252faba 100644 --- a/pkgs/by-name/po/powerdns-admin/package.nix +++ b/pkgs/by-name/po/powerdns-admin/package.nix @@ -15,7 +15,7 @@ let src = fetchFromGitHub { owner = "PowerDNS-Admin"; repo = "PowerDNS-Admin"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-q9mt8wjSNFb452Xsg+qhNOWa03KJkYVGAeCWVSzZCyk="; }; @@ -67,7 +67,6 @@ let zipp zxcvbn standard-imghdr - ]; all_patches = [ @@ -132,8 +131,8 @@ stdenv.mkDerivation { patches = all_patches ++ [ ./0003-Fix-flask-migrate-4.0-compatibility.patch ./0004-Fix-flask-session-and-powerdns-admin-compatibility.patch - ./0005-Use-app-context-to-create-routes.patch - ./0006-Register-modules-before-starting.patch + ./0005-Fix-app-context-and-register-modules.patch + ./0006-Fix-regex.patch ]; postPatch = '' @@ -167,12 +166,12 @@ stdenv.mkDerivation { tests = nixosTests.powerdns-admin; }; - meta = with lib; { + meta = { description = "PowerDNS web interface with advanced features"; mainProgram = "powerdns-admin"; homepage = "https://github.com/PowerDNS-Admin/PowerDNS-Admin"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Flakebi zhaofengli ]; diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index 825567145481..d6c20e3564e1 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.47.1"; + version = "0.48.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-c7g+Y2owuoWqwvhNfsW18ppw8eLG0nAeFIFuoRqvPJY="; + hash = "sha256-Z3FRPk7FGqOraATtrdrrhwMr1mVC4lStDp3seCrKPGw="; }; - cargoHash = "sha256-h4LSFfL+qzkuZ8MToI0MNxSGPCzJUmYgVoGwoYnXboE="; + cargoHash = "sha256-tzW3za0cn8qMsqEs+U10ud/tvU+eFxtolmyJDpf6WoY="; doCheck = false; # test requires network access diff --git a/pkgs/by-name/re/reth/package.nix b/pkgs/by-name/re/reth/package.nix index 7574d1757576..04c5650d3dca 100644 --- a/pkgs/by-name/re/reth/package.nix +++ b/pkgs/by-name/re/reth/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "reth"; - version = "1.7.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "paradigmxyz"; repo = "reth"; rev = "v${version}"; - hash = "sha256-Th2ibG4fVQPPxRSS4ChOQ176xUq3eU1/zNQbQlJUFNw="; + hash = "sha256-Z84zCt/v6e++Et6a2hBcHfrzQvtzBEn+Zx1bBRJfiqM="; }; - cargoHash = "sha256-2zdilVIHCW0N2yZNfLNoVpTASjXU1ABcZzQLzpAGEsY="; + cargoHash = "sha256-KxUiiOTlMNlPw4pHjEcqXsMF3RCA0KVO66WKpz1YoT0="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index b3263710efbb..957d68a1ed3e 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "rqlite"; - version = "9.1.0"; + version = "9.1.2"; src = fetchFromGitHub { owner = "rqlite"; repo = "rqlite"; tag = "v${finalAttrs.version}"; - hash = "sha256-q2T5Ze+rR2KfBvrtIiVa9W8DICxErdeRLA3aNKbyMCo="; + hash = "sha256-7QAJofhssL2N5szD4j9rcv830sEnMyrS2Mg4s4G33HI="; }; - vendorHash = "sha256-Mq469sUYgS19SVJ7noTUl7hml9xUAGDsr64MJM8Xq9g="; + vendorHash = "sha256-zGAC7yDccfhZ+2WeiN9DAsOFTa3j4ymPxeFNwam7+Ts="; subPackages = [ "cmd/rqlite" diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix index 6ca6d2c123ea..a48dce995f98 100644 --- a/pkgs/by-name/ru/rundeck/package.nix +++ b/pkgs/by-name/ru/rundeck/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "rundeck"; - version = "5.15.0-20250902"; + version = "5.16.0-20251006"; src = fetchurl { url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167"; - hash = "sha256-3Nlpd0Sl6NCH+TNPNnh7NJxzOZUNQvKupyFOQOdJsto="; + hash = "sha256-ws84HDqowYz2ouvN7E3SlouGZdZUDVDK4LUmzKXOyec="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ru/rusty-bash/Cargo.lock b/pkgs/by-name/ru/rusty-bash/Cargo.lock index c8e77afd52ee..b3253079a4ad 100644 --- a/pkgs/by-name/ru/rusty-bash/Cargo.lock +++ b/pkgs/by-name/ru/rusty-bash/Cargo.lock @@ -1,6 +1,21 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "ambient-authority" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9d4ee0d472d1cd2e28c97dfa124b3d8d992e10eb0a035f33f5d12e3a177ba3b" [[package]] name = "bitflags" @@ -10,15 +25,69 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "bumpalo" +version = "3.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" + +[[package]] +name = "cap-fs-ext" +version = "3.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e41cc18551193fe8fa6f15c1e3c799bc5ec9e2cfbfaa8ed46f37013e3e6c173c" +dependencies = [ + "cap-primitives", + "cap-std", + "io-lifetimes", + "windows-sys 0.59.0", +] + +[[package]] +name = "cap-primitives" +version = "3.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a1e394ed14f39f8bc26f59d4c0c010dbe7f0a1b9bafff451b1f98b67c8af62a" +dependencies = [ + "ambient-authority", + "fs-set-times", + "io-extras", + "io-lifetimes", + "ipnet", + "maybe-owned", + "rustix 1.1.2", + "rustix-linux-procfs", + "windows-sys 0.59.0", + "winx", +] + +[[package]] +name = "cap-std" +version = "3.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07c0355ca583dd58f176c3c12489d684163861ede3c9efa6fd8bba314c984189" +dependencies = [ + "cap-primitives", + "io-extras", + "io-lifetimes", + "rustix 1.1.2", +] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "cfg_aliases" @@ -26,6 +95,42 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "deranged" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "duplex" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4b4ccdcb95f0ced5ddc8e3dbac4a2f029e9433c5ee94e9b9d7c148c86ffcd4" + +[[package]] +name = "errno" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + [[package]] name = "faccess" version = "0.2.4" @@ -38,34 +143,238 @@ dependencies = [ ] [[package]] -name = "libc" -version = "0.2.161" +name = "fd-lock" +version = "4.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" +dependencies = [ + "cfg-if", + "rustix 1.1.2", + "windows-sys 0.59.0", +] + +[[package]] +name = "fluent-bundle" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198" +dependencies = [ + "memchr", + "thiserror 2.0.17", +] + +[[package]] +name = "fs-set-times" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a" +dependencies = [ + "io-lifetimes", + "rustix 1.1.2", + "windows-sys 0.59.0", +] + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "310da2e345f5eb861e7a07ee182262e94975051db9e4223e909ba90f392f163f" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "io-extras" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2285ddfe3054097ef4b2fe909ef8c3bcd1ea52a8f0d274416caebeef39f04a65" +dependencies = [ + "io-lifetimes", + "os_pipe", + "windows-sys 0.59.0", +] + +[[package]] +name = "io-lifetimes" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06432fb54d3be7964ecd3649233cddf80db2832f47fec34c01f65b3d9d774983" +dependencies = [ + "os_pipe", +] + +[[package]] +name = "io-streams" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dda35e0531ef22cbc0c5ed6d000d1dca8653e64e78925d5db1477c4523e36814" +dependencies = [ + "duplex", + "io-extras", + "io-lifetimes", + "memchr", + "os_pipe", + "parking", + "rustix 0.38.44", + "system-interface", +] + +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "js-sys" +version = "0.3.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.176" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "libredox" -version = "0.1.3" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "libc", "redox_syscall", ] +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "log" +version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "maybe-owned" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" + +[[package]] +name = "memchr" +version = "2.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" + [[package]] name = "nix" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.4", "cfg-if", "cfg_aliases", "libc", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "numtoa" version = "0.2.4" @@ -73,30 +382,131 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f" [[package]] -name = "proc-macro2" -version = "1.0.89" +name = "objc" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "os_pipe" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db335f4760b14ead6290116f2427bf33a14d4f0617d49f78a246de10c1831224" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] [[package]] -name = "redox_syscall" -version = "0.5.7" +name = "r-efi" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "bitflags 2.6.0", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags 2.9.4", ] [[package]] @@ -105,20 +515,132 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" +[[package]] +name = "regex" +version = "1.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" + [[package]] name = "rev_lines" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed62916ac7a5ccbf13fa5e1d303029ff015600fee841756dfc134a1ac62bf05f" dependencies = [ - "thiserror", + "thiserror 1.0.69", +] + +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustix" +version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags 2.9.4", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +dependencies = [ + "bitflags 2.9.4", + "errno", + "libc", + "linux-raw-sys 0.11.0", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustix-linux-procfs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fc84bf7e9aa16c4f2c758f27412dc9841341e16aa682d9c7ac308fe3ee12056" +dependencies = [ + "once_cell", + "rustix 1.1.2", +] + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "self_cell" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749" + +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] name = "signal-hook" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" dependencies = [ "libc", "signal-hook-registry", @@ -126,30 +648,68 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" dependencies = [ "libc", ] +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "socketpair" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20296a054f6fb573c1f73e49b0e3afd1efcc643548928fc9c21144f5ecf4f7e3" +dependencies = [ + "io-extras", + "io-lifetimes", + "rustix 1.1.2", + "uuid", + "windows-sys 0.59.0", +] + +[[package]] +name = "sprintf" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78222247fc55e10208ed1ba60f8296390bc67a489bc27a36231765d8d6f60ec5" +dependencies = [ + "thiserror 2.0.17", +] + [[package]] name = "sush" -version = "0.8.5" +version = "1.2.2" dependencies = [ "faccess", + "fluent-bundle", + "io-streams", + "locale_config", "nix", + "once_cell", + "rand", + "rand_chacha", + "regex", "rev_lines", "signal-hook", + "sprintf", "termion", + "time", + "unic-langid", "unicode-width", ] [[package]] name = "syn" -version = "2.0.85" +version = "2.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" +checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" dependencies = [ "proc-macro2", "quote", @@ -157,10 +717,28 @@ dependencies = [ ] [[package]] -name = "termion" -version = "4.0.3" +name = "system-interface" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eaa98560e51a2cf4f0bb884d8b2098a9ea11ecf3b7078e9c68242c74cc923a7" +checksum = "cc4592f674ce18521c2a81483873a49596655b179f71c5e05d10c1fe66c78745" +dependencies = [ + "bitflags 2.9.4", + "cap-fs-ext", + "cap-std", + "fd-lock", + "io-lifetimes", + "os_pipe", + "rustix 0.38.44", + "socketpair", + "windows-sys 0.59.0", + "winx", +] + +[[package]] +name = "termion" +version = "4.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3669a69de26799d6321a5aa713f55f7e2cd37bd47be044b50f2acafc42c122bb" dependencies = [ "libc", "libredox", @@ -170,18 +748,27 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.65" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +dependencies = [ + "thiserror-impl 2.0.17", ] [[package]] name = "thiserror-impl" -version = "1.0.65" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", @@ -189,10 +776,77 @@ dependencies = [ ] [[package]] -name = "unicode-ident" -version = "1.0.13" +name = "thiserror-impl" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.3.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" + +[[package]] +name = "tinystr" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "type-map" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "unic-langid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28ba52c9b05311f4f6e62d5d9d46f094bd6e84cb8df7b3ef952748d752a7d05" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce1bf08044d4b7a94028c93786f8566047edc11110595914de93362559bc658" +dependencies = [ + "tinystr", +] + +[[package]] +name = "unicode-ident" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" [[package]] name = "unicode-width" @@ -200,6 +854,94 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "uuid" +version = "1.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" +dependencies = [ + "getrandom", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "wasi" +version = "0.14.7+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" +dependencies = [ + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" +dependencies = [ + "unicode-ident", +] + [[package]] name = "winapi" version = "0.3.9" @@ -221,3 +963,142 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winx" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d" +dependencies = [ + "bitflags 2.9.4", + "windows-sys 0.59.0", +] + +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + +[[package]] +name = "zerocopy" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" + +[[package]] +name = "zerovec" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" +dependencies = [ + "zerofrom", +] diff --git a/pkgs/by-name/ru/rusty-bash/package.nix b/pkgs/by-name/ru/rusty-bash/package.nix index 834f15db9da8..9b21227fe1b0 100644 --- a/pkgs/by-name/ru/rusty-bash/package.nix +++ b/pkgs/by-name/ru/rusty-bash/package.nix @@ -4,15 +4,15 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rusty-bash"; - version = "0.8.5"; + version = "1.2.2"; src = fetchFromGitHub { owner = "shellgei"; repo = "rusty_bash"; - tag = "v${version}"; - hash = "sha256-hUMkgsWlGSqOnYdFhDGBWbc13oAssklbuJAg8NkY398="; + tag = "v${finalAttrs.version}"; + hash = "sha256-WBV0wF7SKhOKAo+F1IImpPIgLvo9GYkqWrb2GluUtdA="; }; postPatch = '' @@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "sush"; maintainers = with lib.maintainers; [ aleksana ]; }; -} +}) diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 8b02cd52a896..691268e2d6a3 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "saga"; - version = "9.9.2"; + version = "9.9.3"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; - hash = "sha256-fBnHootXNwdnB+TnBMS7U7oPWhs3p7cFvPVbAIwQCBE="; + hash = "sha256-6wyAUf4Dy41OEHqlY1T8wh/RCmPeCboDccX7ieqXPdo="; }; sourceRoot = "saga-${version}/saga-gis"; @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { meta = { description = "System for Automated Geoscientific Analyses"; homepage = "https://saga-gis.sourceforge.io"; - changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog ${version}/"; + changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${version}/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ michelk diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index eb2ebac90e52..ce2bda3d148f 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -14,13 +14,13 @@ }: rustPlatform.buildRustPackage rec { pname = "snx-rs"; - version = "4.8.1"; + version = "4.8.2"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${version}"; - hash = "sha256-/ntw1AuOqTy9s1jY+6UIDqZWtmjr1DVRQur/h0LkkXI="; + hash = "sha256-wVc3iddqXTpsBZqEY+WWR1Taig4crhlQqw7jypm3ZMc="; }; passthru.updateScript = nix-update-script { }; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - cargoHash = "sha256-lLYQ+N5P8p4jiJCo6UyXvXeDT9JRlzIk8VH6UKlqvX0="; + cargoHash = "sha256-HRew3ldsgUbCh4eW1MSvoxLZobSJRjj7Eg0+XRbjFes="; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; diff --git a/pkgs/by-name/so/soapyrtlsdr/package.nix b/pkgs/by-name/so/soapyrtlsdr/package.nix index 31154d62b863..2dbc572ae08f 100644 --- a/pkgs/by-name/so/soapyrtlsdr/package.nix +++ b/pkgs/by-name/so/soapyrtlsdr/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, cmake, pkg-config, rtl-sdr, @@ -28,6 +29,20 @@ stdenv.mkDerivation (finalAttrs: { soapysdr ]; + patches = [ + (fetchpatch2 { + name = "cmake-update.patch"; + url = "https://github.com/pothosware/SoapyRTLSDR/commit/448c9d0d326c2600905b7ce84222ff9d72ba2189.patch?full_index=1"; + hash = "sha256-hWlNowkf9yZM6p+EGh+IiUm2JfG5mLe8Qq8gTVIdIak="; + }) + + (fetchpatch2 { + name = "fix-cmake4-build.patch"; + url = "https://github.com/pothosware/SoapyRTLSDR/commit/bb2d1511b957138051764c9193a3d6971e912b85.patch?full_index=1"; + hash = "sha256-C90B5WMjx1lJKiX0F/cAfGmz2WRc2BA84FTmVmnC+DI="; + }) + ]; + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with lib; { diff --git a/pkgs/by-name/so/soapyuhd/package.nix b/pkgs/by-name/so/soapyuhd/package.nix index fba5ed77970d..444707bf320a 100644 --- a/pkgs/by-name/so/soapyuhd/package.nix +++ b/pkgs/by-name/so/soapyuhd/package.nix @@ -11,13 +11,14 @@ stdenv.mkDerivation { pname = "soapyuhd"; - version = "0.4.1-unstable-2025-02-13"; + version = "0.4.1-unstable-2025-10-05"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyUHD"; - rev = "6b521393cc45c66770f3d4bc69eac7dda982174c"; - sha256 = "qg0mbw3S973cnok6tVx7Y38ijOQcJdHtPLi889uo7tI="; + # version that supports cmake 4 + rev = "cf78b9ca3bddfc9263d2acb7e8afcb0036938163"; + hash = "sha256-/hJ78dUL477gX3c2kV8kUknIk01PUf+ie1Gl7Ujq1Ac="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spaghettikart/package.nix b/pkgs/by-name/sp/spaghettikart/package.nix index cf08606d5daf..b64e43f97b84 100644 --- a/pkgs/by-name/sp/spaghettikart/package.nix +++ b/pkgs/by-name/sp/spaghettikart/package.nix @@ -4,6 +4,7 @@ applyPatches, writeTextFile, fetchurl, + fetchpatch, stdenv, replaceVars, yaml-cpp, @@ -100,6 +101,19 @@ let hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88="; }; + # Include cmake4 patch + # Remove when yaml-cpp.src is updated to include it + yaml-patched = applyPatches { + src = yaml-cpp.src; + patches = [ + (fetchpatch { + name = "yaml-cpp-fix-cmake-4.patch"; + url = "https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e.patch"; + hash = "sha256-1kXRa+xrAbLEhcJxNV1oGHPmayj1RNIe6dDWXZA3mUA="; + }) + ]; + }; + in stdenv.mkDerivation (finalAttrs: { pname = "spaghettikart"; @@ -183,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TINYXML2" "${tinyxml-2}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cpp.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-patched}") ]; strictDeps = true; diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix index 26082e60cf9f..513ba73b6ecc 100644 --- a/pkgs/by-name/st/steam-unwrapped/package.nix +++ b/pkgs/by-name/st/steam-unwrapped/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "steam-unwrapped"; - version = "1.0.0.84"; + version = "1.0.0.85"; src = fetchurl { # use archive url so the tarball doesn't 404 on a new release url = "https://repo.steampowered.com/steam/archive/stable/steam_${finalAttrs.version}.tar.gz"; - hash = "sha256-Mfp2LVh5Pxqo6p3wEiw0acJT/IrLbapxQPt0M/4He0Q="; + hash = "sha256-fy03Si+0E87VuBJRUUViGdkYolWHK0u3cBbLzPOLt/E="; }; patches = [ diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 214b21ffe8a2..b7153b7ce737 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.20"; + version = "3.16.23"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-z3VWoF5/evd0n97AmrWgSskaNqVaad0Ex2pn53JHkSk="; + hash = "sha256-xwfozRzPrq8PybpRYVkQ/RXF4AbroLk3FMA32XCnFrk="; }; outputs = [ diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix index a4193931ed0e..bcc9c9c8f80c 100644 --- a/pkgs/by-name/su/sudo-rs/package.nix +++ b/pkgs/by-name/su/sudo-rs/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sudo-rs"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "trifectatechfoundation"; repo = "sudo-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-82qd9lVwxI9Md7NWpfauGWKtvR1MvX9VNZ9e1RvzmP4="; + hash = "sha256-gHvTOwMzpkfyjLiJlL+CYswiccDBFIR8Xm3r86IFv+w="; }; - cargoHash = "sha256-hvXVdPs2K1FPi06NZSockNXA9QOnXOsrONiMCTiIs2I="; + cargoHash = "sha256-Z8ml1pKqL2zpz7QanM1skVqr0vJaJ4uegjiYSxMOkr0="; nativeBuildInputs = [ installShellFiles ]; @@ -97,6 +97,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mit ]; maintainers = with lib.maintainers; [ + adamcstephens nicoo rvdp ]; diff --git a/pkgs/by-name/su/superTux/package.nix b/pkgs/by-name/su/superTux/package.nix index 46d2bd9bb0c6..1fb3137615f7 100644 --- a/pkgs/by-name/su/superTux/package.nix +++ b/pkgs/by-name/su/superTux/package.nix @@ -32,6 +32,29 @@ stdenv.mkDerivation rec { postPatch = '' sed '1i#include ' -i external/partio_zip/zip_manager.hpp # gcc12 + # Fix build with cmake 4. Remove for version >= 0.6.4. + # See + substituteInPlace CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 3.1)' \ + 'cmake_minimum_required(VERSION 4.0)' + substituteInPlace external/physfs/CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 2.8.12)' \ + 'cmake_minimum_required(VERSION 4.0)' + substituteInPlace external/sexp-cpp/CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 3.0)' \ + 'cmake_minimum_required(VERSION 4.0)' + substituteInPlace external/squirrel/CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 2.8)' \ + 'cmake_minimum_required(VERSION 4.0)' + substituteInPlace external/tinygettext/CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 2.4)' \ + 'cmake_minimum_required(VERSION 4.0)' + substituteInPlace external/SDL_ttf/CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 3.0)' \ + 'cmake_minimum_required(VERSION 4.0)' + substituteInPlace external/discord-sdk/CMakeLists.txt --replace-fail \ + 'cmake_minimum_required (VERSION 3.2.0)' \ + 'cmake_minimum_required (VERSION 4.0)' ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/th/thinkfan/package.nix b/pkgs/by-name/th/thinkfan/package.nix index d6fcdf56541c..57347b91052d 100644 --- a/pkgs/by-name/th/thinkfan/package.nix +++ b/pkgs/by-name/th/thinkfan/package.nix @@ -3,40 +3,42 @@ stdenv, fetchFromGitHub, cmake, + lm_sensors, yaml-cpp, pkg-config, procps, - coreutils, smartSupport ? false, libatasmart, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "thinkfan"; - version = "1.3.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "vmatare"; repo = "thinkfan"; - rev = version; - sha256 = "sha256-aREZv+t4QhtfLKOMrneLiRxgnu0fzB8UV8dvr1dnhx4="; + tag = finalAttrs.version; + hash = "sha256-QqDWPOXy8E+TY5t0fFRAS8BGA7ZH90xecv5UsFfDssk="; }; - postPatch = '' - # fix hardcoded install path - substituteInPlace CMakeLists.txt --replace /etc $out/etc - - # fix command paths in unit files - for unit in rcscripts/systemd/*; do - substituteInPlace "$unit" \ - --replace /bin/kill ${procps}/bin/kill \ - --replace /usr/bin/pkill ${procps}/bin/pkill \ - --replace /usr/bin/sleep ${coreutils}/bin/sleep - done + postPatch = # fix hardcoded install path + '' + substituteInPlace CMakeLists.txt \ + --replace-fail "/etc" "$out/etc" + '' + # fix command paths in unit files + + '' + substituteInPlace rcscripts/systemd/thinkfan-sleep.service \ + --replace-fail "/usr/bin/pkill" "${lib.getExe' procps "pkill"}" + substituteInPlace rcscripts/systemd/thinkfan-wakeup.service \ + --replace-fail "/usr/bin/pkill" "${lib.getExe' procps "pkill"}" + substituteInPlace rcscripts/systemd/thinkfan.service.cmake \ + --replace-fail "/bin/kill" "${lib.getExe' procps "kill"}" ''; cmakeFlags = [ - "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}" + "-DCMAKE_INSTALL_DOCDIR=share/doc/thinkfan" "-DUSE_NVML=OFF" # force install unit files "-DSYSTEMD_FOUND=ON" @@ -48,7 +50,11 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = [ yaml-cpp ] ++ lib.optional smartSupport libatasmart; + buildInputs = [ + lm_sensors + yaml-cpp + ] + ++ lib.optional smartSupport libatasmart; meta = { description = "Simple, lightweight fan control program"; @@ -65,4 +71,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "thinkfan"; }; -} +}) diff --git a/pkgs/by-name/to/toppler/package.nix b/pkgs/by-name/to/toppler/package.nix index e1a118094795..c8db49d899f8 100644 --- a/pkgs/by-name/to/toppler/package.nix +++ b/pkgs/by-name/to/toppler/package.nix @@ -10,7 +10,7 @@ gettext, povray, imagemagick, - gimp, + gimp2, sdl2-compat, SDL2_mixer, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { gettext povray imagemagick - gimp + gimp2 # GIMP needs a writable home writableTmpDirAsHomeHook ]; diff --git a/pkgs/by-name/us/usbtop/package.nix b/pkgs/by-name/us/usbtop/package.nix index 8b4bad511fa5..bb03b5beec22 100644 --- a/pkgs/by-name/us/usbtop/package.nix +++ b/pkgs/by-name/us/usbtop/package.nix @@ -7,29 +7,41 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "usbtop"; version = "1.0"; src = fetchFromGitHub { owner = "aguinet"; repo = "usbtop"; - rev = "release-${version}"; - sha256 = "0qbad0aq6j4jrh90l6a0akk71wdzhyzmy6q8wl138axyj2bp9kss"; + tag = "release-${finalAttrs.version}"; + hash = "sha256-Ws90l5C+KzQC5QgbX7+Hv/Fw5lRAGQoSzJJIgxVoamE="; }; + postPatch = + # fix compatibility with CMake (https://cmake.org/cmake/help/v4.0/command/cmake_minimum_required.html) + # TODO: drop when https://github.com/aguinet/usbtop/pull/45 is merged + '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'cmake_minimum_required(VERSION 2.8)' \ + 'cmake_minimum_required(VERSION 2.8...4.0)' + ''; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libpcap boost ]; - meta = with lib; { + meta = { homepage = "https://github.com/aguinet/usbtop"; + changelog = "https://github.com/aguinet/usbtop/raw/${finalAttrs.src.rev}/CHANGELOG"; description = "Top utility that shows an estimated instantaneous bandwidth on USB buses and devices"; mainProgram = "usbtop"; maintainers = [ ]; - license = licenses.bsd3; - platforms = platforms.linux; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/vf/vfox/package.nix b/pkgs/by-name/vf/vfox/package.nix index 12d683d65477..547d5bec0c60 100644 --- a/pkgs/by-name/vf/vfox/package.nix +++ b/pkgs/by-name/vf/vfox/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "vfox"; - version = "0.6.10"; + version = "0.8.0"; src = fetchFromGitHub { owner = "version-fox"; repo = "vfox"; tag = "v${finalAttrs.version}"; - hash = "sha256-bH7rHhjmfXCOAv+K0HDyPAi+ZBfLllsGyhLSo8rpcl4="; + hash = "sha256-d6rxk2gdS5oo/71Z53o2eJw/NhApqyqzgMa/sMKLY7s="; }; vendorHash = "sha256-TmWhzjjv+DkFHV4kEKpVYgQpI0Vl4aYvKR9QVpawrYA="; diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index fd7964d8485a..74816b748fd5 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -1,11 +1,13 @@ { lib, + stdenv, buildNpmPackage, fetchFromGitHub, pkg-config, libsecret, - python3, - testers, + nodejs, + clang_20, + versionCheckHook, nix-update-script, }: @@ -28,18 +30,19 @@ buildNpmPackage (finalAttrs: { nativeBuildInputs = [ pkg-config - python3 - ]; + nodejs.python + ] + ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar buildInputs = [ libsecret ]; makeCacheWritable = true; - npmFlags = [ "--legacy-peer-deps" ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; passthru = { - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - }; updateScript = nix-update-script { extraArgs = [ "--version-regex" @@ -51,7 +54,10 @@ buildNpmPackage (finalAttrs: { meta = { homepage = "https://github.com/microsoft/vscode-vsce"; description = "Visual Studio Code Extension Manager"; - maintainers = with lib.maintainers; [ aaronjheng ]; + maintainers = with lib.maintainers; [ + aaronjheng + xiaoxiangmoe + ]; license = lib.licenses.mit; mainProgram = "vsce"; }; diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix index 36a94c147f32..f3c7fbdecbb8 100644 --- a/pkgs/by-name/we/weasis/package.nix +++ b/pkgs/by-name/we/weasis/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchzip, - jdk24, + jdk25, unzip, copyDesktopItems, makeDesktopItem, @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - ./build/script/package-weasis.sh --no-installer --jdk ${jdk24} + ./build/script/package-weasis.sh --no-installer --jdk ${jdk25} runHook postBuild ''; @@ -70,12 +70,12 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString stdenv.isLinux '' mkdir -p $out/share/{applications,pixmaps} - mv weasis-${platform}-jdk${lib.versions.major jdk24.version}-${finalAttrs.version}/Weasis/* $out/ + mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis/* $out/ mv $out/lib/*.png $out/share/pixmaps/ '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications - mv weasis-${platform}-jdk${lib.versions.major jdk24.version}-${finalAttrs.version}/Weasis.app $out/Applications/ + mv weasis-${platform}-jdk${lib.versions.major jdk25.version}-${finalAttrs.version}/Weasis.app $out/Applications/ '' + '' runHook postInstall diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix index ca7657878884..69fd37c9c4f8 100644 --- a/pkgs/by-name/xe/xemu/package.nix +++ b/pkgs/by-name/xe/xemu/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.8.105"; + version = "0.8.106"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; tag = "v${finalAttrs.version}"; - hash = "sha256-1Gp/XGPCIT8qeW1YPI+mh6P0avHHFXtOGcXEEkGT12w="; + hash = "sha256-QlhK86yj0ZvhbXfZyoHkpgxC9rZx/XRZ1LdFNFH1LMk="; nativeBuildInputs = [ git diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix index 90e136ead80f..50650eba17f9 100644 --- a/pkgs/by-name/xe/xenia-canary/package.nix +++ b/pkgs/by-name/xe/xenia-canary/package.nix @@ -19,14 +19,14 @@ }: llvmPackages_20.stdenv.mkDerivation { pname = "xenia-canary"; - version = "0-unstable-2025-09-27"; + version = "0-unstable-2025-10-06"; src = fetchFromGitHub { owner = "xenia-canary"; repo = "xenia-canary"; fetchSubmodules = true; - rev = "41b412fa76f2fc4d913af0b74a68208616f205ce"; - hash = "sha256-Q6Y1aV45wKeutvuiovEtb2Csqzx38gQelHky3EKx2BM="; + rev = "703531d541fb9391afed4fbb951db198c9193c28"; + hash = "sha256-xLZBEnSxDhGWGscvE4Ht4wSAnSxY+0wBLAA2MVVobHg="; }; dontConfigure = true; diff --git a/pkgs/development/compilers/openjdk/24/source.json b/pkgs/development/compilers/openjdk/24/source.json deleted file mode 100644 index ef9e52624b4c..000000000000 --- a/pkgs/development/compilers/openjdk/24/source.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "hash": "sha256-YgkTSh7U/tJxiJIi8fxCkVgcogMQbcN4PgjmlcHcOBE=", - "owner": "openjdk", - "repo": "jdk24u", - "rev": "refs/tags/jdk-24.0.2+12" -} diff --git a/pkgs/development/compilers/openjdk/24/patches/fix-java-home-jdk24.patch b/pkgs/development/compilers/openjdk/25/patches/fix-java-home-jdk25.patch similarity index 100% rename from pkgs/development/compilers/openjdk/24/patches/fix-java-home-jdk24.patch rename to pkgs/development/compilers/openjdk/25/patches/fix-java-home-jdk25.patch diff --git a/pkgs/development/compilers/openjdk/24/patches/read-truststore-from-env-jdk24.patch b/pkgs/development/compilers/openjdk/25/patches/read-truststore-from-env-jdk25.patch similarity index 100% rename from pkgs/development/compilers/openjdk/24/patches/read-truststore-from-env-jdk24.patch rename to pkgs/development/compilers/openjdk/25/patches/read-truststore-from-env-jdk25.patch diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index 2a9012113690..6196350c32c8 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -59,14 +59,12 @@ openjfx17, openjfx21, openjfx23, - openjfx24, openjfx25, openjfx_jdk ? { "17" = openjfx17; "21" = openjfx21; "23" = openjfx23; - "24" = openjfx24; "25" = openjfx25; } .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"), @@ -81,7 +79,6 @@ temurin-bin-17, temurin-bin-21, temurin-bin-23, - temurin-bin-24, temurin-bin-25, jdk-bootstrap ? { @@ -90,7 +87,6 @@ "17" = temurin-bin-17.__spliced.buildBuild or temurin-bin-17; "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21; "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23; - "24" = temurin-bin-24.__spliced.buildBuild or temurin-bin-24; "25" = temurin-bin-25.__spliced.buildBuild or temurin-bin-25; } .${featureVersion}, @@ -107,7 +103,6 @@ let atLeast17 = lib.versionAtLeast featureVersion "17"; atLeast21 = lib.versionAtLeast featureVersion "21"; atLeast23 = lib.versionAtLeast featureVersion "23"; - atLeast24 = lib.versionAtLeast featureVersion "24"; atLeast25 = lib.versionAtLeast featureVersion "25"; tagPrefix = if atLeast11 then "jdk-" else "jdk"; @@ -152,8 +147,8 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ( - if atLeast24 then - ./24/patches/fix-java-home-jdk24.patch + if atLeast25 then + ./25/patches/fix-java-home-jdk25.patch else if atLeast21 then ./21/patches/fix-java-home-jdk21.patch else if atLeast11 then @@ -162,8 +157,8 @@ stdenv.mkDerivation (finalAttrs: { ./8/patches/fix-java-home-jdk8.patch ) ( - if atLeast24 then - ./24/patches/read-truststore-from-env-jdk24.patch + if atLeast25 then + ./25/patches/read-truststore-from-env-jdk25.patch else if atLeast11 then ./11/patches/read-truststore-from-env-jdk10.patch else @@ -271,7 +266,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals atLeast21 [ ensureNewerSourcesForZipFilesHook ] - ++ lib.optionals atLeast24 [ + ++ lib.optionals atLeast25 [ pandoc ]; @@ -477,7 +472,7 @@ stdenv.mkDerivation (finalAttrs: { chmod +x configure patchShebangs --build configure '' - + lib.optionalString atLeast24 '' + + lib.optionalString atLeast25 '' chmod +x make/scripts/*.{template,sh,pl} patchShebangs --build make/scripts ''; diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index d101e08b002f..d2f840632a89 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -feature_versions = (8, 11, 17, 21, 23, 24, 25) +feature_versions = (8, 11, 17, 21, 23, 25) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot",) diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index 4677a640e2c8..6a97a46675dc 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -22,9 +22,6 @@ in jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; - jdk-24 = common { sourcePerArch = sources.jdk.openjdk24; }; - jre-24 = common { sourcePerArch = sources.jre.openjdk24; }; - jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; }; jre-25 = common { sourcePerArch = sources.jre.openjdk25; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index ec2c1168fe68..2ec2e35a80fc 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -27,9 +27,6 @@ in jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; - jdk-24 = common { sourcePerArch = sources.jdk.openjdk24; }; - jre-24 = common { sourcePerArch = sources.jre.openjdk24; }; - jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; }; jre-25 = common { sourcePerArch = sources.jre.openjdk25; }; } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 23e0673fb4bb..ba71e263bef1 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -54,22 +54,6 @@ "version": "23.0.2" } }, - "openjdk24": { - "aarch64": { - "build": "12", - "sha256": "5563867bf1abfc466c59bf3d08e9957a30666fe96fb8f9c5bae939ab11d262d5", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_aarch64_alpine-linux_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "947ba234c65cdbd4d852e8f2812334ed093530d86b32cca5d9b45d6672186f77", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_x64_alpine-linux_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -150,22 +134,6 @@ "version": "23.0.2" } }, - "openjdk24": { - "aarch64": { - "build": "12", - "sha256": "389100187cf328c7b6b6b390fc0f5071ab38e93e8a6c06beb11e59363d2fd0d0", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_aarch64_alpine-linux_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "b63b888d2415828168c4d35a62d88f385a5532a20b7391e30a5d5d0a9a73b892", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_x64_alpine-linux_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -326,34 +294,6 @@ "version": "23.0.2" } }, - "openjdk24": { - "aarch64": { - "build": "12", - "sha256": "6f8725d186d05c627176db9c46c732a6ef3ba41d9e9b3775c4727fc8ac642bb2", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_aarch64_linux_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "12", - "sha256": "00f55805b4fa34c2557428e7f43ac847a8af0177ecb0b9dd8a6016f313ec43a9", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_ppc64le_linux_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - }, - "riscv64": { - "build": "12", - "sha256": "93fb5af13491b5b05ac378002b8a997614dc0f422870c10d5fadcdfcbcd0b948", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_riscv64_linux_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "aea1cc55e51cf651c85f2f00ad021603fe269c4bb6493fa97a321ad770c9b096", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_x64_linux_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -548,34 +488,6 @@ "version": "23.0.2" } }, - "openjdk24": { - "aarch64": { - "build": "12", - "sha256": "6b06ed1d91930ef86afc7d2159948aa9b3054b154cd8afda35d1fddd158fc11d", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_aarch64_linux_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - }, - "packageType": "jre", - "powerpc64le": { - "build": "12", - "sha256": "de9ec7034fb369ec9b5d12bba9d51984d14d859006e89ef2b86bbae9bc4c7ae4", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_ppc64le_linux_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - }, - "riscv64": { - "build": "12", - "sha256": "4a1177077bc5937ec93cfaaff60fd212a8591af241827869c73f87949a1268e9", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_riscv64_linux_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "bee902852ae8b6698e04eb1599dc94af844ae45b72b3b8ec854350b9aba41335", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_x64_linux_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -706,22 +618,6 @@ "version": "23.0.2" } }, - "openjdk24": { - "aarch64": { - "build": "12", - "sha256": "db2ba6f72c19ad8b742303a504f58474bceeb94174a185de5f095c1d45577f1c", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_aarch64_mac_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "4f63497563f6f0eb109f6898bb2e45e6cb428a6e4abe0772698493e373e8f0c7", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jdk_x64_mac_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -814,22 +710,6 @@ "version": "23.0.2" } }, - "openjdk24": { - "aarch64": { - "build": "12", - "sha256": "430546a697213e8a56653ca10ea59557054b2d5451ed82aad3a2cb7359fa1e2f", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_aarch64_mac_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "a246ba0487432ef06d1d13c3588a10663c89b15aea73c8a1c3a81211c4d22627", - "url": "https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24.0.2%2B12/OpenJDK24U-jre_x64_mac_hotspot_24.0.2_12.tar.gz", - "version": "24.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 119d777459dd..1ccea817f083 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -4,9 +4,11 @@ cmake, enet, fetchFromGitHub, + fetchpatch2, fixDarwinDylibNames, flac, freetype, + gitUpdater, gtk3, libGL, libGLU, @@ -53,6 +55,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-agE3K+6VhhG/LO52fiesCsOq1fNYVRhdW7aKdPCbTOo="; }; + patches = [ + (fetchpatch2 { + name = "Bump-CMake-minimum-version-to-3.5"; + url = "https://github.com/liballeg/allegro5/commit/6e93fcaabaafd81701f4cd1b74f4b69dd598bc9b.patch?full_index=1"; + hash = "sha256-IEnn66bS2m6MVFCNf341yLtd7jTl2gflL5EFJFmbEt4="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config @@ -117,6 +127,10 @@ stdenv.mkDerivation rec { "dev" ]; + strictDeps = true; + + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Game programming library"; homepage = "https://liballeg.org/"; diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 024218415de0..02f26957af48 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -63,7 +63,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; + cmakeFlags = [ + "-DCMAKE_SKIP_RPATH=ON" + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ]; meta = with lib; { description = "Game programming library"; diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix index c4034b53427b..8e99804547bf 100644 --- a/pkgs/development/libraries/astal/source.nix +++ b/pkgs/development/libraries/astal/source.nix @@ -7,15 +7,15 @@ let originalDrv = fetchFromGitHub { owner = "Aylur"; repo = "astal"; - rev = "344a6dce56437a190b99e516a6cab8332cccf19e"; - hash = "sha256-BSfvr7wdY5SbathVlrOW7vCyI9UGVIe2b9rTJ0O5IKo="; + rev = "12c15b44608422e494c387aba6adc1ab6315d925"; + hash = "sha256-EfTrJse33t3RP//DqESkTMCpMSdIi/wxxfa12+eP5jo="; }; in originalDrv.overrideAttrs ( final: prev: { name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name pname = "astal-source"; - version = "0-unstable-2025-09-10"; + version = "0-unstable-2025-10-05"; meta = prev.meta // { description = "Building blocks for creating custom desktop shells (source)"; diff --git a/pkgs/development/libraries/ipu6-camera-hal/default.nix b/pkgs/development/libraries/ipu6-camera-hal/default.nix index 71d0e2f5408d..79d40d205e32 100644 --- a/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation { "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" "-DCMAKE_INSTALL_SUB_PATH=${ipuTarget}" "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix index 9d10d8e2649e..eb8b5a43d68c 100644 --- a/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix +++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix @@ -1,5 +1,6 @@ { buildPythonPackage, + python, simple-dftd3, cffi, numpy, @@ -44,4 +45,14 @@ buildPythonPackage { preCheck = '' find . -name "_libdftd3*" -exec cp {} ./dftd3/. \; ''; + + pythonImportsCheck = [ "dftd3" ]; + doCheck = true; + + # Parameters need to be present in the python site packages directory, but they + # are originally only present in the fortran package. This is a consequence of + # building the python bindings separately from the fortran library. + postInstall = '' + ln -s ${simple-dftd3}/share/s-dftd3/parameters.toml $out/${python.sitePackages}/dftd3/. + ''; } diff --git a/pkgs/development/ocaml-modules/cachet/default.nix b/pkgs/development/ocaml-modules/cachet/default.nix new file mode 100644 index 000000000000..2d0e780f5473 --- /dev/null +++ b/pkgs/development/ocaml-modules/cachet/default.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchurl, + buildDunePackage, + alcotest, +}: + +buildDunePackage (finalAttrs: { + pname = "cachet"; + version = "0.0.2"; + + minimalOCamlVersion = "4.13"; + + src = fetchurl { + url = "https://github.com/robur-coop/cachet/releases/download/v${finalAttrs.version}/cachet-${finalAttrs.version}.tbz"; + hash = "sha256:7cf3d609523592516ee5570c106756168d9dca264412a0ef4085d9864c53cbad"; + }; + + doCheck = true; + checkInputs = [ + alcotest + ]; + + meta = { + description = "A simple cache system for mmap"; + homepage = "https://git.robur.coop/robur/cachet"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +}) diff --git a/pkgs/development/ocaml-modules/cachet/lwt.nix b/pkgs/development/ocaml-modules/cachet/lwt.nix new file mode 100644 index 000000000000..6f365e5ac09d --- /dev/null +++ b/pkgs/development/ocaml-modules/cachet/lwt.nix @@ -0,0 +1,21 @@ +{ + buildDunePackage, + cachet, + lwt, + alcotest, +}: + +buildDunePackage { + pname = "cachet-lwt"; + inherit (cachet) src version; + propagatedBuildInputs = [ + cachet + lwt + ]; + doCheck = true; + checkInputs = [ alcotest ]; + + meta = cachet.meta // { + description = "A simple cache system for mmap and lwt"; + }; +} diff --git a/pkgs/development/ocaml-modules/domainslib/default.nix b/pkgs/development/ocaml-modules/domainslib/default.nix index aa3cd5e5be1d..ca5c00d68acb 100644 --- a/pkgs/development/ocaml-modules/domainslib/default.nix +++ b/pkgs/development/ocaml-modules/domainslib/default.nix @@ -11,13 +11,13 @@ buildDunePackage rec { pname = "domainslib"; - version = "0.5.1"; + version = "0.5.2"; minimalOCamlVersion = "5.0"; src = fetchurl { url = "https://github.com/ocaml-multicore/domainslib/releases/download/${version}/domainslib-${version}.tbz"; - hash = "sha256-KMJd+6XZmUSXNsXW/KXgvnFtgY9vODeW3vhL77mDXQE="; + hash = "sha256-pyDs4stBsqWRrRpEotuezVVz6Le1ES6NRtDydfmvHK8="; }; propagatedBuildInputs = [ @@ -37,6 +37,5 @@ buildDunePackage rec { description = "Nested-parallel programming"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; - broken = true; # Not compatible with saturn > 0.4.0 }; } diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index 07be22290b3f..461d28310a6a 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; tag = "v${version}"; - hash = "sha256-UTw20bDT2TBsnSy98Rl503C05W5e+8grVoD4bg4laPc="; + hash = "sha256-/loKnKmLF8EDuZVWdSgxQUslrTKU4DxNmJlFZ0Xv9v8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/binsync/default.nix b/pkgs/development/python-modules/binsync/default.nix index 3f6c999a6668..d52a0eac53e5 100644 --- a/pkgs/development/python-modules/binsync/default.nix +++ b/pkgs/development/python-modules/binsync/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "binsync"; - version = "5.5.1"; + version = "5.7.10"; pyproject = true; src = fetchFromGitHub { owner = "binsync"; repo = "binsync"; tag = "v${version}"; - hash = "sha256-C9yIb//h1pAJnlWT4+VgeVzeSjd0sfn8o4yfePNF/YM="; + hash = "sha256-QDOfbo2yjfjLsLILMhl/ckKwXDusXfE8+YmFpW5djN0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 05cf39a5515b..ca59ca4ff5ea 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.40.45"; + version = "1.40.46"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-VOfGCrrWvXSvlhNxvPlcS2sj02O/wpVSxEydsbrJiWk="; + hash = "sha256-TMRvhoZ0vqFwCLF8vlMK2dO5zV77rETMrKRTvVmz7U0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index a050155de542..17e481bba93a 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "django-oauth-toolkit"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-oauth-toolkit"; tag = version; - hash = "sha256-Ya0KlX+vtLXN2Fgk0Gv7KemJCUTwkaH+4GQA1ByUlBY="; + hash = "sha256-c7LaB8426qjwDveec3BghqCEtPs572PTVodvLAO2CcQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix index 9f55848da841..b9ae88b0fc24 100644 --- a/pkgs/development/python-modules/django-phonenumber-field/default.nix +++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-phonenumber-field"; - version = "8.2.0"; + version = "8.3.0"; pyproject = true; src = fetchFromGitHub { owner = "stefanfoulis"; repo = "django-phonenumber-field"; tag = version; - hash = "sha256-Goi0XmdHUY0BrAZBjnw3UQINtgKLbS/n3auginaQkhk="; + hash = "sha256-hcmhduYG7ggyMuc1FJ8AjkvHNjNAo3PST6Vv8VkBA+s="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index c95a896ef0de..05ebbeb3f0df 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202510061"; + version = "0.1.202510071"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-/r8+DVApf+epNr5OiGMSD7dkMW0xHp0ecf7tdTkldtE="; + hash = "sha256-BFcJBRuVV7+x89MuLova58HMNDLAmI0GwWo0nHWYkEs="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 413eb08c4c86..29b055ba916a 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -86,6 +86,10 @@ buildPythonPackage rec { # these only fail on aarch64 "test_png_rgba8" "test_png_gray8a" + # AssertionError: assert 'resolution' not in ... + # (starting with ImagMagick 7.1.2-5) + "test_date" + "test_jpg" ]; pythonImportsCheck = [ "img2pdf" ]; diff --git a/pkgs/development/python-modules/jupyterlab-vim/default.nix b/pkgs/development/python-modules/jupyterlab-vim/default.nix new file mode 100644 index 000000000000..6fa64f240d43 --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab-vim/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + hatch-jupyter-builder, + hatch-nodejs-version, + jupyterlab, +}: + +buildPythonPackage rec { + pname = "jupyterlab-vim"; + version = "4.1.4"; + pyproject = true; + + src = fetchPypi { + pname = "jupyterlab_vim"; + inherit version; + hash = "sha256-q/KJGq+zLwy5StmDIa5+vL4Mq+Uj042A1WnApQuFIlo="; + }; + + build-system = [ + hatchling + hatch-jupyter-builder + hatch-nodejs-version + ]; + + dependencies = [ jupyterlab ]; + pythonImportsCheck = [ "jupyterlab_vim" ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Vim notebook cell bindings for JupyterLab"; + homepage = "https://github.com/jupyterlab-contrib/jupyterlab-vim"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ mart-mihkel ]; + }; +} diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix index 9570637d68f1..46674cb77332 100644 --- a/pkgs/development/python-modules/llama-index-readers-json/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-json"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_json"; inherit version; - hash = "sha256-bV/NsbEkWctLlOwo9r+W7sTzO38VPw2eB21VbXH1sek="; + hash = "sha256-ggwpTUnfP1aZhAyZ1wTsoNpW52dt0y5/59JT6RSUMNQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/moyopy/default.nix b/pkgs/development/python-modules/moyopy/default.nix index ce14c70db0b3..60895d011a39 100644 --- a/pkgs/development/python-modules/moyopy/default.nix +++ b/pkgs/development/python-modules/moyopy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "moyopy"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "spglib"; repo = "moyo"; tag = "v${version}"; - hash = "sha256-mOXg/BtXCg2ob5rRl9fVcJ1oNuVqOWUcjkAexW9KUfI="; + hash = "sha256-4Dete4rtkfs0Ytf0YSdyDNP51C8GlaxKdQlS1l8hj44="; }; sourceRoot = "${src.name}/moyopy"; @@ -46,7 +46,7 @@ buildPythonPackage rec { sourceRoot cargoRoot ; - hash = "sha256-yaW1nI1BWG8vvbTKc8pIkQXeCqBoJmqyqr1ra8YO6xM="; + hash = "sha256-z45jmkPKfX7kYefFaU/F6SopK0dI6xtgrkllaergtwI="; }; build-system = [ diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b1f228c31e3c..67754b4738f8 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -158,8 +158,8 @@ in "sha256-euF2rskAknxAxRrkS7mOXWZkb9NR70kGGRe5kqTcNgs="; mypy-boto3-backup = - buildMypyBoto3Package "backup" "1.40.0" - "sha256-q7HoaGzpwKAPik9I6e9+esVbwH2zRrIhzPQoIW4juPA="; + buildMypyBoto3Package "backup" "1.40.46" + "sha256-ISPplrUnN2jZ9V+24V7N9xW2kJTY4yIWe17Y/o+FRis="; mypy-boto3-backup-gateway = buildMypyBoto3Package "backup-gateway" "1.40.15" @@ -574,8 +574,8 @@ in "sha256-DS2Bb39wrP+k2H2oxkm13WzRyF6cX96P0JgF2OXAdMA="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.40.39" - "sha256-3b9038gWqTWwQkZ4j4AgP+FXlowWK5uLYeXOF6qBtl0="; + buildMypyBoto3Package "glue" "1.40.46" + "sha256-WhupCfYxYfqqAnUFw96o2vPmrrj6N+7sZFRyTuBbd70="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.40.0" "sha256-KQqyk9PFUttzDrZW7viev8xbumdud05EBdNoxz//hEY="; @@ -857,8 +857,8 @@ in "sha256-7gZOd0TBAWyyY7g85UXAjp4miV08qfB20B6YQww360w="; mypy-boto3-mediaconnect = - buildMypyBoto3Package "mediaconnect" "1.40.0" - "sha256-8EUTmbFAFXO724bxmzxa2RoovG9L6mm1dxbNupbKKRQ="; + buildMypyBoto3Package "mediaconnect" "1.40.46" + "sha256-IjfRXktKU9nJlBJhET307e+nvbwqCucIj0E2dpwuZO4="; mypy-boto3-mediaconvert = buildMypyBoto3Package "mediaconvert" "1.40.17" @@ -897,8 +897,8 @@ in "sha256-loONT/aOVY0IFNGgP7doBtHPp+U9TEzI4SAmdXvrc2Q="; mypy-boto3-memorydb = - buildMypyBoto3Package "memorydb" "1.40.16" - "sha256-aJbMT+n4ml/lcdj4hvIhf2mEFgVUQhHuB65oerbdiA0="; + buildMypyBoto3Package "memorydb" "1.40.46" + "sha256-3es+4YZbr+k3NgCoBdgrMwXVe/jH6cV7Lo2Fq3MZsJw="; mypy-boto3-meteringmarketplace = buildMypyBoto3Package "meteringmarketplace" "1.40.0" @@ -1073,8 +1073,8 @@ in "sha256-g5Mh+Uz/YrF4v7GV3kPUarzTr0miTUioaMaxwYUX4p0="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.40.42" - "sha256-N2azeTi2ixXGbVbeYYFly4/Mui56T6DlLKnZRD0Kp14="; + buildMypyBoto3Package "quicksight" "1.40.46" + "sha256-Hx/CzF02rKQeNgZIz0A/TT4+H+BEP4DXTGE2FuAHZcw="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.40.18" @@ -1085,8 +1085,8 @@ in "sha256-zye0xv5P6GemZiH+T/cIyzx9qaeOKitEWpW6LOkc8KM="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.40.42" - "sha256-d9jOB2pCQA+HFUxODEwpg1jLsSvGoC7EH7baqXU50TI="; + buildMypyBoto3Package "rds" "1.40.46" + "sha256-h7+fF67fsQX82i1XcPQcxCvg3qLUKdnsr7V5DqHdod4="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.40.0" @@ -1113,8 +1113,8 @@ in "sha256-PaBrmTZ/EpFDH94bw/zQqRcLiQrOQlKrIHQgXcuR0Qo="; mypy-boto3-resource-explorer-2 = - buildMypyBoto3Package "resource-explorer-2" "1.40.0" - "sha256-qlgF3um/4jRBAMsb9Ru7N8sm4VekcBkhSCvJw6S/4Uk="; + buildMypyBoto3Package "resource-explorer-2" "1.40.46" + "sha256-x1BJr6TZpO5OlfAG5l9PuAmfTAMtjnRv3SWO6bh2zPc="; mypy-boto3-resource-groups = buildMypyBoto3Package "resource-groups" "1.40.15" diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 650bab594038..9c6b6aa84987 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "oci"; - version = "2.160.2"; + version = "2.160.3"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; tag = "v${version}"; - hash = "sha256-+O3C6We3Awg8zsrfGXhMyLRxnKdRKxFiR72uDSe1WTM="; + hash = "sha256-Nz3/aGumNTMItE/HL5tAdh0QbZngeO02CfJKq4GZ+qY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index bd19be2a49fd..1a597d0b4e3f 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -41,14 +41,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.251.1"; + version = "2.252.0"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-python-sdk"; tag = "v${version}"; - hash = "sha256-6NiWEINVjIzLrHT504wvtFrU34YgyKISvSwozL4JptQ="; + hash = "sha256-odiQIPI0kbikU2gPZ6MEsR7xgYnshaaZFqnEbAyVcl0="; }; build-system = [ diff --git a/pkgs/development/python-modules/tiler/default.nix b/pkgs/development/python-modules/tiler/default.nix index 16dc515e04f2..5ab9aa6288fa 100644 --- a/pkgs/development/python-modules/tiler/default.nix +++ b/pkgs/development/python-modules/tiler/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, fetchPypi, setuptools, setuptools-scm, @@ -14,29 +13,20 @@ buildPythonPackage rec { pname = "tiler"; version = "0.6.0"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-ps0uHgzPa+ZoXXrB+0gfuVIEBUNmym/ym6xCxiyHhxA="; }; - patches = [ - # https://github.com/the-lay/tiler/pull/24 - (fetchpatch { - name = "unpin-setuptools-scm-dependency.patch"; - url = "https://github.com/the-lay/tiler/commit/7a9f7e32c5f9c263c1ae28bfd19c7539556684cb.patch"; - hash = "sha256-TMr3LJtiKUxJv2pAzAd8CWs3AtWsF0YS79NzKBN5TKM="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm wheel ]; - propagatedBuildInputs = [ + dependencies = [ numpy tqdm ]; @@ -45,10 +35,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "tiler" ]; - meta = with lib; { + meta = { description = "N-dimensional NumPy array tiling and merging with overlapping, padding and tapering"; homepage = "https://the-lay.github.io/tiler/"; - license = licenses.mit; - maintainers = with maintainers; [ atila ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ atila ]; }; } diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix index dc497d82fe53..d54e01fc1629 100644 --- a/pkgs/development/python-modules/types-lxml/default.nix +++ b/pkgs/development/python-modules/types-lxml/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "types-lxml"; - version = "2025.03.30"; + version = "2025.08.25"; pyproject = true; src = fetchFromGitHub { owner = "abelcheung"; repo = "types-lxml"; tag = version; - hash = "sha256-+H1VOO72/zq0nITq2a+4wEarPqBdBF7wIfRShFBsLPw="; + hash = "sha256-XuQ3sZi/cuJF76JeyuFEZVsY3F9zmPHRUWbkNQaT0Lo="; }; pythonRelaxDeps = [ "beautifulsoup4" ]; diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index fbe1416808f7..78eab8d64644 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -25,11 +25,19 @@ stdenv.mkDerivation rec { ./headers.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + 'cmake_minimum_required ( VERSION 2.8 )' \ + 'cmake_minimum_required ( VERSION 4.0 )' + ''; + + strictDeps = true; + meta = with lib; { description = "Tool to integrate C/Cpp code with Lua"; homepage = "http://www.codenix.com/~tolua/"; license = licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ colinsane ]; mainProgram = "tolua++"; platforms = with platforms; unix; }; diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix deleted file mode 100644 index 8f7813ac2a8c..000000000000 --- a/pkgs/os-specific/linux/exfat/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - kernel, -}: - -stdenv.mkDerivation rec { - name = "exfat-nofuse-${version}-${kernel.version}"; - version = "2020-04-15"; - - src = fetchFromGitHub { - owner = "barrybingo"; - repo = "exfat-nofuse"; - rev = "297a5739cd4a942a1d814d05a9cd9b542e7b8fc8"; - sha256 = "14jahy7n6pr482fjfrlf9ck3f2rkr5ds0n5r85xdfsla37ria26d"; - }; - - hardeningDisable = [ "pic" ]; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - makeFlags = [ - "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - "ARCH=${stdenv.hostPlatform.linuxArch}" - ] - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - ]; - - installPhase = '' - install -m644 -b -D exfat.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/exfat/exfat.ko - ''; - - meta = { - description = "exfat kernel module"; - inherit (src.meta) homepage; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ makefu ]; - platforms = lib.platforms.linux; - broken = true; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix index c535ac607933..8b1db27f6f82 100644 --- a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { pname = "bitcoin-prometheus-exporter"; - version = "0.8.0"; + version = "0.9.0"; format = "other"; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { owner = "jvstein"; repo = pname; tag = "v${version}"; - sha256 = "sha256-UTH7m50GGVVUm2ogO0LcVGC1y4FGccOfSPiebXwXoNE="; + sha256 = "sha256-08QG/5Kj++rjWz7OciqKSJUk00lSJCbfB5XwwP+h4so="; }; # Copying bitcoind-monitor.py is enough. diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 013c7d499088..d82800e576aa 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -11,13 +11,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pgroonga"; - version = "4.0.2"; + version = "4.0.4"; src = fetchFromGitHub { owner = "pgroonga"; repo = "pgroonga"; tag = "${finalAttrs.version}"; - hash = "sha256-hZy2qDI9bNFvcm7SbCMZxixPEXgPmjmeEOM4VoXKttE="; + hash = "sha256-SXQH+L7FKhu+2+9QyQTNi+3nFYtkE7WXv2A5LdvjG2w="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index de9df296f208..65433208c155 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "4.0") ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b66b7f9bc25b..4076bacec858 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1025,6 +1025,9 @@ mapAliases { gg = go-graft; # Added 2025-03-07 ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18 ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18 + gimp3 = gimp; # added 2025-10-03 + gimp3-with-plugins = gimp-with-plugins; # added 2025-10-03 + gimp3Plugins = gimpPlugins; # added 2025-10-03 git-annex-utils = throw "'git-annex-utils' has been removed as it is unmaintained"; # Added 2025-05-18 git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25 @@ -1973,11 +1976,16 @@ mapAliases { openjdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24 jdk22 = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24 jdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24 + openjdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04 + openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04 + jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04 + jdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04 oobicpl = throw "oobicpl was removed as it is unmaintained upstream"; # Added 2025-04-26 openjfx11 = throw "OpenJFX 11 was removed as it has reached its end of life"; # Added 2024-10-07 openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01 openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01 openjfx22 = throw "OpenJFX 22 was removed as it has reached its end of life"; # Added 2024-09-24 + openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04 openjpeg_2 = throw "'openjpeg_2' has been renamed to/replaced by 'openjpeg'"; # Converted to throw 2024-10-17 openlens = throw "Lens Closed its source code, package obsolete/stale - consider lens as replacement"; # Added 2024-09-04 openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29 @@ -2542,6 +2550,8 @@ mapAliases { temurin-bin-16 = throw "Temurin 16 has been removed as it has reached its end of life"; # Added 2024-08-01 temurin-jre-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24 temurin-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24 + temurin-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04 + temurin-jre-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04 tepl = libgedit-tepl; # Added 2024-04-29 termplay = throw "'termplay' has been removed due to lack of maintenance upstream"; # Added 2025-01-25 testVersion = testers.testVersion; # Added 2022-04-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2c183cfc31e..9f7dac3fd8ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4413,9 +4413,6 @@ with pkgs; temurin-bin-25 = javaPackages.compiler.temurin-bin.jdk-25; temurin-jre-bin-25 = javaPackages.compiler.temurin-bin.jre-25; - temurin-bin-24 = javaPackages.compiler.temurin-bin.jdk-24; - temurin-jre-bin-24 = javaPackages.compiler.temurin-bin.jre-24; - temurin-bin-23 = javaPackages.compiler.temurin-bin.jdk-23; temurin-jre-bin-23 = javaPackages.compiler.temurin-bin.jre-23; @@ -5092,7 +5089,6 @@ with pkgs; openjfx17 = openjfx; openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; }; openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; }; - openjfx24 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "24"; }; openjfx25 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "25"; }; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; @@ -5125,11 +5121,6 @@ with pkgs; jdk23 = openjdk23; jdk23_headless = openjdk23_headless; - openjdk24 = javaPackages.compiler.openjdk24; - openjdk24_headless = javaPackages.compiler.openjdk24.headless; - jdk24 = openjdk24; - jdk24_headless = openjdk24_headless; - openjdk25 = javaPackages.compiler.openjdk25; openjdk25_headless = javaPackages.compiler.openjdk25.headless; jdk25 = openjdk25; @@ -11311,22 +11302,22 @@ with pkgs; freeoffice ; - gimp3 = callPackage ../applications/graphics/gimp { + gimp2 = callPackage ../applications/graphics/gimp/2.0 { lcms = lcms2; }; - gimp3-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { - gimpPlugins = gimp3Plugins; + gimp2-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { + gimpPlugins = gimp2Plugins; plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied }; - gimp3Plugins = recurseIntoAttrs ( + gimp2Plugins = recurseIntoAttrs ( callPackage ../applications/graphics/gimp/plugins { - gimp = gimp3; + gimp = gimp2; } ); - gimp = callPackage ../applications/graphics/gimp/2.0 { + gimp = callPackage ../applications/graphics/gimp { lcms = lcms2; }; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index f0095f5be91b..fd91ab54cda7 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -49,7 +49,6 @@ with pkgs; openjdk17 = mkOpenjdk "17"; openjdk21 = mkOpenjdk "21"; openjdk23 = mkOpenjdk "23"; - openjdk24 = mkOpenjdk "24"; openjdk25 = mkOpenjdk "25"; # Legacy aliases diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 380b398694a0..531a9689a73b 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -407,9 +407,6 @@ in inherit kernel; }; - exfat-nofuse = - if lib.versionOlder kernel.version "5.8" then callPackage ../os-specific/linux/exfat { } else null; - evdi = callPackage ../os-specific/linux/evdi { }; fanout = callPackage ../os-specific/linux/fanout { }; @@ -709,6 +706,7 @@ in zfs_2_1 = throw "zfs_2_1 has been removed"; # added 2024-12-25; ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; deepin-anything-module = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; + exfat-nofuse = throw "exfat-nofuse has been removed, all kernels > 5.8 come with built-in exfat support"; # added 2025-10-07 hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14 rtl8723bs = throw "rtl8723bs was added in mainline kernel version 4.12"; # Added 2023-06-14 diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7145b4c80832..819dd03d7582 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -161,6 +161,10 @@ let ca-certs-nss = callPackage ../development/ocaml-modules/ca-certs-nss { }; + cachet = callPackage ../development/ocaml-modules/cachet { }; + + cachet-lwt = callPackage ../development/ocaml-modules/cachet/lwt.nix { }; + cairo2 = callPackage ../development/ocaml-modules/cairo2 { }; calendar = callPackage ../development/ocaml-modules/calendar { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a268ee31fe92..7f3cf11f543f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1175,6 +1175,31 @@ with self; }; }; + AppFatPackerSimple = buildPerlModule { + pname = "App-FatPacker-Simple"; + version = "0.20"; + src = pkgs.fetchurl { + url = "mirror://cpan/authors/id/S/SK/SKAJI/App-FatPacker-Simple-0.20.tar.gz"; + sha256 = "sha256-nkSy/gno2PxT5aA3UWCRK0Dnn9fIdcCOtQvoGUZocSo="; + }; + buildInputs = [ + ModuleBuildTiny + pkgs.gnumake + ClonePP + PPI + TestLeakTrace + DistributionMetadata + ]; + propagatedBuildInputs = [ + AppFatPacker + ]; + meta = { + description = "A simpler way to fatpack perl programs"; + homepage = "https://metacpan.org/pod/App::FatPacker::Simple"; + mainProgram = "Simple.pm"; + }; + }; + Appcpanminus = buildPerlPackage { pname = "App-cpanminus"; version = "1.7047"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71f478761045..4fa90e9f45dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3653,6 +3653,10 @@ self: super: with self; { dfdiskcache = callPackage ../development/python-modules/dfdiskcache { }; + dftd4 = callPackage ../by-name/df/dftd4/python.nix { + inherit (pkgs) dftd4; + }; + diagrams = callPackage ../development/python-modules/diagrams { }; diceware = callPackage ../development/python-modules/diceware { }; @@ -7697,6 +7701,8 @@ self: super: with self; { jupyterlab-server = callPackage ../development/python-modules/jupyterlab-server { }; + jupyterlab-vim = callPackage ../development/python-modules/jupyterlab-vim { }; + jupyterlab-widgets = callPackage ../development/python-modules/jupyterlab-widgets { }; jupytext = callPackage ../development/python-modules/jupytext { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e8ce5f1c82b6..4ede83718dc2 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -151,7 +151,7 @@ let # jobs.firefox-unwrapped.x86_64-darwin jobs.qt5.qtmultimedia.x86_64-darwin jobs.inkscape.x86_64-darwin - jobs.gimp.x86_64-darwin + jobs.gimp2.x86_64-darwin # FIXME replace with gimp once https://github.com/NixOS/nixpkgs/issues/411189 is resoved jobs.emacs.x86_64-darwin jobs.wireshark.x86_64-darwin jobs.transmission_3-gtk.x86_64-darwin @@ -195,7 +195,7 @@ let # jobs.firefox-unwrapped.aarch64-darwin jobs.qt5.qtmultimedia.aarch64-darwin jobs.inkscape.aarch64-darwin - jobs.gimp.aarch64-darwin + jobs.gimp2.aarch64-darwin # FIXME replace with gimp once https://github.com/NixOS/nixpkgs/issues/411189 is resoved jobs.emacs.aarch64-darwin jobs.wireshark.aarch64-darwin jobs.transmission_3-gtk.aarch64-darwin