Revert "Merge remote-tracking branch 'origin/master' into staging-next"

This reverts commit 28cafe5795, reversing
changes made to 281c9189d4.

Broken merge due to mergiraf removing many newlines from
python-packages.nix.

lib/default.nix

@@ -287,7 +287,6 @@ let
         init
         crossLists
         unique
-        uniqueStrings
         allUnique
         intersectLists
         subtractLists

lib/lists.nix

@@ -11,7 +11,7 @@ let
     warn
     pipe
     ;
-  inherit (lib.attrsets) mapAttrs attrNames;
+  inherit (lib.attrsets) mapAttrs;
   inherit (lib) max;
 in
 rec {
@@ -1839,10 +1839,6 @@ rec {
   /**
     Remove duplicate elements from the `list`. O(n^2) complexity.
 
-    :::{.note}
-    If the list only contains strings and order is not important, the complexity can be reduced to O(n log n) by using [`lib.lists.uniqueStrings`](#function-library-lib.lists.uniqueStrings) instead.
-    :::
-
     # Inputs
 
     `list`
@@ -1868,43 +1864,6 @@ rec {
   */
   unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [ ];
 
-  /**
-    Removes duplicate strings from the `list`. O(n log n) complexity.
-
-    :::{.note}
-    Order is not preserved.
-
-    All elements of the list must be strings without context.
-
-    This function fails when the list contains a non-string element or a [string with context](https://nix.dev/manual/nix/latest/language/string-context.html).
-    In that case use [`lib.lists.unique`](#function-library-lib.lists.unique) instead.
-    :::
-
-    # Inputs
-
-    `list`
-
-    : List of strings
-
-    # Type
-
-    ```
-    uniqueStrings :: [ String ] -> [ String ]
-    ```
-
-    # Examples
-    :::{.example}
-    ## `lib.lists.uniqueStrings` usage example
-
-    ```nix
-    uniqueStrings [ "foo" "bar" "foo" ]
-    => [ "bar" "foo" ] # order is not preserved
-    ```
-
-    :::
-  */
-  uniqueStrings = list: attrNames (groupBy id list);
-
   /**
     Check if list contains only unique elements. O(n^2) complexity.
 

lib/tests/misc.nix

@@ -113,7 +113,6 @@ let
     toIntBase10
     toShellVars
     types
-    uniqueStrings
     updateManyAttrsByPath
     versions
     xor
@@ -1930,69 +1929,6 @@ runTests {
     expected = false;
   };
 
-  testUniqueStrings_empty = {
-    expr = uniqueStrings [ ];
-    expected = [ ];
-  };
-  testUniqueStrings_singles = {
-    expr = uniqueStrings [
-      "all"
-      "unique"
-      "already"
-    ];
-    expected = [
-      "all"
-      "already"
-      "unique"
-    ];
-  };
-  testUniqueStrings_allDuplicates = {
-    expr = uniqueStrings [
-      "dup"
-      "dup"
-      "dup"
-    ];
-    expected = [ "dup" ];
-  };
-  testUniqueStrings_some_duplicates = {
-    expr = uniqueStrings [
-      "foo"
-      "foo"
-      "bar"
-      "bar"
-      "baz"
-    ];
-    expected = [
-      "bar"
-      "baz"
-      "foo"
-    ];
-  };
-  testUniqueStrings_unicode = {
-    expr = uniqueStrings [
-      "café"
-      "@"
-      "#"
-      "@"
-      "#"
-      "$"
-      "😎"
-      "😎"
-      "🙃"
-      ""
-      ""
-    ];
-    expected = [
-      ""
-      "#"
-      "$"
-      "@"
-      "café"
-      "😎"
-      "🙃"
-    ];
-  };
-
   # ATTRSETS
 
   testConcatMapAttrs = {

pkgs/applications/blockchains/bitcoin-knots/default.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchFromGitHub,
   autoreconfHook,
   pkg-config,
   util-linux,
@@ -22,30 +21,20 @@
   python3,
   withGui,
   withWallet ? true,
-  gnupg,
-  # Signatures from the following GPG public keys checked during verification of the source code.
-  # The list can be found at https://github.com/bitcoinknots/guix.sigs/tree/knots/builder-keys
-  builderKeys ? [
-    "1A3E761F19D2CC7785C5502EA291A2C45D0C504A" # luke-jr.gpg
-    "32FE1E61B1C711186CA378DEFD8981F1BC41ABB9" # oomahq.gpg
-    "CACC7CBB26B3D2EE8FC2F2BC0E37EBAB8574F005" # leo-haf.gpg
-  ],
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = if withGui then "bitcoin-knots" else "bitcoind-knots";
   version = "28.1.knots20250305";
 
   src = fetchurl {
-    url = "https://bitcoinknots.org/files/28.x/${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz";
-    # hash retrieved from signed SHA256SUMS
+    url = "https://bitcoinknots.org/files/28.x/${version}/bitcoin-${version}.tar.gz";
     hash = "sha256-DKO3+43Tn/BTKQVrLrCkeMtzm8SfbaJD8rPlb6lDA8A=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    gnupg
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
@@ -69,58 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
     qttools
   ];
 
-  preUnpack =
-    let
-      majorVersion = lib.versions.major finalAttrs.version;
-
-      publicKeys = fetchFromGitHub {
-        owner = "bitcoinknots";
-        repo = "guix.sigs";
-        rev = "b998306d462f39b6077518521700d7156fec76b8";
-        sha256 = "sha256-q4tumAfTr828AZNOa9ia7Y0PYoe6W47V/7SEApTzl3w=";
-      };
-
-      checksums = fetchurl {
-        url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS";
-        hash = "sha256-xWJKaZBLm9H6AuMBSC21FLy/5TRUI0AQVIUF/2PvDhs=";
-      };
-
-      signatures = fetchurl {
-        url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS.asc";
-        hash = "sha256-SywdBEzZqsf2aDeOs7J9n513RTCm+TJA/QYP5+h7Ifo=";
-      };
-
-      verifyBuilderKeys =
-        let
-          script = publicKey: ''
-            echo "Checking if public key ${publicKey} signed the checksum file..."
-            grep "^\[GNUPG:\] VALIDSIG .* ${publicKey}$" verify.log > /dev/null
-            echo "OK"
-          '';
-        in
-        builtins.concatStringsSep "\n" (builtins.map script builderKeys);
-    in
-    ''
-      pushd $(mktemp -d)
-      export GNUPGHOME=$PWD/gnupg
-      mkdir -m 700 -p $GNUPGHOME
-      gpg --no-autostart --batch --import ${publicKeys}/builder-keys/*
-      ln -s ${checksums} ./SHA256SUMS
-      ln -s ${signatures} ./SHA256SUMS.asc
-      ln -s $src ./bitcoin-${finalAttrs.version}.tar.gz
-      gpg --no-autostart --batch --verify --status-fd 1 SHA256SUMS.asc SHA256SUMS > verify.log
-      ${verifyBuilderKeys}
-      grep bitcoin-${finalAttrs.version}.tar.gz SHA256SUMS > SHA256SUMS.filtered
-      echo "Verifying the checksum of bitcoin-${finalAttrs.version}.tar.gz..."
-      sha256sum -c SHA256SUMS.filtered
-      popd
-    '';
-
   configureFlags = [
     "--with-boost-libdir=${boost.out}/lib"
     "--disable-bench"
   ]
-  ++ lib.optionals (!finalAttrs.doCheck) [
+  ++ lib.optionals (!doCheck) [
     "--disable-tests"
     "--disable-gui-tests"
   ]
@@ -148,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Derivative of Bitcoin Core with a collection of improvements";
     homepage = "https://bitcoinknots.org/";
-    changelog = "https://github.com/bitcoinknots/bitcoin/blob/v${finalAttrs.version}/doc/release-notes.md";
+    changelog = "https://github.com/bitcoinknots/bitcoin/blob/v${version}/doc/release-notes.md";
     maintainers = with lib.maintainers; [
       prusnak
       mmahut
@@ -156,4 +98,4 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
   };
-})
+}

pkgs/applications/blockchains/bitcoin/default.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchFromGitHub,
   cmake,
   pkg-config,
   installShellFiles,
@@ -24,16 +23,6 @@
   withGui,
   withWallet ? true,
   enableTracing ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic,
-  gnupg,
-  # Signatures from the following GPG public keys checked during verification of the source code.
-  # The list can be found at https://github.com/bitcoin-core/guix.sigs/tree/main/builder-keys
-  builderKeys ? [
-    "152812300785C96444D3334D17565732E08E5E41" # achow101.gpg
-    "9EDAFF80E080659604F4A76B2EBB056FD847F8A7" # Emzy.gpg
-    "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg
-    "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg
-    "D1DBF2C4B96F2DEBF4C16654410108112E7EA81F" # hebasto.gpg
-  ],
 }:
 
 let
@@ -59,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
     installShellFiles
-    gnupg
   ]
   ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
     autoSignDarwinBinariesHook
@@ -82,51 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
     qttools
   ];
 
-  preUnpack =
-    let
-      publicKeys = fetchFromGitHub {
-        owner = "bitcoin-core";
-        repo = "guix.sigs";
-        rev = "a788388207bd244d5ab07b31ecd6c126f213a6c6";
-        sha256 = "sha256-gbenuEWP6pqY9ywPd/yZy6QfWI7jvSObwto27DRXjGI=";
-      };
-
-      checksums = fetchurl {
-        url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS";
-        hash = "sha256-lOwVH0UqIhOT0I9rAvswuqy+tZ8ZRhH0kGnn9VCbRv4=";
-      };
-
-      signatures = fetchurl {
-        url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS.asc";
-        hash = "sha256-s05cRmZ9aoPdSZTaz6D6qmVwX6OprqxynPn5vZQ7bbw=";
-      };
-
-      verifyBuilderKeys =
-        let
-          script = publicKey: ''
-            echo "Checking if public key ${publicKey} signed the checksum file..."
-            grep "^\[GNUPG:\] VALIDSIG .* ${publicKey}$" verify.log > /dev/null
-            echo "OK"
-          '';
-        in
-        builtins.concatStringsSep "\n" (builtins.map script builderKeys);
-    in
-    ''
-      pushd $(mktemp -d)
-      export GNUPGHOME=$PWD/gnupg
-      mkdir -m 700 -p $GNUPGHOME
-      gpg --no-autostart --batch --import ${publicKeys}/builder-keys/*
-      ln -s ${checksums} ./SHA256SUMS
-      ln -s ${signatures} ./SHA256SUMS.asc
-      ln -s $src ./bitcoin-${finalAttrs.version}.tar.gz
-      gpg --no-autostart --batch --verify --status-fd 1 SHA256SUMS.asc SHA256SUMS > verify.log
-      ${verifyBuilderKeys}
-      grep bitcoin-${finalAttrs.version}.tar.gz SHA256SUMS > SHA256SUMS.filtered
-      echo "Verifying the checksum of bitcoin-${finalAttrs.version}.tar.gz..."
-      sha256sum -c SHA256SUMS.filtered
-      popd
-    '';
-
   postInstall = ''
     cd ..
     installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash

pkgs/applications/editors/tiled/default.nix

@@ -28,14 +28,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "tiled";
-  # nixpkgs-update: no auto update
-  version = "1.11.2";
+  version = "1.11.90";
 
   src = fetchFromGitHub {
     owner = "mapeditor";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E=";
+    sha256 = "sha256-gGsozdFEE5c315DF+EsIY9wGv50wwrOBycejTkVwEHA=";
   };
 
   nativeBuildInputs = [

pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix

@@ -12,18 +12,18 @@
   pkgs,
 }:
 let
-  version = "0.0.27-unstable-2025-08-14";
+  version = "0.0.27-unstable-2025-08-06";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "be0937a459624ce1170f158f9d8660d0ade47eb4";
-    hash = "sha256-1NzzyWW2Tp91wa+Ujv2cDTv/Cb/HgA6LiDuwxVWdJwU=";
+    rev = "2fc63d4128d2dc2fef0913c7480b4586959ebe4e";
+    hash = "sha256-hHa300Ldszsnp6AuYVJwOFc5FfuRTd3phyM6/qBUIQo=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-pTWCT2s820mjnfTscFnoSKC37RE7DAPKxP71QuM+JXQ=";
+    cargoHash = "sha256-8mBpzndz34RrmhJYezd4hLrJyhVL4S4IHK3plaue1k8=";
 
     nativeBuildInputs = [
       pkg-config

pkgs/applications/emulators/libretro/cores/flycast.nix

@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "flycast";
-  version = "0-unstable-2025-08-12";
+  version = "0-unstable-2025-08-01";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "33833cfd1ed2d94d907223442fdb8cdafd8d5d80";
-    hash = "sha256-6YXWJi3xbImfBMWILzsnwJGvj2XDoHcrWgLDPwaHfJs=";
+    rev = "40e400ab084175d3bd0f9e10cf8d6ac78c8b9544";
+    hash = "sha256-k/w1tmuGuRD98bR/kmc/9pLFGeobHMhKQapJOv8qVJo=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/ch/chameleon-cli/package.nix

@@ -1,91 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  makeWrapper,
-  xz,
-  python3,
-}:
-
-let
-  # https://github.com/RfidResearchGroup/ChameleonUltra/blob/main/software/script/requirements.txt
-  pythonPath =
-    with python3.pkgs;
-    makePythonPath [
-      colorama
-      prompt-toolkit
-      pyserial
-    ];
-in
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "chameleon-cli";
-  version = "2.0.0-unstable-2025-08-04";
-
-  src = fetchFromGitHub {
-    owner = "RfidResearchGroup";
-    repo = "ChameleonUltra";
-    rev = "098e0a914b206900f7ea7ae7265486c4349ab644";
-    sparseCheckout = [ "software" ];
-    hash = "sha256-WKxP4jLHkTqBO+nwxhr8DRb3TzDIMlwjA4v+6txQbDo=";
-  };
-
-  sourceRoot = "${finalAttrs.src.name}/software";
-
-  patches = [
-    # Use execute_tool to simplify running hardnested tool,
-    # also fix when the dir conatains hardnested is read only
-    # https://github.com/RfidResearchGroup/ChameleonUltra/pull/266
-    (fetchpatch {
-      url = "https://github.com/RfidResearchGroup/ChameleonUltra/commit/39270fd09ee61ef0659bf3b79ffa4d2b27f3ba63.patch";
-      hash = "sha256-OlHQ2cL+NFdTsSPFI9geg3dabATRjyKxGp5gGG+eDl8=";
-      stripLen = 1;
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace src/CMakeLists.txt \
-      --replace-fail "liblzma" "lzma" \
-      --replace-fail "FetchContent_MakeAvailable(xz)" ""
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    makeWrapper
-  ];
-
-  buildInputs = [
-    xz
-  ];
-
-  cmakeFlags = [
-    "-S"
-    "../src"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/libexec
-    cp -r ../script/* $out/libexec
-    rm -r $out/libexec/tests
-    rm $out/libexec/requirements.txt
-    makeWrapper ${lib.getExe python3} $out/bin/chameleon-cli \
-      --add-flags "$out/libexec/chameleon_cli_main.py" \
-      --prefix PYTHONPATH : ${pythonPath}
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = ./update.sh;
-
-  meta = {
-    description = "Command line interface for Chameleon Ultra";
-    homepage = "https://github.com/RfidResearchGroup/ChameleonUltra";
-    license = lib.licenses.gpl3Only;
-    mainProgram = "chameleon-cli";
-    maintainers = with lib.maintainers; [ azuwis ];
-  };
-})

pkgs/by-name/ch/chameleon-cli/update.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils nix-update
-
-# This update script exists, because nix-update is unable to ignore `dev`
-# tags that exist on the upstream repo.
-#
-# Once https://github.com/Mic92/nix-update/issues/322 is resolved it can be
-# removed.
-
-set -exuo pipefail
-
-cd "$(git rev-parse --show-toplevel)"
-
-nix-update --version=branch chameleon-cli
-
-tag=$(git ls-remote --tags --refs --sort='-version:refname' https://github.com/RfidResearchGroup/ChameleonUltra.git 'v*' | head -n 1 | cut --delimiter=/ --field=3-)
-tag="${tag#v}"
-sed -i -e 's|version = "[^-]*-unstable-|version = "'"${tag}"'-unstable-|' pkgs/by-name/ch/chameleon-cli/package.nix

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

@@ -6,11 +6,11 @@
 }:
 let
   pname = "chatbox";
-  version = "1.15.4";
+  version = "1.15.2";
 
   src = fetchurl {
     url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
-    hash = "sha256-plKibAg1tv0Togt+Jlwm8qrTp7UbBmuEM20xKLi7bb4=";
+    hash = "sha256-KxL073BIfZfjFndwtkDNXwlt1xny76BMV9CQF3x7ATQ=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

pkgs/by-name/ch/chhoto-url/package.nix

@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "6.2.13";
+  version = "6.2.12";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-onGmDAVhT2lzq2pQ5runGuHgPdh1MjgFLU7DUvN7nt0=";
+    hash = "sha256-hV/YWxOPRTojVTFIXwzqImBKyQ1dCDq5+bgCdS7T1p0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-GbjbVr82Aj/CRdBl9gPGwHiyrc7l2F918DNnlEoPI58=";
+  cargoHash = "sha256-9wXbd56KOQ7suZqtg2cSFf2FGQJADFMHJbwAAxJ2V4g=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

pkgs/by-name/cl/clouddrive2/package.nix

@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.9.5";
+  version = "0.9.4";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-Gsq5rvr0SeGxCRwAeeFRZBPOe32EIa7uO6SAIuinezA=";
-        aarch64-linux = "sha256-M+lCUzoiy/sImBZrOjjeP4eqG3F4wbkMQg9Ho3ELGFo=";
-        x86_64-darwin = "sha256-Uyz1wuHICSq5C+n3ZjPinZznhajd6QR36CZgQBm+QRE=";
-        aarch64-darwin = "sha256-ZQxRHTzLUAhnL1rRLR9l8Ix5XzxeTAds7XAmEgZ9Xmo=";
+        x86_64-linux = "sha256-i6+YoZfCFaVcF7XO7wPo8AEpU0LrD4bcsIqLNz/V3aM=";
+        aarch64-linux = "sha256-BV+47uJnvH/Gapz7dACnXIM49x7u/MTdbXiFRGq2DVc=";
+        x86_64-darwin = "sha256-Jjsdx203akCmlveGZD1x8fO6V0N5d3AzGAFIAzgOkHs=";
+        aarch64-darwin = "sha256-DuSZoXTQyfC3CIwNGTsGuQNP410rK9qMBei5T7TZN7A=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };

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

@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "crush";
-  version = "0.6.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "crush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QUYNJ2Ifny9Zj9YVQHcH80E2qa4clWVg2T075IEWujM=";
+    hash = "sha256-u2w19Xmcm3cx/B8QRNGaP2qeg+Cif/L92RNlJav6H3w=";
   };
 
-  vendorHash = "sha256-vdzAVVGr7uTW/A/I8TcYW189E3960SCIqatu7Kb60hg=";
+  vendorHash = "sha256-H92TgZoWdYQ863AAb2116zJtmgkKXh2hRoEBRcn5zeA=";
 
   # rename TestMain to prevent it from running, as it panics in the sandbox.
   postPatch = ''

pkgs/by-name/dr/draupnir/hashes.json

@@ -1,3 +1,3 @@
 {
-  "yarn_offline_cache_hash": "sha256-SoCuCzrKUWWsD/oEh2W3/T1/hhd7ghfpeBojo84sEI8="
+  "yarn_offline_cache_hash": "sha256-xB9SKCM9m2LotwxIzGgT72mLgrDW2spqvR5VoyexIAA="
 }

pkgs/by-name/dr/draupnir/package.json

@@ -1,6 +1,6 @@
 {
   "name": "draupnir",
-  "version": "2.6.1",
+  "version": "2.6.0",
   "description": "A moderation tool for Matrix",
   "main": "lib/index.js",
   "repository": "https://github.com/the-draupnir-project/Draupnir.git",
@@ -63,8 +63,8 @@
     "jsdom": "^24.0.0",
     "matrix-appservice-bridge": "^10.3.1",
     "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
-    "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.11.0",
-    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.11.0",
+    "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@3.10.0",
+    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@3.8.0",
     "pg": "^8.8.0",
     "yaml": "^2.3.2"
   },

pkgs/by-name/dr/draupnir/package.nix

@@ -22,13 +22,13 @@ let
 in
 mkYarnPackage rec {
   pname = "draupnir";
-  version = "2.6.1";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${version}";
-    hash = "sha256-KO2jm9yD/LnJSY1dAbPQ2fJZhmrxWJHU+TIaZzK97bg=";
+    hash = "sha256-v6dHexu9x60onBoHbdI+15p6r5m6mi7bRLgZ9jqF19s=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/gi/gitaly/package.nix

@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.2.2";
+  version = "18.2.1";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,7 +21,7 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-+OmduG9neb15m3i57qPfE42HI4w/zgmA5T6bhlwzrT0=";
+      hash = "sha256-h4JklXImKwudJT3pb/UhHwQHKd87c5aSH1xYC0lRWKo=";
     };
 
     vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0=";

pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff

@@ -1,22 +0,0 @@
-diff --git a/registry/storage/driver/middleware/urlcache/urlcache_test.go b/registry/storage/driver/middleware/urlcache/urlcache_test.go
-index 67ef4abc0e..6644c80837 100644
---- a/registry/storage/driver/middleware/urlcache/urlcache_test.go
-+++ b/registry/storage/driver/middleware/urlcache/urlcache_test.go
-@@ -37,7 +37,7 @@
- 			name:        "missing redis cache",
- 			options:     make(map[string]any),
- 			wantErr:     true,
--			errContains: "urlcache middleware requires `cache` Redis configured",
-+			errContains: "`_redisCache` key has not been passed to urlcache middleware",
- 		},
- 		{
- 			name: "default configuration with redis",
-@@ -231,7 +231,7 @@
- 				"_redisCache": "not a redis cache",
- 			},
- 			wantErr:     true,
--			errContains: "unusable redis cache object",
-+			errContains: "redis cache passed to the middleware cannot be used as the type is wrong",
- 		},
- 	}
- 

pkgs/by-name/gi/gitlab-container-registry/package.nix

@@ -6,7 +6,7 @@
 
 buildGoModule rec {
   pname = "gitlab-container-registry";
-  version = "4.26.0";
+  version = "4.25.0";
   rev = "v${version}-gitlab";
 
   # nixpkgs-update: no auto update
@@ -14,16 +14,10 @@ buildGoModule rec {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-XACKJW5sRXNM4Q24DXEVtjzhVfxoBd+JWHJr1s01ocA=";
+    hash = "sha256-7jzKFC29NAHi5iag6aA/5LzH6IyqMa3yAxtzV9OsBnQ=";
   };
 
-  patches = [
-    # https://gitlab.com/gitlab-org/container-registry/-/merge_requests/2447
-    # Can be removed with next released when merged
-    ./fix-broken-urlcache-tests.diff
-  ];
-
-  vendorHash = "sha256-J4p3vXLmDFYl/z6crqanlmG1FB4Dq04HLx9IhC3usQ4=";
+  vendorHash = "sha256-z9IlfyJ48FQzhbY38GbZaeQjg3cMDU8tLCXKhazP64A=";
 
   checkFlags =
     let

pkgs/by-name/gi/gitlab-pages/package.nix

@@ -6,14 +6,14 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "18.2.2";
+  version = "18.2.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-PPa9SYyE3G+peP2xSpNw7WDDO7WiWKSRpd5tBODkA0g=";
+    hash = "sha256-z1Pl3xeaoqeF/9qOVcuCpuciu1r6NQ4UhlLe9gy9+nE=";
   };
 
   vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA=";

pkgs/by-name/gi/gitlab/data.json

@@ -1,15 +1,15 @@
 {
-  "version": "18.2.2",
-  "repo_hash": "0fqpfprxmgxaz5g0d5z4gsir1zj9fkhli7iq1ahx413ymsiqrxd0",
-  "yarn_hash": "0c6njrciqcjaswh784yxly4qza6k2ghq1ljbdkcn65cna4f4hwgk",
+  "version": "18.2.1",
+  "repo_hash": "1i0y46w18476gn98fmkixdjiyrwajz2347p57dg2ijch4ivzpmlv",
+  "yarn_hash": "04mqinnbhr6zgab2p1bq6y6b20bf4c4cynkgfc67mzm9xhybr3fk",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.2.2-ee",
+  "rev": "v18.2.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.2.2",
-    "GITLAB_PAGES_VERSION": "18.2.2",
+    "GITALY_SERVER_VERSION": "18.2.1",
+    "GITLAB_PAGES_VERSION": "18.2.1",
     "GITLAB_SHELL_VERSION": "14.43.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0",
-    "GITLAB_WORKHORSE_VERSION": "18.2.2"
+    "GITLAB_WORKHORSE_VERSION": "18.2.1"
   }
 }

pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix

@@ -10,7 +10,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "18.2.2";
+  version = "18.2.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {

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

@@ -0,0 +1,69 @@
+{
+  lib,
+  appstream-glib,
+  blueprint-compiler,
+  desktop-file-utils,
+  fetchFromGitHub,
+  gettext,
+  glib,
+  gobject-introspection,
+  libadwaita,
+  libsoup_3,
+  meson,
+  ninja,
+  pkg-config,
+  python3Packages,
+  wrapGAppsHook4,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "imaginer";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "ImaginerApp";
+    repo = "Imaginer";
+    rev = "v${version}";
+    hash = "sha256-x1ZnmfaMfxnITiuFDlMPfTU8KZbd1ME9jDevnlsrbJs=";
+  };
+
+  format = "other";
+  dontWrapGApps = true;
+
+  nativeBuildInputs = [
+    appstream-glib
+    blueprint-compiler
+    desktop-file-utils
+    gettext
+    glib
+    gobject-introspection
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    libadwaita
+    libsoup_3
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    openai
+    pillow
+    pygobject3
+    requests
+  ];
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/ImaginerApp/Imaginer";
+    description = "AI image generator for GNOME";
+    mainProgram = "imaginer";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ _0xMRTT ];
+  };
+}

pkgs/by-name/je/jellyfin-tui/package.nix

@@ -43,10 +43,6 @@ rustPlatform.buildRustPackage rec {
   '';
   doInstallCheck = true;
 
-  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
-    install -Dm644 src/extra/jellyfin-tui.desktop $out/share/applications/jellyfin-tui.desktop
-  '';
-
   passthru.updateScript = nix-update-script { };
 
   meta = {

pkgs/by-name/ku/kubectl-ai/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-ai";
-  version = "0.0.22";
+  version = "0.0.20";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubectl-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sU8CATzhp0seUJNYjvxFkRoA/Xqb57kZqGpEOCxypUA=";
+    hash = "sha256-iyyaQBulncPNJXm7ir/aOjJxJvd0Q178weneiwQbGcU=";
   };
 
-  vendorHash = "sha256-OJnpd8z4e6ytoUi5ydFHYPMA77ryU7Tp8wriuab7yuk=";
+  vendorHash = "sha256-a84HesnInU7JZZTx0Rm1Qgsmo7SJC0kMnckgmUk0Vow=";
 
   # Build the main command
   subPackages = [ "cmd" ];

pkgs/by-name/re/release-plz/package.nix

@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "release-plz";
-  version = "0.3.140";
+  version = "0.3.139";
 
   src = fetchFromGitHub {
     owner = "MarcoIeni";
     repo = "release-plz";
     rev = "release-plz-v${version}";
-    hash = "sha256-pJHyf1aSn4YqzFYW6otuRY+gJ6TBCKFGQuH2Py5uWlE=";
+    hash = "sha256-s2PvMJu0RLO2AOMMonq4xdZlQXHrvKoqh4v9tp72Ud0=";
   };
 
-  cargoHash = "sha256-LfadgdrGD9g/PNeFs/XNUk2x0h1i3znzMhIV+w1DjMk=";
+  cargoHash = "sha256-S5YhAcEhTbiM0VCAy3IiObc1uCPbsIi0QqeFxocVqw4=";
 
   nativeBuildInputs = [
     installShellFiles

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

@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "simplotask";
-  version = "1.18.0";
+  version = "1.17.2";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "spot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0XAxjh9TWMqMkeSEhdgXX9DflHnT40f7VkHgp1QjQUg=";
+    hash = "sha256-7EavT4IHEAe3nq6tkhX7qHpDzy7UTdBMZ7x/bquv4Z8=";
   };
 
   vendorHash = null;

pkgs/by-name/ta/tageditor/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tageditor";
-  version = "3.9.6";
+  version = "3.9.5";
 
   src = fetchFromGitHub {
     owner = "martchus";
     repo = "tageditor";
     tag = "v${version}";
-    hash = "sha256-weGLC8TPSA9XQ/TuLj4DBswmlEbpxPplsxI4sqygHfU=";
+    hash = "sha256-Sia6Y/V81WQj4oWjZAAR4o3TngfWq7sWxxiKEuFjQ2M=";
   };
 
   nativeBuildInputs = [

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

@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tfmigrate";
-  version = "0.4.3";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "minamijoyo";
     repo = "tfmigrate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tuLbcxJj8TsG3I/o3cHO2DtQm9ql3wlhYBtYiMbRW7o=";
+    hash = "sha256-+5nw+EgFTor8XL4cibxkpJL4fdEQ6UuEj5wyOjpaANA=";
   };
 
-  vendorHash = "sha256-TqZi5NZ+4eSzq98/ZM4Gab7Sud7bz1DNHrp5nGaGHDE=";
+  vendorHash = "sha256-mm34U4nLow4lCz/AgfqYZJRb71GpQjR14+tm0hfmdDc=";
 
   checkFlags = [
     "-skip TestExecutorDir" # assumes /usr/bin to be present

pkgs/by-name/ur/urlwatch/package.nix

@@ -12,26 +12,22 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "thp";
     repo = "urlwatch";
-    tag = version;
+    rev = version;
     hash = "sha256-X1UR9JrQuujOIUg87W0YqfXsM3A5nttWjjJMIe3hgk8=";
   };
 
   build-system = with python3Packages; [ setuptools ];
 
   dependencies = with python3Packages; [
-    aioxmpp
-    beautifulsoup4
-    cssbeautifier
     cssselect
     jq
-    jsbeautifier
     keyring
     lxml
     markdown2
     matrix-client
     minidb
-    platformdirs
     playwright
+    platformdirs
     pushbullet-py
     pycodestyle
     pyyaml
@@ -45,13 +41,12 @@ python3Packages.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Tool for monitoring webpages for updates";
+    mainProgram = "urlwatch";
     homepage = "https://thp.io/2008/urlwatch/";
-    changelog = "https://github.com/thp/urlwatch/blob/${src.tag}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [
       kmein
       tv
     ];
-    mainProgram = "urlwatch";
   };
 }

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

@@ -16,19 +16,19 @@
   desktop-file-utils,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "waytrogen";
   version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "nikolaizombie1";
     repo = "waytrogen";
-    tag = finalAttrs.version;
+    tag = version;
     hash = "sha256-vFzOGadWR5xwhIKrKPHoAHstoeyFw4GrS5aYlpvEF5E=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) pname version src;
+    inherit pname version src;
     hash = "sha256-k6n6aWEJ/8Dkbd68CJfJ7kbRTltCuQ4AtZ5dALFD3lU=";
   };
 
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
       in the Rust 🦀 programming language. Supports hyprpaper, swaybg, mpvpaper and swww wallpaper changers.
     '';
     homepage = "https://github.com/nikolaizombie1/waytrogen";
-    changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${version}";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [
       genga898
@@ -76,4 +76,4 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "waytrogen";
     platforms = lib.platforms.linux;
   };
-})
+}

pkgs/by-name/zi/zizmor/package.nix

@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zizmor";
-  version = "1.12.1";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "zizmorcore";
     repo = "zizmor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GnKSbcsVYzbhsrwIUAEArltzQe0IE2tiIr2CqsMQyzk=";
+    hash = "sha256-zxEF76zpqwLroC5GjSkwIC3+XdXmErvabIEqhVe0zCA=";
   };
 
-  cargoHash = "sha256-wLJlaV59sAo97KI6Ekw42aaG6hVkul1wFvcC+71+Zp4=";
+  cargoHash = "sha256-vxDyao9pX/CfS08vFmq3vXtgDIg5NXlEwpzroGW48dA=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles

pkgs/development/compilers/llvm/default.nix

@@ -94,4 +94,4 @@ let
 
   llvmPackages = lib.mapAttrs' (version: args: mkPackage (args // { inherit version; })) versions;
 in
-llvmPackages // { inherit mkPackage versions; }
+llvmPackages // { inherit mkPackage; }

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

@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.10";
+  version = "1.40.9";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-XBWJ7fk+0DN8jfO6f52akkdwvGwJ6axrDfDALs82csM=";
+    hash = "sha256-nRaC/EpTUgtB3zc5iP3n7xYR8rPoTzPuxUKjzCOaemw=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/click-shell/default.nix

@@ -5,15 +5,14 @@
   click,
   pytestCheckHook,
   pytest-click,
-  setuptools,
-  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "click-shell";
   version = "2.1";
-  pyproject = true;
+  format = "setuptools";
 
+  # PyPi release is missing tests
   src = fetchFromGitHub {
     owner = "clarkperkins";
     repo = "click-shell";
@@ -21,18 +20,17 @@ buildPythonPackage rec {
     hash = "sha256-4QpQzg0yFuOFymGiTI+A8o6LyX78iTJMqr0ernYbilI=";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [ click ];
+  propagatedBuildInputs = [ click ];
 
   nativeCheckInputs = [
     pytest-click
     pytestCheckHook
-    writableTmpDirAsHomeHook
   ];
 
   pythonImportsCheck = [ "click_shell" ];
 
+  preCheck = "export HOME=$(mktemp -d)";
+
   meta = with lib; {
     description = "Extension to click that easily turns your click app into a shell utility";
     longDescription = ''
@@ -42,7 +40,6 @@ buildPythonPackage rec {
       with command completion to any click app.
     '';
     homepage = "https://github.com/clarkperkins/click-shell";
-    changelog = "https://github.com/clarkperkins/click-shell/releases/tag/${src.tag}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ binsky ];
   };

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

@@ -2,21 +2,26 @@
   lib,
   fetchPypi,
   buildPythonPackage,
-  setuptools,
+  isPy3k,
+  future,
 }:
 
 buildPythonPackage rec {
   pname = "ecpy";
   version = "1.2.5";
-  pyproject = true;
+  format = "setuptools";
 
   src = fetchPypi {
     pname = "ECPy";
     inherit version;
-    hash = "sha256-ljXP+5tuz3/X9yrqFmWCmsdKHScgBtAFfUWmIariAig=";
+    sha256 = "9635cffb9b6ecf7fd7f72aea1665829ac74a1d272006d0057d45a621aae20228";
   };
 
-  build-system = [ setuptools ];
+  prePatch = ''
+    sed -i "s|reqs.append('future')|pass|" setup.py
+  '';
+
+  propagatedBuildInputs = lib.optional (!isPy3k) future;
 
   # No tests implemented
   doCheck = false;
@@ -26,8 +31,6 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pure Pyhton Elliptic Curve Library";
     homepage = "https://github.com/ubinity/ECPy";
-    changelog = "https://github.com/cslashm/ECPy/releases/tag/${version}";
     license = licenses.asl20;
-    maintainers = [ ];
   };
 }

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

@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "jsonargparse";
-  version = "4.40.2";
+  version = "4.40.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "omni-us";
     repo = "jsonargparse";
     tag = "v${version}";
-    hash = "sha256-3Zs2F46tGcvIF9UOGI/P079BZLJJyEyP9LDPRfvSk4E=";
+    hash = "sha256-GxltSN1o7vAZQXrejpBp5YMqOQaln8pqKxmGNa0vA/Q=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/model-checker/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "model-checker";
-  version = "0.9.40";
+  version = "0.9.36";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "model_checker";
     inherit version;
-    hash = "sha256-8DdH9/lMPmYDQ1jLDbA0jAaAbNyUOU1q7AfCWz6LYAI=";
+    hash = "sha256-FYn8sncKHZqZvI71RUmYOChC/fXzGdaN7GsomZl7AA8=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

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

@@ -402,8 +402,8 @@ rec {
       "sha256-aQR1CrCbisf0vApIjFXa5/oKC4Q1eT0AsLTg0EBojAs=";
 
   mypy-boto3-directconnect =
-    buildMypyBoto3Package "directconnect" "1.40.10"
-      "sha256-ZM9nCSSzMmRjyxnypQcaORwYXiXMXz25Gw2dJlOVcc0=";
+    buildMypyBoto3Package "directconnect" "1.40.0"
+      "sha256-UmrcCxy3zK/cEkM/KCGnr4JEMOOjhNwBNRC6IiMm+NM=";
 
   mypy-boto3-discovery =
     buildMypyBoto3Package "discovery" "1.40.0"
@@ -434,8 +434,8 @@ rec {
       "sha256-MjtEiMiKguv1RAeY4Cjk/apJlgi5jH/6avgMtdcp+2Q=";
 
   mypy-boto3-dynamodb =
-    buildMypyBoto3Package "dynamodb" "1.40.10"
-      "sha256-6mAMWQ5aEyi+TeJ9noEG4Sx5KKNmIuiBGK9QYv/xI8s=";
+    buildMypyBoto3Package "dynamodb" "1.40.0"
+      "sha256-l/ZQBqFwb3y99TrRw6mRThC1N1QZTbStEgBOynw3a04=";
 
   mypy-boto3-dynamodbstreams =
     buildMypyBoto3Package "dynamodbstreams" "1.40.0"
@@ -446,8 +446,8 @@ rec {
       "sha256-p+NFAi4x4J6S4v0f2u0awDG+lb2V7r3XwgYwl5CvhHo=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.40.10"
-      "sha256-mBpXSkz3eVzYlMqhzjVcCz+rVT21TvipBFaFAX4juHs=";
+    buildMypyBoto3Package "ec2" "1.40.8"
+      "sha256-4qoBA1iajEhB0ove45iUUEdllcGds6Y08NhgPUS9TmQ=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.40.0"
@@ -558,8 +558,8 @@ rec {
       "sha256-i76hozLLcN4Y5Jpg/92+6FSgStpw2SfF0HeRhQiRPqE=";
 
   mypy-boto3-fsx =
-    buildMypyBoto3Package "fsx" "1.40.10"
-      "sha256-E9s3Mh66bXUsy/BUPorYaOp58hkY0HpkyX3dX0OsXz4=";
+    buildMypyBoto3Package "fsx" "1.40.9"
+      "sha256-mNs8PA3GpvonrX6vwErh1muD4K2+zdr0ZWvOJP8PRjY=";
 
   mypy-boto3-gamelift =
     buildMypyBoto3Package "gamelift" "1.40.0"
@@ -574,8 +574,8 @@ rec {
       "sha256-So/NDL0KF5iypLYitnJ/38C5RovqBGXcUhHtlEMnjMM=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.40.10"
-      "sha256-fSPTI/S04QFRgZIK5a7gBMaewT7AqaEwuIDf2tGdGHA=";
+    buildMypyBoto3Package "glue" "1.40.5"
+      "sha256-ux3mdI2uZoWqEN7p8yvmWM8F3x8WzQUJaJK1j4fYvXE=";
 
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.40.0"
@@ -594,8 +594,8 @@ rec {
       "sha256-/LlMFYC7cJWb9C5JIt0dTEPtl2sPsalSq7mYaFSf3c4=";
 
   mypy-boto3-guardduty =
-    buildMypyBoto3Package "guardduty" "1.40.10"
-      "sha256-N1zgIPqI1eeE7ET0VDvMlqj7CQzq/gg2q2uCChZ6Q3c=";
+    buildMypyBoto3Package "guardduty" "1.40.5"
+      "sha256-yIFysk4ru4Us4azUpGVYim1j8FTQfxw/s0xmZWwSneQ=";
 
   mypy-boto3-health =
     buildMypyBoto3Package "health" "1.40.0"
@@ -866,8 +866,8 @@ rec {
       "sha256-DJEU4Ha8jpV/J8UP6emYMjcv9RfZt1njsBPD11q0BUI=";
 
   mypy-boto3-medialive =
-    buildMypyBoto3Package "medialive" "1.40.10"
-      "sha256-hGbdgOvsb+gd7640D1WeXj4tOkzuGwi8Ib/RmmQd4tY=";
+    buildMypyBoto3Package "medialive" "1.40.0"
+      "sha256-+2qM6+qeDJnvkvVI+z1EzMfGps7ejjVq4FOxOfEzJdg=";
 
   mypy-boto3-mediapackage =
     buildMypyBoto3Package "mediapackage" "1.40.0"
@@ -1246,8 +1246,8 @@ rec {
       "sha256-ET2prHzHi0EBkWB9MlmdudaaJhay5in5+rdUF0T6veE=";
 
   mypy-boto3-servicediscovery =
-    buildMypyBoto3Package "servicediscovery" "1.40.10"
-      "sha256-/Gyq9dgCjeIrNTxUqE/mvfPr+4c+Ann5+ep3/NJhrW8=";
+    buildMypyBoto3Package "servicediscovery" "1.40.0"
+      "sha256-hg/KQ7V0ej2jmLLYLmBChuxZ4IvKypMWAOs6j5zRoYY=";
 
   mypy-boto3-ses =
     buildMypyBoto3Package "ses" "1.40.0"
@@ -1426,8 +1426,8 @@ rec {
       "sha256-zApXRQ+MpzmwpQcghnoC34FaKlLQ/g8kZZUwbU0G8p8=";
 
   mypy-boto3-workspaces =
-    buildMypyBoto3Package "workspaces" "1.40.10"
-      "sha256-6PTGF3akduOS0VRS43ykcKzK25iyQb+bqvpCe+BM9Qw=";
+    buildMypyBoto3Package "workspaces" "1.40.0"
+      "sha256-LRf2JH9+Z+a1yX1TodO6ASUFY7+Ct9RLu2BS0CF3X0U=";
 
   mypy-boto3-workspaces-web =
     buildMypyBoto3Package "workspaces-web" "1.40.0"

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

@@ -1,26 +1,26 @@
 {
   lib,
   buildPythonPackage,
+  isPy3k,
   fetchPypi,
-  pytestCheckHook,
   requests,
-  setuptools,
   zeroconf,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "netdisco";
   version = "3.0.0";
-  pyproject = true;
+  format = "setuptools";
+
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-TbtZBILzd8zEYeAXQnB8y+jx0tGyhXivkdybf+vNy9I=";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [
+  propagatedBuildInputs = [
     requests
     zeroconf
   ];

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

@@ -1,26 +1,17 @@
 {
   lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-
-  # build-system
-  hatchling,
-
-  # dependencies
-  attrs,
   argcomplete,
+  attrs,
+  buildPythonPackage,
   colorlog,
   dependency-groups,
+  fetchFromGitHub,
+  hatchling,
   jinja2,
   packaging,
-  tomli,
-
-  # tests
   pytestCheckHook,
-  writableTmpDirAsHomeHook,
-
-  # passthru
+  pythonOlder,
+  tomli,
   tox,
   uv,
   virtualenv,
@@ -31,7 +22,7 @@ buildPythonPackage rec {
   version = "2025.05.01";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "wntrblm";
@@ -49,7 +40,8 @@ buildPythonPackage rec {
     dependency-groups
     packaging
     virtualenv
-  ] ++ lib.optionals (pythonOlder "3.11") [
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
     tomli
   ];
 
@@ -61,20 +53,22 @@ buildPythonPackage rec {
     uv = [ uv ];
   };
 
-  nativeCheckInputs = [
-    pytestCheckHook
-    writableTmpDirAsHomeHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
 
   pythonImportsCheck = [ "nox" ];
 
   disabledTests = [
+    # our conda is not available on 3.11
+    "test__create_venv_options"
     # Assertion errors
     "test_uv"
-    # Test requires network access
-    "test_noxfile_script_mode_url_req"
-    # Don't test CLi mode
+    # calls to naked python
     "test_noxfile_script_mode"
+    "test_noxfile_script_mode_url_req"
   ];
 
   disabledTestPaths = [
@@ -82,12 +76,12 @@ buildPythonPackage rec {
     "tests/test_tox_to_nox.py"
   ];
 
-  meta = {
+  meta = with lib; {
     description = "Flexible test automation for Python";
     homepage = "https://nox.thea.codes/";
     changelog = "https://github.com/wntrblm/nox/blob/${src.tag}/CHANGELOG.md";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
+    license = licenses.asl20;
+    maintainers = with maintainers; [
       doronbehar
       fab
     ];

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

@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250814";
+  version = "1.0.2.20250812";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pYOjopZlGfe28FzZmGP485l/AzqNzoW8ecft94p7q+c=";
+    hash = "sha256-y8C5Lg50epkcGR3wnSHhircKwGeY53fcommtEuLfUUM=";
   };
 
   build-system = [ setuptools ];

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

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyftdi";
-  version = "0.57.1";
+  version = "0.56.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "eblot";
     repo = "pyftdi";
     tag = "v${version}";
-    hash = "sha256-RkZXcGvCZXmFrLvj7YqHc6FeZskEqMSQcYgizBSuwIk=";
+    hash = "sha256-/MwgBqwN7xmZepdJzyRhZflbCUpGdWEbEGGKkBnKTFI=";
   };
 
   build-system = [ setuptools ];

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

@@ -1,31 +1,32 @@
 {
   lib,
   buildPythonPackage,
-  setuptools,
+  isPy3k,
   fetchPypi,
-  unittestCheckHook,
+  python,
 }:
 
 buildPythonPackage rec {
   pname = "pyhomematic";
   version = "0.1.78";
-  pyproject = true;
+  format = "setuptools";
+
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-uB9aDa1urIwL2DBdBwPi0sHWPW7SUZ3EaAjuMLSOudc=";
   };
 
-  build-system = [ setuptools ];
-
-  nativeCheckInputs = [ unittestCheckHook ];
+  checkPhase = ''
+    ${python.interpreter} -m unittest
+  '';
 
   pythonImportsCheck = [ "pyhomematic" ];
 
   meta = with lib; {
     description = "Python 3 Interface to interact with Homematic devices";
     homepage = "https://github.com/danielperna84/pyhomematic";
-    changelog = "https://github.com/danielperna84/pyhomematic/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };

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

@@ -3,35 +3,28 @@
   buildPythonPackage,
   fetchFromGitHub,
   requests,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pynamecheap";
   version = "0.0.3";
-  pyproject = true;
+  format = "setuptools";
 
-  src = fetchFromGitHub {
-    owner = "Bemmu";
-    repo = "PyNamecheap";
-    tag = "v${version}";
-    hash = "sha256-J2WYWtZGtZiox4q9tdkLyU1nix9Jn64K0+1mw7xoLLw=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [ requests ];
+  propagatedBuildInputs = [ requests ];
 
   # Tests require access to api.sandbox.namecheap.com
   doCheck = false;
 
-  pythonImportsCheck = [ "namecheap" ];
+  src = fetchFromGitHub {
+    owner = "Bemmu";
+    repo = "PyNamecheap";
+    rev = "v${version}";
+    sha256 = "1g1cd2yc6rpdsc5ax7s93y5nfkf91gcvbgcaqyl9ida6srd9hr97";
+  };
 
   meta = with lib; {
     description = "Namecheap API client in Python";
     homepage = "https://github.com/Bemmu/PyNamecheap";
-    changelog = "https://github.com/Bemmu/PyNamecheap/releases/tag/${src.tag}";
     license = licenses.mit;
-    maintainers = [ ];
   };
 }

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

@@ -2,23 +2,23 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  isPy3k,
   requests,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pynanoleaf";
   version = "0.1.1";
-  pyproject = true;
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MqCDdZxPmeAZ4AE2cEh4Qfjt+AfHoHdCqXH6GHBwcqc=";
+    sha256 = "32a083759c4f99e019e0013670487841f8edf807c7a07742a971fa18707072a7";
   };
 
-  build-system = [ setuptools ];
+  disabled = !isPy3k;
 
-  dependencies = [ requests ];
+  propagatedBuildInputs = [ requests ];
 
   # pynanoleaf does not contain tests
   doCheck = false;
@@ -26,9 +26,8 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "pynanoleaf" ];
 
   meta = with lib; {
-    description = "Python3 wrapper for the Nanoleaf API, capable of controlling both Nanoleaf Aurora and Nanoleaf Canvas";
     homepage = "https://github.com/Oro/pynanoleaf";
-    changelog = "https://github.com/Oro/pynanoleaf/releases/tag/${version}";
+    description = "Python3 wrapper for the Nanoleaf API, capable of controlling both Nanoleaf Aurora and Nanoleaf Canvas";
     license = licenses.mit;
     maintainers = with maintainers; [ oro ];
   };

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

@@ -5,14 +5,15 @@
   click,
   fetchFromGitHub,
   gitpython,
+  importlib-metadata,
   jinja2,
   platformdirs,
   poetry-core,
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
+  tomli,
   tqdm,
-  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
@@ -20,7 +21,7 @@ buildPythonPackage rec {
   version = "0.27.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "tconbeer";
@@ -29,12 +30,16 @@ buildPythonPackage rec {
     hash = "sha256-Yel9SB7KrDqtuZxNx4omz6u4AID8Fk5kFYKBEZD1fuU=";
   };
 
+  pythonRelaxDeps = [ "platformdirs" ];
+
   build-system = [ poetry-core ];
 
   dependencies = [
     click
+    importlib-metadata
     jinja2
     platformdirs
+    tomli
     tqdm
   ];
 
@@ -46,11 +51,11 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
-    writableTmpDirAsHomeHook
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
+    export HOME=$(mktemp -d)
     export PATH="$PATH:$out/bin";
   '';
 

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

@@ -4,22 +4,21 @@
   fetchPypi,
   pythonOlder,
   requests,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "sunwatcher";
   version = "0.2.1";
-  pyproject = true;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-u0vHCw0h0h6pgadBLPBSwv/4CXNj+3HIJCEtt2rdlWs=";
+    sha256 = "0swmvmmbfb914k473yv3fc4zizy2abq2qhd7h6lixli11l5wfjxv";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [ requests ];
+  propagatedBuildInputs = [ requests ];
 
   # Project has no tests
   doCheck = false;
@@ -29,7 +28,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for the SolarLog HTTP API";
     homepage = "https://bitbucket.org/Lavode/sunwatcher/src/master/";
-    license = licenses.asl20;
+    license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };
 }

pkgs/development/python-modules/tencentcloud-sdk-python/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1444";
+  version = "3.0.1443";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-nuB6OYFDHfqhKFti96YAt6BYrdIqm357YPHm0mT90uY=";
+    hash = "sha256-2M5lLjKd60xiSoxoJ9W34DkwCDKrSTbuif7ZP3NxjRI=";
   };
 
   build-system = [ setuptools ];

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

@@ -12,16 +12,17 @@
   pscript,
   pyjwt,
   pytestCheckHook,
+  pythonOlder,
   requests,
-  setuptools,
   uvicorn,
-  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "timetagger";
   version = "25.06.1";
-  pyproject = true;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "almarklein";
@@ -30,9 +31,7 @@ buildPythonPackage rec {
     hash = "sha256-fuZj4DoqtgIcRd/u7l0GsWqmuLEgF3BW5gN5wY8FdK0=";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [
+  propagatedBuildInputs = [
     asgineer
     bcrypt
     iptools
@@ -44,21 +43,22 @@ buildPythonPackage rec {
     uvicorn
   ];
 
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
   nativeCheckInputs = [
     nodejs
     pytestCheckHook
     requests
-    writableTmpDirAsHomeHook
   ];
 
-  pythonImportsCheck = [ "timetagger" ];
-
-  meta = {
+  meta = with lib; {
     description = "Library to interact with TimeTagger";
+    mainProgram = "timetagger";
     homepage = "https://github.com/almarklein/timetagger";
     changelog = "https://github.com/almarklein/timetagger/releases/tag/${src.tag}";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ matthiasbeyer ];
-    mainProgram = "timetagger";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ matthiasbeyer ];
   };
 }

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

@@ -3,24 +3,21 @@
   buildPythonPackage,
   fetchFromGitHub,
   requests,
-  setuptools,
 }:
 
 buildPythonPackage rec {
-  pname = "vultr";
   version = "1.0.1";
-  pyproject = true;
+  format = "setuptools";
+  pname = "vultr";
 
   src = fetchFromGitHub {
     owner = "spry-group";
     repo = "python-vultr";
-    tag = "v${version}";
-    hash = "sha256-ByPtIU6Yro28nH2cIzxqgZR0VwpggCsOAXVDBhssjAI=";
+    rev = "v${version}";
+    sha256 = "00lc5hdhchvm0472p03019bp9541d8y2773xkjy8vblq9qhys8q7";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [ requests ];
+  propagatedBuildInputs = [ requests ];
 
   # Tests disabled. They fail because they try to access the network
   doCheck = false;
@@ -30,7 +27,6 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Vultr.com API Client";
     homepage = "https://github.com/spry-group/python-vultr";
-    changelog = "https://github.com/spry-group/python-vultr/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ lihop ];
   };

pkgs/servers/http/nginx/mainline.nix

@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.29.1";
-  hash = "sha256-xYn35+2AHdvZBK+/PeJq4k6wzOJ8dxei6U33+xLWrSc=";
+  version = "1.27.5";
+  hash = "sha256-6WrOu5wqbbigAMPdGzLsuhuBDwzVhiMtTZIeN2Z03Q4=";
 }

pkgs/servers/spicedb/default.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "spicedb";
-  version = "1.45.2";
+  version = "1.45.1";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "spicedb";
     rev = "v${version}";
-    hash = "sha256-LDAZdcUfrCWtld6V4GDpAbK+BeT/aeVOQ7G++sMoXU4=";
+    hash = "sha256-cKCAA9C0vsCa0BszspvPfrKbdWyaccrMtiO6UWhLIh4=";
   };
 
-  vendorHash = "sha256-hr+xIfPjlrH9igRsYeqNOPgx/jWhDfu73gA+/NoWWxI=";
+  vendorHash = "sha256-R4lOmHIBgnlvOukMjXdVx5e9Oneo1EizhsrDXiTbwTc=";
 
   ldflags = [
     "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'"

pkgs/tools/filesystems/kdiskmark/default.nix

@@ -6,19 +6,19 @@
   qttools,
   fio,
   cmake,
-  polkit-qt-1,
+  polkit-qt,
   extra-cmake-modules,
   fetchFromGitHub,
 }:
 stdenv.mkDerivation rec {
   pname = "kdiskmark";
-  version = "3.2.0";
+  version = "3.1.4";
 
   src = fetchFromGitHub {
     owner = "jonmagon";
     repo = "kdiskmark";
     rev = version;
-    hash = "sha256-b42PNUrG10RyGct6dPtdT89oO222tEovkSPoRcROfaQ=";
+    hash = "sha256-JueY7zw9PIo9ETi7pQLpw8FGRhNXYXeXEvTzZGz9lbw=";
     fetchSubmodules = true;
   };
 
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase
     qttools
-    polkit-qt-1
+    polkit-qt
   ];
 
   preConfigure = ''
     substituteInPlace CMakeLists.txt \
-      --replace-fail \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions
+      --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions
   '';
 
   qtWrapperArgs = [

pkgs/top-level/aliases.nix

@@ -944,7 +944,6 @@ mapAliases {
   imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17
   imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17
   imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17
-  imaginer = throw "'imaginer' has been removed due to lack of upstream maintenance"; # Added 2025-08-15
   immersed-vr = lib.warnOnInstantiate "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11
   inconsolata-nerdfont = lib.warnOnInstantiate "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10
   incrtcl = tclPackages.incrtcl; # Added 2024-10-02

pkgs/top-level/all-packages.nix

@@ -3354,7 +3354,7 @@ with pkgs;
 
   kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { };
 
-  kdiskmark = kdePackages.callPackage ../tools/filesystems/kdiskmark { };
+  kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { };
 
   keepkey-agent = with python3Packages; toPythonApplication keepkey-agent;