Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -1445,12 +1445,6 @@
     githubId = 5149377;
     name = "Amine Chikhaoui";
   };
-  amorsillo = {
-    email = "andrew.morsillo@gmail.com";
-    github = "evelant";
-    githubId = 858965;
-    name = "Andrew Morsillo";
-  };
   amozeo = {
     email = "wroclaw223@outlook.com";
     github = "amozeo";

nixos/modules/services/home-automation/zwave-js-ui.nix

@@ -100,7 +100,7 @@ in
         ProtectHostname = true;
         ProtectKernelLogs = true;
         ProtectKernelModules = true;
-        ProtectKernalTunables = true;
+        ProtectKernelTunables = true;
         ProtectProc = "invisible";
         ProcSubset = "pid";
         RemoveIPC = true;

pkgs/applications/audio/plexamp/default.nix

@@ -7,12 +7,12 @@
 
 let
   pname = "plexamp";
-  version = "4.12.3";
+  version = "4.12.4";
 
   src = fetchurl {
     url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
     name = "${pname}-${version}.AppImage";
-    hash = "sha512-gjOjk/JtHbhEDGzWH/bBtNd7qsYS97hBlPbRw7uWH/PCXD4urUWBrlihNWAOgYClVwl7nbrx/y7mhCrI2N6c1w==";
+    hash = "sha512-LtYqC4pqX7hA+clUj9UVrp0YWebELULM23SsYlKnVDcYbZn8LJldiOOebS0+SU4RqK1a8Z3Kh4fPJ/HfijP0qw==";
   };
 
   appimageContents = appimageTools.extractType2 {
@@ -38,7 +38,7 @@ appimageTools.wrapType2 {
   meta = with lib; {
     description = "Beautiful Plex music player for audiophiles, curators, and hipsters";
     homepage = "https://plexamp.com/";
-    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/80";
+    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/81";
     license = licenses.unfree;
     maintainers = with maintainers; [
       killercup

pkgs/applications/graphics/gimp/default.nix

@@ -66,6 +66,7 @@
   adwaita-icon-theme,
   alsa-lib,
   desktopToDarwinBundle,
+  fetchpatch,
 }:
 
 let
@@ -110,6 +111,13 @@ stdenv.mkDerivation (finalAttrs: {
     (replaceVars ./tests-dbus-conf.patch {
       session_conf = "${dbus.out}/share/dbus-1/session.conf";
     })
+
+    # Fix a crash that occurs when trying to pick a color for text outline
+    # TODO: remove after GIMP 3.2 is released, per https://gitlab.gnome.org/GNOME/gimp/-/issues/14047#note_2491655
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/1685c86af5d6253151d0056a9677ba469ea10164.diff";
+      hash = "sha256-Rb3ANXWki21thByEIWkBgWEml4x9Qq2HAIB9ho1bygw=";
+    })
   ];
 
   nativeBuildInputs =

pkgs/applications/misc/dupeguru/default.nix

@@ -20,6 +20,10 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-/jkZiCapmCLMp7WfgUmpsR8aNCfb3gBELlMYaC4e7zI=";
   };
 
+  patches = [
+    ./remove-setuptools-sandbox.patch
+  ];
+
   nativeBuildInputs = [
     gettext
     python3Packages.pyqt5

pkgs/applications/misc/dupeguru/remove-setuptools-sandbox.patch

@@ -0,0 +1,27 @@
+diff --git a/build.py b/build.py
+index 06905a11..56d54a17 100644
+--- a/build.py
++++ b/build.py
+@@ -10,7 +10,7 @@ from optparse import OptionParser
+ import shutil
+ from multiprocessing import Pool
+ 
+-from setuptools import sandbox
++import subprocess
+ from hscommon import sphinxgen
+ from hscommon.build import (
+     add_to_pythonpath,
+@@ -118,7 +118,12 @@ def build_normpo():
+ def build_pe_modules():
+     print("Building PE Modules")
+     # Leverage setup.py to build modules
+-    sandbox.run_setup("setup.py", ["build_ext", "--inplace"])
++    result = subprocess.run(
++        [sys.executable, "setup.py", "build_ext", "--inplace"],
++        check=True,
++    )
++    if result.returncode != 0:
++        sys.exit("Error building PE modules. Please check the output above.")
+ 
+ 
+ def build_normal():

pkgs/applications/networking/irc/weechat/default.nix

@@ -103,11 +103,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins;
 
 stdenv.mkDerivation rec {
   pname = "weechat";
-  version = "4.6.3";
+  version = "4.7.0";
 
   src = fetchurl {
     url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
-    hash = "sha256-XAte+pabhzxL5YIBmxhSPuQD50MLgiOCW820Son1gV0=";
+    hash = "sha256-RdwDlgYMhjFphoNJ7CgK8cb0rFJKpJJYDhoGXhQsLNg=";
   };
 
   # Why is this needed? https://github.com/weechat/weechat/issues/2031

pkgs/applications/networking/remote/teamviewer/default.nix

@@ -159,7 +159,10 @@ mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
     description = "Desktop sharing application, providing remote support and online meetings";
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     maintainers = with maintainers; [
       jagajaga
       jraygauthier

pkgs/applications/networking/remote/teamviewer/update-teamviewer.sh

@@ -1,7 +1,17 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p nix-update curl
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash curl gnugrep jq nix nix-prefetch nix-prefetch-scripts common-updater-scripts
 
-TEAMVIEWER_VER=$(curl -s https://www.teamviewer.com/en-us/download/linux/ | grep -oP 'Current version: <span data-dl-version-label>\K[0-9]+\.[0-9]+\.[0-9]+')
+set -euo pipefail
 
-nix-update --version "$TEAMVIEWER_VER" --system x86_64-linux teamviewer
-nix-update --version "skip" --system aarch64-linux teamviewer
+current_version=$(nix eval --raw -f . teamviewer.version)
+latest_version=$(curl -s https://www.teamviewer.com/en-us/download/portal/linux/ | grep -oP 'Current version: <span data-dl-version-label>\K[0-9]+\.[0-9]+\.[0-9]+')
+
+echo "current version: $current_version"
+echo "latest version:  $latest_version"
+
+if [[ "$latest_version" == "$current_version" ]]; then
+  echo "package is up-to-date"
+  exit 0
+fi
+
+update-source-version teamviewer "$latest_version"

pkgs/by-name/ar/artisan/package.nix

@@ -6,11 +6,11 @@
 }:
 let
   pname = "artisan";
-  version = "3.1.4";
+  version = "3.2.0";
 
   src = fetchurl {
     url = "https://github.com/artisan-roaster-scope/artisan/releases/download/v${version}/${pname}-linux-${version}.AppImage";
-    hash = "sha256-GU9DCAIMioPRUC1IDu8SbhD802pWEH7MlALnQH+Y4oU=";
+    hash = "sha256-p8M9Z0z/0unJPOLXVOnN8INO4v0D5Ojjug42xT77oqQ=";
   };
 
   appimageContents = appimageTools.extract {

pkgs/by-name/as/astroterm/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "astroterm";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "da-luce";
     repo = "astroterm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SQR5Q369LUtQum5a4f0/sy7GdPB8sBfn6mkAjxyTbg8=";
+    hash = "sha256-XSJq2M+rOZf18ueF1jjApOR140mkMZOm/IFzA7M5x4M=";
   };
 
   bsc5File = fetchurl {

pkgs/by-name/au/auth0-cli/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "auth0-cli";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "auth0";
     repo = "auth0-cli";
     tag = "v${version}";
-    hash = "sha256-1OPoogvCA85Z4pmwnEgoLosh5QDVvFH7SnDArCx156s=";
+    hash = "sha256-iTtjjqONnSmOlaBHOq1SgsbNiKVSKCePg5CJfZs4r/4=";
   };
 
-  vendorHash = "sha256-tIZz3iwY79r5B4b3GuEOd/j0RtviM4uf6v1ZMS6M+t4=";
+  vendorHash = "sha256-e5/9AA68p1byqwUOK5/t4L3WQ/td9BYiNfFDD5NbTeU=";
 
   ldflags = [
     "-s"

pkgs/by-name/be/beebeep/package.nix

@@ -1,29 +1,25 @@
 {
   lib,
-  mkDerivation,
   fetchzip,
-  wrapQtAppsHook,
   autoPatchelfHook,
-  qtbase,
-  qtmultimedia,
-  qtx11extras,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+libsForQt5.mkDerivation rec {
   pname = "beebeep";
   version = "5.8.6";
 
   src = fetchzip {
     url = "https://netix.dl.sourceforge.net/project/beebeep/Linux/beebeep-${version}-qt5-amd64.tar.gz";
-    sha256 = "sha256-YDgFRXFBM1tjLP99mHYJadgccHJYYPAZ1kqR+FngLKU=";
+    hash = "sha256-YDgFRXFBM1tjLP99mHYJadgccHJYYPAZ1kqR+FngLKU=";
   };
 
   nativeBuildInputs = [
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     autoPatchelfHook
   ];
 
-  buildInputs = [
+  buildInputs = with libsForQt5; [
     qtbase
     qtmultimedia
     qtx11extras
@@ -34,12 +30,12 @@ mkDerivation rec {
     cp * $out/bin
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.beebeep.net/";
     description = "BeeBEEP is the free office messenger that is indispensable in all those places where privacy and security are an essential requirement";
     mainProgram = "beebeep";
-    platforms = platforms.linux;
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ mglolenstine ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ mglolenstine ];
   };
 }

pkgs/by-name/bl/blackfire/package.nix

@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "blackfire";
-  version = "2.28.28";
+  version = "2.28.29";
 
   src =
     passthru.sources.${stdenv.hostPlatform.system}
@@ -60,23 +60,23 @@ stdenv.mkDerivation rec {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
-        sha256 = "luMpquZCnK6eFffPLoHNt7XUyBgJNqzeNkC4mhdYVqQ=";
+        sha256 = "WIL8Y2pQq9vYuSI2fq2+T21HvjAd6PJPWKi4phKB5pw=";
       };
       "i686-linux" = fetchurl {
         url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
-        sha256 = "K8/AYVpz25Pwe4Vf1sxwYd/l6yu6hgG/LETbiH1VxgQ=";
+        sha256 = "hcTVPb1zGrR3C1b5F2bgIzwH/lZV0ujeERNx0qt00Pc=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
-        sha256 = "COXdRnO0PAV1XbpK6VusBSiwMkP/WAfDfBDRGDpF2OY=";
+        sha256 = "7Qs47SjAhsOAIcCCCJk7jjDD1ab7CyjbPHfXl25z9mE=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
-        sha256 = "WZsF4SJ3BinPx9hhSG4Bi028qXUQXjdtqf2j/0/FN1w=";
+        sha256 = "v4ApyuA9kMfqZAGVXPSSJJS0fm9lP2zz0iD8lf9VGa0=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
-        sha256 = "l19yB2cA7JK7oUl4MnxLKoqA8RFD1KLq/NXsAkWmxFQ=";
+        sha256 = "t78kpafSfbCA/0Kzhn/+/wjAet2qne33CYqFvRT0XUM=";
       };
     };
 

pkgs/by-name/ch/chessx/package.nix

@@ -3,14 +3,9 @@
   lib,
   pkg-config,
   zlib,
-  qtbase,
-  qtsvg,
-  qttools,
-  qtmultimedia,
-  qmake,
   fetchpatch,
   fetchurl,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,19 +17,25 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-76YOe1WpB+vdEoEKGTHeaWJLpCVE4RoyYu1WLy3Dxhg=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
-    qmake
-    wrapQtAppsHook
-  ];
+  nativeBuildInputs =
+    [
+      pkg-config
+    ]
+    ++ (with libsForQt5; [
+      qmake
+      wrapQtAppsHook
+    ]);
 
-  buildInputs = [
-    qtbase
-    qtmultimedia
-    qtsvg
-    qttools
-    zlib
-  ];
+  buildInputs =
+    [
+      zlib
+    ]
+    ++ (with libsForQt5; [
+      qtbase
+      qtmultimedia
+      qtsvg
+      qttools
+    ]);
 
   patches =
     # needed to backport patches to successfully build, due to broken release
@@ -63,12 +64,12 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://chessx.sourceforge.io/";
     description = "Browse and analyse chess games";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ luispedro ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ luispedro ];
+    platforms = lib.platforms.linux;
     mainProgram = "chessx";
   };
 })

pkgs/by-name/et/ethersync/package.nix

@@ -0,0 +1,41 @@
+{
+  fetchFromGitHub,
+  lib,
+  rustPlatform,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "ethersync";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "ethersync";
+    repo = "ethersync";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dHV4+WxNdEvRZK8WNK0qp9f43Y9oSUtlXrq/mI0yWls=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/daemon";
+
+  cargoHash = "sha256-uKtJp4RD0YbOmtzbxebpYQxlBmP+5k88d+76hT4cTI8=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Real-time co-editing of local text files";
+    homepage = "https://ethersync.github.io/ethersync/";
+    downloadPage = "https://github.com/ethersync/ethersync";
+    changelog = "https://github.com/ethersync/ethersync/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
+      prince213
+      ethancedwards8
+    ];
+  };
+})

pkgs/by-name/ev/evemu/package.nix

@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
       lgpl3Only
       gpl3Only
     ];
