Merge staging-next into staging

pkgs/applications/editors/emacs/build-support/elpa2nix.el

···
 (require 'package)
 (package-initialize)
 
+;; TODO remove this patch when Emacs bug#77143 is fixed
+;; see that bug for more info
+(defun package--description-file (dir)
+  "Return package description file name for package DIR."
+  (concat (let ((subdir (file-name-nondirectory
+                         (directory-file-name dir))))
+            (if (string-match "\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\|snapshot\\)[0-9]+\\)*\\)\\'" subdir)
+                (match-string 1 subdir) subdir))
+          "-pkg.el"))
+
 (defun elpa2nix-install-package ()
   (if (not noninteractive)
       (error "`elpa2nix-install-package' is to be used only with -batch"))

pkgs/applications/editors/emacs/build-support/melpa.nix

···
     src = fetchFromGitHub {
       owner = "melpa";
       repo = "package-build";
-      rev = "d5661f1f1996a893fbcbacb4d290c57acab4fb0e";
-      hash = "sha256-zVhFR2kLLkCKC+esPBbIk3qOa033YND1HF9GiNI4JM8=";
+      rev = "d1722503145facf96631ac118ec0213a73082b76";
+      hash = "sha256-utsZLm9IF9UkTwxFWvJmwA3Ox4tlMeNNTo+f/CqYJGA=";
     };
 
-    patches = [ ./package-build-dont-use-mtime.patch ];
+    prePatch = ''
+      substituteInPlace package-build.el \
+        --replace-fail '(format "--mtime=@%d" time)' '"--mtime=@0"'
+    '';
 
     dontConfigure = true;
     dontBuild = true;

pkgs/applications/editors/emacs/build-support/melpa2nix.el

···
   (let* ((default-directory (package-recipe--working-tree rcp)))
     (unwind-protect
         (let ((files (package-build-expand-files-spec rcp t)))
-          (unless files
-            (error "Unable to find files matching recipe patterns"))
-          (if (> (length files) 1)
-              (package-build--build-multi-file-package rcp files)
-            (package-build--build-single-file-package rcp files))))))
+          (if files
+              (funcall package-build-build-function rcp files)
+            (error "Unable to find files matching recipe patterns"))))))
 
 (defun melpa2nix-build-package ()
   (unless noninteractive

pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch

···
-diff --git a/package-build.el b/package-build.el
-index 29cdb61..c19be1b 100644
---- a/package-build.el
-+++ b/package-build.el
-@@ -923,7 +923,6 @@ DIRECTORY is a temporary directory that contains the directory
- that is put in the tarball."
-   (let* ((name (oref rcp name))
-          (version (oref rcp version))
--         (time (oref rcp time))
-          (tar (expand-file-name (concat name "-" version ".tar")
-                                 package-build-archive-dir))
-          (dir (concat name "-" version)))
-@@ -939,7 +938,7 @@ that is put in the tarball."
-        ;; prevent a reproducible tarball as described at
-        ;; https://reproducible-builds.org/docs/archives.
-        "--sort=name"
--       (format "--mtime=@%d" time)
-+       "--mtime=@0"
-        "--owner=0" "--group=0" "--numeric-owner"
-        "--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"))
-     (when (and package-build-verbose noninteractive)

pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix

···
 
 melpaBuild {
   pname = "color-theme-solarized";
+  ename = "solarized-theme";
   version = "0-unstable-2023-02-09";
 
   src = fetchFromGitHub {
···
     rev = "b186e5d62d0b83cbf5cf38f7eb7a199dea9a3ee3";
     hash = "sha256-7E8r56dzfD06tsQEnqU5mWSbwz9x9QPbzken2J/fhlg=";
   };
+
+  files = ''(:defaults (:exclude "color-theme-solarized-pkg.el"))'';
 
   # https://github.com/NixOS/nixpkgs/issues/335408
   ignoreCompilationError = true;

pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix

···
 in
 melpaBuild {
   inherit pname version src;
+  melpaVersion = "1.4"; # upstream versions such as 1.04 are not supported
 
   outputs = [
     "out"

pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix

···
   pname = "session-management-for-emacs";
   ename = "session";
   version = "2.2a";
+  melpaVersion = "2.2"; # default value derived from version is not valid for Emacs
 
   src = fetchzip {
     url = "mirror://sourceforge/emacs-session/session-${version}.tar.gz";

pkgs/applications/editors/vscode/extensions/default.nix

···
         mktplcRef = {
           name = "ng-template";
           publisher = "Angular";
-          version = "19.2.1";
-          hash = "sha256-X4ZDKgUyoBU8LIh+aM3JyvqGE9LnXVhvOXtAdX6gUv4=";
+          version = "19.2.2";
+          hash = "sha256-WoNrKcK9Gr9gVWH/pwKyEUHuzcVNKh6zQwwpG4BuVCg=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";
···
         mktplcRef = {
           name = "vscode-bazel";
           publisher = "bazelbuild";
-          version = "0.10.0";
-          sha256 = "sha256-8SUOzsUmfgt9fAy037qLVNrGJPvTnIeMNz2tbN5psbs=";
+          version = "0.11.0";
+          sha256 = "sha256-c1Uvu9qBsQabdfhNxG0tCmCq3ub3wfgdoGor0cATo0c=";
         };
         meta = {
           description = "Bazel support for Visual Studio Code";
···
         mktplcRef = {
           publisher = "bmalehorn";
           name = "vscode-fish";
-          version = "1.0.38";
-          hash = "sha256-QEifCTlzYMX+5H6+k2o1lsQrhW3vxVpn+KFg/3WVVFo=";
+          version = "1.0.39";
+          hash = "sha256-T5wD4btQ2HSq3vB1m/qHM7VcvHfZmMD9OV93ZwxXcQg=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/bmalehorn.vscode-fish/changelog";
···
         mktplcRef = {
           name = "vscode-tailwindcss";
           publisher = "bradlc";
-          version = "0.14.11";
-          hash = "sha256-sZcbUIAs4m96rBfYJbyZegqAqL71+OjVykqna+QMdu0=";
+          version = "0.14.12";
+          hash = "sha256-Dn+Z5uZYoWSriNnkYK1rRoHv8sjr7ui70UeTA3e0wIs=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog";
···
           mktplcRef = {
             name = "catppuccin-vsc";
             publisher = "catppuccin";
-            version = "3.16.1";
-            hash = "sha256-qEwQ583DW17dlJbODN8SNUMbDMCR1gUH4REaFkQT65I=";
+            version = "3.17.0";
+            hash = "sha256-udDbsXAEsJUt3WUU8aBvCi8Pu+8gu+xQkimlmvRZ9pg=";
           };
           meta = {
             changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc/changelog";
···
         mktplcRef = {
           name = "profiler-php-vscode";
           publisher = "devsense";
-          version = "1.41.14332";
-          hash = "sha256-u2lNqG6FUhWnnNGtv+sjTbP/hbu4Da/8xjLzmPZkZOA=";
+          version = "1.57.17031";
+          hash = "sha256-fC+8trGmvgYjsnJA6+L6sxFoE6Cr91Q7xdparE9JKyg=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.profiler-php-vscode/changelog";
···
         mktplcRef = {
           name = "elm-ls-vscode";
           publisher = "Elmtooling";
-          version = "2.6.0";
-          hash = "sha256-iNFc7YJFl3d4/BJE9TPJfL0iqEkUtyEyVt4v1J2bXts=";
+          version = "2.8.0";
+          hash = "sha256-81tHgNjYc0LJjsgsQfo5xyh20k/i3PKcgYp9GZTvwfs=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Elmtooling.elm-ls-vscode/changelog";
···
         mktplcRef = {
           name = "vscode-open-in-github";
           publisher = "fabiospampinato";
-          version = "2.3.0";
-          hash = "sha256-vrW6uZyeEJipGtfz7BEeeAwiwtBlfQLjC7jAP1v5GoE=";
+          version = "2.3.1";
+          hash = "sha256-wqY8AArlTpQzoZ9OfV9MzlHIr9M/Ac4QUZL99n327EI=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/fabiospampinato.vscode-open-in-github/changelog";
···
         mktplcRef = {
           name = "foam-vscode";
           publisher = "foam";
-          version = "0.26.8";
-          hash = "sha256-DI0iPx/Wan3cgUCWgRvXt0uESCIJBR6lF3y/TRgYFnc=";
+          version = "0.26.10";
+          hash = "sha256-vhQtdc0553TyPkQnTHwg7Nr+UbDMf9yR+2jj40ANPdQ=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
···
         mktplcRef = {
           name = "godot-tools";
           publisher = "geequlim";
-          version = "2.3.0";
-          hash = "sha256-iuSec4PoVxyu1KB2jfCYOd98UrqQjH3q24zOR4VCPgs=";
+          version = "2.5.1";
+          hash = "sha256-kAzRSNZw1zaECblJv7NzXnE2JXSy9hzdT2cGX+uwleY=";
         };
         meta = {
           description = "VS Code extension for game development with Godot Engine and GDScript";
···
         mktplcRef = {
           name = "chatgpt-vscode";
           publisher = "genieai";
-          version = "0.0.8";
-          sha256 = "RKvmZkegFs4y+sEVaamPRO1F1E+k4jJyI0Q9XqKowrQ=";
+          version = "0.0.13";
+          sha256 = "sha256-aoVICzU5sfA96FCU4ysUGmULruGWLaVo2lFpiPhdtGA=";
         };
       };
 
···
           publisher = "github";
           name = "copilot";
           # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json
-          version = "1.292.0";
-          hash = "sha256-bgyDMEbIceTGtZ6CqUehkJLMAL8Osega6kMwb+buTAU=";
+          version = "1.293.0";
+          hash = "sha256-LwgINocPHA9jL6pMw40BgaZ3lOUwWPoOJWTDr+27h5Q=";
         };
 
         meta = {
···
         mktplcRef = {
           name = "gleam";
           publisher = "gleam";
-          version = "2.3.0";
-          hash = "sha256-dhRS8fLKY0plRwnrAUWT4g/LfH6IpODTNhT79g4Nm+0=";
+          version = "2.11.1";
+          hash = "sha256-tySY6vPg71QQKeKivCoJzcAH73nML/NWhtr+TgaSKRg=";
         };
         meta = {
           description = "Support for the Gleam programming language";
···
         mktplcRef = {
           name = "vscode-graphql-syntax";
           publisher = "GraphQL";
-          version = "1.3.6";
-          hash = "sha256-74Y/LpOhAj3TSplohhJqBwJDT87nCAiKrWsF90bc8jU=";
+          version = "1.3.8";
+          hash = "sha256-10x2kX9Gc7O/tGRDPZfy1cKdCIvGTCXcD2bDokIz7TU=";
         };
         meta = {
           description = "Adds full GraphQL syntax highlighting and language support such as bracket matching";
···
         mktplcRef = {
           name = "latex-workshop";
           publisher = "James-Yu";
-          version = "10.8.0";
-          sha256 = "sha256-tdQ3Z/OfNH0UgpHcn8Zq5rQxoetD61dossEh8hRygew=";
+          version = "10.9.0";
+          sha256 = "sha256-hexky9ZZt+u0H8HVcNiI2Jmx9HL5+uKHLVBNqEbgqLo=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
···
         mktplcRef = {
           name = "goto-next-previous-member";
           publisher = "mishkinf";
-          version = "0.0.6";
-          sha256 = "07rpnbkb51835gflf4fpr0v7fhj8hgbhsgcz2wpag8wdzdxc3025";
+          version = "0.0.10";
+          sha256 = "sha256-mRPWEU/M5uhiDUl9KwQi6w5hfzIZxKMhO48ssVfICoQ=";
         };
         meta = {
           license = lib.licenses.mit;
···
         mktplcRef = {
           name = "anycode";
           publisher = "ms-vscode";
-          version = "0.0.73";
-          hash = "sha256-83qz4wYnRK/KtrQMHwMAFhOnVyLXG1/EwUvVW2v30ho=";
+          version = "0.0.74";
+          hash = "sha256-rTWAOvIsrl0DSqxoQy5eU6EREJovU1oRMC8/2Q6x4Hk=";
         };
         meta = {
           license = lib.licenses.mit;
···
         mktplcRef = {
           name = "color-highlight";
           publisher = "naumovs";
-          version = "2.6.0";
-          hash = "sha256-TcPQOAHCYeFHPdR85GIXsy3fx70p8cLdO2UNO0krUOs=";
+          version = "2.8.0";
+          hash = "sha256-mT2P1lEdW66YkDRN6fi0rmmvvyBfXiJjAUHns8a8ipE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/naumovs.color-highlight/changelog";
···
         mktplcRef = {
           publisher = "shopify";
           name = "ruby-lsp";
-          version = "0.9.12";
-          hash = "sha256-ahfVRbTAKmmqOWV7vHK0+KLwYSUVgKqlIG1+lV3E5c4=";
+          version = "0.9.13";
+          hash = "sha256-Lde17QPuaubrvomwZjWA9f34/Dn0qyG5MQxMLJFWBQ8=";
         };
         meta = {
           description = "VS Code plugin for connecting with the Ruby LSP";
···
         mktplcRef = {
           name = "vscode-stylelint";
           publisher = "stylelint";
-          version = "1.4.0";
-          hash = "sha256-CsQBRoVDtNLlkHa6NLmOspkswB/JUMfMuU2dMYDlDnc=";
+          version = "1.5.0";
+          hash = "sha256-SHUb7+eL0PWlw/KUidXPvE5+MFsJz1Fi7Csptiw8j4M=";
         };
         meta = {
           description = "Official Stylelint extension for Visual Studio Code";
···
         mktplcRef = {
           name = "tabnine-vscode";
           publisher = "tabnine";
-          version = "3.247.0";
-          hash = "sha256-TOpdiqkOUmC+CXJn0H3+NYqTHkeuNf2Y37F0OgN6YzM=";
+          version = "3.249.0";
+          hash = "sha256-Pp1LlVAkozh2kIEvmPxg4LuuT08MeGbMN77M5Mx81qI=";
         };
         meta = {
           license = lib.licenses.mit;
···
         mktplcRef = {
           name = "vstuc";
           publisher = "VisualStudioToolsForUnity";
-          version = "1.1.0";
-          hash = "sha256-86KDksbTKlPgKC1joUc7uQTsDe2w9AIL0fekZP0z6gE=";
+          version = "1.1.1";
+          hash = "sha256-iE/o6hkDwT7jLTVvJbviQZgV+KnhSAGEZ2mf3gsua38=";
         };
         meta = {
           description = "Integrates Visual Studio Code for Unity";
···
         mktplcRef = {
           name = "vscode-icons";
           publisher = "vscode-icons-team";
-          version = "12.11.0";
-          hash = "sha256-RpuCHJBLqhAXAdvC0qGDUJIy5ww1yqlSb7hKwCALidM=";
+          version = "12.12.0";
+          hash = "sha256-C73ZpmVJ9ltzbfV3LmawV2X/2e+e1F3dxaYZzKMBZdQ=";
         };
         meta = {
           description = "Bring real icons to your Visual Studio Code";
···
         mktplcRef = {
           name = "vscode-zig";
           publisher = "ziglang";
-          version = "0.6.6";
-          hash = "sha256-UxbCRsTp7Fz6iAeC3lwojWrLPMJx5b7cNXxOFY7k0pk=";
+          version = "0.6.7";
+          hash = "sha256-l8pu348v2JUg/7+Qy5B41eyraPUj9WQ1WuW1aumgM9w=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog";

pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix

···
   mktplcRef = {
     publisher = "ms-pyright";
     name = "pyright";
-    version = "1.1.397";
-    hash = "sha256-Z6iKOgAglxDdPz9D4pL1STj3+uy8S89oOalqfdV1reI=";
+    version = "1.1.398";
+    hash = "sha256-fSBn4c1e1e4atJUV6STmEYB/++WXZFsN2v5+zyfYnZA=";
   };
 
   meta = {

pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix

···
   mktplcRef = {
     name = "claude-dev";
     publisher = "saoudrizwan";
-    version = "3.8.3";
-    hash = "sha256-0FAxQ67AKcSbCp8vQr2KUOIRw8LEQ3TQyJkfJwtmdoY=";
+    version = "3.8.4";
+    hash = "sha256-Ona7JntYaHbh7/1Q3Y+7UxmI+X0H93Y/cIW73DXxA1M=";
   };
 
   meta = {

pkgs/applications/misc/blender/default.nix pkgs/by-name/bl/blender/package.nix

···
   cudaSupport ? config.cudaSupport,
   dbus,
   embree,
-  fetchgit,
-  fetchpatch2,
   fetchzip,
   ffmpeg,
   fftw,
···
   makeWrapper,
   mesa,
   openal,
-  opencollada,
+  opencollada-blender,
   opencolorio,
   openexr,
   openimagedenoise,
···
 
 stdenv'.mkDerivation (finalAttrs: {
   pname = "blender";
-  version = "4.3.2";
+  version = "4.4.0";
 
-  srcs = [
-    (fetchzip {
-      name = "source";
-      url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
-      hash = "sha256-LCU2JpQbvQ+W/jC+H8J2suh+X5sTLOG9TcE2EeHqVh4=";
-    })
-    (fetchgit {
-      name = "assets";
-      url = "https://projects.blender.org/blender/blender-assets.git";
-      rev = "v${finalAttrs.version}";
-      fetchLFS = true;
-      hash = "sha256-B/UibETNBEUAO1pLCY6wR/Mmdk2o9YyNs6z6pV8dBJI=";
-    })
-  ];
+  srcs = fetchzip {
+    name = "source";
+    url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
+    hash = "sha256-pAzOayAPyRYgTixAyg2prkUtI70uFulRuBYhgU9ZNw4=";
+  };
 
-  postUnpack = ''
-    chmod -R u+w *
-    rm -r assets/working
-    mv assets --target-directory source/release/datafiles/
-  '';
-
-  sourceRoot = "source";
-
-  patches = [
-    ./draco.patch
-    (fetchpatch2 {
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/raw/4b6214600e11851d7793256e2f6846a594e6f223/ffmpeg-7-1.patch";
-      hash = "sha256-YXXqP/+79y3f41n3cJ3A1RBzgdoYqfKZD/REqmWYdgQ=";
-    })
-    (fetchpatch2 {
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/raw/4b6214600e11851d7793256e2f6846a594e6f223/ffmpeg-7-2.patch";
-      hash = "sha256-mF6IA/dbHdNEkBN5XXCRcLIZ/8kXoirNwq7RDuLRAjw=";
-    })
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
+  patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
 
   postPatch =
     (lib.optionalString stdenv.hostPlatform.isDarwin ''
···
       "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}"
       "-DWITH_OPENSUBDIV=ON"
       "-DWITH_OPENVDB=ON"
+      "-DWITH_PIPEWIRE=OFF"
       "-DWITH_PULSEAUDIO=OFF"
       "-DWITH_PYTHON_INSTALL=OFF"
       "-DWITH_PYTHON_INSTALL_NUMPY=OFF"
···
       wayland
       wayland-protocols
     ]
-    ++ lib.optional colladaSupport opencollada
+    ++ lib.optional colladaSupport opencollada-blender
     ++ lib.optional jackaudioSupport libjack2
     ++ lib.optional spaceNavSupport libspnav
     ++ lib.optionals vulkanSupport [
···
     lib.optionalString stdenv.hostPlatform.isDarwin ''
       mkdir $out/Applications
       mv $out/Blender.app $out/Applications
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      mv $out/share/blender/${lib.versions.majorMinor finalAttrs.version}/python{,-ext}
     ''
     + ''
       buildPythonPath "$pythonPath"

pkgs/applications/misc/blender/draco.patch

···
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 97596dbee8d..d1ad6ac5de0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1237,13 +1237,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES        OFF)
- set_and_warn_dependency(WITH_PYTHON WITH_DRACO         OFF)
- set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID     OFF)
- 
--if(NOT WITH_PYTHON_MODULE)
--  if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
--    message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
--    set(WITH_DRACO OFF)
--  endif()
--endif()
--
- # enable boost for cycles, audaspace or i18n
- # otherwise if the user disabled
- 
-diff --git a/scripts/addons_core/io_scene_gltf2/io/com/draco.py b/scripts/addons_core/io_scene_gltf2/io/com/draco.py
-index 75e23162c67..875596c3d2f 100644
---- a/scripts/addons_core/io_scene_gltf2/io/com/draco.py
-+++ b/scripts/addons_core/io_scene_gltf2/io/com/draco.py
-@@ -31,8 +31,8 @@ def dll_path() -> Path:
-     :return: DLL path.
-     """
-     lib_name = 'extern_draco'
--    blender_root = Path(bpy.app.binary_path).parent
--    python_lib = Path('{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version))
-+    blender_root = Path(bpy.app.binary_path).parent.parent
-+    python_lib = Path('share/blender/{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version))
-     python_version = 'python{v[0]}.{v[1]}'.format(v=sys.version_info)
- 
-     path = os.environ.get('BLENDER_EXTERN_DRACO_LIBRARY_PATH')

pkgs/by-name/au/authenticator/package.nix

···
-{ lib
-, stdenv
-, fetchFromGitLab
-, appstream-glib
-, cargo
-, desktop-file-utils
-, meson
-, ninja
-, pkg-config
-, rustPlatform
-, rustc
-, wrapGAppsHook4
-, gdk-pixbuf
-, glib
-, gst_all_1
-, gtk4
-, libadwaita
-, openssl
-, pipewire
-, sqlite
-, wayland
-, zbar
-, glycin-loaders
-, nix-update-script
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  appstream-glib,
+  cargo,
+  desktop-file-utils,
+  meson,
+  ninja,
+  pkg-config,
+  rustPlatform,
+  rustc,
+  wrapGAppsHook4,
+  gdk-pixbuf,
+  glib,
+  gst_all_1,
+  gtk4,
+  libadwaita,
+  openssl,
+  pipewire,
+  sqlite,
+  wayland,
+  zbar,
+  glycin-loaders,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "authenticator";
-  version = "4.6.0";
+  version = "4.6.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "Authenticator";
-    rev = version;
-    hash = "sha256-Kq/J/1+ROibR6NjfH/g760/CT4DZg1hIcsXQ4MHzrDc=";
+    tag = finalAttrs.version;
+    hash = "sha256-UvHIVUed4rxmjliaZ7jnwCjiHyvUDihoJyG3G+fYtow=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    name = "${pname}-${version}";
-    hash = "sha256-SQDr4jdCZzuizYWwJ5crrunqN8O2bCUv5gIslBduAZY=";
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-iOIGm3egVtVM6Eb3W5/ys9nQV5so0dnv2ZODjQwrVyw=";
   };
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      # vp8enc preset
-      --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets"
-      # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
-    )
-  '';
+  strictDeps = true;
 
   nativeBuildInputs = [
     appstream-glib
···
     zbar
   ];
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      # vp8enc preset
+      --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets"
+      # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
+      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
+    )
+  '';
+
   passthru = {
     updateScript = nix-update-script { };
   };
···
     maintainers = with lib.maintainers; [ austinbutler ] ++ lib.teams.gnome-circle.members;
     platforms = lib.platforms.linux;
   };
-}
+})

pkgs/by-name/bu/buf/package.nix

···
 
 buildGoModule rec {
   pname = "buf";
-  version = "1.50.1";
+  version = "1.51.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "buf";
     rev = "v${version}";
-    hash = "sha256-n4X8Wgi/5z6fteR+uxr68R3kD7eorMzlAW8jacTZGHg=";
+    hash = "sha256-/6SDsIVyorDWjOkdUB1t0vAA2VLy6MiGyiFo+2rUfEU=";
   };
 
-  vendorHash = "sha256-HU4Di8ri2d93EUscCx8/gRiEJdLTcnKUaQ4kesKfZ+w=";
+  vendorHash = "sha256-4GD2yNfYTQobPeJ+zPQ+ECDTeNUi4PK8oXSxpBF/4Wk=";
 
   patches = [
     # Skip a test that requires networking to be available to work.

pkgs/by-name/im/immich-machine-learning/package.nix

···
   ];
 
   build-system = with python.pkgs; [
-    poetry-core
+    hatchling
     cython
   ];
 

pkgs/by-name/im/immich/package.nix

···
     sourceRoot = "${src.name}/web";
     inherit (sources.components.web) npmDepsHash;
 
+    # prePatch is needed because npmConfigHook is a postPatch
+    prePatch = ''
+      # some part of the build wants to use un-prefixed binaries. let them.
+      mkdir -p $TMP/bin
+      ln -s "$(type -p ${stdenv.cc.targetPrefix}pkg-config)" $TMP/bin/pkg-config || true
+      ln -s "$(type -p ${stdenv.cc.targetPrefix}c++filt)" $TMP/bin/c++filt || true
+      ln -s "$(type -p ${stdenv.cc.targetPrefix}readelf)" $TMP/bin/readelf || true
+      export PATH="$TMP/bin:$PATH"
+    '';
+
     preBuild = ''
       rm node_modules/@immich/sdk
       ln -s ${openapi} node_modules/@immich/sdk
···
   src = "${src}/server";
   inherit (sources.components.server) npmDepsHash;
 
-  postPatch = ''
+  # prePatch is needed because npmConfigHook is a postPatch
+  prePatch = ''
     # pg_dumpall fails without database root access
     # see https://github.com/immich-app/immich/issues/13971
     substituteInPlace src/services/backup.service.ts \
···
 
     # some part of the build wants to use un-prefixed binaries. let them.
     mkdir -p $TMP/bin
-    ln -s "$(type -p ${stdenv.cc.targetPrefix}pkg-config)" $TMP/bin/pkg-config
-    ln -s "$(type -p ${stdenv.cc.targetPrefix}c++filt)" $TMP/bin/c++filt
-    ln -s "$(type -p ${stdenv.cc.targetPrefix}readelf)" $TMP/bin/readelf
+    ln -s "$(type -p ${stdenv.cc.targetPrefix}pkg-config)" $TMP/bin/pkg-config || true
+    ln -s "$(type -p ${stdenv.cc.targetPrefix}c++filt)" $TMP/bin/c++filt || true
+    ln -s "$(type -p ${stdenv.cc.targetPrefix}readelf)" $TMP/bin/readelf || true
     export PATH="$TMP/bin:$PATH"
   '';
 

pkgs/by-name/im/immich/sources.json

···
 {
-  "version": "1.129.0",
-  "hash": "sha256-cBTWmbJLbpUPLCfa0WsO87p79mZycS/vxPD55gdEYI4=",
+  "version": "1.130.3",
+  "hash": "sha256-qMRX8gwoagZJwhMg/1X+ZItFyC73qxLR8pHujWu1rog=",
   "components": {
     "cli": {
-      "npmDepsHash": "sha256-dMa0ZcLu2oU9jpYl3EEXTz0mY0YoK41mm6o0AGNaroU=",
-      "version": "2.2.53"
+      "npmDepsHash": "sha256-l8Aw9V6bwj/kauBmmKGiqytzjGwyXL1qlEg54eQcddQ=",
+      "version": "2.2.57"
     },
     "server": {
-      "npmDepsHash": "sha256-VoY+/nUtjHcgeD66DHoRR53eTLqLsGrI3V3LCO1H934=",
-      "version": "1.129.0"
+      "npmDepsHash": "sha256-4FiD1+lVqth3MNzityx3oAo/LLXkfTaA57vG4KUhUcM=",
+      "version": "1.130.3"
     },
     "web": {
-      "npmDepsHash": "sha256-xRKKRDq0T321tbAGIrVojiVVtjYmg2p2RjoXteRIVoQ=",
-      "version": "1.129.0"
+      "npmDepsHash": "sha256-nUMXNdEK8Dyai0/NKcXD8bB+aH/ZeiDcQmRKVzo9cqc=",
+      "version": "1.130.3"
     },
     "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-ZcsVTxmMzy3fGlnHMUIzZxyXw9rDgWMcfeqqkYuF7hQ=",
-      "version": "1.129.0"
+      "npmDepsHash": "sha256-B8NqGLgmT126Cf0uPx4Eka60i3mNPskvHnfVTEqf0BY=",
+      "version": "1.130.3"
     },
     "geonames": {
-      "timestamp": "20250306005539",
-      "hash": "sha256-2JYoUVF2w4RCyPn/PRoJ0/bv/hADwoLhrwY1K/51c64="
+      "timestamp": "20250325151913",
+      "hash": "sha256-bg+KON+ydWlRJ8MsIL7Ue0c97aqiiItuK8+kFngd6W0="
     }
   }
 }

pkgs/by-name/in/inko/package.nix

···
   lib,
   rustPlatform,
   fetchFromGitHub,
-  llvm_16,
+  llvm_17,
   libffi,
   libz,
   libxml2,
···
   stdenv,
   makeWrapper,
   callPackage,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "inko";
-  version = "0.15.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "inko-lang";
     repo = "inko";
-    rev = "v${version}";
-    hash = "sha256-Iojv8pTyILYpLFnoTlgUGmlfWWH0DgsGBRxzd3oRNwA=";
+    tag = "v${version}";
+    hash = "sha256-jVfAfR02R2RaTtzFSBoLuq/wdPaaI/eochrZaRVdmHY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-BTfg3uPLvbeKPgb7qF9WFYLzUCZ6AVRk9I0T2hxuVqU=";
+  cargoHash = "sha256-IOMhwcZHB5jVYDM65zifxCjVHWl1EBbxNA3WVmarWcs=";
 
   buildInputs = [
     libffi
···
   ];
 
   nativeBuildInputs = [
-    llvm_16
+    llvm_17
     makeWrapper
   ];
 
···
     cp -r std/src/* $out/lib/
   '';
 
-  passthru.tests = {
-    simple = callPackage ./test.nix { };
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      simple = callPackage ./test.nix { };
+    };
   };
 
   meta = {
     description = "Language for building concurrent software with confidence";
     homepage = "https://inko-lang.org/";
     license = lib.licenses.mpl20;
-    maintainers = [ lib.maintainers.feathecutie ];
+    maintainers = [ lib.maintainers.feathecutie ] ++ lib.teams.ngi.members;
     platforms = lib.platforms.unix;
     mainProgram = "inko";
   };

pkgs/by-name/iv/ivm/package.nix

···
   libz,
   libxml2,
   ncurses,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttr: {
   pname = "ivm";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "inko-lang";
     repo = "ivm";
-    rev = "v${version}";
+    tag = "v${finalAttr.version}";
     hash = "sha256-pqqUvHK6mPrK1Mir2ILANxtih9OrAKDJPE0nRWc5JOY=";
   };
 
···
       }
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Cross-platform Inko version manager";
     homepage = "https://github.com/inko-lang/ivm";
     license = lib.licenses.mpl20;
-    maintainers = [ lib.maintainers.feathecutie ];
+    maintainers = [ lib.maintainers.feathecutie ] ++ lib.teams.ngi.members;
     platforms = lib.platforms.unix;
     mainProgram = "ivm";
   };
-}
+})

pkgs/by-name/li/livepeer/package.nix

···
 
 buildGoModule rec {
   pname = "livepeer";
-  version = "0.8.3";
+  version = "0.8.4";
 
   proxyVendor = true;
-  vendorHash = "sha256-bHlBHoofFBd34tp3Qsefr4Bpo7Zp1xn5F4z8kFtKeWQ=";
+  vendorHash = "sha256-9BxLyl8lZTKx/2Qw0NR4+1GdmD9FQPfnVU+x/RWEIvA=";
 
   src = fetchFromGitHub {
     owner = "livepeer";
     repo = "go-livepeer";
     tag = "v${version}";
-    hash = "sha256-93sy+NX934Dh2vJwYpzlmz69yzbThpAw+eSQsZ1bMd0=";
+    hash = "sha256-slM3StvePwCyKXFmbxyZAZ4tTtLea4SMBXCojK8zrdM=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/om/om4/include-exit.patch

···
+Index: a/parser.y
+===================================================================
+--- a/parser.y
++++ a/parser.y
+@@ -16,8 +16,9 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ #include <math.h>
+ #include <stdint.h>
++#include <stdlib.h>
+ #define YYSTYPE	int32_t
+ extern int32_t end_result;
+ extern int yylex(void);
+ extern int yyerror(const char *);

pkgs/by-name/om/om4/package.nix

···
   src = fetchFromGitHub {
     owner = "ibara";
     repo = "m4";
-    rev = "${pname}-${version}";
-    sha256 = "04h76hxwb5rs3ylkw1dv8k0kmkzl84ccqlwdwxb6i0x57rrqbgzx";
+    tag = "om4-${version}";
+    hash = "sha256-/b+Fcz6lg2hW541TzBhB9M86wUS7BT6pHzqXxTs0BxI=";
   };
 
+  patches = [
+    # parser.y:51:25: error: implicit declaration of function 'exit' []
+    ./include-exit.patch
+  ];
+
   strictDeps = true;
   nativeBuildInputs = [
     bison
···
 
   configureFlags = [ "--enable-m4" ];
 
-  meta = with lib; {
+  meta = {
     description = "Portable OpenBSD m4 macro processor";
     homepage = "https://github.com/ibara/m4";
-    license = with licenses; [
+    license = with lib.licenses; [
       bsd2
       bsd3
       isc
       publicDomain
     ];
     mainProgram = "m4";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     maintainers = [ ];
   };
 }

pkgs/by-name/op/opencollada-blender/package.nix

···
+{
+  cmake,
+  fetchFromGitHub,
+  lib,
+  libxml2,
+  pcre,
+  pkg-config,
+  stdenv,
+}:
+
+stdenv.mkDerivation {
+  pname = "opencollada";
+  version = "unstable-2025-01-30";
+
+  src = fetchFromGitHub {
+    owner = "aras-p";
+    repo = "OpenCOLLADA";
+    rev = "4526eb8aaa6462c71fbedd23103976c151a01c50";
+    sha256 = "sha256-ctr+GjDzxOJxBfaMwjwayPkAOcF+FMsP1X72QCOwvTY=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  propagatedBuildInputs = [
+    libxml2
+    pcre
+  ];
+
+  meta = {
+    description = "Library for handling the COLLADA file format";
+    homepage = "https://github.com/KhronosGroup/OpenCOLLADA/";
+    maintainers = [ lib.maintainers.amarshall ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
+  };
+}

pkgs/by-name/op/opencollada/package.nix

···
 {
-  lib,
-  stdenv,
+  cmake,
   fetchFromGitHub,
   fetchurl,
-  cmake,
-  pkg-config,
+  lib,
   libxml2,
   pcre,
-  darwin,
+  pkg-config,
+  stdenv,
 }:
 
 stdenv.mkDerivation rec {
   pname = "opencollada";
-
   version = "1.6.68";
 
   src = fetchFromGitHub {
···
     })
   ];
 
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
-    with darwin.apple_sdk.frameworks; [ AGL ]
-  );
-
-  propagatedBuildInputs = [
-    libxml2
-    pcre
-  ];
-
   postPatch =
     ''
       # Drop blanket -Werror as it tends to fail on newer toolchain for
···
       substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \
         --replace math.h cmath
     '';
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  propagatedBuildInputs = [
+    libxml2
+    pcre
+  ];
 
   meta = {
     description = "Library for handling the COLLADA file format";

pkgs/by-name/ph/phpactor/package.nix

···
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpactor";
-  version = "2025.02.21.0";
+  version = "2025.03.28.0";
 
   src = fetchFromGitHub {
     owner = "phpactor";
     repo = "phpactor";
     rev = finalAttrs.version;
-    hash = "sha256-c/tYyWTfMGfylhm0DCr8zCN8Qh0xGAb5aiMSou4khdg=";
+    hash = "sha256-K3phBiu2D3DbOm7mApqqSNnVCsfYRQtN/o3bCVubN9I=";
   };
 
-  vendorHash = "sha256-+Yar3FLE5Fhvj24vCBd9+2vEfNXlhaGPbP33Zpz5hzM=";
+  vendorHash = "sha256-7wFlS+a97tdhfxfc/IElzOVH25MAgf42UZBC1giBAls=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/py/pywal16/package.nix

···
 
 python3.pkgs.buildPythonApplication rec {
   pname = "pywal16";
-  version = "3.8.3";
+  version = "3.8.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eylles";
     repo = "pywal16";
     tag = version;
-    hash = "sha256-yF90HkRg44pPRO/7Gj5BEgj44Qgs4OIM+GR7inJVKMI=";
+    hash = "sha256-gdFHAvZD1jBc2ZA5NujRUN1nortlzAj3sLh9B+dMJlk=";
   };
 
   build-system = [ python3.pkgs.setuptools ];

pkgs/by-name/ro/root/package.nix

···
   gnugrep,
   gnused,
   gsl,
-  lapack,
   libGLU,
   libGL,
   libxcrypt,
···
   xorg,
   xz,
   man,
-  openblas,
   openssl,
   pcre,
   nlohmann_json,
···
 
 stdenv.mkDerivation rec {
   pname = "root";
-  version = "6.34.04";
+  version = "6.34.06";
 
   passthru = {
     tests = import ./tests { inherit callPackage; };
···
 
   src = fetchurl {
     url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
-    hash = "sha256-4yDFNzqOh7sptygJVMqDVa2MQpXPSSNWBvDIsgCss3Q=";
+    hash = "sha256-p5nWMtrlux7Ifq5uvARqEiaMaEnyqIN5IcEY/FG2z/M=";
   };
 
   clad_src = fetchgit {
···
       gl2ps
       glew
       gsl
-      lapack
       libjpeg
       libpng
       libtiff
···
       libxml2
       llvm_18
       lz4
-      openblas
       openssl
       patchRcPathCsh
       patchRcPathFish
···
       done
       substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
         --replace-fail 'set(lcgpackages ' '#set(lcgpackages '
-
-      # Make sure that clad is finding the right llvm version
-      substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
-        --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=''${LLVM_CMAKE_PATH}'
 
       substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \
         --replace-fail 'add_clang_symlink(''${link} clang)' ""

pkgs/by-name/st/starlark/package.nix

···
 }:
 buildGoModule {
   pname = "starlark";
-  version = "0-unstable-2025-02-25";
+  version = "0-unstable-2025-03-18";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "starlark-go";
-    rev = "0d3f41d403af5d6607cdf241f12b7e0572f2cb58";
-    hash = "sha256-ZZR89U2+LhzAptNz/S2qMBKNGdf5xUbXLcLCHizhQ2A=";
+    rev = "d9371fef63fe912333a96a4e54ff72d071cb71ad";
+    hash = "sha256-gbhn9bvt5SjOvdIEyQzMitLpS3KdOvvvR73l4E6Hap8=";
   };
 
   vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo=";

pkgs/by-name/st/strip-ansi/package.nix

···
+{
+  stdenv,
+  buildPackages,
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+  installShellFiles,
+}:
+let
+  canRunStripAnsi = stdenv.hostPlatform.emulatorAvailable buildPackages;
+  stripAnsiCompletions = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/strip-ansi-completions";
+in
+rustPlatform.buildRustPackage {
+  pname = "strip-ansi";
+  version = "0.1.0-unstable-2024-09-01";
+
+  src = fetchFromGitHub {
+    owner = "KSXGitHub";
+    repo = "strip-ansi-cli";
+    rev = "60dbdbc22b41f743c237cb75b11e72cf7884b792";
+    hash = "sha256-FvozEjNWXE1XEIq/06JehES7LVKoWmzIoaB4fD1kUsY=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-kebx9OrAeh4c01VDUmlfTVn0EgFfzewiXjaQ3qtJrPY=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString canRunStripAnsi ''
+    installShellCompletion --cmd strip-ansi \
+      --bash <(${stripAnsiCompletions} bash) \
+      --fish <(${stripAnsiCompletions} fish) \
+      --zsh <(${stripAnsiCompletions} zsh)
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/KSXGitHub/strip-ansi-cli";
+    description = "Strip ANSI escape sequences from text";
+    license = [ lib.licenses.mit ];
+    maintainers = [ lib.maintainers._9999years ];
+    mainProgram = "strip-ansi";
+  };
+}

pkgs/by-name/tx/txtpbfmt/package.nix

···
 
 buildGoModule {
   pname = "txtpbfmt";
-  version = "0-unstable-2025-03-17";
+  version = "0-unstable-2025-03-26";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "txtpbfmt";
-    rev = "bcaa21031d50b90bf873b5e952f30b4721fadfc0";
-    hash = "sha256-KqIkenKJwn6QssUOJDwusDU/h9K5DSWPxflbmoWUMEY=";
+    rev = "a5fe55684d52b017a494471a2a08264d778166ad";
+    hash = "sha256-e8tDQOr6CtGjVhhiPjSG14adrqi5geBitD1SnqL6Tx8=";
   };
 
   vendorHash = "sha256-iWY0b6PAw9BhA8WrTEECnVAKWTGXuIiGvOi9uhJO4PI=";

pkgs/by-name/wa/wait4x/package.nix

···
   inherit pname version;
 
   src = fetchFromGitHub {
-    owner = "atkrad";
+    owner = "wait4x";
     repo = pname;
     rev = "v${version}";
     hash = "sha256-UVs8tCOgPU/IwM3Z3/ehFnAbHTSOHGAO9VpcB/NItGM=";
···
 
   meta = with lib; {
     description = "Wait4X allows you to wait for a port or a service to enter the requested state";
-    homepage = "https://github.com/atkrad/wait4x";
+    homepage = "https://github.com/wait4x/wait4x";
     license = licenses.asl20;
     maintainers = with maintainers; [ jfvillablanca ];
     mainProgram = "wait4x";

pkgs/by-name/xt/xtensor/0001-Fix-clang-build-errors-on-darwin.patch

···
+From 475bedb15252a3732683f3a62c45cc3f1abbab5c Mon Sep 17 00:00:00 2001
+From: Mykola Vankovych <[e-mail]>
+Date: Tue, 14 Jan 2025 16:48:47 +0100
+Subject: [PATCH] Added fixes for building with clang 19 (more strict template
+ matching rules)
+
+---
+ include/xtensor/xexpression_traits.hpp | 7 +++----
+ include/xtensor/xstorage.hpp           | 4 ++--
+ include/xtensor/xutils.hpp             | 3 ++-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/include/xtensor/xexpression_traits.hpp b/include/xtensor/xexpression_traits.hpp
+index 205de67a5..2f84ae234 100644
+--- a/include/xtensor/xexpression_traits.hpp
++++ b/include/xtensor/xexpression_traits.hpp
+@@ -103,16 +103,15 @@ namespace xt
+             using type = xarray<T, L>;
+         };
+ 
+-#if defined(__GNUC__) && (__GNUC__ > 6)
+-#if __cplusplus == 201703L
++// Workaround for rebind_container problems when C++17 feature is enabled
++#ifdef __cpp_template_template_args
+         template <template <class, std::size_t, class, bool> class S, class X, std::size_t N, class A, bool Init>
+         struct xtype_for_shape<S<X, N, A, Init>>
+         {
+             template <class T, layout_type L>
+             using type = xarray<T, L>;
+         };
+-#endif  // __cplusplus == 201703L
+-#endif  // __GNUC__ && (__GNUC__ > 6)
++#endif  // __cpp_template_template_args
+ 
+         template <template <class, std::size_t> class S, class X, std::size_t N>
+         struct xtype_for_shape<S<X, N>>
+diff --git a/include/xtensor/xstorage.hpp b/include/xtensor/xstorage.hpp
+index ac179a852..fec8e10f3 100644
+--- a/include/xtensor/xstorage.hpp
++++ b/include/xtensor/xstorage.hpp
+@@ -1637,8 +1637,8 @@ namespace xt
+         return !(lhs < rhs);
+     }
+ 
+-// Workaround for rebind_container problems on GCC 8 with C++17 enabled
+-#if defined(__GNUC__) && __GNUC__ > 6 && !defined(__clang__) && __cplusplus >= 201703L
++// Workaround for rebind_container problems when C++17 feature is enabled
++#ifdef __cpp_template_template_args
+     template <class X, class T, std::size_t N>
+     struct rebind_container<X, aligned_array<T, N>>
+     {
+diff --git a/include/xtensor/xutils.hpp b/include/xtensor/xutils.hpp
+index 9844b0ba7..b8c818efd 100644
+--- a/include/xtensor/xutils.hpp
++++ b/include/xtensor/xutils.hpp
+@@ -1023,7 +1023,8 @@ namespace xt
+         using type = C<X, allocator>;
+     };
+ 
+-#if defined(__GNUC__) && __GNUC__ > 6 && !defined(__clang__) && __cplusplus >= 201703L
++// Workaround for rebind_container problems when C++17 feature is enabled
++#ifdef __cpp_template_template_args
+     template <class X, class T, std::size_t N>
+     struct rebind_container<X, std::array<T, N>>
+     {
+

pkgs/by-name/xt/xtensor/package.nix

···
     hash = "sha256-hVfdtYcJ6mzqj0AUu6QF9aVKQGYKd45RngY6UN3yOH4=";
   };
 
+  # See https://github.com/xtensor-stack/xtensor/pull/2821
+  patches = lib.optionals stdenv.cc.isClang [ ./0001-Fix-clang-build-errors-on-darwin.patch ];
+
   nativeBuildInputs = [
     cmake
   ];

pkgs/development/lua-modules/generated-packages.nix

···
 lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
   pname = "lze";
-  version = "0.10.0-1";
+  version = "0.11.0-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/lze-0.10.0-1.rockspec";
-    sha256 = "107micilys1nxg1dpqzabfvxbzly4mfhyc9xjkkfnsyxjvqjhd28";
+    url    = "mirror://luarocks/lze-0.11.0-1.rockspec";
+    sha256 = "05465ndcfvvyvvxz8h7xm9vrcfbfhvs6sbrcy73cl5s44r46ym00";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/BirdeeHub/lze/archive/v0.10.0.zip";
-    sha256 = "186mhaal7cmlxdgqqgvgvqjlw30f4w7vrzx7y2l9vzmgw4ilvrj8";
+    url    = "https://github.com/BirdeeHub/lze/archive/v0.11.0.zip";
+    sha256 = "1awqix5xx4pkv09gba5xwv67qyi2qzf9aji48bk2xr431vshz5jv";
   };
 
   disabled = luaOlder "5.1";
···
 lzextras = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
   pname = "lzextras";
-  version = "0.2.5-1";
+  version = "0.3.0-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/lzextras-0.2.5-1.rockspec";
-    sha256 = "0aqvly57k99fgcxhs1dfqyrf8bl7v6x75vdcjqpqsm3pkpvs1nl4";
+    url    = "mirror://luarocks/lzextras-0.3.0-1.rockspec";
+    sha256 = "1w8ar8qi1hnbnj70f3lhrzf0hp1d0jbvya9v318pqcd16wh7x6ii";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/BirdeeHub/lzextras/archive/v0.2.5.zip";
-    sha256 = "1lk2k0iml8livwn1sjabn8d808alvd0axx6p9xcsb83x69g8a0dj";
+    url    = "https://github.com/BirdeeHub/lzextras/archive/v0.3.0.zip";
+    sha256 = "0942wnlk7cf74z2ni3dhv2zm8ld4nazs9ciaql00vvbswh4a9z2w";
   };
 
   disabled = luaOlder "5.1";

pkgs/development/python-modules/google-genai/default.nix

···
 
 buildPythonPackage rec {
   pname = "google-genai";
-  version = "1.6.0";
+  version = "1.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-genai";
     tag = "v${version}";
-    hash = "sha256-HXLo4dmlZNXXXpchO5sRlBzzQBU4cFS5qDpka2NdLTM=";
+    hash = "sha256-6toZvocikcGpM0DKqq7/OpYDePt9Q8+WblSUJVXq6lE=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/textnets/default.nix

···
   fetchFromGitHub,
 
   # build-system
-  cython,
-  poetry-core,
+  cython_0,
+  pdm-backend,
   setuptools,
 
   # dependencies
-  cairocffi,
   igraph,
   leidenalg,
+  matplotlib,
   pandas,
   pyarrow,
   scipy,
···
 
 buildPythonPackage rec {
   pname = "textnets";
-  version = "0.9.5";
+  version = "0.10.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jboynyc";
     repo = "textnets";
     tag = "v${version}";
-    hash = "sha256-MdKPxIshSx6U2EFGDTUS4EhoByyuVf0HKqvm9cS2KNY=";
+    hash = "sha256-BK0bBoe6GrZpVL4HvTwzRlXRWXfKdYJDhLD2UQctTjc=";
   };
 
   build-system = [
-    cython
-    poetry-core
+    cython_0
+    pdm-backend
     setuptools
   ];
 
   pythonRelaxDeps = [
-    "igraph"
-    "leidenalg"
     "pyarrow"
     "toolz"
   ];
 
   dependencies = [
-    cairocffi
     igraph
     leidenalg
+    matplotlib
     pandas
     pyarrow
     scipy
···
 
   pythonImportsCheck = [ "textnets" ];
 
-  # Enables the package to find the cythonized .so files during testing. See #255262
+  # Enable the package to find the cythonized .so files during testing. See #255262
+  # Set MPLBACKEND=agg for headless matplotlib on darwin. See #350784
   preCheck = ''
     rm -r textnets
+    export MPLBACKEND=agg
   '';
-
-  disabledTests =
-    [
-      # Test fails: Throws a UserWarning asking the user to install `textnets[fca]`.
-      "test_context"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # MemoryError: ("cairo returned CAIRO_STATUS_NO_MEMORY: b'out of memory'", 1)
-      "test_plot_backbone"
-      "test_plot_filtered"
-      "test_plot_layout"
-      "test_plot_projected"
-      "test_plot_scaled"
-    ];
 
   meta = {
     description = "Text analysis with networks";

pkgs/development/tools/build-managers/bazel/bazel_7/default.nix

···
   # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
   # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
   enableNixHacks ? false,
-  version ? "7.4.1",
+  version ? "7.6.0",
 }:
 
 let
···
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    hash = "sha256-gzhmGLxIn02jYmbvJiDsZKUmxobPBwQTMsr/fJU6+vU=";
+    hash = "sha256-eQKNB38G8ziDuorzoj5Rne/DZQL22meVLrdK0z7B2FI=";
   };
 
   defaultShellUtils =

pkgs/servers/teleport/16/default.nix

···
 import ../generic.nix (
   args
   // {
-    version = "16.4.18";
-    hash = "sha256-DpbRfWVsfGpIANs6LMtIPtgsCEt5UMoNBpqelMQF+7s=";
-    vendorHash = "sha256-H7EIt9HImdjSQMCv0Jr4mx3woMA6ZSR7KMpQbKvggZU=";
-    pnpmHash = "sha256-LHdX7Vo4neaN+SNrh/De3n/0mR6ZgGvJzNKcxOOHpZA=";
+    version = "16.5.0";
+    hash = "sha256-d634UB/YGDdAeBEJcRsRE5gqd31oQX3P4HJ+PoMQUmk=";
+    vendorHash = "sha256-0/ZYG8mYv3B0YJ89NJVG7M29/hU2zBtSXmoD32VEqpk=";
+    pnpmHash = "sha256-dqCfwMzSnEPQXz1bsroqSihkvw2Kcvyz+A4fpa52LVk=";
     cargoHash = "sha256-NASNBk4QVoqe2cz4l94aXo6pUtF8Qxwb61XRI/ErjTs=";
   }
 )

pkgs/servers/teleport/17/default.nix

···
 import ../generic.nix (
   args
   // {
-    version = "17.4.0";
-    hash = "sha256-O/JMv757DcO7x8Lh5cMeoa1GPvtQETxUlW2meMSSoM0=";
+    version = "17.4.1";
+    hash = "sha256-wXQ2ZFbx/Nx8BzJK/yOGrtGs9ELhRRYlPQIbgBegOHQ=";
     vendorHash = "sha256-C2YpZr9baUUE3pPHXNCIppujYQkioC9DWzSqeigmzmE=";
     pnpmHash = "sha256-Hh4R+mkJJp9CR4NHw+VFzLPxb7e9T1BQkey0in2t934=";
     cargoHash = "sha256-0PT9y56V/WHo3M5TcpVWBuHcQMZ0w2L4rEuXuTvVNFU=";

pkgs/servers/teleport/generic.nix

···
   nodejs,
   openssl,
   pkg-config,
-  pnpm_9,
   pnpm_10,
   rustc,
   Security,
···
 
     pnpmDeps =
       if pnpmHash != null then
-        if lib.versionAtLeast version "17" then
-          pnpm_10.fetchDeps {
-            inherit src pname version;
-            hash = pnpmHash;
-          }
-        else
-          pnpm_9.fetchDeps {
-            inherit src pname version;
-            hash = pnpmHash;
-          }
+        pnpm_10.fetchDeps {
+          inherit src pname version;
+          hash = pnpmHash;
+        }
       else
         null;
 
···
         wasm-pack
       ]
       ++ (
-        if lib.versionAtLeast version "17" then
+        if lib.versionAtLeast version "16" then
           [ pnpm_10.configHook ]
-        else if lib.versionAtLeast version "16" then
-          [ pnpm_9.configHook ]
         else
           [
             yarn

pkgs/top-level/all-packages.nix

···
     pinentry = pinentry-curses;
   };
 
-  blender = callPackage  ../applications/misc/blender {
+  blender = callPackage  ../by-name/bl/blender/package.nix {
     openexr = openexr_3;
     python3Packages = python311Packages;
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL;