Merge remote-tracking branch 'origin/staging-next' into staging

doc/languages-frameworks/typst.section.md

@@ -7,10 +7,12 @@ Typst can be configured to include packages from [Typst Universe](https://typst.
 You can create a custom Typst environment with a selected set of packages from **Typst Universe** using the following code. It is also possible to specify a Typst package with a specific version (e.g., `cetz_0_3_0`). A package without a version number will always refer to its latest version.
 
 ```nix
-typst.withPackages (p: with p; [
+typst.withPackages (
+  p: with p; [
     polylux_0_4_0
     cetz_0_3_0
-])
+  ]
+)
 ```
 
 ### Handling Outdated Package Hashes {#typst-handling-outdated-package-hashes}
@@ -18,18 +20,24 @@ typst.withPackages (p: with p; [
 Since **Typst Universe** does not provide a way to fetch a package with a specific hash, the package hashes in `nixpkgs` can sometimes be outdated. To resolve this issue, you can manually override the package source using the following approach:
 
 ```nix
-typst.withPackages.override (old: {
+typst.withPackages.override
-  typstPackages = old.typstPackages.extend (_: previous: {
+  (old: {
+    typstPackages = old.typstPackages.extend (
+      _: previous: {
         polylux_0_4_0 = previous.polylux_0_4_0.overrideAttrs (oldPolylux: {
           src = oldPolylux.src.overrideAttrs {
             outputHash = YourUpToDatePolyluxHash;
           };
         });
-  });
+      }
-}) (p: with p; [
+    );
+  })
+  (
+    p: with p; [
       polylux_0_4_0
       cetz_0_3_0
-])
+    ]
+  )
 ```
 
 ## Custom Packages {#typst-custom-packages}
@@ -39,12 +47,15 @@ typst.withPackages.override (old: {
 Here's how to define a custom Typst package:
 
 ```nix
-{ buildTypstPackage, typstPackages, fetchzip }:
+{
+  buildTypstPackage,
+  typstPackages,
+}:
 
 buildTypstPackage (finalAttrs: {
   pname = "my-typst-package";
   version = "0.0.1";
-  src = fetchzip { ... };
+  src = ./.;
   typstDeps = with typstPackages; [ cetz_0_3_0 ];
 })
 ```

lib/licenses.nix

@@ -1164,6 +1164,13 @@ lib.mapAttrs mkLicense (
       fullName = "Sendmail License";
     };
 
+    sfl = {
+      fullName = "Source First License 1.1";
+      url = "https://gitlab.futo.org/videostreaming/grayjay/-/blob/master/LICENSE.md";
+      free = false;
+      redistributable = true;
+    };
+
     sgi-b-20 = {
       spdxId = "SGI-B-2.0";
       fullName = "SGI Free Software License B v2.0";

maintainers/maintainer-list.nix

@@ -4503,6 +4503,11 @@
     githubId = 3956062;
     name = "Simon Lackerbauer";
   };
+  cilki = {
+    github = "cilki";
+    githubId = 10459406;
+    name = "Tyler Cook";
+  };
   cimm = {
     email = "8k9ft8m5gv@astil.be";
     github = "cimm";
@@ -4941,12 +4946,6 @@
     githubId = 32609395;
     name = "B YI";
   };
-  copumpkin = {
-    email = "pumpkingod@gmail.com";
-    github = "copumpkin";
-    githubId = 2623;
-    name = "Dan Peebles";
-  };
   corbanr = {
     email = "corban@raunco.co";
     github = "CorbanR";
@@ -21398,6 +21397,11 @@
     github = "samemrecebi";
     githubId = 64419750;
   };
+  samfundev = {
+    name = "samfundev";
+    github = "samfundev";
+    githubId = 6759716;
+  };
   samhug = {
     email = "s@m-h.ug";
     github = "samhug";

maintainers/scripts/kde/generate-sources.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.packaging ps.pyyaml ])"
+#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.packaging ps.pyyaml ])" nix-update
 import base64
 import binascii
 import json
 import pathlib
-from typing import Optional
+import subprocess
 from urllib.parse import urljoin, urlparse
 
 import bs4
@@ -30,7 +30,13 @@ ROOT_TEMPLATE = jinja2.Template('''
   {{ p }} = callPackage ./{{ p }} { };
   {%- endfor %}
 }
-'''.strip());
+'''.strip())
+
+PROJECTS_WITH_RUST = {
+    "akonadi-search",
+    "angelfish",
+    "kdepim-addons",
+}
 
 def to_sri(hash):
     raw = binascii.unhexlify(hash)
@@ -65,7 +71,7 @@ def to_sri(hash):
     type=str,
     default=None,
 )
-def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[str]):
+def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: str | None):
     root_dir = nixpkgs / "pkgs/kde"
     set_dir = root_dir / set
     generated_dir = root_dir / "generated"
@@ -119,6 +125,18 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st
 
         pkg_dir = set_dir / project_name
         pkg_file = pkg_dir / "default.nix"
+
+        if project_name in PROJECTS_WITH_RUST:
+            print(f"Updating cargoDeps hash for {set}/{project_name}...")
+            subprocess.run([
+                "nix-update",
+                f"kdePackages.{project_name}",
+                "--version",
+                "skip",
+                "--override-filename",
+                pkg_file
+            ])
+
         if not pkg_file.exists():
             print(f"Generated new package: {set}/{project_name}")
             pkg_dir.mkdir(parents=True, exist_ok=True)

nixos/lib/make-disk-image.nix

@@ -1,7 +1,7 @@
 /*
   Technical details
 
-  `make-disk-image` has a bit of magic to minimize the amount of work to do in a virtual machine.
+  `make-disk-image` has a bit of magic to minimize the amount of work to do in a virtual machine. It also might arguably have too much, or at least too specific magic, so please consider to work towards the effort of unifying our image builders, as outlined in https://github.com/NixOS/nixpkgs/issues/324817 before adding more.
 
   It relies on the [LKL (Linux Kernel Library) project](https://github.com/lkl/linux) which provides Linux kernel as userspace library.
 
@@ -447,8 +447,7 @@ let
     mkdir -p $root
 
     # Copy arbitrary other files into the image
-    # Semi-shamelessly copied from make-etc.sh. I (@copumpkin) shall factor this stuff out as part of
+    # Semi-shamelessly copied from make-etc.sh.
-    # https://github.com/NixOS/nixpkgs/issues/23052.
     set -f
     sources_=(${lib.concatStringsSep " " sources})
     targets_=(${lib.concatStringsSep " " targets})

nixos/modules/services/backup/restic-rest-server.nix

@@ -90,7 +90,7 @@ in
         ExecStart = ''
           ${cfg.package}/bin/rest-server \
           --path ${cfg.dataDir} \
-          --htpasswd-file ${cfg.htpasswd-file} \
+          ${lib.optionalString (cfg.htpasswd-file != null) "--htpasswd-file ${cfg.htpasswd-file}"} \
           ${lib.optionalString cfg.appendOnly "--append-only"} \
           ${lib.optionalString cfg.privateRepos "--private-repos"} \
           ${lib.optionalString cfg.prometheus "--prometheus"} \
@@ -119,7 +119,7 @@ in
         ProtectControlGroups = true;
         PrivateDevices = true;
         ReadWritePaths = [ cfg.dataDir ];
-        ReadOnlyPaths = [ cfg.htpasswd-file ];
+        ReadOnlyPaths = lib.optional (cfg.htpasswd-file != null) cfg.htpasswd-file;
         RemoveIPC = true;
         RestrictAddressFamilies = "none";
         RestrictNamespaces = true;

pkgs/applications/editors/vscode/vscode.nix

@@ -36,22 +36,22 @@ let
 
   sha256 =
     {
-      x86_64-linux = "0hb1rmrrd7zjihrl080h7jf4dprpr7mvm3ykv13mg0xmmv0d7pww";
+      x86_64-linux = "0d9qfifxslwkyv9v42y2h7nbqndq5w16z08qar4vly1hnjnmzzxl";
-      x86_64-darwin = "0bf69y7xxn499r35zxliqx0jvhyd11b46p5a87w62g90q4kcald8";
+      x86_64-darwin = "1yyfkgif0nyhgb28wn1wmdq9wyzxybgdfp8j9nknh0nmvmf1r9w6";
-      aarch64-linux = "05zjk3l05lxh21anxxds6fn98fxlkrak37sz79jg50cxrpn5jvxg";
+      aarch64-linux = "05xj9fswgf24l9mx98hcapzq90820dwwp9mskbbzai3kxy915yqx";
-      aarch64-darwin = "1sjvj4d0d3mcjczb1sjia6gl34vkr91z7jxbyqbf5c88j3zybvw5";
+      aarch64-darwin = "0a41szz9gljf31pq5czqwiyrxms5cf1x1058rsacaihvx8vn38ya";
-      armv7l-linux = "1m7g179hlz2kri0pqsaigdyfnkkv4xwaxmxrbdpxh0sjb2imv8x2";
+      armv7l-linux = "0iq3y8vj4gm20bxkcrsrnb3g0nf5lg5mpb1bxrg2cy4dgaxjl170";
     }
     .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.99.2";
+  version = "1.99.3";
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   # This is used for VS Code - Remote SSH test
-  rev = "4949701c880d4bdb949e3c0e6b400288da7f474b";
+  rev = "17baf841131aa23349f217ca7c570c76ee87b957";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
   longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      sha256 = "0rd5j7n0cc3srn8rcm3ia1knp6zwwjvbjw4067xv0nvb8ilalssw";
+      sha256 = "02b2hbdhambi4viyxsxsdayj294g45i49n5yj828nwigw71asysv";
     };
     stdenv = stdenvNoCC;
   };

pkgs/applications/editors/vscode/vscodium.nix

@@ -26,11 +26,11 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-80tLW2fzZg5DsvQJoMGSfwsL5myrv1gRq9YjPNJicJw=";
+      x86_64-linux = "sha256-NgbN8hqayBG/5bFS+2f+Jmx8a1RSjHJG8zvvJvtOLGs=";
-      x86_64-darwin = "sha256-kADaLEaa+VHJlcYCuUOudDskgB4sEUDNQhKBjAEE5O0=";
+      x86_64-darwin = "sha256-Gt8K3sL81cxeldiG/mNXFzQG1/M2D7Klj/scCAa+RgI=";
-      aarch64-linux = "sha256-vDceHu5UiJCVrSKQ8CgbEIiKqzBEz16/BqPSKyiGwZs=";
+      aarch64-linux = "sha256-YXKiYVHwo5Nn8e8JGtuuKcXx4JgxfnDr10rvwEy2m3Y=";
-      aarch64-darwin = "sha256-zY+dHurXWqY23yq6ucXPtJZxX0t30KvF5C3eq/BBMkE=";
+      aarch64-darwin = "sha256-uBimHECN3qvyHvmGDleR228ms5OBlBFPHafRueUfzBU=";
-      armv7l-linux = "sha256-3l+Xap9iDwXcj7AH3tJrvkbEbF4gaE5pPHrDgB+zZIk=";
+      armv7l-linux = "sha256-DacykoqnE4ZFNn8t5i93k3k/OK0H9krWzw5YoX4+rrM=";
     }
     .${system} or throwSystem;
 
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.99.22418";
+  version = "1.99.32562";
   pname = "vscodium";
 
   executableName = "codium";

pkgs/applications/emulators/zsnes/2.x.nix

@@ -6,6 +6,7 @@
   libGL,
   libGLU,
   libpng,
+  libX11,
   nasm,
   pkg-config,
   zlib,
@@ -18,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "zsnes";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-Xz+9YgMpnHyno7vP67aut4tIyG/gTn7SnU2FO2QMND0=";
   };
 
@@ -32,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libGLU
     libpng
+    libX11
     zlib
   ];
 

pkgs/applications/networking/cluster/minikube/default.nix

@@ -80,7 +80,6 @@ buildGoModule rec {
     license = licenses.asl20;
     maintainers = with maintainers; [
       ebzzry
-      copumpkin
       vdemeester
       atkinschang
       Chili-Man

pkgs/applications/radio/soapysdr/default.nix

@@ -18,7 +18,7 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "soapysdr";
   # Don't forget to change passthru.abiVersion
-  version = "0.8.1-unstable-2024-12-22";
+  version = "0.8.1-unstable-2025-03-30-03";
 
   src = fetchFromGitHub {
     owner = "pothosware";
@@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Instead of applying several patches for Python 3.12 compat, just take the latest, from:
     # use old get python lib for v2 (#437)
-    rev = "309335ec6a52eb712387ed025d705a3c0f7a1e24";
+    rev = "fbf9f3c328868f46029284716df49095ab7b99a6";
-    hash = "sha256-a9414gX4fUAPQaKKqrWgSlFHZH0BWqbgHzhVCKnIn2M=";
+    hash = "sha256-W4915c6hV/GR5PZRRXZJW3ERsZmQQQ08EA9wYp2tAVk=";
   };
 
   nativeBuildInputs = [

pkgs/applications/science/biology/iv/default.nix

@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  neuron-version,
-  libX11,
-  libXext,
-  patchelf,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "iv";
-  version = "19";
-
-  src = fetchurl {
-    url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/iv-${version}.tar.gz";
-    sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx";
-  };
-
-  nativeBuildInputs = [ patchelf ];
-  buildInputs = [ libXext ];
-  propagatedBuildInputs = [ libX11 ];
-
-  hardeningDisable = [ "format" ];
-
-  postInstall =
-    ''
-      for dir in $out/*; do # */
-        if [ -d $dir/lib ]; then
-          mv $dir/* $out # */
-          rmdir $dir
-          break
-        fi
-      done
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so
-    '';
-
-  meta = with lib; {
-    description = "InterViews graphical library for Neuron";
-    license = licenses.bsd3;
-    homepage = "http://www.neuron.yale.edu/neuron";
-    platforms = platforms.all;
-  };
-}

pkgs/applications/virtualization/lkl/default.nix

@@ -116,7 +116,6 @@ stdenv.mkDerivation {
     platforms = platforms.linux; # Darwin probably works too but I haven't tested it
     license = licenses.gpl2;
     maintainers = with maintainers; [
-      copumpkin
       raitobezarius
     ];
   };

pkgs/by-name/al/alt-ergo/package.nix

@@ -8,11 +8,11 @@
 
 let
   pname = "alt-ergo";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchurl {
     url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz";
-    hash = "sha256-EmkxGvJSeKRmiSuoeMyIi6WfF39T3QPxKixiOwP8834=";
+    hash = "sha256-31YEWjr3n7z70d7q8JAS1bw5C0wiI+HZwlwRwwHZ7ro=";
   };
 in
 

pkgs/by-name/am/amazon-ssm-agent/package.nix

@@ -176,7 +176,6 @@ buildGoModule rec {
     license = licenses.asl20;
     platforms = platforms.unix;
     maintainers = with maintainers; [
-      copumpkin
       manveru
       anthonyroussel
       arianvp

pkgs/by-name/az/az-pim-cli/package.nix

@@ -5,8 +5,9 @@
   installShellFiles,
   stdenv,
   buildPackages,
-  versionCheckHook,
   nix-update-script,
+  testers,
+  az-pim-cli,
 }:
 buildGoModule (finalAttrs: {
   pname = "az-pim-cli";
@@ -37,11 +38,13 @@ buildGoModule (finalAttrs: {
     ''
   );
 
-  doInstallCheck = true;
+  passthru = {
-  nativeInstallCheck = [ versionCheckHook ];
+    updateScript = nix-update-script { };
-  versionCheckProgramArg = "version";
+    tests.version = testers.testVersion {
-
+      command = "HOME=$TMPDIR az-pim-cli --version";
-  passthru.updateScript = nix-update-script { };
+      package = az-pim-cli;
+    };
+  };
 
   meta = {
     description = "List and activate Azure Entra ID Privileged Identity Management roles from the CLI";

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

@@ -9,13 +9,14 @@
   harfbuzz,
   pkg-config,
   scdoc,
+  makeWrapper,
   ncursesSupport ? true,
   ncurses,
-  waylandSupport ? true,
+  waylandSupport ? stdenv.hostPlatform.isLinux,
   wayland,
   wayland-protocols,
   wayland-scanner,
-  x11Support ? true,
+  x11Support ? stdenv.hostPlatform.isLinux,
   xorg,
 }:
 
@@ -30,11 +31,18 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-0vpqJ2jydTt6aVni0ma0g+80PFz+C4xJ5M77sMODkSg=";
   };
 
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace GNUmakefile --replace '-soname' '-install_name'
+  '';
+
   strictDeps = true;
-  nativeBuildInputs = [
+  nativeBuildInputs =
+    [
       pkg-config
       scdoc
-  ] ++ lib.optionals waylandSupport [ wayland-scanner ];
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin makeWrapper
+    ++ lib.optional waylandSupport wayland-scanner;
 
   buildInputs =
     [
@@ -66,12 +74,20 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional waylandSupport "wayland"
     ++ lib.optional x11Support "x11";
 
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    so="$(find "$out/lib" -name "libbemenu.so.[0-9]" -print -quit)"
+    for f in "$out/bin/"*; do
+        install_name_tool -change "$(basename $so)" "$so" $f
+        wrapProgram $f --set BEMENU_BACKEND curses
+    done
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/Cloudef/bemenu";
     description = "Dynamic menu library and client program inspired by dmenu";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ crertel ];
     mainProgram = "bemenu";
-    platforms = with platforms; linux;
+    platforms = with platforms; linux ++ darwin;
   };
 })

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

@@ -17,7 +17,7 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "1.2.8";
+  version = "1.2.10";
   pname = "bun";
 
   src =
@@ -86,19 +86,19 @@ stdenvNoCC.mkDerivation rec {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
-        hash = "sha256-ioBqQKA3Mp5PtVlFcmf2xOvoIEy7rNsD85s0m+1ao1U=";
+        hash = "sha256-B4le8PtmEkm4awtyO2WxzEeQx/NoW2PNqQEisAKZlyw=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
-        hash = "sha256-Iwg/JW8qHRVcRW4S45xR4x3EG5fGNCDZkV9Du4ar6rE=";
+        hash = "sha256-VFkv0CN+PskaKTPf8BXhWniYnZcjQELn1TNKTArVBgM=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip";
-        hash = "sha256-vYcbm19aR540MrO4YFQgeSwNOKLot8/H03i0NP8c2og=";
+        hash = "sha256-wkFtHbo9P80XYa1ytpXaUPFElJbGrQNeadQkp4ZEEUQ=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
-        hash = "sha256-QrSLNmdguYb+HWqLE8VwbSZzCDmoV3eQzS6PKHmenzE=";
+        hash = "sha256-aKFU/xvpaFG00ah8xRl/An74Crea+j1FhxUPrlw0w24=";
       };
     };
     updateScript = writeShellScript "update-bun" ''

pkgs/by-name/ca/cargo-tauri/package.nix

@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tauri";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
     tag = "tauri-cli-v${version}";
-    hash = "sha256-tUa3Hb2pDqjcQs8isu1PxI5nx4rUzB/rOep2hDsun1Q=";
+    hash = "sha256-ut5Etn5yf4X3NvFa5JCRH2sQGnC/xzaRhALoyxdjy2k=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-nwrKeCKrzwDOdRwkkuRMR91IbtPRxnSrJFyEW0W+1wA=";
+  cargoHash = "sha256-1YLpK2frSmdCj5aksuZhnHkAZdwHX/ZuVKXyqVJel/s=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/ce/centerim/package.nix

@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  gnused,
-  openssl,
-  curl,
-  ncurses,
-  libjpeg,
-  withGpg ? true,
-  gpgme ? null,
-}:
-
-stdenv.mkDerivation rec {
-  version = "5.0.1";
-  pname = "centerim5";
-
-  src = fetchurl {
-    url = "http://centerim.org/download/cim5/${pname}-${version}.tar.gz";
-    sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk";
-  };
-
-  CXXFLAGS = "-std=gnu++98";
-
-  buildInputs = [
-    openssl
-    curl
-    ncurses
-    libjpeg
-  ] ++ lib.optional withGpg gpgme;
-
-  preConfigure = ''
-    ${gnused}/bin/sed -i '1,1i#include <stdio.h>' libicq2000/libicq2000/sigslot.h
-  '';
-
-  configureFlags = [
-    "--with-openssl=${openssl.dev}"
-  ];
-
-  meta = {
-    homepage = "https://www.centerim.org/";
-    description = "Fork of CenterICQ, a curses instant messaging program";
-    license = lib.licenses.gpl2Plus;
-    platforms = with lib.platforms; linux;
-  };
-}

pkgs/by-name/ch/changedetection-io/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "changedetection-io";
-  version = "0.49.13";
+  version = "0.49.4";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "dgtlmoon";
     repo = "changedetection.io";
     tag = version;
-    hash = "sha256-X4MLqDSjp0zAs652G4CaRjeksagun+AlLXy4MxVyTJ8=";
+    hash = "sha256-EmtJ8XXPb75W4VPj4Si9fdzVLDKVfm+8P6UZZlMpMdI=";
   };
 
   pythonRelaxDeps = true;

pkgs/by-name/cl/clojure-lsp/package.nix

@@ -10,18 +10,18 @@
 
 buildGraalvmNativeImage rec {
   pname = "clojure-lsp";
-  version = "2025.03.07-17.42.36";
+  version = "2025.03.27-20.21.36";
 
   src = fetchFromGitHub {
     owner = "clojure-lsp";
     repo = "clojure-lsp";
     rev = version;
-    hash = "sha256-3CKY3t2NWGAQNWYhmyiq3IJDMp81Q0LDCrS23XJeIys=";
+    hash = "sha256-xS/WVTJFCdktYxBvey855PW5Heqlx4EhpDAMHQ5Bj5M=";
   };
 
   jar = fetchurl {
     url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
-    hash = "sha256-ZxUSIHUTJW2TtRZiESKAnuBOS7s2UwzqpTTgAxjkR7Q=";
+    hash = "sha256-g8jX+41gojvoJHV/xMcP+4ROc9LewCUTuDTQcpHQ6+E=";
   };
 
   extraNativeImageBuildArgs = [

pkgs/by-name/co/codechecker/package.nix

@@ -123,5 +123,6 @@ python3Packages.buildPythonApplication rec {
       felixsinger
     ];
     mainProgram = "CodeChecker";
+    platforms = platforms.darwin ++ platforms.linux;
   };
 }

pkgs/by-name/co/commonsBcel/package.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = "https://commons.apache.org/proper/commons-bcel/";
     description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    maintainers = with lib.maintainers; [ copumpkin ];
+    maintainers = [ ];
     license = lib.licenses.asl20;
     platforms = with lib.platforms; unix;
   };

pkgs/by-name/co/commonsCompress/package.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://commons.apache.org/proper/commons-compress";
     description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files";
-    maintainers = with lib.maintainers; [ copumpkin ];
+    maintainers = [ ];
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.asl20;
     platforms = with lib.platforms; unix;

pkgs/by-name/co/commonsFileUpload/package.nix

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://commons.apache.org/proper/commons-fileupload";
     description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications";
-    maintainers = with lib.maintainers; [ copumpkin ];
+    maintainers = [ ];
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.asl20;
     platforms = with lib.platforms; unix;

pkgs/by-name/co/commonsIo/package.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://commons.apache.org/proper/commons-io";
     description = "Library of utilities to assist with developing IO functionality";
-    maintainers = with lib.maintainers; [ copumpkin ];
+    maintainers = [ ];
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.asl20;
     platforms = with lib.platforms; unix;

pkgs/by-name/co/commonsLang/package.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Provides additional methods to manipulate standard Java library classes";
     homepage = "https://commons.apache.org/proper/commons-lang";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ copumpkin ];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
   };

pkgs/by-name/co/commonsMath/package.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://commons.apache.org/proper/commons-math/";
     description = "Library of lightweight, self-contained mathematics and statistics components";
-    maintainers = with lib.maintainers; [ copumpkin ];
+    maintainers = [ ];
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.asl20;
     platforms = with lib.platforms; unix;

pkgs/by-name/cr/createrepo_c/package.nix

@@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
     homepage = "https://rpm-software-management.github.io/createrepo_c/";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ copumpkin ];
+    maintainers = [ ];
   };
 }

pkgs/by-name/dc/dcgm/package.nix

@@ -6,7 +6,7 @@
   catch2,
   cmake,
   ninja,
-  cudaPackages_11_8,
+  cudaPackages_11,
   cudaPackages_12,
   boost,
   fmt_9,
@@ -24,7 +24,7 @@ let
   # The runtime closure, thankfully, is quite small as it does not
   # include the CUDA libraries.
   cudaPackageSets = [
-    cudaPackages_11_8
+    cudaPackages_11
     cudaPackages_12
   ];
 

pkgs/by-name/de/deno/package.nix

@@ -5,6 +5,7 @@
   fetchFromGitHub,
   rustPlatform,
   cmake,
+  yq,
   protobuf,
   installShellFiles,
   librusty_v8 ? callPackage ./librusty_v8.nix {
@@ -18,39 +19,37 @@
 let
   canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 in
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deno";
-  version = "2.2.8";
+  version = "2.2.10";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
-    hash = "sha256-pGhqfQR+42XUY0v99fvSyLQPlvzCWntq4qS9vyuJEpY=";
+    hash = "sha256-6Tuoxvatfm3edkUiMDGmCZdl/jLKr7WH8WCXR14jKT4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-FJ3wPkL1Pgw6S66n5hyQfUZWTVXs4oZ0bJJaN22OxoY=";
+  cargoHash = "sha256-wH+y93loozkgCZZeCR1EVNGBUPY/+OYwZRFeAIcVNTg=";
 
   postPatch = ''
     # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
-    substituteInPlace Cargo.toml --replace-fail "libffi = \"=3.2.0\"" "libffi = { version = \"3.2.0\", features = [\"system\"] }"
+    tomlq -ti '.workspace.dependencies.libffi = { "version": .workspace.dependencies.libffi, "features": ["system"] }' Cargo.toml
   '';
 
   # uses zlib-ng but can't dynamically link yet
   # https://github.com/rust-lang/libz-sys/issues/158
-  nativeBuildInputs =
+  nativeBuildInputs = [
-    [
     rustPlatform.bindgenHook
+    # for tomlq to adjust Cargo.toml
+    yq
     # required by libz-ng-sys crate
     cmake
     # required by deno_kv crate
     protobuf
     installShellFiles
-    ]
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ];
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      lld
-    ];
 
   configureFlags = lib.optionals stdenv.cc.isClang [
     # This never worked with clang, but became a hard error recently: https://github.com/llvm/llvm-project/commit/3d5b610c864c8f5980eaa16c22b71ff1cf462fae
@@ -89,7 +88,7 @@ rustPlatform.buildRustPackage rec {
   installCheckPhase = lib.optionalString canExecute ''
     runHook preInstallCheck
     $out/bin/deno --help
-    $out/bin/deno --version | grep "deno ${version}"
+    $out/bin/deno --version | grep "deno ${finalAttrs.version}"
     runHook postInstallCheck
   '';
 
@@ -98,7 +97,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     homepage = "https://deno.land/";
-    changelog = "https://github.com/denoland/deno/releases/tag/v${version}";
+    changelog = "https://github.com/denoland/deno/releases/tag/v${finalAttrs.version}";
     description = "Secure runtime for JavaScript and TypeScript";
     longDescription = ''
       Deno aims to be a productive and secure scripting environment for the modern programmer.
@@ -122,4 +121,4 @@ rustPlatform.buildRustPackage rec {
       "aarch64-darwin"
     ];
   };
-}
+})

pkgs/by-name/di/digikam/package.nix

@@ -4,6 +4,7 @@
   lib,
   fetchFromGitLab,
   fetchgit,
+  fetchpatch,
 
   cmake,
   ninja,
@@ -62,18 +63,25 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "digikam";
-  version = "8.5.0";
+  version = "8.6.0";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "graphics";
     repo = "digikam";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KO6kq0SlYzu7sh6+7JQWhIeHNowy3fx03OFTdDwyR10=";
+    hash = "sha256-CMyvNOAlIqD6OeqUquQ+/sOiBXmEowZe3/qmaXxh0X0=";
   };
 
   patches = [
     ./disable-tests-download.patch
+
+    # Fix build with Qt 6.9
+    # FIXME: remove in next update
+    (fetchpatch {
+      url = "https://invent.kde.org/graphics/digikam/-/commit/325b19fc7f0d04cdc1308f235c207c1ab43e945d.patch";
+      hash = "sha256-bsxaNuLuU9MyDRmenOqO4JuzsbpUvfKQwcSCDfLHoWQ=";
+    })
   ];
 
   strictDeps = true;

pkgs/by-name/ec/ecs-agent/package.nix

@@ -32,7 +32,7 @@ buildGoModule rec {
     changelog = "https://github.com/aws/amazon-ecs-agent/raw/v${version}/CHANGELOG.md";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ copumpkin ];
+    maintainers = [ ];
     mainProgram = "agent";
   };
 }

pkgs/by-name/fi/fityk/package.nix

@@ -4,7 +4,7 @@
   fetchFromGitHub,
   autoreconfHook,
   wxGTK32,
-  boost,
+  boost186,
   lua,
   zlib,
   bzip2,
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     wxGTK32
-    boost
+    boost186
     lua
     zlib
     bzip2

pkgs/by-name/fl/flix/package.nix

@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "flix";
-  version = "0.58.1";
+  version = "0.59.0";
 
   src = fetchurl {
     url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
-    sha256 = "sha256-YD0H6t5Qj6k8jUfjuMzgY3K2iAN+u4kvcjaqMANkrsw=";
+    sha256 = "sha256-Rh1i0wL6+Td0j+eJ4qCYYSz8dmG1Op7Z0cGBBjjJ68Q=";
   };
 
   dontUnpack = true;

pkgs/by-name/fo/foodfetch/package.nix

@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildInputs = [ openssl ];
 
   doInstallCheck = true;
-  nativeInstallCheck = [ versionCheckHook ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/go/goldboot/package.nix

@@ -0,0 +1,57 @@
+{
+  fetchFromGitHub,
+  rustPlatform,
+  lib,
+  versionCheckHook,
+  pkg-config,
+  zstd,
+  OVMF,
+  qemu,
+  qemu-utils,
+  openssl,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "goldboot";
+  version = "0.0.10";
+
+  src = fetchFromGitHub {
+    owner = "fossable";
+    repo = "goldboot";
+    rev = "goldboot-v${finalAttrs.version}";
+    hash = "sha256-O9yhyJZpjQxC0HP43RsOgPMOKp6d23SNhMLiGtmwXzs=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-NF0Fj+r6qWcM4VEIm1fzveZuz6MIaG32Z+zBfSMC/t4=";
+
+  buildAndTestSubdir = "goldboot";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    zstd
+    OVMF
+    qemu
+    qemu-utils
+    openssl
+  ];
+
+  # Tests require networking, so skip them for now
+  doCheck = false;
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    mainProgram = "goldboot";
+    description = "Immutable infrastructure for the desktop";
+    homepage = "https://github.com/fossable/goldboot";
+    changelog = "https://github.com/fossable/goldboot/releases/tag/goldboot-v${finalAttrs.version}";
+    license = lib.licenses.agpl3Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ cilki ];
+  };
+})

pkgs/by-name/gr/grayjay/package.nix

@@ -0,0 +1,191 @@
+{
+  buildDotnetModule,
+  fetchFromGitLab,
+  dotnetCorePackages,
+  buildNpmPackage,
+  lib,
+  libz,
+  icu,
+  openssl,
+  xorg,
+  gtk3,
+  glib,
+  nss,
+  nspr,
+  dbus,
+  atk,
+  cups,
+  libdrm,
+  expat,
+  libxkbcommon,
+  pango,
+  cairo,
+  udev,
+  alsa-lib,
+  mesa,
+  libGL,
+  libsecret,
+  nix-update-script,
+  autoPatchelfHook,
+  makeDesktopItem,
+  copyDesktopItems,
+  libgcc,
+  krb5,
+  wrapGAppsHook3,
+}:
+let
+  version = "5";
+  src = fetchFromGitLab {
+    domain = "gitlab.futo.org";
+    owner = "videostreaming";
+    repo = "Grayjay.Desktop";
+    tag = version;
+    hash = "sha256-xrbYghNymny6MQrvFn++GaI+kUoOphPQMWcqH47U1Yg=";
+    fetchSubmodules = true;
+    fetchLFS = true;
+  };
+  frontend = buildNpmPackage {
+    name = "grayjay-frontend";
+    inherit version src;
+
+    sourceRoot = "source/Grayjay.Desktop.Web";
+
+    npmBuildScript = "build";
+    npmDepsHash = "sha256-pTEbMSAJwTY6ZRriPWfBFnRHSYufSsD0d+hWGz35xFM=";
+
+    installPhase = ''
+      runHook preInstall
+      cp -r dist/ $out
+      runHook postInstall
+    '';
+  };
+in
+buildDotnetModule {
+  pname = "grayjay";
+
+  inherit version src frontend;
+
+  buildInputs = [
+    openssl
+    libgcc
+    xorg.libX11
+    gtk3
+    glib
+    alsa-lib
+    mesa
+    nspr
+    nss
+    icu
+    krb5
+  ];
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    wrapGAppsHook3
+    copyDesktopItems
+  ];
+
+  dontWrapGApps = true;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "Grayjay";
+      exec = "Grayjay";
+      icon = "grayjay";
+      comment = "Cross platform media application for streaming and downloading media";
+      desktopName = "Grayjay Desktop";
+      categories = [ "Network" ];
+    })
+  ];
+
+  projectFile = [
+    "Grayjay.ClientServer/Grayjay.ClientServer.csproj"
+    "Grayjay.Engine/Grayjay.Engine/Grayjay.Engine.csproj"
+    "Grayjay.Desktop.CEF/Grayjay.Desktop.CEF.csproj"
+    "FUTO.MDNS/FUTO.MDNS/FUTO.MDNS.csproj"
+    "JustCef/DotCef.csproj"
+  ];
+
+  testProjectFile = [
+    "Grayjay.Desktop.Tests/Grayjay.Desktop.Tests.csproj"
+    "Grayjay.Engine/Grayjay.Engine.Tests/Grayjay.Engine.Tests.csproj"
+  ];
+
+  nugetDeps = ./deps.json;
+
+  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+
+  executables = [ "Grayjay" ];
+
+  preBuild = ''
+    rm -r Grayjay.ClientServer/wwwroot/web
+    cp -r ${frontend} Grayjay.ClientServer/wwwroot/web
+  '';
+
+  postInstall = ''
+    chmod +x $out/lib/grayjay/cef/dotcefnative
+    chmod +x $out/lib/grayjay/ffmpeg
+    rm $out/lib/grayjay/Portable
+    ln -s /tmp/grayjay-launch $out/lib/grayjay/launch
+    ln -s /tmp/grayjay-cef-launch $out/lib/grayjay/cef/launch
+    mkdir -p $out/share/icons/hicolor/scalable/apps
+    ln -s $out/lib/grayjay/grayjay.png $out/share/icons/hicolor/scalable/apps/grayjay.png
+  '';
+
+  makeWrapperArgs = [
+    "--chdir"
+    "${placeholder "out"}/lib/grayjay"
+  ];
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  runtimeDeps = [
+    libz
+
+    xorg.libXcomposite
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXrandr
+    xorg.libxcb
+
+    dbus
+    atk
+    cups
+    libdrm
+    expat
+    libxkbcommon
+    pango
+    cairo
+    udev
+    libGL
+    libsecret
+  ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--subpackage"
+      "frontend"
+      "--url"
+      "https://github.com/futo-org/Grayjay.Desktop"
+    ];
+  };
+
+  meta = {
+    description = "Cross-platform application to stream and download content from various sources";
+    longDescription = ''
+      Grayjay is a cross-platform application that enables users to
+      stream and download multimedia content from various online sources,
+      most prominently YouTube.
+      It also offers an extensible plugin API to create and import new
+      integrations.
+    '';
+    homepage = "https://grayjay.app/desktop/";
+    license = lib.licenses.sfl;
+    maintainers = with lib.maintainers; [ samfundev ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "Grayjay";
+  };
+}

pkgs/by-name/ha/haproxy/package.nix

@@ -35,11 +35,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.1.6";
+  version = "3.1.7";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-IYUuSjdLuNmz3aXcg0r+ZVf0ItcCn0/j6sPDBfUSR2A=";
+    hash = "sha256-o5UmRO+TmzYmDZHYGjNWNqqbRFcrTLi2ABJy+IVFxmY=";
   };
 
   buildInputs =

pkgs/by-name/ic/icewm/package.nix

@@ -37,18 +37,17 @@
   pcre2,
   perl,
   pkg-config,
-  fetchpatch,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "icewm";
-  version = "3.7.1";
+  version = "3.7.3";
 
   src = fetchFromGitHub {
     owner = "ice-wm";
     repo = "icewm";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
-    hash = "sha256-4JF2ZAp8dx2fpSYRUz4I8US3oIZrSS90oljuxQDm38A=";
+    hash = "sha256-A9LLVIU00ddINMiiuBapp4dc4/w8Z+TeC+zXV1CtTCE=";
   };
 
   strictDeps = true;
@@ -95,17 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
   ];
 
-  patches = [
-    # https://github.com/NixOS/nixpkgs/issues/385959
-    # https://github.com/bbidulock/icewm/issues/794
-    # TODO: remove this patch when it is included in a release
-    (fetchpatch {
-      name = "fdomenu-icons-quoted";
-      url = "https://github.com/bbidulock/icewm/commit/74bb0a2989127a3ff87d2932ff547713bc710cfe.patch";
-      hash = "sha256-/rMSJYGAJs9cgNu5j4Mov/PfO7ocXQeNRq0vasfRcKA=";
-    })
-  ];
-
   cmakeFlags = [
     "-DPREFIX=$out"
     "-DCFGDIR=/etc/icewm"

pkgs/by-name/js/jsonnet/package.nix

@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
     description = "Purely-functional configuration language that helps you define JSON data";
     maintainers = with lib.maintainers; [
       benley
-      copumpkin
     ];
     license = lib.licenses.asl20;
     homepage = "https://github.com/google/jsonnet";

pkgs/by-name/k2/k2pdfopt/package.nix

@@ -4,6 +4,7 @@
   runCommand,
   fetchzip,
   fetchurl,
+  fetchpatch,
   fetchFromGitHub,
   cmake,
   jbig2dec,
@@ -117,13 +118,43 @@ stdenv.mkDerivation rec {
           cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/
         '';
       };
+      # mupdf_patch no longer applies cleanly against mupdf 1.25.0 or later, due to a conflicting
+      # hunk (mupdf_conflict) introduced in commit bd8d337939f36f55b96cb6984f5c7bbf2f488ce0 of mupdf.
+      # This merge conflict can be resolved as desired by reverting mupdf_conflict, applying mupdf_patch,
+      # and finally reapplying mupdf_conflict, with an increased fuzz factor (see mupdf_modded below).
+      # TODO: remove workaround with conflicting hunk when mupdf in k2pdfopt is updated to 1.25.0 or later
+      mupdf_conflict =
+        hash: revert:
+        fetchpatch {
+          name = "mupdf-conflicting-hunk" + (lib.optionalString revert "-reverted") + ".patch";
+          url = "https://github.com/ArtifexSoftware/mupdf/commit/bd8d337939f36f55b96cb6984f5c7bbf2f488ce0.patch";
+          inherit hash revert;
+          includes = [ "source/fitz/stext-device.c" ];
+          postFetch = ''
+            filterdiff -#6 "$out" > "$tmpfile"
+            mv "$tmpfile" "$out"
+          '';
+        };
       mupdf_modded = mupdf.overrideAttrs (
         {
           patches ? [ ],
           ...
         }:
         {
-          patches = patches ++ [ mupdf_patch ];
+          # The fuzz factor is increased to automatically resolve the merge conflict.
+          patchFlags = [
+            "-p1"
+            "-F3"
+          ];
+          # Reverting and reapplying the conflicting hunk is necessary, otherwise the result will be faulty.
+          patches = patches ++ [
+            # revert conflicting hunk
+            (mupdf_conflict "sha256-24tl9YBuZBYhb12yY3T0lKsA7NswfK0QcMYhb2IpepA=" true)
+            # apply modifications
+            mupdf_patch
+            # reapply conflicting hunk
+            (mupdf_conflict "sha256-bnBV7LyX1w/BXxBFF1bkA8x+/0I9Am33o8GiAeEKHYQ=" false)
+          ];
           # This function is missing in font.c, see font-win32.c
           postPatch = ''
             echo "void pdf_install_load_system_font_funcs(fz_context *ctx) {}" >> source/fitz/font.c

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

@@ -63,10 +63,13 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/bragefuglseth/keypunch";
     license = lib.licenses.gpl3Plus;
     mainProgram = "keypunch";
-    maintainers = with lib.maintainers; [
+    maintainers =
+      with lib.maintainers;
+      [
         tomasajt
         getchoo
-    ];
+      ]
+      ++ lib.teams.gnome-circle.members;
     platforms = lib.platforms.linux;
   };
 })

pkgs/by-name/kr/krep/package.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
   doInstallCheck = true;
-  nativeInstallCheck = [ versionCheckHook ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
   meta = {
     description = "Blazingly fast string search utility designed for performance-critical applications";

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

@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/openSUSE/libsolv";
     license = licenses.bsd3;
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ copumpkin ];
+    maintainers = [ ];
   };
 }

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

@@ -8,7 +8,7 @@
 
 buildGoModule rec {
   pname = "litmusctl";
-  version = "1.14.0";
+  version = "1.15.0";
 
   nativeBuildInputs = [
     installShellFiles
@@ -22,7 +22,7 @@ buildGoModule rec {
     owner = "litmuschaos";
     repo = "litmusctl";
     rev = "${version}";
-    hash = "sha256-Saj5sx5YkcKsnMrnIzPcLok+mgEZSh9p8rnfQbJhAeU=";
+    hash = "sha256-SNqxfoYABKV4MheyP5G9nkRca/1+ozOPEvZAUtGdxh0=";
   };
 
   vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0=";

pkgs/by-name/lu/ludusavi/package.nix

@@ -32,17 +32,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ludusavi";
-  version = "0.29.0";
+  version = "0.29.1";
 
   src = fetchFromGitHub {
     owner = "mtkennerly";
     repo = "ludusavi";
     rev = "v${version}";
-    hash = "sha256-+6/hpOFyAdYxh+HkOlc85utqIY4s4gyZoVQxin9hbkU=";
+    hash = "sha256-IApPudo8oD6YkYJkGpowqpaqrsl2/Q2VFyYfYQI3mN0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-9ki6/KDoa1yLg7mZS7tB7ZjjiZIWOne4Ol7fIK4YPSo=";
+  cargoHash = "sha256-ixxUz+XJPzPu51sxHpXs92Tis2gj9SElqYtNiN+n2EY=";
 
   dontWrapGApps = true;
 

pkgs/by-name/me/metadata-cleaner/package.nix

@@ -21,13 +21,12 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "metadata-cleaner";
   version = "2.5.6";
-
+  pyproject = false;
-  format = "other";
 
   src = fetchFromGitLab {
     owner = "rmnvgr";
     repo = "metadata-cleaner";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-J+nwgLbAFoh1gq3J4cqQEShZJCSZesyCjT9DfkCWIHs=";
   };
 
@@ -61,15 +60,15 @@ python3.pkgs.buildPythonApplication rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Python GTK application to view and clean metadata in files, using mat2";
     mainProgram = "metadata-cleaner";
     homepage = "https://gitlab.com/rmnvgr/metadata-cleaner";
-    changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       cc-by-sa-40
     ];
-    maintainers = with maintainers; [ dotlambda ] ++ lib.teams.gnome-circle.members;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

pkgs/by-name/mi/micro-httpd/package.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     description = "Really small HTTP server";
     license = licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ copumpkin ];
+    maintainers = [ ];
     mainProgram = "micro_httpd";
   };
 }

pkgs/by-name/mi/minio-client/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "minio-client";
-  version = "2025-03-12T17-29-24Z";
+  version = "2025-04-08T15-39-49Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "sha256-8n/qjM+FBrjbSLcd9iVioh3iEAkMNrIo5fG/ZQkAmBo=";
+    sha256 = "sha256-H/iIlzdOLcE2xn96FuyyFcXC0is94MUYbfjA5b/hEqg=";
   };
 
-  vendorHash = "sha256-P7W8xgHc+2ksZnY0iuuPKjwsxSqjhPdiUfNMe18ldL0=";
+  vendorHash = "sha256-0Lfjhd4DlIpnbMp/4gObgeO9L1QC03FhJbFDLXW6UOQ=";
 
   subPackages = [ "." ];
 

pkgs/by-name/my/myks/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "myks";
-  version = "4.8.0";
+  version = "4.8.1";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     tag = "v${version}";
-    hash = "sha256-B2arJ7m7q/vf1YcaYquhkBU3anekZAwRd1ZIvwvYnmM=";
+    hash = "sha256-bjry2szn4bOGsIeJl221T+6aV+MW9yXQcLBS3sJcswQ=";
   };
 
-  vendorHash = "sha256-/LpBb0wbK7OP8HmL2/uMVeilIs4P51Pf+sg23zbPqtI=";
+  vendorHash = "sha256-kUOjbBosj2u25n/fGoC0DpAYkWIgoxIfkXJlNpRALfw=";
 
   subPackages = ".";
 

pkgs/by-name/na/naps2/package.nix

@@ -4,6 +4,7 @@
   buildDotnetModule,
   dotnetCorePackages,
   fetchFromGitHub,
+  wrapGAppsHook3,
   gtk3,
   gdk-pixbuf,
   glib,
@@ -13,34 +14,35 @@
 
 buildDotnetModule rec {
   pname = "naps2";
-  version = "7.4.3";
+  version = "7.5.3";
 
   src = fetchFromGitHub {
     owner = "cyanfish";
     repo = "naps2";
-    rev = "v${version}";
+    tag = "v${version}";
-    hash = "sha256-/qSfxGHcCSoNp516LFYWgEL4csf8EKgtSffBt1C02uE=";
+    hash = "sha256-vX+ZyCQsYqJjgYaufWJRnzX8retiFK5QHSP40bbBaCc=";
   };
 
   projectFile = "NAPS2.App.Gtk/NAPS2.App.Gtk.csproj";
   nugetDeps = ./deps.json;
 
+  postPatch = ''
+    substituteInPlace NAPS2.Images.Gtk/NAPS2.Images.Gtk.csproj \
+      --replace-fail TargetFramework TargetFrameworks \
+  '';
+
+  dotnetFlags = [
+    "-p:TargetFrameworks=net8"
+    "-p:EnablePreviewFeatures=true"
+  ];
+
   executables = [ "naps2" ];
 
-  dotnet-sdk =
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
-    with dotnetCorePackages;
-    sdk_8_0
-    // {
-      inherit
-        (combinePackages [
-          sdk_8_0
-          sdk_6_0-bin
-        ])
-        packages
-        targetPackages
-        ;
-    };
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
+
+  nativeBuildInputs = [ wrapGAppsHook3 ];
+
   selfContainedBuild = true;
   runtimeDeps = [
     gtk3
@@ -68,7 +70,6 @@ buildDotnetModule rec {
     maintainers = with lib.maintainers; [ eliandoran ];
     platforms = lib.platforms.linux;
     mainProgram = "naps2";
-    broken = stdenv.hostPlatform.isAarch64; # Google.Protobuf.Tools dependency fails to build.
   };
 
 }

pkgs/by-name/ol/ollama/package.nix

@@ -19,7 +19,6 @@
   cudaArches ? cudaPackages.cudaFlags.realArches or [ ],
   darwin,
   autoAddDriverRunpath,
-  versionCheckHook,
 
   # passthru
   nixosTests,
@@ -247,10 +246,6 @@ goBuild {
 
   __darwinAllowLocalNetworking = true;
 
-  nativeInstallCheck = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
-  doInstallCheck = true;
-
   passthru = {
     tests =
       {

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

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "omnictl";
-  version = "0.48.0";
+  version = "0.48.3";
 
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "omni";
     rev = "v${version}";
-    hash = "sha256-/+ayHgqXnzA72ms0Z023Vw16rqDE5Eyu/RIPE2AOOG4=";
+    hash = "sha256-D5CiIC9JVF3fhS0MplWekliOdGAblFzJPafrlYDq1Js=";
   };
 
-  vendorHash = "sha256-hHQV28OpZJWgulHXFRb2n9CVxVo958y5FUoxsafzFw8=";
+  vendorHash = "sha256-LMDIpgtMbwr/cpVoAAnr56c/G81ocuOQCJDI+S0z1XU=";
 
   ldflags = [
     "-s"

pkgs/by-name/op/open-timeline-io/package.nix

@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  imath,
+  rapidjson,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "open-timeline-io";
+  version = "0.17.0";
+
+  src = fetchFromGitHub {
+    owner = "AcademySoftwareFoundation";
+    repo = "OpenTimelineIO";
+    rev = "v${version}";
+    hash = "sha256-53KXjbhHxuEtu6iRGWrirvFamuZ/WbOTcKCfs1iqKmM=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  propagatedBuildInputs = [
+    imath
+  ];
+
+  buildInputs = [
+    rapidjson
+  ];
+
+  cmakeFlags = [
+    "-DOTIO_DEPENDENCIES_INSTALL=0"
+    "-DOTIO_FIND_IMATH=1"
+  ];
+
+  meta = {
+    description = "Open Source API and interchange format for editorial timeline information";
+    homepage = "https://github.com/AcademySoftwareFoundation/OpenTimelineIO";
+    license = lib.licenses.asl20;
+    maintainers = [ ];
+    platforms = lib.platforms.all;
+  };
+}

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

@@ -31,9 +31,12 @@ buildGoModule (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/openpubkey/opkssh";
-    description = "Integrating SSO with SSH - short-lived SSH keys with an OpenID provider";
+    description = "Enables SSH to be used with OpenID Connect";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.johnrichardrinehart ];
+    maintainers = with lib.maintainers; [
+      johnrichardrinehart
+      sarcasticadmin
+    ];
     mainProgram = "opkssh";
   };
 })

pkgs/by-name/os/ossia-score/package.nix

@@ -44,13 +44,13 @@
 
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "ossia-score";
-  version = "3.4.1";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "ossia";
     repo = "score";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-PpIGlw3MmJYiLaKX+oHM7QUjlk6Bw/W2GwdkLgPK1Hg=";
+    hash = "sha256-7gZTUdOVfMlNDuvLrt8twbHCBOz9hoZQaQdWdDF6qMg=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/os/ostree/package.nix

@@ -181,6 +181,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://ostreedev.github.io/ostree/";
     license = licenses.lgpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ copumpkin ];
+    maintainers = [ ];
   };
 })

pkgs/by-name/pa/paxtest/package.nix

@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Only;
     platforms = platforms.linux;
     maintainers = with maintainers; [
-      copumpkin
       joachifm
     ];
   };

pkgs/by-name/pe/petidomo/package.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = true;
 
   doInstallCheck = true;
-  nativeInstallCheck = [ versionCheckHook ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
   meta = {
     homepage = "https://petidomo.sourceforge.net/";

pkgs/by-name/po/portfolio/package.nix

@@ -33,11 +33,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "PortfolioPerformance";
-  version = "0.74.2";
+  version = "0.75.1";
 
   src = fetchurl {
     url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-RPoEby12DiJwdM2ejVfOQyrJjy/qgQ9BbqYyaV9KMD0=";
+    hash = "sha256-TIkEv8YEKgvi2DQ7vc90ZjyvVNOiMQvBhb8rqPT2Xl0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/pu/pulumictl/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "pulumictl";
-  version = "0.0.48";
+  version = "0.0.49";
 
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "pulumictl";
     rev = "v${version}";
-    sha256 = "sha256-rFVxfWeESWmqH0BhKY6BO5AxSPXVW8tOPGyUXB5Kc/E=";
+    sha256 = "sha256-VEfDKkavZWWxfE1J2Cy/lnPyHiOJWOtwwcYpeb1pkkM=";
   };
 
-  vendorHash = "sha256-x5CBSzwOfX0BwwbAOuW1ibrLnnkVSNjqG0Sj2EcmRbM=";
+  vendorHash = "sha256-IqJdbeayUcTTEiPAar1goqubAjTavJNYOzCyKXGd0Q8=";
 
   ldflags = [
     "-s"

pkgs/by-name/rc/rclip/package.nix

@@ -6,14 +6,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "rclip";
-  version = "1.11.0";
+  version = "2.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yurijmikhalevich";
     repo = "rclip";
     tag = "v${version}";
-    hash = "sha256-bu9kz0CCq78lp+d2uPoApzZnVybwyWD/fwgnXYG52dk=";
+    hash = "sha256-d/jEtcBvOiebdI4DgWNWtP8ZfOy2x7EaQt/6mo7o2Ok=";
   };
 
   build-system = with python3Packages; [

pkgs/by-name/rd/rdkafka/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rdkafka";
-  version = "2.8.0";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "confluentinc";
     repo = "librdkafka";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-OCCsxgEO8UvCcC0XwzqpqmaT8dV0Klrspp+2o1FbH2Y=";
+    sha256 = "sha256-u4+qskNw18TD59aiSTyv1XOYT2DI24uZnGEAzJ4YBJU=";
   };
 
   outputs = [

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

@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.19.11";
+  version = "1.19.15";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-rKvbh4TihITP+M4znObUU+80YfG9gookilLpIBUxt9U=";
+    hash = "sha256-gmhpxh/u5Ror3V2BMjAJzaWs66+nrsUiBXkVd5G8B/E=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

pkgs/by-name/rp/rpm-ostree/package.nix

@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
     description = "Hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";
     homepage = "https://coreos.github.io/rpm-ostree/";
     license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ copumpkin ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "rpm-ostree";
   };

pkgs/by-name/rq/rquickshare/fix-pnpm-outdated-lockfile.patch

@@ -0,0 +1,35 @@
+diff --git a/app/legacy/pnpm-lock.yaml b/app/legacy/pnpm-lock.yaml
+index ce6a292..76ba03e 100644
+--- a/app/legacy/pnpm-lock.yaml
++++ b/app/legacy/pnpm-lock.yaml
+@@ -12,8 +12,8 @@ importers:
+         specifier: link:../../core_lib
+         version: link:../../core_lib
+       '@tauri-apps/api':
+-        specifier: 1.5.6
+-        version: 1.5.6
++        specifier: 1.6.0
++        version: 1.6.0
+       pinia:
+         specifier: ^2.2.1
+         version: 2.2.1(typescript@5.6.0-dev.20240811)(vue@3.4.27(typescript@5.6.0-dev.20240811))
+@@ -500,10 +500,6 @@ packages:
+     peerDependencies:
+       tailwindcss: '>=3.0.0 || insiders'
+ 
+-  '@tauri-apps/api@1.5.6':
+-    resolution: {integrity: sha512-LH5ToovAHnDVe5Qa9f/+jW28I6DeMhos8bNDtBOmmnaDpPmJmYLyHdeDblAWWWYc7KKRDg9/66vMuKyq0WIeFA==}
+-    engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
+-
+   '@tauri-apps/api@1.6.0':
+     resolution: {integrity: sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg==}
+     engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
+@@ -2707,8 +2703,6 @@ snapshots:
+       postcss-selector-parser: 6.0.10
+       tailwindcss: 3.4.9
+ 
+-  '@tauri-apps/api@1.5.6': {}
+-
+   '@tauri-apps/api@1.6.0': {}
+ 
+   '@tauri-apps/cli-darwin-arm64@1.5.14':

pkgs/by-name/rq/rquickshare/package.nix

@@ -3,6 +3,7 @@
   cargo-tauri,
   cargo-tauri_1,
   fetchFromGitHub,
+  applyPatches,
   glib-networking,
   libayatana-appindicator,
   libsoup_2_4,
@@ -39,13 +40,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "rquickshare" + (app-type-either "" "-legacy");
-  version = "0.11.4";
+  version = "0.11.5";
 
+  src = applyPatches {
     src = fetchFromGitHub {
       owner = "Martichou";
       repo = "rquickshare";
       tag = "v${version}";
-    hash = "sha256-Gq78vxM9hJ+dAHM3RAKHtkFIsoV0XQN4vNbOO3amvTs=";
+      hash = "sha256-DZdzk0wqKhVa51PgQf8UsAY6EbGKvRIGru71Z8rvrwA=";
+    };
+    patches = [ ./fix-pnpm-outdated-lockfile.patch ];
   };
 
   # from https://github.com/NixOS/nixpkgs/blob/04e40bca2a68d7ca85f1c47f00598abb062a8b12/pkgs/by-name/ca/cargo-tauri/test-app.nix#L23-L26
@@ -59,14 +63,14 @@ rustPlatform.buildRustPackage rec {
     inherit pname version src;
 
     sourceRoot = "${src.name}/app/${app-type}";
-    hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-sDHysaKMdNcbL1szww7/wg0bGHOnEKsKoySZJJCcPik=";
+    hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-8QRigYNtxirXidFFnTzA6rP0+L64M/iakPqe2lZKegs=";
   };
 
   useFetchCargoVendor = true;
   cargoRoot = "app/${app-type}/src-tauri";
   buildAndTestSubdir = cargoRoot;
   cargoPatches = [ ./remove-duplicate-versions-of-sys-metrics.patch ];
-  cargoHash = app-type-either "sha256-wraCzzC7YVCXEXBTd8c1cbtCdBunENpUMQ1vZGwfGMs=" "sha256-TBsHlFwbWWa2LEZdmDyz/9vWiFOXKX39PCsjW6OqEGY=";
+  cargoHash = app-type-either "sha256-XfN+/oC3lttDquLfoyJWBaFfdjW/wyODCIiZZksypLM=" "sha256-4vBHxuKg4P9H0FZYYNUT+AVj4Qvz99q7Bhd7x47UC2w=";
 
   nativeBuildInputs = [
     proper-cargo-tauri.hook

pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch

@@ -1,9 +1,9 @@
 diff --git a/app/legacy/src-tauri/Cargo.lock b/app/legacy/src-tauri/Cargo.lock
-index 1bba0ae..af24986 100644
+index 14872dc..341fcc8 100644
 --- a/app/legacy/src-tauri/Cargo.lock
 +++ b/app/legacy/src-tauri/Cargo.lock
-@@ -4138,7 +4138,7 @@ dependencies = [
+@@ -4296,7 +4296,7 @@ dependencies = [
-  "rand 0.8.5",
+  "rand 0.9.0",
   "serde",
   "sha2",
 - "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)",
@@ -11,7 +11,7 @@ index 1bba0ae..af24986 100644
   "tokio",
   "tokio-util",
   "tracing-subscriber",
-@@ -4158,7 +4158,7 @@ dependencies = [
+@@ -4316,7 +4316,7 @@ dependencies = [
   "rqs_lib",
   "serde",
   "serde_json",
@@ -20,10 +20,13 @@ index 1bba0ae..af24986 100644
   "tauri",
   "tauri-build",
   "tauri-plugin-autostart",
-@@ -4759,22 +4759,7 @@ dependencies = [
+@@ -4920,21 +4920,6 @@ dependencies = [
- [[package]]
+  "libc",
- name = "sys_metrics"
+ ]
- version = "0.2.7"
+ 
+-[[package]]
+-name = "sys_metrics"
+-version = "0.2.7"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484"
 -dependencies = [
@@ -36,16 +39,11 @@ index 1bba0ae..af24986 100644
 - "serde",
 -]
 -
--[[package]]
+ [[package]]
--name = "sys_metrics"
+ name = "sys_metrics"
--version = "0.2.7"
+ version = "0.2.7"
--source = "git+https://github.com/Martichou/sys_metrics#c0f4ec7b9156d3ab83ee61276984c7fd4e632098"
-+source = "git+https://github.com/Martichou/sys_metrics#e5b324a17d1724bd97923a173c3535cc06a44b0c"
- dependencies = [
-  "core-foundation-sys",
-  "glob",
 diff --git a/app/legacy/src-tauri/Cargo.toml b/app/legacy/src-tauri/Cargo.toml
-index b971c3d..44abf29 100644
+index fb735b2..cfd1349 100644
 --- a/app/legacy/src-tauri/Cargo.toml
 +++ b/app/legacy/src-tauri/Cargo.toml
 @@ -20,7 +20,7 @@ notify-rust = "4.10"
@@ -54,15 +52,15 @@ index b971c3d..44abf29 100644
  serde_json = "1.0"
 -sys_metrics = "0.2"
 +sys_metrics = { git = "https://github.com/Martichou/sys_metrics" }
- tauri = { version = "1.5", features = ["api-all", "reqwest-native-tls-vendored", "system-tray", "devtools"] }
+ tauri = { version = "1.8", features = ["api-all", "reqwest-native-tls-vendored", "devtools", "system-tray"] }
  tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
  tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 diff --git a/app/main/src-tauri/Cargo.lock b/app/main/src-tauri/Cargo.lock
-index bc4753a..ed4c7e8 100644
+index 5580ef5..4327d4c 100644
 --- a/app/main/src-tauri/Cargo.lock
 +++ b/app/main/src-tauri/Cargo.lock
-@@ -4182,7 +4182,7 @@ dependencies = [
+@@ -4247,7 +4247,7 @@ dependencies = [
-  "rand 0.8.5",
+  "rand 0.9.0",
   "serde",
   "sha2",
 - "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)",
@@ -70,7 +68,7 @@ index bc4753a..ed4c7e8 100644
   "tokio",
   "tokio-util",
   "tracing-subscriber",
-@@ -4202,7 +4202,7 @@ dependencies = [
+@@ -4267,7 +4267,7 @@ dependencies = [
   "rqs_lib",
   "serde",
   "serde_json",
@@ -79,7 +77,7 @@ index bc4753a..ed4c7e8 100644
   "tauri",
   "tauri-build",
   "tauri-plugin-autostart",
-@@ -4867,21 +4867,6 @@ dependencies = [
+@@ -4932,21 +4932,6 @@ dependencies = [
   "syn 2.0.95",
  ]
  
@@ -102,7 +100,7 @@ index bc4753a..ed4c7e8 100644
  name = "sys_metrics"
  version = "0.2.7"
 diff --git a/app/main/src-tauri/Cargo.toml b/app/main/src-tauri/Cargo.toml
-index 5653700..5120513 100644
+index 8864112..7707922 100644
 --- a/app/main/src-tauri/Cargo.toml
 +++ b/app/main/src-tauri/Cargo.toml
 @@ -20,7 +20,7 @@ notify-rust = "4.10"

pkgs/by-name/ru/ruff/package.nix

@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.11.5";
+  version = "0.11.6";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-7R913Dt395qsyJCp7eXGQ9BcAAvV7GrJqoZAsXn6CTs=";
+    hash = "sha256-Yi8eRA2xL+wumXXrq5c4NNtPORZ3BjEM5IowDEfsjwA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-dA2OEogzEBTu2c5OVoxU4dj5TuMWpxmHk7r63lFsEjU=";
+  cargoHash = "sha256-rJNA6Lh3OnY60BZ8YnjP+7cSGftbCb69ISQyr7z523Q=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/ru/rust-stakeholder/package.nix

@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
-  versionCheckHook,
   nix-update-script,
 }:
 rustPlatform.buildRustPackage {
@@ -19,10 +18,6 @@ rustPlatform.buildRustPackage {
   useFetchCargoVendor = true;
   cargoHash = "sha256-NxO+7Wh8Ff6RPFtmbEa3EJszfDaZDXGWZDAoXPEAnpI=";
 
-  nativeInstallCheck = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
-  doInstallCheck = true;
-
   passthru.updateScript = nix-update-script { };
 
   meta = {

pkgs/by-name/sa/sauerbraten/package.nix

@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     cp -r "../docs/"* $out/share/doc/sauerbraten/
     cp sauer_client sauer_server $out/share/sauerbraten/
     cp -r ../packages ../data $out/share/sauerbraten/
-    ln -s $out/share/sauerbraten/cube.png $out/share/icon/sauerbraten.png
+    ln -s $out/share/sauerbraten/data/cube.png $out/share/icon/sauerbraten.png
 
     makeWrapper $out/share/sauerbraten/sauer_server $out/bin/sauerbraten_server \
       --chdir "$out/share/sauerbraten"

pkgs/by-name/sd/SDL2_classic/package.nix

@@ -3,7 +3,6 @@
   stdenv,
   config,
   fetchFromGitHub,
-  fetchpatch,
   nix-update-script,
   pkg-config,
   mesa,
@@ -71,13 +70,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL2";
-  version = "2.32.2";
+  version = "2.32.4";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "SDL";
     rev = "release-${finalAttrs.version}";
-    hash = "sha256-Gtg8G1tRouGZbes1KhsXpYbItpNHYqJCiQKW/L77b+U=";
+    hash = "sha256-4yUJkttUAbDC/5IdcCFY5ZTIG1qsxEEOjTTuplXV/p4=";
   };
   dontDisableStatic = if withStatic then 1 else 0;
   outputs = [
@@ -92,11 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
     # but on NixOS they're spread across different paths.
     # This patch + the setup-hook will ensure that `sdl2-config --cflags` works correctly.
     ./find-headers.patch
-    # https://github.com/libsdl-org/SDL/issues/12224
-    (fetchpatch {
-      url = "https://github.com/libsdl-org/SDL/commit/9e079fe9c7931738ed63d257b1d7fb8a07b66824.diff";
-      hash = "sha256-G8gAivCtw5zuPVI9wvEq2oIo/NxFdnPqyLwrmHG1EJ4=";
-    })
   ];
 
   postPatch = ''

pkgs/by-name/si/simdutf/package.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "6.4.2";
+  version = "6.5.0";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-at1MBvbsgu7Z7UJQqVaakT1Ux16jJVP5JSVubrqF7VY=";
+    hash = "sha256-bZ4r62GMz2Dkd3fKTJhelitaA8jUBaDjG6jOysEg8Nk=";
   };
 
   # Fix build on darwin

pkgs/by-name/so/soapyremote/package.nix

@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "0.5.2";
+  version = "0.5.2-unstable-2024-01-24";
 
 in
 stdenv.mkDerivation {
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "pothosware";
     repo = "SoapyRemote";
-    rev = "soapy-remote-${version}";
+    rev = "54caa5b2af348906607c5516a112057650d0873d";
-    sha256 = "124sy9v08fm51ds1yzrxspychn34y0rl6y48mzariianazvzmfax";
+    sha256 = "sha256-uekElbcbX2P5TEufWEoP6tgUM/4vxgSQZu8qaBCSo18=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/so/sou/package.nix

@@ -3,7 +3,8 @@
   buildGoModule,
   fetchFromGitHub,
   nix-update-script,
-  versionCheckHook,
+  testers,
+  sou,
 }:
 
 buildGoModule (finalAttrs: {
@@ -25,13 +26,16 @@ buildGoModule (finalAttrs: {
     "-X=main.version=${finalAttrs.version}"
   ];
 
-  doInstallCheck = true;
-  nativeInstallCheck = [ versionCheckHook ];
-
   # Some of the tests use localhost networking
   __darwinAllowLocalNetworking = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      command = "HOME=$TMPDIR sou --version";
+      package = sou;
+    };
+  };
 
   meta = {
     description = "Tool for exploring files in container image layers";

pkgs/by-name/so/souffle/package.nix

@@ -97,7 +97,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [
       thoughtpolice
-      copumpkin
       wchresta
       markusscherer
     ];

pkgs/by-name/tf/tfmigrate/package.nix

@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
   ];
 
   doInstallCheck = true;
-  nativeInstallCheck = [ versionCheckHook ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/tr/trayscale/package.nix

@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "trayscale";
-  version = "0.14.2";
+  version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = "DeedleFake";
     repo = "trayscale";
-    rev = "v${version}";
+    tag = "v${version}";
-    hash = "sha256-Ct52IcRm44aDibiZfA1YySC7/jocHC4rB418DQvrp1s=";
+    hash = "sha256-HIx3icecgu29jlrHpXfIXzJAxgKSgpeGexouiL2lYB8=";
   };
 
-  vendorHash = "sha256-GA3jmj1/OruiaDT+q5ZQyZfhehRIMrc9+K9CCoQ1fsE=";
+  vendorHash = "sha256-hFUzFjQ8LWOKifDp3FiIUwdttX0FrPpRdtWj6fqE5uQ=";
 
   subPackages = [ "cmd/trayscale" ];
 
@@ -60,6 +60,6 @@ buildGoModule rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sikmir ];
     mainProgram = "trayscale";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/tw/twitch-dl/package.nix

@@ -10,20 +10,16 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "twitch-dl";
-  version = "2.11.0";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ihabunek";
     repo = "twitch-dl";
     tag = version;
-    hash = "sha256-L+IbcSUaxhTg2slNc5x1VJPnA5e2qrPEeWjspK2COAI=";
+    hash = "sha256-/TlJG6Mh8/Ax4bKKR/plhMMY2x6YXwcFP6zjClOPaD8=";
   };
 
-  pythonRelaxDeps = [
-    "m3u8"
-  ];
-
   nativeBuildInputs = [
     python3Packages.setuptools
     python3Packages.setuptools-scm

pkgs/by-name/vo/vors/package.nix

@@ -0,0 +1,108 @@
+{
+  curl,
+  fetchurl,
+  lib,
+  genericUpdater,
+  go,
+  perl,
+  stdenv,
+  writeShellScript,
+  zstd,
+  pkg-config,
+  opusfile,
+  sox,
+  makeWrapper,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vors";
+  version = "3.1.0";
+
+  src = fetchurl {
+    url = "http://www.vors.stargrave.org/download/vors-${finalAttrs.version}.tar.zst";
+    hash = "sha256-ZRQI96j0n00eh1qxO8NgJeOQPU9bfzHoHa45xQNuzv8=";
+  };
+
+  buildInputs = [
+    go
+    opusfile
+    sox
+  ];
+
+  nativeBuildInputs = [
+    zstd
+    pkg-config
+    perl
+    makeWrapper
+  ];
+
+  preConfigure = "export GOCACHE=$NIX_BUILD_TOP/gocache";
+
+  buildPhase = ''
+    runHook preBuild
+    ./mk-non-static
+    mkdir -p ./local/lib # Required to prevent building libopusfile
+    ./build
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p "$out"/bin
+    cp -f bin/* "$out"/bin
+    chmod 755 "$out"/bin/*
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    wrapProgram "$out"/bin/vors-client \
+        --prefix PATH : ${lib.makeBinPath [ sox ]}
+  '';
+
+  enableParallelBuilding = true;
+
+  passthru.updateScript = genericUpdater {
+    versionLister = writeShellScript "vors-versionLister" ''
+      ${curl}/bin/curl -s ${finalAttrs.meta.downloadPage} | ${perl}/bin/perl -lne 'print $1 if /td.*>([0-9.]+)</'
+    '';
+  };
+
+  meta = {
+    broken = stdenv.hostPlatform.isDarwin;
+    description = "Very simple and usable multi-user VoIP solution";
+    downloadPage = "http://www.vors.stargrave.org/Install.html";
+    homepage = "http://www.vors.stargrave.org/";
+    license = lib.licenses.gpl3Only;
+    longDescription = ''
+      VoRS – Vo(IP) Really Simple. Very simple and usable multi-user
+      VoIP solution. Some kind of alternative to Mumble without
+      gaming-related features.
+
+      Mumble has wonderful simplicity and workability, but its
+      client is written on Qt, which requires hundreds of megabytes
+      of additional libraries to build it up. And users tend to
+      complain about its newer client versions quality and
+      convenience.
+
+      So let’s write as simple VoIP talking client as it is possible,
+      without compromising convenience and simplicity for the user!
+      I just want a simple command, which only requires to specify
+      the server’s address with the key to just immediately talk
+      with someone.
+
+      No GUI requirement. Why would someone need a GUI for voice
+      application? But a fancy real-time refreshing TUI would be
+      desirable. Mumble tends to output no information, sometimes
+      hiding the fact of a problem and that everything stopped
+      working.
+
+      Mono-cypher, mono-codec protocol.
+
+      Maximal easiness of usage: here is your address, key, do me good.
+    '';
+    maintainers = with lib.maintainers; [
+      dvn0
+    ];
+    platforms = lib.platforms.all;
+  };
+})

pkgs/by-name/xa/xar/package.nix

@@ -183,9 +183,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/apple-oss-distributions/xar";
     description = "An easily extensible archive format";
     license = lib.licenses.bsd3;
-    maintainers =
+    maintainers = lib.teams.darwin.members ++ lib.attrValues { inherit (lib.maintainers) tie; };
-      lib.teams.darwin.members
-      ++ lib.attrValues { inherit (lib.maintainers) copumpkin tie; };
     platforms = lib.platforms.unix;
     mainProgram = "xar";
   };

pkgs/by-name/ya/yarn-berry/update.sh

@@ -19,5 +19,5 @@ EOF
 version=$(jq -r "[.data.repository.tag.nodes[].name | select(contains(\"-\")|not)] | max_by(split(\".\") | map(tonumber))" <<< "$payload")
 version3=$(jq -r "[.data.repository.tag.nodes[].name | select(contains(\"-\")|not)] | map(select(. < \"4.0.0\")) | sort | last" <<< "$payload")
 
-update-source-version yarn-berry4 "$version" --version-key="version_4"
+update-source-version yarn-berry_4 "$version" --version-key="version_4"
-update-source-version yarn-berry3 "$version3" --version-key="version_3"
+update-source-version yarn-berry_3 "$version3" --version-key="version_3"

pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix

@@ -38,6 +38,14 @@ qtModule {
     })
     # add version specific QML import path
     ./use-versioned-import-path.patch
+
+    # The build attempts to sign qmltestrunner, which may already be signed, causing it to fail unless forced.
+    # FIXME: remove for 6.9.1
+    (fetchpatch2 {
+      url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/8effbbcefd8cae27cd5da07b4ffe3aa86dad83bf.diff";
+      hash = "sha256-wKrKXdr1ddshpRVIZZ/dsn87wjPXSaoUvXT9edlPtzA=";
+    })
+
     # Backport patch to fix qmlsc crash on "if + for"
     # FIXME: remove for 6.9.1
     (fetchpatch2 {

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

@@ -26,6 +26,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/verigak/colors/";
     description = "ANSI colors for Python";
     license = licenses.isc;
-    maintainers = with maintainers; [ copumpkin ];
+    maintainers = [ ];
   };
 }

pkgs/development/python-modules/boto3-stubs/default.nix

@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.37.35";
+  version = "1.37.36";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-OQDIBsLGaIBPFxPm79VmoGyZv/zI43CemCKp3saBkj8=";
+    hash = "sha256-0IlcyLMUpMGTNVuWUwrosFGlK5qge603HVswehQMimA=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/botocore-stubs/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.37.29";
+  version = "1.37.36";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-xZiYvx0Jv2qfSR9HBcVpbnS4MVa3ZqoXFoZ/EbigTqE=";
+    hash = "sha256-Ln/0bH08LADbZkWvRr4XYqOvqK0lsS/DnFgKoZmTyFI=";
   };
 
   nativeBuildInputs = [ setuptools ];

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

@@ -40,7 +40,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/jnwatson/py-lmdb/blob/py-lmdb_${version}/ChangeLog";
     license = lib.licenses.openldap;
     maintainers = with lib.maintainers; [
-      copumpkin
       ivan
     ];
   };

pkgs/development/python-modules/mypy-boto3/default.nix

@@ -46,8 +46,8 @@ let
 in
 rec {
   mypy-boto3-accessanalyzer =
-    buildMypyBoto3Package "accessanalyzer" "1.37.0"
+    buildMypyBoto3Package "accessanalyzer" "1.37.36"
-      "sha256-mm2NgDfVTGN4LqbUR0YJhMwmcsftMRpyg3QZNo/p2Ko=";
+      "sha256-eCSfYW61ednEn1fbQoTJ5Wgl4S5kjevMlz2hzr5n2AQ=";
 
   mypy-boto3-account =
     buildMypyBoto3Package "account" "1.37.0"
@@ -62,8 +62,8 @@ rec {
       "sha256-rq8i4Hs7gv8pwAXd9qJcLCvXIt7qiCnMaCuU80hCEs8=";
 
   mypy-boto3-amp =
-    buildMypyBoto3Package "amp" "1.37.0"
+    buildMypyBoto3Package "amp" "1.37.36"
-      "sha256-rxpBCIXOkSl5UeP1e0Rz8VK4tU3qD7nqG77YiGTv/0U=";
+      "sha256-odOqacsjn2opQla0k+jj1oAOIqjWUq6vmkX7tLK93/s=";
 
   mypy-boto3-amplify =
     buildMypyBoto3Package "amplify" "1.37.17"
@@ -150,8 +150,8 @@ rec {
       "sha256-wH8zPvix4Yd0uBbz71EJmk6YWe/bBZz4v+QHjl2yud0=";
 
   mypy-boto3-autoscaling =
-    buildMypyBoto3Package "autoscaling" "1.37.0"
+    buildMypyBoto3Package "autoscaling" "1.37.36"
-      "sha256-C28bRk0IhJreEN0Zs/SfyBrhnvV12+Lbojp2oGJenfc=";
+      "sha256-H2w6UEQv1NraYA3jPWXI+PL4MYNOphsnx1AImYk3OHU=";
 
   mypy-boto3-autoscaling-plans =
     buildMypyBoto3Package "autoscaling-plans" "1.37.0"
@@ -338,8 +338,8 @@ rec {
       "sha256-ZksL1EtJj4H12D8JvRS8sTDnhKc2j+1UiRlMTN3yHGc=";
 
   mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.37.10"
+    buildMypyBoto3Package "connect" "1.37.36"
-      "sha256-5oHBPdOYeB+6eAXrw0xPy7uLAORtflFbYzG8fGgzrXE=";
+      "sha256-Hl1LkaaJ1UQkr0zKzT+RO3ISWQfu/AJKHUk3tCpgPAE=";
 
   mypy-boto3-connect-contact-lens =
     buildMypyBoto3Package "connect-contact-lens" "1.37.33"
@@ -462,8 +462,8 @@ rec {
       "sha256-7Sz4g1+0B99ZybhrzJOS0K71thybaDPUYmF4+SN1sGc=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.37.26"
+    buildMypyBoto3Package "ecs" "1.37.36"
-      "sha256-RsP/geW/mnQQuzglIlPgNMkBs5Q862S8fUBxLe6x7og=";
+      "sha256-9bjyK1uqd81ecObI8jPW5hooS/07pqTdiVFcBzMQvTs=";
 
   mypy-boto3-efs =
     buildMypyBoto3Package "efs" "1.37.0"
@@ -674,8 +674,8 @@ rec {
       "sha256-eEq8LDmORpA464IecxTI6FqVIitn3t+t4ElsHkfSAs4=";
 
   mypy-boto3-iotfleetwise =
-    buildMypyBoto3Package "iotfleetwise" "1.37.30"
+    buildMypyBoto3Package "iotfleetwise" "1.37.36"
-      "sha256-DYuNsbiLD2E+oJAcrqBppujmpyFye0m73b8YsE0Pydo=";
+      "sha256-Rua+n9vvAiLAzy/DwDd6ErujD04q1Xsts0nle0KbUH0=";
 
   mypy-boto3-iotsecuretunneling =
     buildMypyBoto3Package "iotsecuretunneling" "1.37.0"
@@ -898,8 +898,8 @@ rec {
       "sha256-bySahvnK2ZFX2wETtu+PQyhbMYyH2RdcYMNEDnYMTzM=";
 
   mypy-boto3-memorydb =
-    buildMypyBoto3Package "memorydb" "1.37.0"
+    buildMypyBoto3Package "memorydb" "1.37.36"
-      "sha256-88OSler+2SJ2zDYtLmM5NeOPafKIf5zaLV8MMLRb5es=";
+      "sha256-9WLf5gu0g3GBaSumy9HaWQrG5w5z9v++SNxYbk+iyTk=";
 
   mypy-boto3-meteringmarketplace =
     buildMypyBoto3Package "meteringmarketplace" "1.37.33"
@@ -966,8 +966,8 @@ rec {
       "sha256-XJE33wPIGIlSVxrJ3qE09AmFLkYwKR6zWXXtDnEVvSA=";
 
   mypy-boto3-omics =
-    buildMypyBoto3Package "omics" "1.37.0"
+    buildMypyBoto3Package "omics" "1.37.36"
-      "sha256-L+XFhueTb9fq32oyVVbysBMXgds1UlXryqRwiDOI+Io=";
+      "sha256-sJXXQ3pKKNmXDplUe24dEboelzNpQe/Mkj+DNTjAg08=";
 
   mypy-boto3-opensearch =
     buildMypyBoto3Package "opensearch" "1.37.27"

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

@@ -50,14 +50,14 @@
 
 buildPythonPackage rec {
   pname = "nicegui";
-  version = "2.13.0";
+  version = "2.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zauberzeug";
     repo = "nicegui";
     tag = "v${version}";
-    hash = "sha256-CawBLQstWLZ7AOmoOxsU7W7bZnnqvMmZacBC9CI/h+M=";
+    hash = "sha256-pwR+9QBCIMZXFK9n8GRESl9UFsh7zcgOxTngdgdyMuc=";
   };
 
   build-system = [

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

@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/cpburnz/python-path-specification";
     changelog = "https://github.com/cpburnz/python-pathspec/blob/v${version}/CHANGES.rst";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ copumpkin ];
+    maintainers = [ ];
   };
 }

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

@@ -64,8 +64,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pantsbuild/pex";
     changelog = "https://github.com/pantsbuild/pex/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [
+    maintainers = [ ];
-      copumpkin
-    ];
   };
 }

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

@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250412";
+  version = "1.0.2.20250417";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bnsevMlfJY0cjfhhqA+RyB/SP2QklVmDM+Bgt3ATLko=";
+    hash = "sha256-hIZcImPbnSWtr9PV3etARhOweu+lxrgpTp//PCV47O0=";
   };
 
   build-system = [ setuptools ];

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

@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "pysdl2";
-  version = "0.9.17";
+  version = "0.9.17-unstable-2025-04-03";
   pyproject = true;
 
   pythonImportsCheck = [ "sdl2" ];
@@ -29,23 +29,29 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "py-sdl";
     repo = "py-sdl2";
-    tag = version;
+    rev = "6414ee1c5f4a6eb91b71f5f9e35d469eee395b9f";
-    hash = "sha256-FqVgDGpImLN2a51TnU6eKjLK3rwW3ujdzOkK58ERBbE=";
+    hash = "sha256-E6Jpuin4bqDkvFTaZTsTNkNQJd2e5fuTf2oLsQ71uQ0=";
   };
 
   patches = [
     (replaceVars ./PySDL2-dll.patch (
-      builtins.mapAttrs
+      (builtins.mapAttrs
         (_: pkg: "${pkg}/lib/lib${pkg.pname}${stdenv.hostPlatform.extensions.sharedLibrary}")
         {
           inherit
-            SDL2
             SDL2_ttf
             SDL2_image
             SDL2_gfx
             SDL2_mixer
             ;
         }
+      )
+      // {
+        # sdl2-compat has the pname sdl2-compat,
+        # but the shared object is named libSDL2.so for compatibility reasons.
+        # This requires making the shared object path for SDL2 not depend on pname.
+        SDL2 = (pkg: "${pkg}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}") SDL2;
+      }
     ))
   ];
 
@@ -75,10 +81,34 @@ buildPythonPackage rec {
   disabledTests = [
     # GetPrefPath for OrgName/AppName is None
     "test_SDL_GetPrefPath"
+
+    # broken with sdl2-compat
+    "test_SDL_AddDelHintCallback"
+    "test_SDL_HasIntersectionF"
+    "test_SDL_IntersectFRect"
+    "test_SDL_UnionFRect"
+    "test_SDL_EncloseFPoints"
+    "test_SDL_IntersectFRectAndLine"
+    "test_SDL_GetSetTextureScaleMode"
+    "test_init"
+    "test_logical_size"
+    "test_copy"
+
+    # sdl2-compat fails on these in our build sandbox
+    "test_create_sprite"
+    "test_create_software_sprite"
+    "test_create_texture_sprite"
+    "test_from_image"
+    "test_from_surface"
+    "test_from_text"
+
+    "test_SDL_Init"
+    "test_SDL_InitSubSystem"
+    "test_SDL_SetWindowIcon"
   ];
 
   meta = {
-    changelog = "https://github.com/py-sdl/py-sdl2/releases/tag/${src.tag}";
+    changelog = "https://github.com/py-sdl/py-sdl2/compare/0.9.17..${src.rev}";
     description = "Wrapper around the SDL2 library and as such similar to the discontinued PySDL project";
     homepage = "https://github.com/py-sdl/py-sdl2";
     license = lib.licenses.publicDomain;

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

@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/vsajip/python-gnupg";
     changelog = "https://github.com/vsajip/python-gnupg/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ copumpkin ];
+    maintainers = [ ];
   };
 }

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

@@ -1,8 +1,8 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
 
   # build-system
   hatchling,
@@ -12,10 +12,12 @@
   redis,
 
   # tests
+  addBinToPathHook,
   psutil,
   pytestCheckHook,
   redisTestHook,
   sentry-sdk,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -23,8 +25,6 @@ buildPythonPackage rec {
   version = "2.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "rq";
     repo = "rq";
@@ -40,26 +40,30 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    addBinToPathHook
     psutil
     pytestCheckHook
     redisTestHook
     sentry-sdk
+    versionCheckHook
   ];
+  versionCheckProgramArg = "--version";
 
   __darwinAllowLocalNetworking = true;
 
-  disabledTests = [
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
-    # https://github.com/rq/rq/commit/fd261d5d8fc0fe604fa396ee6b9c9b7a7bb4142f
+    # PermissionError: [Errno 13] Permission denied: '/tmp/rq-tests.txt'
-    "test_clean_large_registry"
+    "test_deleted_jobs_arent_executed"
+    "test_suspend_worker_execution"
   ];
 
   pythonImportsCheck = [ "rq" ];
 
-  meta = with lib; {
+  meta = {
     description = "Library for creating background jobs and processing them";
     homepage = "https://github.com/nvie/rq/";
     changelog = "https://github.com/rq/rq/releases/tag/${src.tag}";
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
-    maintainers = with maintainers; [ mrmebelman ];
+    maintainers = with lib.maintainers; [ mrmebelman ];
   };
 }

pkgs/development/python-modules/xiaomi-ble/default.nix

@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "xiaomi-ble";
-  version = "0.36.0";
+  version = "0.38.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "xiaomi-ble";
     tag = "v${version}";
-    hash = "sha256-qk8eoPuyU8deEuQkRRtTt1AxIpjaXaS/byDxMfZnLgI=";
+    hash = "sha256-ysuQBmTdBmV3U3D2K4Lf0h7yNsEIkmsFtzGZyTbVa/c=";
   };
 
   build-system = [ poetry-core ];