-    maintainers = [ maintainers.amorsillo ];
     platforms = platforms.linux;
   };
 }

pkgs/by-name/fa/factoriolab/package.nix

@@ -10,13 +10,13 @@
 }:
 buildNpmPackage rec {
   pname = "factoriolab";
-  version = "3.15.0";
+  version = "3.16.3";
 
   src = fetchFromGitHub {
     owner = "factoriolab";
     repo = "factoriolab";
     tag = "v${version}";
-    hash = "sha256-HWt3BxW2nBgnJ+BzsL+JpFfrLht2Yl/Btbre6EfM9F4=";
+    hash = "sha256-LfeYe2lkT08RIk3Fx0/Ym8aDaEF4ZcYxuFmASH//u2Q=";
   };
   buildInputs = [ vips ];
   nativeBuildInputs = [

pkgs/by-name/fa/fakeroot/package.nix

@@ -25,17 +25,27 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-2ihdvYRnv2wpZrEikP4hCdshY8Eqarqnw3s9HPb+xKU=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isLinux [
-    ./einval.patch
+  patches =
+    lib.optionals stdenv.hostPlatform.isLinux [
+      ./einval.patch
 
-    # patches needed for musl libc, borrowed from alpine packaging.
-    # it is applied regardless of the environment to prevent patchrot
-    (fetchpatch {
-      name = "fakeroot-no64.patch";
-      url = "https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-no64.patch?id=f68c541324ad07cc5b7f5228501b5f2ce4b36158";
-      sha256 = "sha256-NCDaB4nK71gvz8iQxlfaQTazsG0SBUQ/RAnN+FqwKkY=";
-    })
-  ];
+      # patches needed for musl libc, borrowed from alpine packaging.
+      # it is applied regardless of the environment to prevent patchrot
+      (fetchpatch {
+        name = "fakeroot-no64.patch";
+        url = "https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-no64.patch?id=f68c541324ad07cc5b7f5228501b5f2ce4b36158";
+        sha256 = "sha256-NCDaB4nK71gvz8iQxlfaQTazsG0SBUQ/RAnN+FqwKkY=";
+      })
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # patch needed to fix execution on macos
+      # TODO: remove when the next release comes out: https://salsa.debian.org/clint/fakeroot/-/merge_requests/34
+      (fetchpatch {
+        name = "fakeroot-fix-macos.patch";
+        url = "https://salsa.debian.org/clint/fakeroot/-/merge_requests/34.diff";
+        hash = "sha256-D5f1bXUaN2YMD/NTx/WIrqDBx/qNHpfLRcPhbdHYLl8=";
+      })
+    ];
 
   nativeBuildInputs = [
     autoreconfHook

pkgs/by-name/ga/gallery-dl/package.nix

@@ -8,7 +8,7 @@
 
 let
   pname = "gallery-dl";
-  version = "1.29.7";
+  version = "1.30.0";
 in
 python3Packages.buildPythonApplication {
   inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
     owner = "mikf";
     repo = "gallery-dl";
     tag = "v${version}";
-    hash = "sha256-OngtJ6E7Gvr+/5Vjv1vepPVVksNDRlXZkU9yMYRvh2k=";
+    hash = "sha256-puxkxrAkYu8oBmMltr1IfjNIAuoOu7yv6UZo6VqC6L8=";
   };
 
   build-system = [ python3Packages.setuptools ];

pkgs/by-name/ge/geonkick/package.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "geonkick";
-  version = "3.6.0";
+  version = "3.6.1";
 
   src = fetchFromGitLab {
     owner = "Geonkick-Synthesizer";
     repo = "geonkick";
     rev = "v${version}";
-    hash = "sha256-lTJ5O2UfXRUELErbMS9fCdCUgxhBxKRv/nIK8w5Fkiw=";
+    hash = "sha256-f5RJzkr98CygOT0O5igMnqetl8if81hKzGAJ2IrR5Hg=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ke/keepass/package.nix

@@ -165,7 +165,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "GUI password manager with strong cryptography";
     homepage = "http://www.keepass.info/";
     maintainers = with lib.maintainers; [
-      amorsillo
       obadz
     ];
     platforms = with lib.platforms; all;

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

@@ -25,6 +25,5 @@ stdenv.mkDerivation rec {
     homepage = "https://www.freedesktop.org/software/libevdev/doc/latest/index.html";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = [ maintainers.amorsillo ];
   };
 }

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

@@ -16,26 +16,17 @@
   ninja,
   cunit,
   gitUpdater,
-  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
   pname = "libtracefs";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchzip {
     url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-libtracefs-${version}.tar.gz";
-    hash = "sha256-2UiEgY4mQRLpWah+2rVfPiiUYBSSzRAy5gOv4YELQFQ=";
+    hash = "sha256-rpZUa34HMnDMSsGGwtOriEEHDfnW8emRSHZxzRkY3c4=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "add-missing-documentation-to-meson-build.patch";
-      url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/patch/?id=4cbebed79b1fe933367e298ea7ddef694b9f98d0";
-      hash = "sha256-tSaR0wpxrm50IyMgMoUCcHBB9r8lQQZZYGru6Znre50=";
-    })
-  ];
-
   postPatch = ''
     chmod +x samples/extract-example.sh
     patchShebangs --build check-manpages.sh samples/extract-example.sh Documentation/install-docs.sh.in

pkgs/by-name/ma/maltego/package.nix

@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "maltego";
-  version = "4.9.3";
+  version = "4.10.0";
 
   src = fetchzip {
     url = "https://downloads.maltego.com/maltego-v4/linux/Maltego.v${finalAttrs.version}.linux.zip";
-    hash = "sha256-h0cTA6/i7cpYvGQli3UA6WZnaMOProN4f0TTdeIczcY=";
+    hash = "sha256-uN4KBfORh2CTcQbf3VGXFa0WZwYnsnfRiyILFCdxZyg=";
   };
 
   postPatch = ''

pkgs/by-name/mi/microsoft-edge/package.nix

@@ -179,11 +179,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "138.0.3351.83";
+  version = "138.0.3351.95";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-NcDw2483l+VmBgr4Ue2vZmFFs3ZdWJvsfsub7stMEOE=";
+    hash = "sha256-Q5TdmqLlRITWDRZwUTMiOOjXQm09Cq+bK6N5XNew6R8=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly
@@ -293,6 +293,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       maeve-oake
       leleuvilela
       bricklou
+      jonhermansen
     ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

pkgs/by-name/mo/mods/package.nix

@@ -1,34 +1,37 @@
 {
   lib,
+  stdenv,
   buildGoModule,
   installShellFiles,
   fetchFromGitHub,
   gitUpdater,
   testers,
   mods,
+  installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
+  installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "mods";
   version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "mods";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-wzLYkcgUWPzghJEhYRh7HH19Rqov1RJAxdgp3AGnOTY=";
   };
 
   vendorHash = "sha256-L+4vkh7u6uMm5ICMk8ke5RVY1oYeKMYWVYYq9YqpKiw=";
 
-  nativeBuildInputs = [
+  nativeBuildInputs = lib.optionals (installManPages || installShellCompletions) [
     installShellFiles
   ];
 
   ldflags = [
     "-s"
     "-w"
-    "-X=main.Version=${version}"
+    "-X=main.Version=${finalAttrs.version}"
   ];
 
   # These tests require internet access.
@@ -46,16 +49,20 @@ buildGoModule rec {
     };
   };
 
-  postInstall = ''
-    export HOME=$(mktemp -d)
-    $out/bin/mods man > mods.1
-    $out/bin/mods completion bash > mods.bash
-    $out/bin/mods completion fish > mods.fish
-    $out/bin/mods completion zsh > mods.zsh
-
-    installManPage mods.1
-    installShellCompletion mods.{bash,fish,zsh}
-  '';
+  postInstall =
+    ''
+      export HOME=$(mktemp -d)
+    ''
+    + lib.optionalString installManPages ''
+      $out/bin/mods man > ./mods.1
+      installManPage ./mods.1
+    ''
+    + lib.optionalString installShellCompletions ''
+      installShellCompletion --cmd mods \
+        --bash <($out/bin/mods completion bash) \
+        --fish <($out/bin/mods completion fish) \
+        --zsh <($out/bin/mods completion zsh)
+    '';
 
   meta = {
     description = "AI on the command line";
@@ -64,7 +71,8 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [
       dit7ya
       caarlos0
+      delafthi
     ];
     mainProgram = "mods";
   };
-}
+})

pkgs/by-name/mo/monetdb/package.nix

@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "monetdb";
-  version = "11.53.3";
+  version = "11.53.9";
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-8q8Q3b7D6BR+UMmcu4T5y+Xtwmr1URHc0Cq97tfDD6I=";
+    hash = "sha256-qltKYPEWU5w3SIJumxunUTwC//egn7UtvmcFL+bxIUk=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ne/nextcloud-talk-desktop/package.nix

@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextcloud-talk-desktop";
-  version = "1.2.3";
+  version = "1.2.5";
 
   # Building from source would require building also building Server and Talk components
   # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
   src = fetchzip {
     url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip";
-    hash = "sha256-St0frZpSjAHnF6MJWMRm4Md0TxNnNSAbLf+Sz9EDgS4=";
+    hash = "sha256-Jozdyxd02LocmbRrR2pB7EtIRIjd988JtDhlCNbumks=";
     stripRoot = false;
   };
 

pkgs/by-name/ow/owi/package.nix

@@ -14,14 +14,14 @@ let
 in
 ocamlPackages.buildDunePackage rec {
   pname = "owi";
-  version = "0.2-unstable-2025-07-08";
+  version = "0.2-unstable-2025-07-11";
 
   src = fetchFromGitHub {
     owner = "ocamlpro";
     repo = "owi";
-    rev = "bcd7d362ed165c542deb2d49da1d45296aa03277";
+    rev = "be3d93320dcbf7d4e991f9b240ff490b5a1b0acc";
     fetchSubmodules = true;
-    hash = "sha256-611k9CQx0C3QKR4NZpnr77LoBZSFBEdU0uRnZshO1cc=";
+    hash = "sha256-yc/f/N+smGk3NwtZnP/k4ISN3mvp1GL9VTcjgosbQJw=";
   };
 
   nativeBuildInputs = with ocamlPackages; [
@@ -85,5 +85,6 @@ ocamlPackages.buildDunePackage rec {
     maintainers = [ lib.maintainers.ethancedwards8 ];
     teams = with lib.teams; [ ngi ];
     mainProgram = "owi";
+    badPlatforms = lib.platforms.darwin;
   };
 }

pkgs/by-name/ra/rainfrog/package.nix

@@ -7,7 +7,7 @@
   rainfrog,
 }:
 let
-  version = "0.3.2";
+  version = "0.3.3";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -17,11 +17,11 @@ rustPlatform.buildRustPackage {
     owner = "achristmascarl";
     repo = "rainfrog";
     tag = "v${version}";
-    hash = "sha256-3oRuJytFGPfWLoxtrpgEwRWAPE8HGct5PqU1mxDinZs=";
+    hash = "sha256-nGUk+997TBx/2U3QMF4OpRqzwNzC0ILRraz3kOzzoBw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-W/3UNZw3gHVI/3uIzyaDmKGjM8gsfcr86+Vxlfm9Yb4=";
+  cargoHash = "sha256-8RvZmQI1WXfM2Sh5bMAkeJVNvOUp8fmM0MznZzCpxgY=";
 
   passthru = {
     tests.version = testers.testVersion {

pkgs/by-name/re/readest/package.nix

@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.64";
+  version = "0.9.66";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J3AqZIbpf/B0KMFjjNRq97E5OWPt7wJvIlDdfb4sbvU=";
+    hash = "sha256-0KIqPB41sS0rX5IBao+0ThPz4EttpZxSb5mL4Spuoho=";
     fetchSubmodules = true;
   };
 
@@ -40,14 +40,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-nWDMtQZE+96gnvEwtp84iOcbfMAjnqKZK0cgQuh4+k8=";
+    hash = "sha256-o0R5b+cE680RgdBT+4uiCtec3y3dGxYkBmnKzT/7JOg=";
   };
 
   pnpmRoot = "../..";
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-35REIeZy/D9UWzSI6yQZc1MRYwlAnjzsk5T7KOAhWVw=";
+  cargoHash = "sha256-ReRCzKbdmjPr9rQwCI7mLEs/MjV2yCp7FFZAlib1xIs=";
 
   cargoRoot = "../..";
 

pkgs/by-name/sp/spideroak/package.nix

@@ -78,7 +78,6 @@ stdenv.mkDerivation {
     description = "Secure online backup and sychronization";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ amorsillo ];
     platforms = lib.platforms.linux;
     mainProgram = "spideroak";
   };

pkgs/by-name/sp/spirit/package.nix

@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   version = "0.8.0";
 
   src = fetchFromGitHub {
-    owner = "cashapp";
+    owner = "block";
     repo = "spirit";
     tag = "v${finalAttrs.version}";
     hash = "sha256-bGKqiCd9dggppORouoWlAoAaYdx4vAivsP22KWm1fxU=";
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
   ];
 
   meta = {
-    homepage = "https://github.com/cashapp/spirit";
+    homepage = "https://github.com/block/spirit";
     description = "Online schema change tool for MySQL";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ aaronjheng ];

pkgs/by-name/tu/tuxedo-rs/package.nix

@@ -2,10 +2,9 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
-  testers,
-  tuxedo-rs,
+  versionCheckHook,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tuxedo-rs";
   version = "0.3.1";
 
@@ -14,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AaronErhardt";
     repo = "tuxedo-rs";
-    rev = "tailor-v${version}";
+    rev = "tailor-v${finalAttrs.version}";
     hash = "sha256-+NzwUs8TZsA0us9hI1UmEKdiOo9IqTRmTOHs4xmC7MY=";
   };
 
@@ -24,11 +23,11 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-EkTLL7thZ/bBpY7TwfEsPOjJxzQ3vpxDi+sYPNAK6og=";
 
-  passthru.tests.version = testers.testVersion {
-    package = tuxedo-rs;
-    command = "${meta.mainProgram} --version";
-    version = version;
-  };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+  versionCheckProgramArg = "--version";
 
   postInstall = ''
     install -Dm444 tailord/com.tux.Tailor.conf -t $out/share/dbus-1/system.d
@@ -52,4 +51,4 @@ rustPlatform.buildRustPackage rec {
     platforms = platforms.linux;
     mainProgram = "tailor";
   };
-}
+})

pkgs/by-name/tw/twingate/package.nix

@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "twingate";
-  version = "2025.155.154174";
+  version = "2025.175.154516";
 
   src = fetchurl {
     url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb";
-    hash = "sha256-TPXw9PDNZ/0X3yZ51mEBtCi9/NO7T6M66nauoBOn6HQ=";
+    hash = "sha256-WqIG5AUfRxkJ1qzGs6cB/2fe/UUNOZiL5/v9QMXlmK8=";
   };
 
   buildInputs = [

pkgs/by-name/up/upscaler/package.nix

@@ -18,7 +18,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "upscaler";
-  version = "1.5.2";
+  version = "1.6.0";
 
   pyproject = false; # meson instead of pyproject
 
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
     owner = "World";
     repo = "Upscaler";
     rev = version;
-    hash = "sha256-QpKeu4k31BKcpPFLvb4iuFMdE3IwQARCDXTqWhWhBM0=";
+    hash = "sha256-OsycWrMR/SEZTlNQFd0wKF4CQNXKV/mBHaqiliMFw00=";
   };
 
   passthru.updateScript = gitUpdater { };

pkgs/desktops/gnome/extensions/pop-shell/default.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation {
   pname = "gnome-shell-extension-pop-shell";
-  version = "1.2.0-unstable-2025-03-10";
+  version = "1.2.0-unstable-2025-07-09";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "shell";
-    rev = "b3fc4253dc29b30fb52ac5eef5d3af643a46d18c";
-    hash = "sha256-EMX1AREpOO3DgxV/EbF2hP5JLggzlgFu1gsbhF3W1os=";
+    rev = "6fd8c039a081e8ad7bbd40ef7883ec6e5fc2a3f8";
+    hash = "sha256-3zIbfjaJSUbPmUVppoSBWviQWQvykaT1qw9uQvcXmvM=";
   };
 
   nativeBuildInputs = [

pkgs/development/compilers/llvm/common/compiler-rt/default.nix

@@ -62,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
         + lib.optionalString (lib.versionAtLeast release_version "14") ''
           cp -r ${monorepoSrc}/cmake "$out"
         ''
+        + lib.optionalString (lib.versionAtLeast release_version "21") ''
+          cp -r ${monorepoSrc}/third-party "$out"
+        ''
         + ''
           cp -r ${monorepoSrc}/compiler-rt "$out"
         ''

pkgs/development/compilers/llvm/default.nix

@@ -32,10 +32,11 @@ let
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
-    "21.0.0-git".gitRelease = {
-      rev = "e08833443256f8dde2f864853fa9491ffa7112d5";
-      rev-version = "21.0.0-unstable-2025-07-13";
-      sha256 = "sha256-O0mh9Kq6PHvGiCigjb5rDDqHNFBhy5Dv+IP67TstX8U=";
+    "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q=";
+    "22.0.0-git".gitRelease = {
+      rev = "f2956173aea4ff0fe0b823be1953d1968f91fb98";
+      rev-version = "22.0.0-unstable-2025-07-17";
+      sha256 = "sha256-qmF67vdfrMB5p9yej1KZeh5Spek67RJXQODpV5w9IQA=";
     };
   } // llvmVersions;
 

pkgs/development/libraries/gtkspell/default.nix

@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    # Fix build with gettext 0.25
+    ./gettext-0.25.patch
     # Build with enchant 2
     # https://github.com/archlinux/svntogit-packages/tree/packages/gtkspell/trunk
     (fetchpatch {

pkgs/development/libraries/gtkspell/gettext-0.25.patch

@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index e926833..667a8e6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,6 +12,10 @@ AC_CONFIG_SRCDIR(gtkspell/gtkspell.c)
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+ AC_CONFIG_HEADERS([config.h])
+ 
++AC_CONFIG_MACRO_DIRS([m4])
++AM_GNU_GETTEXT_VERSION([0.25])
++AM_GNU_GETTEXT([external])
++
+ SPELLER_LIB=-lenchant
+       
+ AC_SUBST(SPELLER_LIB)

pkgs/development/ocaml-modules/processor/default.nix

@@ -6,15 +6,15 @@
 
 buildDunePackage rec {
   pname = "processor";
-  version = "0.1";
+  version = "0.1-unstable-2024-07-23";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchFromGitHub {
     owner = "haesbaert";
     repo = "ocaml-processor";
-    tag = "v${version}";
-    hash = "sha256-eGSNYjVbUIUMelajqZYOd3gvmRKQ9UP3TfMflLR9i7k=";
+    rev = "74df5ab38773e5c4ad5c3a3f21f525d863731c17";
+    hash = "sha256-tWmgAsYfcpZUyxo7F+WIC3WOfAjDiuV74CscqEd93gk=";
   };
 
   doCheck = true;

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

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "binary";
-  version = "1.0.1";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ofek";
     repo = "binary";
     tag = "v${version}";
-    hash = "sha256-PbQlD/VR5KKoQ3+C6pnNoA/BJB5CEnXh6Q8CVZH/6cs=";
+    hash = "sha256-dU+E6MxAmH8AEGTW2/lZmtgRTinKCv9gDiVeb4n78U4=";
   };
 
   build-system = [

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

@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "ddgs";
-  version = "9.0.2";
+  version = "9.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deedy5";
     repo = "ddgs";
     tag = "v${version}";
-    hash = "sha256-c0kTZV+lM1/vkI51TK6klUmnoaAdt8KSEn/rjeqcBa8=";
+    hash = "sha256-TWLB/IAUn0YEXwYGooqd/pz8xv8tmK8E1ZZ8G/TEtbU=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/google-cloud-translate/default.nix

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-translate";
-  version = "3.20.3";
+  version = "3.21.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_translate";
     inherit version;
-    hash = "sha256-bTZUx/h3O/ytddhBkPdbqe6vJp5j4L+3PD8QrVUR5Ps=";
+    hash = "sha256-dg8l4bl5/qalncpE/8io3HCGk8UK43o5Vo/xKExTS+I=";
   };
 
   build-system = [ setuptools ];

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

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "gsd";
-  version = "3.4.2";
+  version = "4.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "glotzerlab";
     repo = "gsd";
     tag = "v${version}";
-    hash = "sha256-sBO5tt85BVLUrqSVWUT/tYzeLWyvyyI9ZXjNLt9/uAE=";
+    hash = "sha256-8pEs1use/R7g0l6h+rxjpN5j8PznqkJpjLxqiupn9iY=";
   };
 
   build-system = [
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     description = "General simulation data file format";
     mainProgram = "gsd";
     homepage = "https://github.com/glotzerlab/gsd";
-    changelog = "https://github.com/glotzerlab/gsd/blob/v${version}/CHANGELOG.rst";
+    changelog = "https://github.com/glotzerlab/gsd/blob/${src.tag}/CHANGELOG.rst";
     license = licenses.bsd2;
     maintainers = [ ];
   };

pkgs/development/python-modules/llm-github-copilot/default.nix

@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  llm-github-copilot,
+  writableTmpDirAsHomeHook,
+  pytestCheckHook,
+  pytest-vcr,
+  pytest-asyncio,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-github-copilot";
+  version = "0.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jmdaly";
+    repo = "llm-github-copilot";
+    tag = version;
+    hash = "sha256-BUVpt1Vv0+kxbTYHDdiYy3+ySJKWJ9b+dYexV7YS+NI=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ llm ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+    pytest-vcr
+    pytest-asyncio
+  ];
+
+  pythonImportsCheck = [ "llm_github_copilot" ];
+
+  passthru.tests = llm.mkPluginTest llm-github-copilot;
+
+  meta = {
+    description = "LLM plugin providing access to GitHub Copilot";
+    homepage = "https://github.com/jmdaly/llm-github-copilot";
+    changelog = "https://github.com/jmdaly/llm-github-copilot/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ afh ];
+  };
+}

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

