From 44da664db54cfad044a6e368089de2198ef3fcba Mon Sep 17 00:00:00 2001 From: yakrobat Date: Fri, 2 Feb 2024 05:45:28 +0300 Subject: [PATCH 01/17] maintainers: add nasrally --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9e23d7401e46..0f9d1ca9a96c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17602,6 +17602,12 @@ name = "Nasir Hussain"; keys = [ { fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; } ]; }; + nasrally = { + email = "suffer.ring@ya.ru"; + github = "nasrally"; + githubId = 50599445; + name = "Nikita Grishko"; + }; nat-418 = { github = "nat-418"; githubId = 93013864; From 70469150c9d53de554b0e47cc4af9abba2ff710d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 8 Aug 2025 09:30:37 +0200 Subject: [PATCH 02/17] xppen_{3,4}: init at 3.4.9-240607 and 4.0.7-250117 Co-authored-by: yakrobat --- pkgs/applications/misc/xppen/default.nix | 19 +++++++ pkgs/applications/misc/xppen/generic.nix | 71 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 3 files changed, 95 insertions(+) create mode 100644 pkgs/applications/misc/xppen/default.nix create mode 100644 pkgs/applications/misc/xppen/generic.nix diff --git a/pkgs/applications/misc/xppen/default.nix b/pkgs/applications/misc/xppen/default.nix new file mode 100644 index 000000000000..27bc92f168b3 --- /dev/null +++ b/pkgs/applications/misc/xppen/default.nix @@ -0,0 +1,19 @@ +{ + callPackage, +}: + +# to update: try to find the latest 3.x.x or 4.x.x .tar.gz on https://www.xp-pen.com/download +{ + xppen_3 = callPackage ./generic.nix { + pname = "xppen_3"; + version = "3.4.9-240607"; + url = "https://www.xp-pen.com/download/file.html?id=2901&pid=819&ext=gz"; + hash = "sha256-ZXeTlDjhryXamb7x2LxDdOtf8R9rgKPyUsdx96XchWM="; + }; + xppen_4 = callPackage ./generic.nix { + pname = "xppen_4"; + version = "4.0.7-250117"; + url = "https://www.xp-pen.com/download/file.html?id=3652&pid=1211&ext=gz"; + hash = "sha256-sH05Qquo2u0npSlv8Par/mn1w/ESO9g42CCGwBauHhU="; + }; +} diff --git a/pkgs/applications/misc/xppen/generic.nix b/pkgs/applications/misc/xppen/generic.nix new file mode 100644 index 000000000000..a48a20b2ef4c --- /dev/null +++ b/pkgs/applications/misc/xppen/generic.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchzip, + autoPatchelfHook, + qt5, + libusb1, + pname, + version, + url, + hash, +}: + +stdenv.mkDerivation { + inherit pname version; + + src = fetchzip { + name = "XPPenLinux${version}.tar.gz"; + extension = "tar.gz"; + inherit url hash; + }; + + nativeBuildInputs = [ + autoPatchelfHook + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + qt5.qtbase + libusb1 + ]; + + dontConfigure = true; + dontBuild = true; + dontCheck = true; + + installPhase = '' + runHook preInstall + + rm -r App/usr/lib/pentablet/{lib,platforms,PenTablet.sh} + mkdir -p $out/{bin,usr} + cp -r App/lib $out/lib + cp -r App/usr/share $out/share + cp -r App/usr/lib $out/usr/lib + + # hack: edit the binary directly + # TODO: replace it with buildFHSEnv if possible? last time it caused other issues + sed -i 's#/usr/lib/pentablet#/var/lib/pentablet#g' $out/usr/lib/pentablet/PenTablet + ln -s $out/usr/lib/pentablet/PenTablet $out/bin/PenTablet + + substituteInPlace $out/share/applications/xppentablet.desktop \ + --replace-fail "/usr/lib/pentablet/PenTablet.sh" "PenTablet" \ + --replace-fail "/usr/share/icons/hicolor/256x256/apps/xppentablet.png" "xppentablet" + + runHook postInstall + ''; + + meta = { + description = "XPPen driver"; + downloadPage = "https://www.xp-pen.com/download/"; + homepage = "https://www.xp-pen.com/"; + license = lib.licenses.unfree; + mainProgram = "PenTablet"; + maintainers = with lib.maintainers; [ + gepbird + nasrally + ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3a9bf4d938a..3cc85d4ef09c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14077,6 +14077,11 @@ with pkgs; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; + inherit (callPackage ../applications/misc/xppen { }) + xppen_3 + xppen_4 + ; + xygrib = libsForQt5.callPackage ../applications/misc/xygrib { }; ydiff = with python3.pkgs; toPythonApplication ydiff; From c29545ba8db9d89b9916a92e4e8ece84e4a59ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 8 Aug 2025 09:33:34 +0200 Subject: [PATCH 03/17] nixos/xppen: init Co-authored-by: yakrobat --- .../manual/release-notes/rl-2511.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/xppen.nix | 55 +++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 nixos/modules/programs/xppen.nix diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 01ad322de9c5..e055c3220289 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -31,6 +31,8 @@ - [Homebridge](https://github.com/homebridge/homebridge), a lightweight Node.js server you can run on your home network that emulates the iOS HomeKit API. Available as [services.homebridge](#opt-services.homebridge.enable). +- [XPPen](https://www.xp-pen.com/), the official closed-source driver for XP Pen tablets. Available as [programs.xppen](#opt-programs.xppen.enable). + - [LACT](https://github.com/ilya-zlobintsev/LACT), a GPU monitoring and configuration tool, can now be enabled through [services.lact.enable](#opt-services.lact.enable). Note that for LACT to work properly on AMD GPU systems, you need to enable [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 77e96c2d85a8..0529761cd82d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -357,6 +357,7 @@ ./programs/xfconf.nix ./programs/xfs_quota.nix ./programs/xonsh.nix + ./programs/xppen.nix ./programs/xss-lock.nix ./programs/xwayland.nix ./programs/yazi.nix diff --git a/nixos/modules/programs/xppen.nix b/nixos/modules/programs/xppen.nix new file mode 100644 index 000000000000..e3ce1f7f314f --- /dev/null +++ b/nixos/modules/programs/xppen.nix @@ -0,0 +1,55 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.xppen; +in + +{ + options.programs.xppen = { + enable = lib.mkEnableOption "XPPen PenTablet application"; + package = lib.mkPackageOption pkgs "xppen_4" { + example = "pkgs.xppen_3"; + extraDescription = '' + Use xppen_4 for newer and xppen_3 for older tablets. + To check which version of the driver you need, go to + https://www.xp-pen.com/download/ then select your tablet + and look for the major version in the available files for Linux. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + hardware.uinput.enable = true; + + environment.systemPackages = [ cfg.package ]; + + services.udev.packages = [ cfg.package ]; + + systemd.tmpfiles.rules = [ + "d /var/lib/pentablet/conf/xppen 0777 - - -" + ]; + + systemd.services.xppen-create-config-dir = { + restartTriggers = [ cfg.package ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + TimeoutSec = 60; + ExecStart = pkgs.writeShellScript "xppen-create-config-dir" '' + readarray -d "" files < <(find ${cfg.package}/usr/lib/pentablet/conf -type f -print0) + for file in "''${files[@]}"; do + file_new="/var''${file#${cfg.package + "/usr"}}" + if [ ! -f $file_new ]; then + install -m 666 "''$file" "''$file_new" + fi + done + ''; + }; + }; + }; +} From 780198f91a3db1843ad3f40bfc2b7a8aa428aa5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Oct 2025 00:49:38 +0000 Subject: [PATCH 04/17] ocamlPackages.gapi-ocaml: 0.4.6 -> 0.4.7 --- pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 040314db9b48..84ffc37a30cd 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { pname = "gapi-ocaml"; - version = "0.4.6"; + version = "0.4.7"; minimalOCamlVersion = "4.08"; @@ -20,7 +20,7 @@ buildDunePackage rec { owner = "astrada"; repo = pname; rev = "v${version}"; - hash = "sha256-pMieplqWGjgA6NVK0hEEVTRjggZtiPP/OepRi9SxMok="; + hash = "sha256-uQJfrgF0oafURlamHslt9hX9MP4vFeVqDhuX7T/kjiY="; }; nativeBuildInputs = [ cppo ]; From 4d87af6c208dc6006f7b50af1b383981c4a39598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 28 Oct 2025 22:09:38 -0400 Subject: [PATCH 05/17] pkgsCross.mingwW64.libxcb: fix build --- pkgs/by-name/li/libxcb/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libxcb/package.nix b/pkgs/by-name/li/libxcb/package.nix index 349ddf5b786e..b56bec0672e1 100644 --- a/pkgs/by-name/li/libxcb/package.nix +++ b/pkgs/by-name/li/libxcb/package.nix @@ -57,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: { tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; + env = lib.optionalAttrs stdenv.hostPlatform.isMinGW { + NIX_CFLAGS_COMPILE = toString [ "-Wno-incompatible-pointer-types" ]; + }; + meta = { description = "C interface to the X Window System protocol"; homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb"; From 2496dd621bfc5306d8e4a42bf4d96662560b01b5 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 28 Oct 2025 15:41:50 +0100 Subject: [PATCH 06/17] jkqtplotter: init at 5.0.0-unstable-2025-10-13 --- .../libraries/jkqtplotter/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/jkqtplotter/default.nix diff --git a/pkgs/development/libraries/jkqtplotter/default.nix b/pkgs/development/libraries/jkqtplotter/default.nix new file mode 100644 index 000000000000..8699da76be4b --- /dev/null +++ b/pkgs/development/libraries/jkqtplotter/default.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + qttools, + wrapQtAppsHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "jkqtplotter"; + version = "5.0.0-unstable-2025-10-13"; + + src = fetchFromGitHub { + owner = "jkriege2"; + repo = "JKQtPlotter"; + rev = "d243218119b1632987df26baea0d4bc6ccdee533"; + hash = "sha256-fLkZGl4LYr9zdGjxxhcU6IZkpXV/Sex4TC9DFPyw43M="; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + qttools + ]; + + meta = { + description = "Qt plotting framework"; + maintainers = [ lib.maintainers.sheepforce ]; + homepage = "https://github.com/jkriege2/JKQtPlotter"; + license = lib.licenses.lgpl21Plus; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cf105e26898..d2e9df9395b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3131,6 +3131,8 @@ with pkgs; jl = haskellPackages.jl; + jkqtplotter = libsForQt5.callPackage ../development/libraries/jkqtplotter { }; + joplin = nodePackages.joplin; jpylyzer = with python3Packages; toPythonApplication jpylyzer; From e95ff6dd75c1222246628b61e75a3846073ff73b Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 28 Oct 2025 15:50:57 +0100 Subject: [PATCH 07/17] avogadrolibs: 1.101.0 -> 1.102.1 --- .../science/chemistry/avogadrolibs/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index aa8849e5faaa..89dbbc7dd837 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -12,6 +12,7 @@ python3, libarchive, libmsym, + jkqtplotter, qttools, wrapQtAppsHook, }: @@ -28,32 +29,32 @@ let moleculesRepo = fetchFromGitHub { owner = "OpenChemistry"; repo = "molecules"; - tag = "1.101.0"; + tag = "1.102.1"; hash = "sha256-hMLf0gYYnQpjSGKcPy4tihNbmpRR7UxnXF/hyhforgI="; }; crystalsRepo = fetchFromGitHub { owner = "OpenChemistry"; repo = "crystals"; - tag = "1.101.0"; + tag = "1.102.1"; hash = "sha256-WhzFldaOt/wJy1kk+ypOkw1OYFT3hqD7j5qGdq9g+IY="; }; fragmentsRepo = fetchFromGitHub { owner = "OpenChemistry"; repo = "fragments"; - tag = "1.101.0"; + tag = "1.102.1"; hash = "sha256-x10jGl3lAEfm8OxUZJnjXRJCQg8RLQZTstjwnt5B2bw="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "avogadrolibs"; - version = "1.101.0"; + version = "1.102.1"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadrolibs"; - tag = version; - hash = "sha256-0DJU40Etse90rdX8xByjQeUiBsJtEQozZQQsWsc4vxk="; + tag = finalAttrs.version; + hash = "sha256-RmGRdCy1ubwAkEJlfldscR84NLOMBx33OdHdcq1R1gg="; }; postUnpack = '' @@ -77,6 +78,7 @@ stdenv.mkDerivation rec { glew libarchive libmsym + jkqtplotter qttools ]; @@ -96,4 +98,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2Only; }; -} +}) From 419f850ac03ce5b9c00ee8914df5563937cce6dc Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 28 Oct 2025 15:53:13 +0100 Subject: [PATCH 08/17] avogadro2: 1.101.0 -> 1.102.1 --- .../science/chemistry/avogadro2/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix index 24f967cb7d0f..4a18b8857166 100644 --- a/pkgs/applications/science/chemistry/avogadro2/default.nix +++ b/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -7,6 +7,7 @@ avogadrolibs, molequeue, hdf5, + jkqtplotter, openbabel, qttools, wrapQtAppsHook, @@ -17,20 +18,20 @@ let avogadroI18N = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadro-i18n"; - tag = "1.101.0"; - hash = "sha256-3qFx/rc5xqfrLq3Kr5b/Rid2LR/gfP6uqhhATyQL6Y8="; + tag = "1.102.1"; + hash = "sha256-doY+AWJ0GiE6VsTolgmFIRcRVl52lTgwNJLpXgVQ57c="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "avogadro2"; - version = "1.101.0"; + version = "1.102.1"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadroapp"; - rev = version; - hash = "sha256-F8to1DyeyyhsivkXDB/KH10/7teVnsoSU/ZHIsNISqc="; + rev = finalAttrs.version; + hash = "sha256-nBkOiw6JO/cG1Ob9gw7Tt/076OoRaRRmDc/a9YAfZCA="; }; postUnpack = '' @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { molequeue eigen hdf5 + jkqtplotter qttools ]; @@ -62,4 +64,4 @@ stdenv.mkDerivation rec { inherit (mesa.meta) platforms; license = licenses.bsd3; }; -} +}) From 186afb137aac18c09e435893b30c02eccd0677bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Oct 2025 22:29:32 +0000 Subject: [PATCH 09/17] foxglove-studio: 2.38.0 -> 2.39.0 --- pkgs/by-name/fo/foxglove-studio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/foxglove-studio/package.nix b/pkgs/by-name/fo/foxglove-studio/package.nix index cdcdc274793a..187e405004c0 100644 --- a/pkgs/by-name/fo/foxglove-studio/package.nix +++ b/pkgs/by-name/fo/foxglove-studio/package.nix @@ -20,11 +20,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "foxglove-studio"; - version = "2.38.0"; + version = "2.39.0"; src = fetchurl { url = "https://get.foxglove.dev/desktop/v${finalAttrs.version}/foxglove-studio-${finalAttrs.version}-linux-amd64.deb"; - hash = "sha256-GXWxiKPpOTgoMGcI8y9Hbesmv/jOOJxKnCl4RvkYNqQ="; + hash = "sha256-bEvlgFCDt1b/bZhqJeeMMIDq8qjga5pwRlo/fTa3QKs="; }; nativeBuildInputs = [ From 69b3f65469642046d2f620cdec4b828d1af35188 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 28 Oct 2025 20:15:52 +0000 Subject: [PATCH 10/17] python3Packages.lerobot: 0.3.3 -> 0.4.0 Diff: https://github.com/huggingface/lerobot/compare/v0.3.3...v0.4.0 Changelog: https://github.com/huggingface/lerobot/releases/tag/v0.4.0 --- .../python-modules/lerobot/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix index c7622536b604..daec5bd39c0b 100644 --- a/pkgs/development/python-modules/lerobot/default.nix +++ b/pkgs/development/python-modules/lerobot/default.nix @@ -8,6 +8,7 @@ setuptools, # dependencies + accelerate, av, datasets, deepdiff, @@ -26,6 +27,7 @@ rerun-sdk, termcolor, torch, + torchcodec, torchvision, wandb, @@ -36,14 +38,14 @@ buildPythonPackage rec { pname = "lerobot"; - version = "0.3.3"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "lerobot"; tag = "v${version}"; - hash = "sha256-JaspLUuSupmk6QD+mUVLuCSczTNjy0w+nsLBcy7tXnE="; + hash = "sha256-RVe1X0qBPm+okO3Gi/UdkuvuX0m4RlbhIs+NJLlC9wU="; }; # ValueError: mutable default for field value is not allowed: use default_factory @@ -73,7 +75,9 @@ buildPythonPackage rec { ]; dependencies = [ + accelerate av + cmake datasets deepdiff diffusers @@ -91,9 +95,13 @@ buildPythonPackage rec { rerun-sdk termcolor torch + torchcodec torchvision wandb - ]; + ] + ++ imageio.optional-dependencies.ffmpeg + ++ huggingface-hub.optional-dependencies.hf_transfer + ++ huggingface-hub.optional-dependencies.cli; pythonImportsCheck = [ "lerobot" ]; @@ -105,6 +113,7 @@ buildPythonPackage rec { disabledTests = [ # RuntimeError: OpenCVCamera(/build/source/tests/artifacts/cameras/image_480x270.png) read failed "test_async_read" + "test_fourcc_with_camer" "test_read" "test_rotation" @@ -134,6 +143,11 @@ buildPythonPackage rec { "test_cosine_decay_with_warmup_scheduler" "test_diffuser_scheduler" "test_vqbet_scheduler" + + # AssertionError: Regex pattern did not match. + # Regex: "Can't instantiate abstract class NonCallableStep with abstract method __call_" + # Input: "Can't instantiate abstract class NonCallableStep without an implementation for abstract method '__call__'" + "test_construction_rejects_step_without_call" ]; meta = { From a850f666b3f0b1bbbc4b071db87203fd0c28c2d7 Mon Sep 17 00:00:00 2001 From: botnk Date: Thu, 30 Oct 2025 01:49:54 +0000 Subject: [PATCH 11/17] zed-editor: 0.209.7 -> 0.210.4 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.210.4 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index ed74dd70f5d8..bbd8b88a2f43 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -101,7 +101,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.209.7"; + version = "0.210.4"; outputs = [ "out" @@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-vmHBPpRFSaqj62NZCAKtc3ZiMe8P++Ji57aJ5cuWjWQ="; + hash = "sha256-xSADK/LAbcb47Hd66p+11GuylOFSsbNTVtJtiVOylNQ="; }; postPatch = '' @@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-UM01zsi/brSyxzAaEUQ+ZUB8j5c6LMHv0eAhyuQ1huA="; + cargoHash = "sha256-bVRDOhjeRwS/j0Lul7JtnvXKUldOYH4dOJhUgMhfeuQ="; nativeBuildInputs = [ cmake From 6371dc10e0a49bc61a2c2e5df5c0ed425e2cfa00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Oct 2025 05:13:11 +0000 Subject: [PATCH 12/17] hledger-fmt: 0.3.1 -> 0.3.5 --- pkgs/by-name/hl/hledger-fmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hl/hledger-fmt/package.nix b/pkgs/by-name/hl/hledger-fmt/package.nix index bb5d8fe1b2d9..5f9315e3e493 100644 --- a/pkgs/by-name/hl/hledger-fmt/package.nix +++ b/pkgs/by-name/hl/hledger-fmt/package.nix @@ -9,20 +9,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hledger-fmt"; - version = "0.3.1"; + version = "0.3.5"; src = fetchFromGitHub { owner = "mondeja"; repo = "hledger-fmt"; tag = "v${finalAttrs.version}"; - hash = "sha256-5dPKSUJLxQ5WXZefuwr3wLhr3MNzy+dzpJkgKFU0/SE="; + hash = "sha256-VyDVdXxTge3ERTrkIIWgR75m7TaEbbPmFDNsoYOi9tM="; }; nativeBuildInputs = [ installShellFiles ]; - cargoHash = "sha256-yErH9AyfBZF0PByqViVhXHB/FAc0awz4bOyAHtcHe0s="; + cargoHash = "sha256-jn4ptV0IVnnXR2oCxxUnGaoWG/LBlRkf25/8Nasm9qI="; # Tests try to invoke the binary from "target/debug/hledger-fmt" # https://github.com/mondeja/hledger-fmt/blob/783abdb32eefb20195c7e9562858552935bb9c8e/src/cli/tests.rs#L5 From a689038a50792eea3bf84bca1d5bacc59113f375 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Oct 2025 06:45:10 +0000 Subject: [PATCH 13/17] terraform-providers.okta_okta: 6.3.0 -> 6.4.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cca0d968e74b..48083d3275bb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1003,13 +1003,13 @@ "vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE=" }, "okta_okta": { - "hash": "sha256-Y0gNIhJDJoK6wL5FoCjyhccywYBkCygovXGxVTylTn8=", + "hash": "sha256-7vjNorBNdfF3cTu1ANx+5Uh5chAL54lWZ7R9cMI/gpA=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v6.3.0", + "rev": "v6.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oE4nB0dFsiz82kj9QOr0vIjD3aBR+jxeAW5/ZWUxp44=" + "vendorHash": "sha256-gLFMFVw44jJcuVzY6OcUHJ74rRCIQuon4p9RNoQPLPs=" }, "oktadeveloper_oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From 1aeb6c7b28cbe66337ab85af9408656579e8a981 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 30 Oct 2025 08:10:22 +0100 Subject: [PATCH 14/17] rcu: 4.0.29 -> 4.0.30 --- pkgs/by-name/rc/rcu/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 1165087ab22a..08707fb7ba56 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -19,11 +19,12 @@ }: let + # shiboken2 is broken on Python > 3.12 python3Packages = python312Packages; in python3Packages.buildPythonApplication rec { pname = "rcu"; - version = "4.0.29"; + version = "4.0.30"; format = "other"; @@ -31,7 +32,7 @@ python3Packages.buildPythonApplication rec { let src-tarball = requireFile { name = "rcu-${version}-source.tar.gz"; - hash = "sha256-qbHjRKH9GOwBduyod8AOm2SYOjGUH1mYSpCTifOehVM="; + hash = "sha256-SJnDTW6oQUd+UjWgJz74Po+ibk3JfotFU7CIt4J/nDA="; url = "https://www.davisr.me/projects/rcu/"; }; in From a9d91573e9c747e9aa96d3419f78311967da4c0e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 30 Oct 2025 09:38:15 +0100 Subject: [PATCH 15/17] postgresqlPackages.anonymizer: fix maintainer pings Because of `lib.getAttrs`, `postgresqlPackages.anonymizer.meta.teamsPosition` returned the path to `lib/attrsets.nix`. This caused maintainer pings for that file for the maintainers of `postgresqlPackages.anonymizer`. Using regular `inherit` syntax moves the definition of the `teams` attribute in the right file and fixes the maintainer pings. --- pkgs/servers/sql/postgresql/ext/anonymizer.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix index 410bcd6966f8..23958e28a7cc 100644 --- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix +++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix @@ -23,7 +23,8 @@ buildPgrxExtension { passthru.tests = nixosTests.postgresql.anonymizer.passthru.override postgresql; - meta = lib.getAttrs [ "homepage" "teams" "license" ] pg-dump-anon.meta // { + meta = { + inherit (pg-dump-anon.meta) homepage teams license; description = "Extension to mask or replace personally identifiable information (PII) or commercially sensitive data from a PostgreSQL database"; }; } From e53d27e5ded10e24e9621acceae1d6052c3925c8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 30 Oct 2025 09:03:31 +0000 Subject: [PATCH 16/17] saga: cleanup --- pkgs/by-name/sa/saga/package.nix | 95 +++++++++++++++++--------------- 1 file changed, 52 insertions(+), 43 deletions(-) diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index f935cd93dc36..8b6062988af4 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -1,47 +1,51 @@ { - stdenv, lib, + stdenv, fetchurl, - # native + + # nativeBuildInputs cmake, - desktopToDarwinBundle, dos2unix, pkg-config, wrapGAppsHook3, - # not native - gdal, - wxGTK32, - proj, - libsForQt5, + # darwin-specific + desktopToDarwinBundle, + + # buildInputs curl, - libiodbc, - xz, - libharu, - opencv, - vigra, - pdal, - libpq, - unixODBC, - poppler, - hdf5, - netcdf, - sqlite, - qhull, - giflib, - libsvm, fftw, + gdal, + giflib, + hdf5, + libharu, + libiodbc, + libpq, + libsForQt5, + libsvm, + opencv, + pdal, + proj, + qhull, + vigra, + wxGTK32, + xz, + # darwin-specific + netcdf, + poppler, + sqlite, + unixODBC, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "saga"; version = "9.10.0"; src = fetchurl { - url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; + url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz"; hash = "sha256-xsXOB4WCzkZhH/mIYEUQNiQ9NnX+0CF2IcWkmwEJBUA="; }; - sourceRoot = "saga-${version}/saga-gis"; + sourceRoot = "saga-${finalAttrs.version}/saga-gis"; postPatch = '' dos2unix src/saga_core/saga_gui/res/org.saga_gis.saga_gui.desktop @@ -50,37 +54,42 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake dos2unix - wrapGAppsHook3 pkg-config + wrapGAppsHook3 ] - ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle + ]; buildInputs = [ curl - libsForQt5.dxflib fftw - libsvm - hdf5 gdal - wxGTK32 + giflib + hdf5 + libharu + libiodbc + libpq + libsForQt5.dxflib + libsvm + opencv pdal proj - libharu - opencv - vigra - libpq - libiodbc - xz qhull - giflib + vigra + wxGTK32 + xz + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart ] # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin ++ lib.optionals stdenv.hostPlatform.isDarwin [ - unixODBC - poppler netcdf + poppler sqlite + unixODBC ]; cmakeFlags = [ @@ -90,7 +99,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%20${version}/"; + changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${finalAttrs.version}/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ michelk @@ -99,4 +108,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.geospatial ]; platforms = with lib.platforms; unix; }; -} +}) From ac8ee5518fdebe5d04e773b6ad48eb6535270fe9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 30 Oct 2025 09:03:51 +0000 Subject: [PATCH 17/17] saga: fix build with cudaSupport --- pkgs/by-name/sa/saga/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 8b6062988af4..533797675ed8 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + config, fetchurl, # nativeBuildInputs @@ -8,6 +9,8 @@ dos2unix, pkg-config, wrapGAppsHook3, + # cuda-specific + cudaPackages, # darwin-specific desktopToDarwinBundle, @@ -34,6 +37,8 @@ poppler, sqlite, unixODBC, + + cudaSupport ? config.cudaSupport, }: stdenv.mkDerivation (finalAttrs: { @@ -57,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: { pkg-config wrapGAppsHook3 ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];