@@ -75,6 +75,7 @@ let
       llm-gemini ? false,
       llm-gguf ? false,
       llm-git ? false,
+      llm-github-copilot ? false,
       llm-grok ? false,
       llm-groq ? false,
       llm-hacker-news ? false,

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "neo";
-  version = "0.14.1";
+  version = "0.14.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "NeuralEnsemble";
     repo = "python-neo";
     tag = version;
-    hash = "sha256-n0+K1J6K3WYN+1LxcHoVuA+U3LeiRG0EsicJf5uKvnE=";
+    hash = "sha256-THAdUFCbteiUdfhjLzl6ocM2I0zFKHfFxJExCnK1z1Y=";
   };
 
   build-system = [ setuptools ];

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

@@ -19,13 +19,13 @@
 
 buildPythonPackage rec {
   pname = "numpydoc";
-  version = "1.8.0";
+  version = "1.9.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname;
     inherit version;
-    hash = "sha256-AiOQq3RkpE+HN/efizHOHTz6S0r3nMqhqsXoNo21h/s=";
+    hash = "sha256-X+xkkI/gQazEs6/CoyxJqrFUDPWBh29VY9aLsSnifFs=";
   };
 
   build-system = [ setuptools ];

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

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pymupdf4llm";
-  version = "0.0.17";
+  version = "0.0.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pymupdf";
     repo = "RAG";
     tag = "v${version}";
-    hash = "sha256-+RLK+UorkU8eVQJGrc7pVNZPtIpxMgA9mBKA6GeWUa0=";
+    hash = "sha256-20upIcCoUB8zjW/qBvA3kFxJ6jcdXV3ohkurMmnlMkc=";
   };
 
   sourceRoot = "${src.name}/pymupdf4llm";

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

@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyvista";
-  version = "0.45.2";
+  version = "0.45.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyvista";
     repo = "pyvista";
     tag = "v${version}";
-    hash = "sha256-szI9kzJQOVCKcGTWj9Twq9i2DzbrHt/LmYBBfq6MBy8=";
+    hash = "sha256-9N1dF/zwjzoxX4xYIr5084M9pAk3YK3T48OUnCoC0NU=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/scikit-fmm/default.nix

@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "scikit-fmm";
-  version = "2025.1.29";
+  version = "2025.6.23";
   pyproject = true;
 
   src = fetchPypi {
     pname = "scikit_fmm";
     inherit version;
-    hash = "sha256-7gTKuObCAahEjfmIL8Azbby3nxJPPh4rjb4x1O4xBQw=";
+    hash = "sha256-oyCPXziB5At4eNESG6ObjVfxvDj7Tl8NnRxmqbAH5E8=";
   };
 
   build-system = [ meson-python ];

pkgs/misc/uboot/default.nix

@@ -29,6 +29,7 @@
   armTrustedFirmwareS905,
   opensbi,
   buildPackages,
+  darwin,
 }@pkgs:
 
 let
@@ -82,22 +83,25 @@ let
           patchShebangs scripts
         '';
 
-        nativeBuildInputs = [
-          ncurses # tools/kwboot
-          bc
-          bison
-          flex
-          installShellFiles
-          (buildPackages.python3.withPackages (p: [
-            p.libfdt
-            p.setuptools # for pkg_resources
-            p.pyelftools
-          ]))
-          swig
-          which # for scripts/dtc-version.sh
-          perl # for oid build (secureboot)
-        ] ++ lib.optionals (!crossTools) toolsDeps;
-        depsBuildBuild = [ buildPackages.stdenv.cc ];
+        nativeBuildInputs =
+          [
+            ncurses # tools/kwboot
+            bc
+            bison
+            flex
+            installShellFiles
+            (buildPackages.python3.withPackages (p: [
+              p.libfdt
+              p.setuptools # for pkg_resources
+              p.pyelftools
+            ]))
+            swig
+            which # for scripts/dtc-version.sh
+            perl # for oid build (secureboot)
+          ]
+          ++ lib.optionals (!crossTools) toolsDeps
+          ++ lib.optionals stdenv.buildPlatform.isDarwin [ darwin.DarwinTools ]; # sw_vers command is needed on darwin
+        depsBuildBuild = [ buildPackages.gccStdenv.cc ]; # gccStdenv is needed for Darwin buildPlatform
         buildInputs = lib.optionals crossTools toolsDeps;
 
         hardeningDisable = [ "all" ];
@@ -107,6 +111,7 @@ let
         makeFlags = [
           "DTC=${lib.getExe buildPackages.dtc}"
           "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+          "HOSTCFLAGS=-fcommon"
         ] ++ extraMakeFlags;
 
         passAsFile = [ "extraConfig" ];
@@ -114,7 +119,7 @@ let
         configurePhase = ''
           runHook preConfigure
 
-          make ${defconfig}
+          make -j$NIX_BUILD_CORES ${defconfig}
 
           cat $extraConfigPath >> .config
 

pkgs/os-specific/linux/trace-cmd/default.nix

@@ -16,11 +16,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "trace-cmd";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchzip {
     url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz";
-    hash = "sha256-kEji3qDqQsSK0tL8Fx2ycSd2lTXBXOHHTvsb6XDNSa8=";
+    hash = "sha256-35BEzuevGiRQFqvWOQK1m20juhSd5101a8bBsNtM8Eo=";
   };
 
   # Don't build and install html documentation
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     "libdir=${placeholder "lib"}/lib"
     "pkgconfig_dir=${placeholder "dev"}/lib/pkgconfig"
     "includedir=${placeholder "dev"}/include"
-    "BASH_COMPLETE_DIR=${placeholder "out"}/share/bash-completion/completions"
+    "completion_dir=${placeholder "out"}/share/bash-completion/completions"
   ];
 
   passthru.updateScript = gitUpdater {

pkgs/top-level/all-packages.nix

@@ -296,8 +296,6 @@ with pkgs;
     opencv = opencv.override { enableGtk3 = true; };
   };
 
-  beebeep = libsForQt5.callPackage ../applications/office/beebeep { };
-
   bloodhound-py = with python3Packages; toPythonApplication bloodhound-py;
 
   # Zip file format only allows times after year 1980, which makes e.g. Python
@@ -5784,6 +5782,13 @@ with pkgs;
       llvm_20 = llvmPackages_20.llvm;
       bolt_20 = llvmPackages_20.bolt;
 
+      llvmPackages_21 = llvmPackagesSet."21";
+      clang_21 = llvmPackages_21.clang;
+      lld_21 = llvmPackages_21.lld;
+      lldb_21 = llvmPackages_21.lldb;
+      llvm_21 = llvmPackages_21.llvm;
+      bolt_21 = llvmPackages_21.bolt;
+
       mkLLVMPackages = llvmPackagesSet.mkPackage;
     })
     llvmPackages_12
@@ -5809,6 +5814,12 @@ with pkgs;
     lldb_20
     llvm_20
     bolt_20
+    llvmPackages_21
+    clang_21
+    lld_21
+    lldb_21
+    llvm_21
+    bolt_21
     mkLLVMPackages
     ;
 
@@ -14601,8 +14612,6 @@ with pkgs;
 
   cataclysm-dda-git = cataclysmDDA.git.tiles;
 
-  chessx = libsForQt5.callPackage ../games/chessx { };
-
   chiaki = libsForQt5.callPackage ../games/chiaki { };
 
   chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };

pkgs/top-level/python-packages.nix

@@ -8521,6 +8521,8 @@ self: super: with self; {
 
   llm-git = callPackage ../development/python-modules/llm-git { };
 
+  llm-github-copilot = callPackage ../development/python-modules/llm-github-copilot { };
+
   llm-grok = callPackage ../development/python-modules/llm-grok { };
 
   llm-groq = callPackage ../development/python-modules/llm-groq { };