Merge master into staging-next

.github/labeler.yml

@@ -1,3 +1,4 @@
+# NOTE: bsd, darwin and cross-compilation labels are handled by ofborg
 "6.topic: agda":
   - any:
     - changed-files:
@@ -8,12 +9,6 @@
         - pkgs/development/libraries/agda/**/*
         - pkgs/top-level/agda-packages.nix
 
-"6.topic: bsd":
-  - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/os-specific/bsd/**/*
-
 "6.topic: cinnamon":
   - any:
     - changed-files:
@@ -55,14 +50,6 @@
         - pkgs/development/cuda-modules/**/*
         - pkgs/top-level/cuda-packages.nix
 
-"6.topic: darwin":
-  - any:
-    - changed-files:
-      - any-glob-to-any-file:
-        - pkgs/os-specific/darwin/**/*
-        - pkgs/top-level/darwin-aliases.nix
-        - pkgs/top-level/darwin-packages.nix
-
 "6.topic: deepin":
   - any:
     - changed-files:

lib/fixed-points.nix

@@ -160,7 +160,9 @@ rec {
     A fixed-point function returning an attribute set has the form
 
     ```nix
-    final: { # attributes }
+    final: {
+      # attributes
+    }
     ```
 
     where `final` refers to the lazily evaluated attribute set returned by the fixed-point function.
@@ -168,7 +170,9 @@ rec {
     An overlay to such a fixed-point function has the form
 
     ```nix
-    final: prev: { # attributes }
+    final: prev: {
+      # attributes
+    }
     ```
 
     where `prev` refers to the result of the original function to `final`, and `final` is the result of the composition of the overlay and the original function.
@@ -177,8 +181,12 @@ rec {
 
     ```nix
     let
-      f = final: { # attributes };
+      f = final: {
-      overlay = final: prev: { # attributes };
+        # attributes
+      };
+      overlay = final: prev: {
+        # attributes
+      };
     in extends overlay f;
     ```
 
@@ -186,8 +194,12 @@ rec {
 
     ```nix
     let
-      f = final: { # attributes };
+      f = final: {
-      overlay = final: prev: { # attributes };
+        # attributes
+      };
+      overlay = final: prev: {
+        # attributes
+      };
       g = extends overlay f;
     in fix g
     ```

maintainers/maintainer-list.nix

@@ -9402,6 +9402,12 @@
     githubId = 36996706;
     name = "Philip Rying";
   };
+  imsick = {
+    email = "lent-lather-excuse@duck.com";
+    github = "dvishal485";
+    githubId = 26341736;
+    name = "Vishal Das";
+  };
   imuli = {
     email = "i@imu.li";
     github = "imuli";

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -245,6 +245,9 @@
   Also be aware that if you have set additional options in `services.wstunnel.{clients,servers}.<name>.extraArgs`,
   they may have been modified or removed upstream.
 
+- `gnat` and `gnatPackages` now use GNAT 13 instead of GNAT 12. This matches
+  the default `gcc` version.
+
 - `percona-server_8_4` and `mysql84` now have password authentication via the deprecated `mysql_native_password` disabled by default. This authentication plugin can be enabled via a CLI argument again, for detailed instructions and alternative authentication methods [see upstream documentation](https://dev.mysql.com/doc/refman/8.4/en/native-pluggable-authentication.html). The config file directive `default_authentication_plugin` has been removed.
 
 - Percona has decided not to follow the LTS/ Innovation release scheme of upstream MySQL and thus [will only create releases for MySQL LTS versions](https://www.percona.com/blog/no-mysql-9-x-innovation-releases-from-percona/). Hence, the package names `percona-server_lts`, `percona-server_innovation`, `percona-xtrabackup_lts` and `percona-xtrabackup_innovation` are deprecated.

nixos/tests/keepassxc.nix

@@ -17,6 +17,11 @@ import ./make-test-python.nix ({ pkgs, ...} :
 
     services.xserver.enable = true;
 
+    # for better OCR
+    environment.etc."icewm/prefoverride".text = ''
+      ColorActiveTitleBar = "rgb:FF/FF/FF"
+    '';
+
     # Regression test for https://github.com/NixOS/nixpkgs/issues/163482
     qt = {
       enable = true;
@@ -41,7 +46,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
         machine.wait_for_x()
 
     with subtest("Can create database and entry with CLI"):
-        ${aliceDo "keepassxc-cli db-create -k foo.keyfile foo.kdbx"}
+        ${aliceDo "keepassxc-cli db-create --set-key-file foo.keyfile foo.kdbx"}
         ${aliceDo "keepassxc-cli add --no-password -k foo.keyfile foo.kdbx bar"}
 
     with subtest("Ensure KeePassXC starts"):
@@ -62,10 +67,21 @@ import ./make-test-python.nix ({ pkgs, ...} :
         # Wait for the enter password screen to appear.
         machine.wait_for_text("/home/alice/foo.kdbx")
 
-        # Click on "Browse" button to select keyfile
+        # Click on "I have key file" button to open keyfile dialog
         machine.send_key("tab")
+        machine.send_key("tab")
+        machine.send_key("tab")
+        machine.send_key("ret")
+
+        # Select keyfile
+        machine.wait_for_text("Select key file")
         machine.send_chars("/home/alice/foo.keyfile")
         machine.send_key("ret")
+
+        # Open database
+        machine.wait_for_text("foo.kdbx \\[Locked] - KeePassXC")
+        machine.send_key("ret")
+
         # Database is unlocked (doesn't have "[Locked]" in the title anymore)
         machine.wait_for_text("foo.kdbx - KeePassXC")
   '';

nixos/tests/retroarch.nix

@@ -1,10 +1,14 @@
-import ./make-test-python.nix ({ pkgs, ... }:
+import ./make-test-python.nix (
+  { pkgs, ... }:
 
   {
     name = "retroarch";
-    meta = with pkgs.lib; { maintainers = teams.libretro.members ++ [ maintainers.j0hax ]; };
+    meta = with pkgs.lib; {
+      maintainers = teams.libretro.members ++ [ maintainers.j0hax ];
+    };
 
-    nodes.machine = { ... }:
+    nodes.machine =
+      { ... }:
 
       {
         imports = [ ./common/user-account.nix ];
@@ -23,11 +27,13 @@ import ./make-test-python.nix ({ pkgs, ... }:
         };
       };
 
-    testScript = { nodes, ... }:
+    testScript =
+      { nodes, ... }:
       let
         user = nodes.machine.config.users.users.alice;
         xdo = "${pkgs.xdotool}/bin/xdotool";
-      in ''
+      in
+      ''
         with subtest("Wait for login"):
             start_all()
             machine.wait_for_file("/tmp/xauth_*")
@@ -35,7 +41,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
 
         with subtest("Check RetroArch started"):
             machine.wait_until_succeeds("pgrep retroarch")
-            machine.wait_for_window("^RetroArch ")
+            machine.wait_for_window("^RetroArch")
 
         with subtest("Check configuration created"):
             machine.wait_for_file("${user.home}/.config/retroarch/retroarch.cfg")
@@ -46,4 +52,5 @@ import ./make-test-python.nix ({ pkgs, ... }:
             )
             machine.screenshot("screen")
       '';
-  })
+  }
+)

pkgs/applications/misc/bambu-studio/default.nix

@@ -6,7 +6,7 @@
   cmake,
   pkg-config,
   wrapGAppsHook3,
-  boost179,
+  boost180,
   cereal,
   cgal_5,
   curl,
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     binutils
-    boost179
+    boost180
     cereal
     cgal_5
     curl

pkgs/applications/misc/keepassxc/default.nix

@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , qttools
 
@@ -61,6 +62,12 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./darwin.patch
+
+    # https://github.com/keepassxreboot/keepassxc/issues/10391
+    (fetchpatch {
+      url = "https://github.com/keepassxreboot/keepassxc/commit/6a9ed210792ac60d9ed35cc702500e5ebbb95622.patch";
+      hash = "sha256-CyaVMfJ0O+5vgvmwI6rYbf0G7ryKFcLv3p4b/D6Pzw8=";
+    })
   ];
 
   cmakeFlags = [

pkgs/applications/networking/browsers/librewolf/src.json

@@ -1,11 +1,11 @@
 {
-  "packageVersion": "131.0.3-1",
+  "packageVersion": "132.0.1",
   "source": {
-    "rev": "131.0.3-1",
+    "rev": "132.0.1",
-    "sha256": "0ayl43nq3h9a3b4nl7sfmil43v0k3x1bmxl7c7ws8710dj2674rc"
+    "sha256": "hjtzX6jMJh1pnnO6WsLiOqwfpVYmCTZcEEXAmdBm180="
   },
   "firefox": {
-    "version": "131.0.3",
+    "version": "132.0",
-    "sha512": "3aa96db839f7a45e34c43b5e7e3333e1100ca11545ad26a8e42987fbc72df5ae7ebebe7dfc8c4e856d2bb4676c0516914a07c001f6047799f314146a3329c0ce"
+    "sha512": "JU/7oW1ubGHP+qgTH4Gpp4iA5XI7fueKw2JRon2C5v8IgjiuKJ0HRpujpRtbWWmgjs0fwC3LTZMyWgj6wc/JFg=="
   }
 }

pkgs/applications/networking/browsers/palemoon/bin.nix

@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "33.4.0.1";
+  version = "33.4.1";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: {
     in {
       gtk3 = fetchzip {
         urls = urlRegionVariants "gtk3";
-        hash = "sha256-34x9L0L42KO7mUDaW41I71ln5xyHGAKBoAJ6HcDC//g=";
+        hash = "sha256-pjOzU8atFNzYujxxoVihn0Cvq4Xvh7U2auSznE29Wpc=";
       };
       gtk2 = fetchzip {
         urls = urlRegionVariants "gtk2";
-        hash = "sha256-TRIgfqKsJxueZ/Oazw7kTLjVyxdh+IUiR+XDaemow9A=";
+        hash = "sha256-ikgO0vVTySw3I6gdSu5k2e35xZ95bJY4f18Fjh+c0rA=";
       };
     };
 

pkgs/applications/networking/dnscontrol/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dnscontrol";
-  version = "4.14.2";
+  version = "4.14.3";
 
   src = fetchFromGitHub {
     owner = "StackExchange";
     repo = "dnscontrol";
     rev = "v${version}";
-    hash = "sha256-Sdm/3Svg37NW710whH58YtFULKWXU5+87LmErfjRm3Y=";
+    hash = "sha256-FDxNJ6pOigasulxtAAnvHfWHQ3Ji459IQScA4dld9KQ=";
   };
 
-  vendorHash = "sha256-yyj5uP1v49mieLnNvCDG6n4+jC/+zRvdtfjaTYsAhhA=";
+  vendorHash = "sha256-aqS5esDroGg83NJygX8tW8P0U4YCkll98KmAfya6lKM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/applications/networking/gnmic/default.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gnmic";
-  version = "0.38.2";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "openconfig";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-TSRexhhYny1L7znhjqPLudIMUYhyMQUmLClyXzsZxcY=";
+    hash = "sha256-xS2TLYA/9Xb4UJ8yCpqDBQbHTE1p2OlBpp8R2BTXwyk=";
   };
 
-  vendorHash = "sha256-pJz613QFdA+8HcV+U0aG+A+WDZtSZIgaLVqCnu4WQWo=";
+  vendorHash = "sha256-9A/ZcamCMUpNxG3taHrqI4JChjpSjSuwx0ZUyGAuGXo=";
 
   ldflags = [
     "-s" "-w"

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

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fastp";
-  version = "0.23.4";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "OpenGene";
     repo = "fastp";
     rev = "v${version}";
-    sha256 = "sha256-hkCo8CiZNJuVcL9Eg/R7YzM7/FEcGEnovV325oWa7y8=";
+    sha256 = "sha256-Jl2Os/6yLWXTDv6irInYlUHpz6QTw8CEMVGFXblAay0=";
   };
 
   buildInputs = [ zlib libdeflate isa-l ];

pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch

@@ -0,0 +1,28 @@
+compatibility with newer spdlog/fmt versions
+
+diff --git a/plugins/module_identification/src/api/module_identification.cpp b/plugins/module_identification/src/api/module_identification.cpp
+index 808875e8a68..3cf3cf1fb8b 100644
+--- a/plugins/module_identification/src/api/module_identification.cpp
++++ b/plugins/module_identification/src/api/module_identification.cpp
+@@ -406,7 +406,7 @@ namespace hal
+ 
+                 const u32 num_threads = std::min(config.m_max_thread_count, std::thread::hardware_concurrency() - 1);
+ 
+-                log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, config.m_multithreading_priority);
++                log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, fmt::underlying(config.m_multithreading_priority));
+ 
+                 auto stats = Statistics();
+ 
+diff --git a/plugins/z3_utils/src/simplification.cpp b/plugins/z3_utils/src/simplification.cpp
+index d64cab665f2..561fa7f1a23 100644
+--- a/plugins/z3_utils/src/simplification.cpp
++++ b/plugins/z3_utils/src/simplification.cpp
+@@ -617,7 +617,7 @@ namespace hal
+                     return false;
+ 
+                 default: {
+-                    log_error("z3_utils", "commutative check not implemeted for type {}!", t);
++                    log_error("z3_utils", "commutative check not implemeted for type {}!", fmt::underlying(t));
+                     return false;
+                 }
+             }

pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix

@@ -8,6 +8,7 @@
 , igraph
 , llvmPackages
 , ninja
+, nlohmann_json
 , pkg-config
 , python3Packages
 , qtbase
@@ -15,75 +16,36 @@
 , quazip
 , rapidjson
 , spdlog
-, suitesparse
+, verilator
 , wrapQtAppsHook
 , z3
 }:
 
-let
+stdenv.mkDerivation rec {
-  # hal doesn't work with igraph 0.10.x yet https://github.com/emsec/hal/pull/487
+  version = "4.4.1";
-  igraph' = igraph.overrideAttrs (final: prev: {
-    version = "0.9.10";
-    src = fetchFromGitHub {
-      owner = "igraph";
-      repo = final.pname;
-      rev = final.version;
-      hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk=";
-    };
-    patches = (prev.patches or []) ++ [
-      # needed by clang
-      (fetchpatch {
-        name = "libxml2-2.11-compat.patch";
-        url = "https://github.com/igraph/igraph/commit/5ad464be5ae2f6ebb69c97cb0140c800cc8d97d6.patch";
-        hash = "sha256-adU5SctH+H54UaAmr5BZInytD3wjUzLtQbCwngAWs4o=";
-      })
-    ];
-    postPatch = prev.postPatch + lib.optionalString stdenv.hostPlatform.isAarch64 ''
-      # https://github.com/igraph/igraph/issues/1694
-      substituteInPlace tests/CMakeLists.txt \
-        --replace "igraph_scg_grouping3" "" \
-        --replace "igraph_scg_semiprojectors2" ""
-    '';
-    NIX_CFLAGS_COMPILE = (prev.NIX_CFLAGS_COMPILE or []) ++ lib.optionals stdenv.cc.isClang [
-      "-Wno-strict-prototypes"
-      "-Wno-unused-but-set-parameter"
-      "-Wno-unused-but-set-variable"
-    ];
-    # general options brought back from the old 0.9.x package
-    buildInputs = prev.buildInputs ++ [ suitesparse ];
-    cmakeFlags = prev.cmakeFlags ++ [ "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" ];
-  });
-
-in stdenv.mkDerivation rec {
-  version = "4.2.0";
   pname = "hal-hardware-analyzer";
 
   src = fetchFromGitHub {
     owner = "emsec";
     repo = "hal";
     rev = "v${version}";
-    sha256 = "sha256-Yl86AClE3vWygqj1omCOXX8koJK2SjTkMZFReRThez0=";
+    sha256 = "sha256-8kmYeqsmqR7tY044rZb3KuEAVGv37IObX6k1qjXWG0A=";
   };
 
   patches = [
     (fetchpatch {
-      name = "cmake-add-no-vendored-options.patch";
+      name = "de-vendor-nlohmann-json.patch";
-      # https://github.com/emsec/hal/pull/529
+      # https://github.com/emsec/hal/pull/596
-      url = "https://github.com/emsec/hal/commit/37d5c1a0eacb25de57cc552c13e74f559a5aa6e8.patch";
+      url = "https://github.com/emsec/hal/commit/f8337d554d80cfa2588512696696fd4c878dd7a3.patch";
-      hash = "sha256-a30VjDt4roJOTntisixqnH17wwCgWc4VWeh1+RgqFuY=";
+      hash = "sha256-QjgvcduwbFccC807JFOevlTfO3KiL9T3HSqYmh3sXAQ=";
     })
     (fetchpatch {
-      name = "hal-fix-fmt-10.1-compat.patch";
+      name = "fix-vendored-igraph-regression.patch";
-      # https://github.com/emsec/hal/pull/530
+      # https://github.com/emsec/hal/pull/596
-      url = "https://github.com/emsec/hal/commit/b639a56b303141afbf6731b70b7cc7452551f024.patch";
+      url = "https://github.com/emsec/hal/commit/fe1fe74719ab4fef873a22e2b28cce0c57d570e0.patch";
-      hash = "sha256-a7AyDEKkqdbiHpa4OHTRuP9Yewb3Nxs/j6bwez5m0yU=";
+      hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E=";
-    })
-    (fetchpatch {
-      name = "fix-gcc-13-build.patch";
-      # https://github.com/emsec/hal/pull/557
-      url = "https://github.com/emsec/hal/commit/831b1a7866aa9aabd55ff288c084862dc6a138d8.patch";
-      hash = "sha256-kB/sJJtLGl5PUv+mmWVpee/okkJzp5HF0BCiCRCcTKw=";
     })
+    ./4.4.1-newer-spdlog-fmt-compat.patch
   ];
 
   # make sure bundled dependencies don't get in the way - install also otherwise
@@ -105,9 +67,11 @@ in stdenv.mkDerivation rec {
     qtsvg
     boost
     rapidjson
-    igraph'
+    igraph
+    nlohmann_json
     spdlog
     graphviz
+    verilator
     z3
     quazip
   ]
@@ -129,12 +93,16 @@ in stdenv.mkDerivation rec {
     "-DUSE_VENDORED_SPDLOG=off"
     "-DUSE_VENDORED_QUAZIP=off"
     "-DUSE_VENDORED_IGRAPH=off"
+    "-DUSE_VENDORED_NLOHMANN_JSON=off"
     "-DBUILD_ALL_PLUGINS=on"
   ];
   # needed for macos build - this is why we use wrapQtAppsHook instead of
   # the qt mkDerivation - the latter forcibly overrides this.
   cmakeBuildType = "MinSizeRel";
 
+  # https://github.com/emsec/hal/issues/598
+  NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isAarch64 "-flax-vector-conversions";
+
   # some plugins depend on other plugins and need to be able to load them
   postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     find $out/lib/hal_plugins -name '*.so*' | while read -r f ; do

pkgs/applications/virtualization/virter/default.nix

@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "virter";
-  version = "0.27.0";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "LINBIT";
     repo = "virter";
     rev = "v${version}";
-    hash = "sha256-sfO704nZnsSpSokJUwc3ucPBlKIi3cbZUG1dwbKDnFw=";
+    hash = "sha256-/AhC7eQE9ITvXcK228ZgcIOaSs0osjdFZI/0jHL7mqc=";
   };
 
-  vendorHash = "sha256-NmA1rLWSX03zurGZWvXv61TSB9hecEfi7Hx9yi7QL/c=";
+  vendorHash = "sha256-v3rM45hijJKNxW43VhwcL3R2heZLA70RzqBXYeOYgRY=";
 
   ldflags = [
     "-s"

pkgs/by-name/ag/agate/package.nix

@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "agate";
-  version = "3.3.9";
+  version = "3.3.10";
 
   src = fetchFromGitHub {
     owner = "mbrubeck";
     repo = "agate";
     rev = "v${version}";
-    hash = "sha256-u+v9RydB6OIsq2zOSmTDuejneb2uNFhRXsVNlGcPABs=";
+    hash = "sha256-uuMOe5yi0DSD7mTPnI0m/lpkv6Lb669vndwPE01oSUU=";
   };
 
-  cargoHash = "sha256-oNI+UsxDdHSQGtl6vhxNWSiYVc8TV/vG8UoQX2w4ZoM=";
+  cargoHash = "sha256-6iEpOUhpWClgfAry8xIHJUPaAVKdPVaq3cTrSql9roo=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/al/aldente/package.nix

@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "aldente";
-  version = "1.28.5";
+  version = "1.28.6";
 
   src = fetchurl {
     url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg";
-    hash = "sha256-N+0bNgD80LLzwRAvYwxcLC0WnMgpvS4DnX/dZx0nIvE=";
+    hash = "sha256-g52XHx1jK0VEgLQJL+vX16bFd8eMu0dw8Fqp4hOtVtE=";
   };
 
   dontBuild = true;

pkgs/by-name/ap/apx-gui/package.nix

@@ -1,29 +1,30 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchFromGitHub
+  stdenv,
-, appstream-glib
+  fetchFromGitHub,
-, desktop-file-utils
+  appstream-glib,
-, gobject-introspection
+  desktop-file-utils,
-, libadwaita
+  gobject-introspection,
-, meson
+  libadwaita,
-, ninja
+  meson,
-, pkg-config
+  ninja,
-, python3
+  pkg-config,
-, wrapGAppsHook4
+  python3,
-, apx
+  wrapGAppsHook4,
-, gnome-console
+  apx,
-, vte-gtk4
+  gnome-console,
+  vte-gtk4,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "apx-gui";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
-    owner  = "Vanilla-OS";
+    owner = "Vanilla-OS";
-    repo   = "apx-gui";
+    repo = "apx-gui";
-    rev    = "v${finalAttrs.version}";
+    rev = "v${finalAttrs.version}";
-    hash = "sha256-UgDBDk4ChgWFUoz5BAXbn0b4Bngs9/hTmcu1Y4FXLU0=";
+    hash = "sha256-nZMbVXeWEgfBsVgX2iESRzDgu0tjiqC1dTCaTlW0iWA=";
   };
 
   strictDeps = true;
@@ -35,7 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-    (python3.withPackages (ps: [ ps.pygobject3 ps.requests ]))
+    (python3.withPackages (ps: [
+      ps.pygobject3
+      ps.pyyaml
+      ps.requests
+    ]))
     wrapGAppsHook4
   ];
 
@@ -46,15 +51,20 @@ stdenv.mkDerivation (finalAttrs: {
 
   preFixup = ''
     gappsWrapperArgs+=(
-      --prefix PATH : "${lib.makeBinPath [ apx gnome-console ]}"
+      --prefix PATH : "${
+        lib.makeBinPath [
+          apx
+          gnome-console
+        ]
+      }"
     )
   '';
 
   meta = {
     description = "GUI frontend for Apx in GTK 4 and Libadwaita";
-    homepage    = "https://github.com/Vanilla-OS/apx-gui";
+    homepage = "https://github.com/Vanilla-OS/apx-gui";
-    license     = lib.licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
-    platforms   = lib.platforms.linux;
+    platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ chewblacka ];
     mainProgram = "apx-gui";
   };

pkgs/by-name/ar/arc-browser/package.nix

@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arc-browser";
-  version = "1.66.0-55166";
+  version = "1.67.0-55463";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-up+ScCjFgxlATUbCeWZcVF2jZGfCw018MfT6kAqAHO4=";
+    hash = "sha256-up3H6Ke3tlL0/WbOv4qgbLxBaG8o5dibAPxtEnSad6g=";
   };
 
   nativeBuildInputs = [ undmg ];

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

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "buf";
-  version = "1.45.0";
+  version = "1.46.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "buf";
     rev = "v${version}";
-    hash = "sha256-zmk9o0P4BaUqng9E/s6KKWntwS4NmTg/xPTrQruTQSo=";
+    hash = "sha256-XLVEZYQEq9qXrH7EytoHO3QExOAZX6N57amcKBy5ORE=";
   };
 
-  vendorHash = "sha256-NMrPBUwbDsXW8tc5l1Liqd19+v2RrXf6dlcwVnHxVXQ=";
+  vendorHash = "sha256-P1MNwpz3UbaQHLFv5mMs9d0xulitfAD90T1jWxVi5/k=";
 
   patches = [
     # Skip a test that requires networking to be available to work.
@@ -75,12 +75,12 @@ buildGoModule rec {
 
   passthru.tests.version = testers.testVersion { package = buf; };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://buf.build";
     changelog = "https://github.com/bufbuild/buf/releases/tag/v${version}";
     description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
-    maintainers = with maintainers; [ jk lrewega aaronjheng ];
+    maintainers = with lib.maintainers; [ jk lrewega aaronjheng ];
     mainProgram = "buf";
   };
 }

pkgs/by-name/ci/circt/package.nix

@@ -48,25 +48,45 @@ stdenv.mkDerivation rec {
     "-DCIRCT_LLHD_SIM_ENABLED=OFF"
   ];
 
-  # There are some tests depending on `clang-tools` to work. They are activated only when detected
-  # `clang-tidy` in PATH, However, we cannot simply put `clang-tools` in checkInputs to make these
-  # tests work. Because
-  #
-  # 1. The absolute paths of binaries used in tests are resolved in configure phase.
-  # 2. When stdenv = clangStdenv, the `clang-tidy` binary appears in PATH via `clang-unwrapped`,
-  #    which is always placed before `${clang-tools}/bin` in PATH. `clang-tidy` provided in
-  #    `clang-unwrapped` cause tests failing because it is not wrapped to resolve header search paths.
-  #    https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue.
-  #
-  # As a temporary fix, we disabled these tests when using clang stdenv
   # cannot use lib.optionalString as it creates an empty string, disabling all tests
-  LIT_FILTER_OUT = if stdenv.cc.isClang then "CIRCT :: Target/ExportSystemC/.*\.mlir" else null;
+  LIT_FILTER_OUT =
+    let
+      lit-filters =
+        # There are some tests depending on `clang-tools` to work. They are activated only when detected
+        # `clang-tidy` in PATH, However, we cannot simply put `clang-tools` in checkInputs to make these
+        # tests work. Because
+        #
+        # 1. The absolute paths of binaries used in tests are resolved in configure phase.
+        # 2. When stdenv = clangStdenv, the `clang-tidy` binary appears in PATH via `clang-unwrapped`,
+        #    which is always placed before `${clang-tools}/bin` in PATH. `clang-tidy` provided in
+        #    `clang-unwrapped` cause tests failing because it is not wrapped to resolve header search paths.
+        #    https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue.
+        #
+        # As a temporary fix, we disabled these tests when using clang stdenv
+        lib.optionals stdenv.cc.isClang [ "CIRCT :: Target/ExportSystemC/.*\.mlir" ]
+        # Disable some tests on x86_64-darwin
+        ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
+          # These test seem to pass on hydra (rosetta) but not on x86_64-darwin machines
+          "CIRCT :: Target/ExportSMTLIB/attributes.mlir"
+          "CIRCT :: Target/ExportSMTLIB/basic.mlir"
+          "CIRCT :: circt-bmc/comb-errors.mlir"
+          "CIRCT :: circt-bmc/seq-errors.mlir"
+          # This test was having issues with rosetta
+          "CIRCT :: Dialect/SMT/basic.mlir"
+        ];
+    in
+    if lit-filters != [ ] then lib.strings.concatStringsSep "|" lit-filters else null;
 
   preConfigure = ''
     find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \;
     # circt uses git to check its version, but when cloned on nix it can't access git.
     # So this hard codes the version.
-    substituteInPlace cmake/modules/GenVersionFile.cmake --replace "unknown git version" "${src.rev}"
+    substituteInPlace cmake/modules/GenVersionFile.cmake \
+      --replace-fail "unknown git version" "${src.rev}"
+    # Increase timeout on tests because some were failing on hydra.
+    # Using `replace-warn` so it doesn't break when upstream changes the timeout.
+    substituteInPlace integration_test/CMakeLists.txt \
+      --replace-warn 'set(CIRCT_INTEGRATION_TIMEOUT 60)' 'set(CIRCT_INTEGRATION_TIMEOUT 300)'
   '';
 
   doCheck = true;

pkgs/by-name/ev/evolution-data-server/package.nix

@@ -179,6 +179,6 @@ stdenv.mkDerivation rec {
     changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${version}/NEWS?ref_type=tags";
     license = licenses.lgpl2Plus;
     maintainers = teams.gnome.members;
-    platforms = platforms.unix;
+    platforms = platforms.linux; # requires libuuid
   };
 }

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

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flashmq";
-  version = "1.17.2";
+  version = "1.17.3";
 
   src = fetchFromGitHub {
     owner = "halfgaar";
     repo = "FlashMQ";
     rev = "v${version}";
-    hash = "sha256-9PZ0niX7VQzoJ6JE50NOU2es8PyBt7ECENvr2lDpb7Y=";
+    hash = "sha256-AL3jkmz+LLg8apyMkemQugFrZpn5f1sJEskjEiZ5/PQ=";
   };
 
   nativeBuildInputs = [ cmake installShellFiles ];

pkgs/by-name/gh/gh-poi/package.nix

@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "gh-poi";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "seachicken";
     repo = "gh-poi";
     rev = "v${version}";
-    hash = "sha256-ZQkXXaa4n88bJdgP2FSXtgBrUi39teO98SzZq+I5doM=";
+    hash = "sha256-xLeIqTGwizvBmOgwisqoCrFY4KdWoWrA0YYgPWtQT/M=";
   };
 
   ldflags = [ "-s" "-w" ];
@@ -19,7 +19,7 @@ buildGoModule rec {
   vendorHash = "sha256-D/YZLwwGJWCekq9mpfCECzJyJ/xSlg7fC6leJh+e8i0=";
 
   # Skip checks because some of test suites require fixture.
-  # See: https://github.com/seachicken/gh-poi/blob/v0.10.1/.github/workflows/contract-test.yml#L28-L29
+  # See: https://github.com/seachicken/gh-poi/blob/v0.11.0/.github/workflows/contract-test.yml#L28-L29
   doCheck = false;
 
   meta = with lib; {

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

@@ -2,16 +2,16 @@
 
 buildNpmPackage rec {
   pname = "inshellisense";
-  version = "0.0.1-rc.16";
+  version = "0.0.1-rc.18";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-jqLYN251ZvLOjYsSQJmvQ1TupO4jz3Q23aDpKX+Puvs=";
+    hash = "sha256-9cSygGQar2rD3lorehlNmUzd0ZnABNJSJwmoNH3MTmk=";
   };
 
-  npmDepsHash = "sha256-rGUyA0RLnNZ6ocmHPXfBLJ6ZmeeTN9w+TJTtfTQQ24M=";
+  npmDepsHash = "sha256-/FSzeHPgVb5OB6mjP5GYAYBdTmk93xyWJI+NH7L61Do=";
 
   # Needed for dependency `@homebridge/node-pty-prebuilt-multiarch`
   # On Darwin systems the build fails with,

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

@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   buildNpmPackage,
-  jellyfin,
   nix-update-script,
   pkg-config,
   xcbuild,
@@ -11,24 +10,27 @@
   giflib,
   apple-sdk_11,
   darwinMinVersionHook,
+  jellyfin,
 }:
 buildNpmPackage rec {
   pname = "jellyfin-web";
-  version = "10.10.0";
+  version = "10.10.1";
 
-  src = fetchFromGitHub {
+  src =
-    owner = "jellyfin";
+    assert version == jellyfin.version;
-    repo = "jellyfin-web";
+    fetchFromGitHub {
-    rev = "v${version}";
+      owner = "jellyfin";
-    hash = "sha256-BuAvdDIvW2mQ+MzVBPGCFV73P6GxR/I3U24kCu+lXbc=";
+      repo = "jellyfin-web";
-  };
+      rev = "v${version}";
+      hash = "sha256-+f+chR00eDCVZvAGNDB61c0htsVvqFK62oZorW3Qdsg=";
+    };
 
   postPatch = ''
     substituteInPlace webpack.common.js \
       --replace-fail "git describe --always --dirty" "echo ${src.rev}" \
   '';
 
-  npmDepsHash = "sha256-EAZm4UTc9+gW7uPiNEp2vLSKA2vOmLKKZ4/DrnGrvYQ=";
+  npmDepsHash = "sha256-kL57KmBHmBwJEhsUciPaj826qdoSQxZXxtFNGkddGZk=";
 
   preBuild = ''
     # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart

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

@@ -13,13 +13,13 @@
 
 buildDotnetModule rec {
   pname = "jellyfin";
-  version = "10.10.0"; # ensure that jellyfin-web has matching version
+  version = "10.10.1"; # ensure that jellyfin-web has matching version
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin";
     rev = "v${version}";
-    hash = "sha256-XeMZEUorRrpS6GJ2qaXbyKUw0EaKCJF0PSoghUmOnrc=";
+    hash = "sha256-jDiJ1tnCR3cZvNmvZ47Vvoqow1sC+xciHsO546yoIKY=";
   };
 
   propagatedBuildInputs = [ sqlite ];

pkgs/by-name/le/leetgo/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "leetgo";
-  version = "1.4.9";
+  version = "1.4.10";
 
   src = fetchFromGitHub {
     owner = "j178";
     repo = "leetgo";
     rev = "v${version}";
-    hash = "sha256-FlQYTNz1Fh0igwnufjVXN4bsUYBB1kls19D+/v7Ztps=";
+    hash = "sha256-0cBhJfxzzZ5IrVVYNWVoKK9c1baj5U2CvDO52wdsjcs=";
   };
 
-  vendorHash = "sha256-DdAe9yyusA6Ac8ioKqLiM5lcOt9Xy7F77gMG6yBTl7Q=";
+  vendorHash = "sha256-1/U+sPauV3kYvQKTGSuX9FvvEFNsksTPXtfZH0a/o0s=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix

@@ -0,0 +1,104 @@
+{
+  stdenv,
+  lib,
+  fetchurl,
+  rpm,
+  cpio,
+  glib,
+  gusb,
+  pixman,
+  libgudev,
+  nss,
+  libfprint,
+  cairo,
+  pkg-config,
+  autoPatchelfHook,
+  makePkgconfigItem,
+  copyPkgconfigItems,
+}:
+
+# https://discourse.nixos.org/t/request-for-libfprint-port-for-2808-a658/55474
+let
+  # The provided `.so`'s name in the binary package we fetch and unpack
+  libso = "libfprint-2.so.2.0.0";
+in
+stdenv.mkDerivation rec {
+  pname = "libfprint-focaltech-2808-a658";
+  version = "1.94.4";
+  # https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/413#note_2476573
+  src = fetchurl {
+    url = "https://github.com/ftfpteams/RTS5811-FT9366-fingerprint-linux-driver-with-VID-2808-and-PID-a658/raw/b040ccd953c27e26c1285c456b4264e70b36bc3f/libfprint-2-2-${version}+tod1-FT9366_20240627.x86_64.rpm";
+    hash = "sha256-MRWHwBievAfTfQqjs1WGKBnht9cIDj9aYiT3YJ0/CUM=";
+  };
+
+  nativeBuildInputs = [
+    rpm
+    cpio
+    pkg-config
+    autoPatchelfHook
+    copyPkgconfigItems
+  ];
+
+  buildInputs = [
+    stdenv.cc.cc
+    glib
+    gusb
+    pixman
+    nss
+    libgudev
+    libfprint
+    cairo
+  ];
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    rpm2cpio $src | cpio -idmv
+
+    runHook postUnpack
+  '';
+
+  # custom pkg-config based on libfprint's pkg-config
+  pkgconfigItems = [
+    (makePkgconfigItem rec {
+      name = "libfprint-2";
+      inherit version;
+      inherit (meta) description;
+      cflags = [ "-I${variables.includedir}/libfprint-2" ];
+      libs = [
+        "-L${variables.libdir}"
+        "-lfprint-2"
+      ];
+      variables = rec {
+        prefix = "${placeholder "out"}";
+        includedir = "${prefix}/include";
+        libdir = "${prefix}/lib";
+      };
+    })
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm444 usr/lib64/${libso} -t $out/lib
+
+    # create this symlink as it was there in libfprint
+    ln -s -T $out/lib/${libso} $out/lib/libfprint-2.so
+    ln -s -T $out/lib/${libso} $out/lib/libfprint-2.so.2
+
+    # get files from libfprint required to build the package
+    cp -r ${libfprint}/lib/girepository-1.0 $out/lib
+    cp -r ${libfprint}/include $out
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Focaltech Fingerprint driver for focaltech 0x2808:0xa658";
+    homepage = "https://github.com/ftfpteams/RTS5811-FT9366-fingerprint-linux-driver-with-VID-2808-and-PID-a658";
+    license = lib.licenses.unfree;
+    maintainers = [ lib.maintainers.imsick ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+}

pkgs/by-name/lo/loguru/package.nix

@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+}:
+
+stdenv.mkDerivation {
+  pname = "loguru";
+  version = "2.1.0-unstable-2023-04-06";
+
+  src = fetchFromGitHub {
+    owner = "emilk";
+    repo = "loguru";
+    rev = "4adaa185883e3c04da25913579c451d3c32cfac1";
+    hash = "sha256-NpMKyjCC06bC5B3xqgDr2NgA9RsPEeiWr9GbHrHHzZ8=";
+  };
+
+  patches = [
+    # See https://github.com/emilk/loguru/issues/249
+    # The following patches are coming from a fork and fix builds on Darwin
+    # Hopefully they will be merged in the main repository soon.
+    (fetchpatch {
+      url = "https://github.com/virtuosonic/loguru/commit/e1ffdc4149083cc221d44b666a0f7e3ec4a87259.patch";
+      hash = "sha256-fYdS8+qfgyj1J+T6H434jDGK/L+VYq+L22CQ7M/uiXE=";
+    })
+    (fetchpatch {
+      url = "https://github.com/virtuosonic/loguru/commit/743777bea361642349d4673e6a0a55912849c14f.patch";
+      hash = "sha256-3FhH7zdkzHuXSirSCr8A3uHg8UpSfEM02AkR0ZSG0Yw=";
+    })
+  ];
+
+  cmakeFlags = [
+    "-DLOGURU_WITH_STREAMS=1"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  meta = {
+    description = "Lightweight C++ logging library";
+    homepage = "https://github.com/emilk/loguru";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ drupol ];
+    platforms = lib.platforms.all;
+  };
+}

pkgs/by-name/ma/manicode/package-lock.json

@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "manicode": "^1.0.94"
+        "manicode": "^1.0.99"
       }
     },
     "node_modules/@types/diff": {
@@ -355,9 +355,9 @@
       "license": "MIT"
     },
     "node_modules/manicode": {
-      "version": "1.0.94",
+      "version": "1.0.99",
-      "resolved": "https://registry.npmjs.org/manicode/-/manicode-1.0.94.tgz",
+      "resolved": "https://registry.npmjs.org/manicode/-/manicode-1.0.99.tgz",
-      "integrity": "sha512-61mCaweUCEpD6fvM898wOa0dReRDR1NaQwX3KKfml8OV2RYMXFb7ulo+rWVqQKzhRh/XYJyIUk0SEy4tNgMoFA==",
+      "integrity": "sha512-nPcFII4HyMUJJuCCVRqrt6o5ogyBcB6/SRFeUtyg2vUZyO26KMGD0v+2VHfc/L7IUSHoaAsd8OeNGWdkixg8tw==",
       "license": "MIT",
       "dependencies": {
         "@types/diff": "5.2.1",

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

@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "manicode";
-  version = "1.0.94";
+  version = "1.0.99";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/manicode/-/manicode-${version}.tgz";
-    hash = "sha256-mn3bxZashP4zgCO7pB9yqjZ7uLglTC+pa3ifxlIW4BY=";
+    hash = "sha256-LVTh8yOfP92zGSdxLpThC+U9E8cBjoL0+iMQOldNO8A=";
   };
 
-  npmDepsHash = "sha256-PnySdTtlgZ9J0qIegwgiDoGuqa7/KyUxUpiZ8yepuZI=";
+  npmDepsHash = "sha256-MAm/FE8M6BBDZD5Fy2k6GcM5Qv35jNeUwHcemmbUj/A=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

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

@@ -1,34 +1,28 @@
-{ lib
+{
-, rustPlatform
+  lib,
-, fetchFromGitHub
+  rustPlatform,
-, stdenv
+  fetchFromGitHub,
-, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "matugen";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "InioX";
     repo = "matugen";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    hash = "sha256-WFitpFF1Ah4HkzSe4H4aN/ZM0EEIcP5ozLMUWaDggFU=";
+    hash = "sha256-SN4m0ka5VHLIQYTszhlCIB+2D+nyWMzJM5n5bZdkG/I=";
   };
 
-  cargoHash = "sha256-pD1NKUJmvMTnYKWjRrGnvbA0zVvGpWRIlf/9ovP9Jq4=";
+  cargoHash = "sha256-FwQhhwlldDskDzmIOxhwRuUv8NxXCxd3ZmOwqcuWz64=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+  meta = {
-    darwin.apple_sdk.frameworks.Security
-    darwin.apple_sdk.frameworks.SystemConfiguration
-  ];
-
-  meta = with lib; {
     description = "Material you color generation tool";
     homepage = "https://github.com/InioX/matugen";
     changelog = "https://github.com/InioX/matugen/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
-    maintainers = with maintainers; [ lampros ];
+    maintainers = with lib.maintainers; [ lampros ];
     mainProgram = "matugen";
   };
 }

pkgs/by-name/me/media-downloader/package.nix

@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "media-downloader";
-  version = "5.1.0";
+  version = "5.2.0";
 
   src = fetchFromGitHub {
     owner = "mhogomchungu";
     repo = "media-downloader";
     rev = finalAttrs.version;
-    hash = "sha256-uN7u6/XRDpJFaZiMOYzLvTC7f0MIlKUGh6ter6aPzbI=";
+    hash = "sha256-DytzYnvO8LEDYWzySzoWCAwXw0VKzjlCrjvcCjm0ilE=";
   };
 
   nativeBuildInputs = [

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

@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "myks";
-  version = "4.2.3";
+  version = "4.2.4";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     rev = "refs/tags/v${version}";
-    hash = "sha256-sf+X+qafR0kpJTNIYoLr8q6stm+DgiD/yhVRyBRPA/s=";
+    hash = "sha256-RgVlr+POF5IUei/Rf5mHrjkw0wE5BjU3xwm1Ai1Pemw=";
   };
 
-  vendorHash = "sha256-aWXU2UG4/U8g4dgspjyIfTT2J++WoJlLHAo6K3CSLxc=";
+  vendorHash = "sha256-CE5sT7zXN4ZhIIODOUwqrD0GOvnSVvkMcgLbBmJocKo=";
 
   subPackages = ".";
 

pkgs/by-name/ni/nimble/lock.json

@@ -2,25 +2,27 @@
   "depends": [
     {
       "method": "fetchzip",
+      "path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source",
+      "rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0",
+      "sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615",
+      "srcDir": "src",
+      "url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz",
+      "subDir": "",
       "packages": [
         "checksums"
-      ],
+      ]
-      "path": "/nix/store/z6799507gzbw46lzbi1i8mwm0nbvrvnx-source",
-      "rev": "7ff0b762332d2591bbeb65df9bb86d52ea44ec01",
-      "sha256": "11612prr2wwbx414ip0zjh1fv638dgfvzxfd6v2f432n0wfwhjhj",
-      "srcDir": "src",
-      "url": "https://github.com/nim-lang/checksums/archive/7ff0b762332d2591bbeb65df9bb86d52ea44ec01.tar.gz"
     },
     {
       "method": "fetchzip",
-      "packages": [
-        "sat"
-      ],
       "path": "/nix/store/lwg9fm34h5xv0dvxij9r5m2y6pn1zsvx-source",
-      "rev": "a53d9d6e0470f78f8ba14652d981e7bcdbcd579f",
+      "rev": "faf1617f44d7632ee9601ebc13887644925dcc01",
       "sha256": "1dxbc41wbvkpdp6q3qz1r38lpn32447qkkgyh2s12ym6bx4ynni4",
       "srcDir": "src",
-      "url": "https://github.com/nim-lang/sat/archive/a53d9d6e0470f78f8ba14652d981e7bcdbcd579f.tar.gz"
+      "url": "https://github.com/nim-lang/sat/archive/faf1617f44d7632ee9601ebc13887644925dcc01.tar.gz",
+      "subDir": "",
+      "packages": [
+        "sat"
+      ]
     }
   ]
 }

pkgs/by-name/ni/nimble/package.nix

@@ -10,13 +10,13 @@
 buildNimPackage (
   final: prev: {
     pname = "nimble";
-    version = "0-unstable-2024-05-14";
+    version = "0.16.2";
 
     src = fetchFromGitHub {
       owner = "nim-lang";
       repo = "nimble";
-      rev = "f8bd7b5fa6ea7a583b411b5959b06e6b5eb23667";
+      rev = "v${final.version}";
-      hash = "sha256-aRDaucD6wOUPtXLIrahvK0vBfurdgFrk+swzqzMA09w=";
+      hash = "sha256-MVHf19UbOWk8Zba2scj06PxdYYOJA6OXrVyDQ9Ku6Us=";
     };
 
     lockFile = ./lock.json;

pkgs/by-name/ob/objfw/package.nix

@@ -9,13 +9,13 @@
 
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "objfw";
-  version = "1.1.7";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "ObjFW";
     repo = "ObjFW";
-    rev = "refs/tags/1.1.7-release";
+    rev = "refs/tags/1.2-release";
-    hash = "sha256-0ylG/2ZSO3b8zdh6W9QJH5OJW9V344CCik1DduV5mhI=";
+    hash = "sha256-nGajiLYwkIDyJujN2zWULkQXKV2A2wzjYl9IoZBU/N4=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/pr/proto/package.nix

@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "proto";
-  version = "0.41.3";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = "proto";
     rev = "v${version}";
-    hash = "sha256-FkuHKfrMH+l/k9lfFhbG619KoDIxmEYwoaniHSPF8hQ=";
+    hash = "sha256-ZCuqxsCyaw5JmX9bpsSeTpSc07DnvPE9EiRQrHR5UNo=";
   };
 
-  cargoHash = "sha256-vll9ckegcECmzoOkTCe2q2M1r4s5JlUnv2DtzJEQ7bY=";
+  cargoHash = "sha256-ykl/WC3sfIwT1uhTrnRz2G8bzr1vkoGB03MwNP/Y5Xs=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.SystemConfiguration

pkgs/by-name/sb/sbom-utility/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "sbom-utility";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "sbom-utility";
     rev = "refs/tags/v${version}";
-    hash = "sha256-EqK2TGlv2RGfvR95lzYz3EHJkfq4q4Ty5H2zFdd9cME=";
+    hash = "sha256-LiHCA5q9IJ67jZ2JUcbCFVCYnT36nyq9QzgH9PMr9kM=";
   };
 
-  vendorHash = "sha256-qh8kIwgrlmHkocM5ZoGnOY7ISJlct/TV7dAxvXlPw68=";
+  vendorHash = "sha256-vyYSir5u6d5nv+2ScrHpasQGER4VFSoLb1FDUDIrtDM=";
 
   preCheck = ''
     cd test

pkgs/by-name/tp/tparse/package.nix

@@ -5,7 +5,7 @@
 }:
 let
   pname = "tparse";
-  version = "0.15.0";
+  version = "0.16.0";
 in
 buildGoModule {
   inherit pname version;
@@ -14,10 +14,10 @@ buildGoModule {
     owner = "mfridman";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-CxoVu3WH2I/1wT5o/RGIrGFrGCQOC4vcUKMiH/Gv3aY=";
+    hash = "sha256-fljSjch09kQCpnZerI/h4SRCyxUydfFZGyOXsxmgYOk=";
   };
 
-  vendorHash = "sha256-soIti6o8BUnarPf5/bcMJKdEG0oRpDLMkQM6RlbZQ5I=";
+  vendorHash = "sha256-gGmPQ8YaTk7xG5B8UPK7vOui5YFeEnkuGrAsf0eylXQ=";
 
   ldflags = [
     "-s"

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

@@ -1,16 +1,16 @@
 { lib, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "treefmt";
-  version = "2.0.5";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "treefmt";
     rev = "v${version}";
-    hash = "sha256-lDQbrq9AWH5Hjgy5AllbLLBUl/JkYGw68M5wob14kus=";
+    hash = "sha256-I97mCxQMPq6fV0GD9gVbtQ/i/Sju9/+ZazbkbGqy9Qw=";
   };
 
-  vendorHash = "sha256-OyOgTBwcRNd6kdnn3TFuq7xukeK0A1imK/WMer0tldk=";
+  vendorHash = "sha256-PiH+FMSPeTFwS6cMgZX8Uy2bjZnQ+APqL5d7FMnqR9U=";
 
   subPackages = [ "." ];
 

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

@@ -2,13 +2,12 @@
   coreutils,
   fetchFromGitHub,
   lib,
-  python39,
+  python3,
   bash,
 }:
 
 let
-  # the latest python version that waagent test against according to https://github.com/Azure/WALinuxAgent/blob/28345a55f9b21dae89472111635fd6e41809d958/.github/workflows/ci_pr.yml#L75
+  python = python3;
-  python = python39;
 
 in
 python.pkgs.buildPythonApplication rec {

pkgs/by-name/wh/whatsie/package.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "whatsie";
-  version = "4.16.2";
+  version = "4.16.3";
 
   src = fetchFromGitHub {
     owner = "keshavbhatt";
     repo = "whatsie";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-4Ur/FNg4jqtyWGB0lW4Uw2XlfMclz080LDRNO+RnkrM=";
+    hash = "sha256-F6hQY3Br0iFDYkghBgRAyzLW6QhhG8UHOgkEgDjeQLg=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";

pkgs/by-name/xw/xwayland-satellite/package.nix

@@ -3,23 +3,23 @@
   fetchFromGitHub,
   libxcb,
   makeBinaryWrapper,
+  nix-update-script,
   pkg-config,
   rustPlatform,
-  unstableGitUpdater,
   xcb-util-cursor,
   xwayland,
   withSystemd ? true,
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage rec {
   pname = "xwayland-satellite";
-  version = "0.4-unstable-2024-09-15";
+  version = "0.5";
 
   src = fetchFromGitHub {
     owner = "Supreeeme";
     repo = "xwayland-satellite";
-    rev = "b962a0f33b503aa39c9cf6919f488b664e5b79b4";
+    rev = "refs/tags/v${version}";
-    hash = "sha256-OANPb73V/RQDqtpIcbzeJ93KuOHKFQv+1xXC44Ut7tY=";
+    hash = "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=";
   };
 
   postPatch = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage {
       --replace-fail '/usr/local/bin' "$out/bin"
   '';
 
-  cargoHash = "sha256-1EtwGMoLfYK0VZj8jdQiweO/RHGBzyEoeMEI4pmqfu8=";
+  cargoHash = "sha256-KnkU+uLToD0cBNgPnRiR34XHIphQWoATjim1E/MVf48=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage {
       --prefix PATH : "${lib.makeBinPath [ xwayland ]}"
   '';
 
-  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Xwayland outside your Wayland compositor";
@@ -63,6 +63,7 @@ rustPlatform.buildRustPackage {
       Grants rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base.
     '';
     homepage = "https://github.com/Supreeeme/xwayland-satellite";
+    changelog = "https://github.com/Supreeeme/xwayland-satellite/releases/tag/v${version}";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       if-loop69420

pkgs/by-name/zl/zls/package.nix

@@ -21,9 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dversion_data_path=${zig_0_13.src}/doc/langref.html.in"
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ zig_0_13.hook ];
-    zig_0_13.hook
-  ];
 
   postPatch = ''
     ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p

pkgs/development/compilers/ispc/default.nix

@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   pname   = "ispc";
-  version = "1.24.0";
+  version = "1.25.0";
 
   dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner  = pname;
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q=";
+    sha256 = "sha256-DT8YjyAOdtAaWnCUvKRQGhPOazUkuRWkajBVK279Qhk=";
   };
 
   nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ];
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       echo "================================"
       echo
       (cd ../
-       PATH=${llvmPackages.clang}/bin:$PATH python run_tests.py -t $target --non-interactive --verbose --file=test_output.log
+       PATH=${llvmPackages.clang}/bin:$PATH python scripts/run_tests.py -t $target --non-interactive --verbose --file=test_output.log
        fgrep -q "No new fails"  test_output.log || exit 1)
     done
   '';

pkgs/development/libraries/gtk4-layer-shell/default.nix

@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk4-layer-shell";
-  version = "1.0.3";
+  version = "1.0.4";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "devdoc";
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "wmww";
     repo = "gtk4-layer-shell";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-oGtU1H1waA8ZAjaLMdb+x0KIIwgjhdn38ra/eFVWfFI=";
+    hash = "sha256-0Ya3NVTSO/urU8H+h6SVZBkcvdnqwr06rNWyBtwhQ8E=";
   };
 
   strictDeps = true;

pkgs/development/libraries/odpic/default.nix

@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
 
 let
-  version = "5.3.0";
+  version = "5.4.0";
   libPath = lib.makeLibraryPath [ oracle-instantclient.lib ];
 
 in
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     owner = "oracle";
     repo = "odpi";
     rev = "v${version}";
-    sha256 = "sha256-Ez9B89I008YMu1s/8J0V4bydkooth+O5846Fmwl4FsA=";
+    sha256 = "sha256-MmzForjAgccze7VvNcN6vX4rfiy+W9eGQ2Qh49ah7Ps=";
   };
 
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

pkgs/development/python-modules/ahocorasick-rs/default.nix

@@ -1,11 +1,13 @@
 {
   lib,
   buildPythonPackage,
+  pythonOlder,
   fetchPypi,
   rustPlatform,
   pytestCheckHook,
   pyahocorasick,
   hypothesis,
+  typing-extensions,
   pytest-benchmark,
 }:
 
@@ -32,6 +34,8 @@ buildPythonPackage rec {
     cargoSetupHook
   ];
 
+  dependencies = lib.optionals (pythonOlder "3.12") [ typing-extensions ];
+
   nativeCheckInputs = [
     pytest-benchmark
     pytestCheckHook

pkgs/development/python-modules/aws-lambda-builders/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aws-lambda-builders";
-  version = "1.50.0";
+  version = "1.51.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "awslabs";
     repo = "aws-lambda-builders";
     rev = "refs/tags/v${version}";
-    hash = "sha256-GXpyO+Qd6NP5yxWn1kw34x+P5uyR0rcNlzwivT6eHdE=";
+    hash = "sha256-9EmhOehkXf6aUu6GLhzE0nkfyx+8ovv+Hr7w7DszXTg=";
   };
 
   postPatch = ''

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

@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "binwalk${lib.optionalString visualizationSupport "-full"}";
-  version = "2.4.2";
+  version = "2.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OSPG";
     repo = "binwalk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-IFq/XotW3bbf3obWXRK6Nw1KQDqyFHb4tcA09Twg8SQ=";
+    hash = "sha256-kabibUMh5HyAJCXOyZo3QSNIVz8fER4Xivuv9E3CfEE=";
   };
 
   build-system = [ setuptools ];

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

@@ -3,6 +3,7 @@
   fetchFromGitHub,
   buildPythonPackage,
   numpy,
+  pyparsing,
   cython,
   zlib,
   python-lzo,
@@ -37,7 +38,10 @@ buildPythonPackage rec {
 
   buildInputs = [ zlib ];
 
-  dependencies = [ numpy ];
+  dependencies = [
+    numpy
+    pyparsing
+  ];
 
   nativeCheckInputs = [
     python-lzo

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

@@ -5,6 +5,7 @@
   poetry-core,
   pythonOlder,
   setuptools,
+  prettytable,
 }:
 
 buildPythonPackage rec {
@@ -21,9 +22,12 @@ buildPythonPackage rec {
     hash = "sha256-WPtn8YGlj67MEy2onxoU5SctQ7NcvTImaU0VgMoz2B4=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ setuptools ];
+  dependencies = [
+    setuptools
+    prettytable
+  ];
 
   # Tests require a spark installation
   doCheck = false;

pkgs/development/python-modules/cx-freeze/default.nix

@@ -29,8 +29,7 @@ buildPythonPackage rec {
     sed -i /patchelf/d pyproject.toml
     # Build system requirements
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools>=65.6.3,<71" "setuptools" \
+      --replace-fail "setuptools>=70.1,<75" "setuptools"
-      --replace-fail "wheel>=0.42.0,<=0.43.0" "wheel"
   '';
 
   build-system = [

pkgs/development/python-modules/deepsearch-toolkit/default.nix

@@ -0,0 +1,93 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  certifi,
+  docling-core,
+  platformdirs,
+  pluggy,
+  pydantic,
+  pydantic-settings,
+  python-dateutil,
+  python-dotenv,
+  requests,
+  six,
+  tabulate,
+  tqdm,
+  typer,
+  urllib3,
+  anyio,
+  fastapi,
+  uvicorn,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "deepsearch-toolkit";
+  version = "1.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "DS4SD";
+    repo = "deepsearch-toolkit";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-7XiI/VtXX4lRMreqUh6hJvdIULGvsCEdrd+zV5Jrne0=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    certifi
+    docling-core
+    platformdirs
+    pluggy
+    pydantic
+    pydantic-settings
+    python-dateutil
+    python-dotenv
+    requests
+    six
+    tabulate
+    tqdm
+    typer
+    urllib3
+  ];
+
+  pythonRelaxDeps = [
+    "urllib3"
+  ];
+
+  optional-dependencies = rec {
+    all = api;
+    api = [
+      anyio
+      fastapi
+      uvicorn
+    ];
+  };
+
+  pythonImportsCheck = [
+    "deepsearch"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # Tests require the creation of a deepsearch profile
+    "test_project_listing"
+    "test_system_info"
+  ];
+
+  meta = {
+    changelog = "https://github.com/DS4SD/deepsearch-toolkit/blob/${src.rev}/CHANGELOG.md";
+    description = "Interact with the Deep Search platform for new knowledge explorations and discoveries";
+    homepage = "https://github.com/DS4SD/deepsearch-toolkit";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}

pkgs/development/python-modules/django-silk/default.nix

@@ -25,16 +25,16 @@
 
 buildPythonPackage rec {
   pname = "django-silk";
-  version = "5.2.0";
+  version = "5.3.0";
   format = "setuptools";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-silk";
     rev = "refs/tags/${version}";
-    hash = "sha256-wSQ0yV9+UyjgsaQGNn+MdeUkx9eeRqaHvDpUxIGRmGM=";
+    hash = "sha256-teDvQzNmzCOWdPOqlm2GRhhlilOjM+VAcfOXPw/Rq44=";
   };
 
   # "test_time_taken" tests aren't suitable for reproducible execution, but Django's

pkgs/development/python-modules/docling-core/default.nix

@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  jsonref,
+  jsonschema,
+  pandas,
+  pillow,
+  pydantic,
+  tabulate,
+  jsondiff,
+  requests,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "docling-core";
+  version = "2.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "DS4SD";
+    repo = "docling-core";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-yNsmMAeR1sbZsddpjMFWZy2UAbIWWiZmdW4/lwLvCbM=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    jsonref
+    jsonschema
+    pandas
+    pillow
+    pydantic
+    tabulate
+  ];
+
+  pythonImportsCheck = [
+    "docling_core"
+  ];
+
+  nativeCheckInputs = [
+    jsondiff
+    pytestCheckHook
+    requests
+  ];
+
+  meta = {
+    changelog = "https://github.com/DS4SD/docling-core/blob/${version}/CHANGELOG.md";
+    description = "Python library to define and validate data types in Docling";
+    homepage = "https://github.com/DS4SD/docling-core";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}

pkgs/development/python-modules/docling-ibm-models/default.nix

@@ -0,0 +1,75 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  huggingface-hub,
+  jsonlines,
+  lxml,
+  mean-average-precision,
+  numpy,
+  opencv-python-headless,
+  pillow,
+  torch,
+  torchvision,
+  tqdm,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "docling-ibm-models";
+  version = "2.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "DS4SD";
+    repo = "docling-ibm-models";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-vSEW1+mFTjUvjjUOoX3aGgT/y8iwP3JGIZaPh9RbX5I=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    huggingface-hub
+    jsonlines
+    lxml
+    mean-average-precision
+    numpy
+    opencv-python-headless
+    pillow
+    torch
+    torchvision
+    tqdm
+  ];
+
+  pythonRelaxDeps = [
+    "lxml"
+    "mean_average_precision"
+    "torchvision"
+  ];
+
+  pythonImportsCheck = [
+    "docling_ibm_models"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # Requires network access
+    "test_layoutpredictor"
+    "test_tf_predictor"
+  ];
+
+  meta = {
+    changelog = "https://github.com/DS4SD/docling-ibm-models/blob/${src.rev}/CHANGELOG.md";
+    description = "Docling IBM models";
+    homepage = "https://github.com/DS4SD/docling-ibm-models";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}

pkgs/development/python-modules/docling-parse/default.nix

@@ -0,0 +1,81 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  cxxopts,
+  poetry-core,
+  pybind11,
+  tabulate,
+  zlib,
+  nlohmann_json,
+  utf8cpp,
+  libjpeg,
+  qpdf,
+  loguru-cpp,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "docling-parse";
+  version = "2.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "DS4SD";
+    repo = "docling-parse";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-unXGmMp5xyRCqSoFmqcQAZOBzpE0EzgEEBIfZUHhRcQ=";
+  };
+
+  dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  build-system = [
+    poetry-core
+  ];
+
+  env.NIX_CFLAGS_COMPILE = "-I${lib.getDev utf8cpp}/include/utf8cpp";
+
+  buildInputs = [
+    pybind11
+    cxxopts
+    libjpeg
+    loguru-cpp
+    nlohmann_json
+    qpdf
+    utf8cpp
+    zlib
+  ];
+
+  env.USE_SYSTEM_DEPS = true;
+
+  cmakeFlags = [
+    "-DUSE_SYSTEM_DEPS=True"
+  ];
+
+  dependencies = [
+    tabulate
+  ];
+
+  pythonImportsCheck = [
+    "docling_parse"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/DS4SD/docling-parse/blob/${src.rev}/CHANGELOG.md";
+    description = "Simple package to extract text with coordinates from programmatic PDFs";
+    homepage = "https://github.com/DS4SD/docling-parse";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}

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

@@ -6,6 +6,7 @@
   poetry-core,
   pythonOlder,
   tqdm,
+  pyyaml,
 }:
 buildPythonPackage rec {
   pname = "gguf";
@@ -23,6 +24,7 @@ buildPythonPackage rec {
     numpy
     poetry-core
     tqdm
+    pyyaml
   ];
 
   meta = with lib; {

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

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "gremlinpython";
-  version = "3.7.1";
+  version = "3.7.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "apache";
     repo = "tinkerpop";
     rev = "refs/tags/${version}";
-    hash = "sha256-2viZXksHNFynOm6+1Vo2a8xrXl4pQcAxAVgehp5y6us=";
+    hash = "sha256-Yc0l3kE+6dM9v4QUZPFpm/yjDCrqVO35Vy5srEjAExE=";
   };
 
   sourceRoot = "${src.name}/gremlin-python/src/main/python";

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

@@ -5,7 +5,6 @@
   fetchPypi,
   xcbuild,
   cython_0,
-  libusb1,
   udev,
   darwin,
 }:
@@ -23,10 +22,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
   propagatedBuildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
+    lib.optionals stdenv.hostPlatform.isLinux [ udev ]
-      libusb1
-      udev
-    ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin (
       with darwin.apple_sdk.frameworks;
       [
@@ -36,13 +32,6 @@ buildPythonPackage rec {
       ]
     );
 
-  # Fix the USB backend library lookup
-  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
-    libusb=${libusb1.dev}/include/libusb-1.0
-    test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
-    sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
-  '';
-
   pythonImportsCheck = [ "hid" ];
 
   meta = with lib; {

pkgs/development/python-modules/httpx-socks/default.nix

@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "httpx-socks";
-  version = "0.9.1";
+  version = "0.9.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "romis2012";
     repo = "httpx-socks";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9v5DfxEtM7jq+b8wR0M1klTSnSdFjQ4aDl8ZSZWxbFA=";
+    hash = "sha256-PUiciSuDCO4r49st6ye5xPLCyvYMKfZY+yHAkp5j3ZI=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/linode-api/default.nix

@@ -6,6 +6,7 @@
   setuptools,
   requests,
   polling,
+  deprecated,
   pytestCheckHook,
   mock,
   httpretty,
@@ -31,6 +32,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     requests
     polling
+    deprecated
   ];
 
   nativeCheckInputs = [

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

@@ -0,0 +1,55 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pdm-backend,
+  pygments,
+  objprint,
+  python-slugify,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "marko";
+  version = "2.1.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "frostming";
+    repo = "marko";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-KqdBYmlVs00atXy7MSsriRBnL7w13io2oFZ0IyJ2Om4=";
+  };
+
+  build-system = [
+    pdm-backend
+  ];
+
+  optional-dependencies = {
+    codehilite = [
+      pygments
+    ];
+    repr = [
+      objprint
+    ];
+    toc = [
+      python-slugify
+    ];
+  };
+
+  pythonImportsCheck = [
+    "marko"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ] ++ optional-dependencies.toc ++ optional-dependencies.codehilite;
+
+  meta = {
+    changelog = "https://github.com/frostming/marko/blob/${src.rev}/CHANGELOG.md";
+    description = "Markdown parser with high extensibility";
+    homepage = "https://github.com/frostming/marko";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}

pkgs/development/python-modules/mean-average-precision/default.nix

@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  numpy,
+  pandas,
+}:
+
+buildPythonPackage rec {
+  pname = "mean-average-precision";
+  version = "2024.01.05.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "bes-dev";
+    repo = "mean_average_precision";
+    rev = "refs/tags/${version}";
+    hash = "sha256-qo160L+oJsHERVOV0qdiRIZPMjvSlUmMTrAzThfrQSs=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+    pandas
+  ];
+
+  pythonImportsCheck = [
+    "mean_average_precision"
+  ];
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    description = "Mean Average Precision for Object Detection";
+    homepage = "https://github.com/bes-dev/mean_average_precision";
+    changelog = "https://github.com/bes-dev/mean_average_precision/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}

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

@@ -0,0 +1,39 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "objprint";
+  version = "0.2.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "gaogaotiantian";
+    repo = "objprint";
+    rev = version;
+    hash = "sha256-IGYjDdi3JzYk53ITVOhVnm9EDsa+4HXSVtVUE3wQWTo=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "objprint"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Library that can print Python objects in human readable format";
+    homepage = "https://github.com/gaogaotiantian/objprint";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}

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

@@ -145,5 +145,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/collerek/ormar/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ andreasfelix ];
+    broken = true;
   };
 }

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

@@ -65,5 +65,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/pulumi/pulumi";
     license = licenses.asl20;
     maintainers = with maintainers; [ teto ];
+    # https://github.com/pulumi/pulumi/issues/16828
+    broken = versionAtLeast protobuf.version "5";
   };
 }

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

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyngrok";
-  version = "7.2.0";
+  version = "7.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TkOvmy8hzu2NITeXAo/ogjAD8YW0l5Lk04MwI2XIFRU=";
+    hash = "sha256-UJIbCcsQzKmFeH8gvfxFVN4ovT7eCnSHBsCCooInm/E=";
   };
 
   nativeBuildInputs = [ setuptools ];

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

@@ -13,6 +13,8 @@
   watchdog,
   webtest,
   wheel,
+  build,
+  importlib-resources,
 }:
 
 buildPythonPackage rec {
@@ -38,7 +40,7 @@ buildPythonPackage rec {
   dependencies = [
     distutils
     pip
-  ];
+  ] ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ];
 
   optional-dependencies = {
     passlib = [ passlib ];
@@ -51,6 +53,7 @@ buildPythonPackage rec {
     setuptools
     twine
     webtest
+    build
   ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   __darwinAllowLocalNetworking = true;

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

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "stookwijzer";
-  version = "1.4.10";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fwestenberg";
     repo = "stookwijzer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-uvmv35rdmqfr+psGQdnb3g2q72qCx4ew3gJdGeun6W8=";
+    hash = "sha256-QZyuzOAz/VAThgZdhOGeOLvC+2wtp1mgCXzIekBm/Xs=";
   };
 
   build-system = [ setuptools ];

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

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "tatsu";
-  version = "5.12.1";
+  version = "5.12.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "neogeny";
     repo = "TatSu";
     rev = "refs/tags/v${version}";
-    hash = "sha256-dY+hvNwYrkKko9A5yRT0EWYlvVu3OrhJMzk/8cjzuUo=";
+    hash = "sha256-FRNQz3JtsFw1nch+ffGMzZF1+gq7XifPok9qsUiRPs8=";
   };
 
   nativeBuildInputs = [ setuptools ];

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

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "teslajsonpy";
-  version = "3.12.1";
+  version = "3.12.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "zabuldon";
     repo = "teslajsonpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-kUuvzjQBHWy3Si/Ha9M01ijv4QyQwK/g5gyhd7/lIdA=";
+    hash = "sha256-chUW7aa99KzYyn8qVDX4GK8eI8MoP8+TKRx9PI+0ZKE=";
   };
 
   build-system = [ poetry-core ];

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

@@ -19,16 +19,16 @@
 
 buildPythonPackage rec {
   pname = "xsdata";
-  version = "24.9";
+  version = "24.11";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "tefra";
     repo = "xsdata";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wQSrdAS4E6AmpP+pKviFomLrcSHLROhTWHg/hYGTaeQ=";
+    hash = "sha256-hyNC9VcWkGnOYm6BpXgH3RzmHTqBVmQoADvcEvgF6yg=";
   };
 
   patches = [

pkgs/development/tools/language-servers/lua-language-server/default.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lua-language-server";
-  version = "3.11.1";
+  version = "3.12.0";
 
   src = fetchFromGitHub {
     owner = "luals";
     repo = "lua-language-server";
     rev = finalAttrs.version;
-    hash = "sha256-ZYaiSBSnO9lPb/5pYa0OiL0KParuMb4/jIBtE3S/Ruo=";
+    hash = "sha256-wyQ4oXGemoT5QVZughFKd386RjzlW4ArtQL0ofMnhpU=";
     fetchSubmodules = true;
   };
 
@@ -39,6 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
       # this feature is not used in lua-language-server
       sed -i /filewatch/d 3rd/bee.lua/test/test.lua
 
+      # flaky tests on linux
+      # https://github.com/LuaLS/lua-language-server/issues/2926
+      sed -i /load-relative-library/d test/tclient/init.lua
+
       pushd 3rd/luamake
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''

pkgs/development/tools/misc/tyson/default.nix

@@ -1,27 +1,31 @@
-{ lib
+{
-, buildGoModule
+  lib,
-, fetchFromGitHub
+  buildGoModule,
-, installShellFiles
+  fetchFromGitHub,
+  installShellFiles,
 }:
 
 buildGoModule rec {
   pname = "tyson";
-  version = "0.1.1";
+  version = "0.1.1-unstable-2024-04-10";
 
   src = fetchFromGitHub {
     owner = "jetpack-io";
     repo = "tyson";
-    rev = "v${version}";
+    rev = "d6b38819db9b260928b29f4d39bf4c72841c6a01";
-    hash = "sha256-c4ROLn+BSX7v/4C9/IeU6HiE2YvnqDuXXGp2iZhAVk4=";
+    hash = "sha256-NoQJBEedV3NDNQ4PVvvjjsO7N+rq40LWKp962P+naEY=";
   };
 
-  vendorHash = "sha256-NhDv7oH8LK/vebwjs55tsCCWVhbZZd15z5ewOF5z9+Y=";
+  vendorHash = "sha256-kJIfKgVaHuCYvvTZXyuZ/Hg8z1BlW4oW6+5s1inFizg=";
 
   nativeBuildInputs = [
     installShellFiles
   ];
 
-  ldflags = [ "-s" "-w" ];
+  ldflags = [
+    "-s"
+    "-w"
+  ];
 
   postInstall = ''
     installShellCompletion --cmd tyson \
@@ -33,8 +37,8 @@ buildGoModule rec {
   meta = with lib; {
     description = "TypeScript as a configuration language";
     mainProgram = "tyson";
-    homepage = "https://github.com/jetpack-io/tyson";
+    homepage = "https://github.com/jetify-com/tyson";
-    changelog = "https://github.com/jetpack-io/tyson/releases/tag/${src.rev}";
+    changelog = "https://github.com/jetify-com/tyson/releases/tag/${src.rev}";
     license = licenses.asl20;
     maintainers = with maintainers; [ figsoda ];
   };

pkgs/development/tools/rust/cargo-leptos/default.nix

@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "cargo-leptos";
-  version = "0.2.20";
+  version = "0.2.21";
 
   src = fetchFromGitHub {
     owner = "leptos-rs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-45zus+mNOiWWbuF50XpMwc1B6Uoy5E1kUQmtdGVc46g=";
+    hash = "sha256-Oe65m9io7ihymUjylaWHQM/x7r0y/xXqD313H3oyjN8=";
   };
 
-  cargoHash = "sha256-54CRNSDWdqD582Vv6d8snYEJrpkQ2Cvp8sjgQ6BcvHY=";
+  cargoHash = "sha256-wZNtEr6IAy+OABpTm93rOhKAP1NEEYUvokjaVdoaSG4=";
 
   buildInputs = optionals isDarwin [
     SystemConfiguration

pkgs/development/tools/unityhub/default.nix

@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "unityhub";
-  version = "3.9.1";
+  version = "3.10.0";
 
   src = fetchurl {
     url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb";
-    sha256 = "sha256-ZNsViLT0sFnHeV3FvJFPQbJ99mgpD2rH+bZOOGPgIhA=";
+    sha256 = "sha256-9dm6tVQ5nsDC8X2clrT4cAl8jg4wLwcihE4bnFgdU+A=";
   };
 
   nativeBuildInputs = [

pkgs/development/tools/wasm-pack/default.nix

@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-pack";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "rustwasm";
     repo = "wasm-pack";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NEujk4ZPQ2xHWBCVjBCD7H6f58P4KrwCNoDHKa0d5JE=";
+    hash = "sha256-CN1LcLX7ag+in9sosT2NYVKfhDLGv2m3zHOk2T4MFYc=";
   };
 
-  cargoHash = "sha256-pFKGQcWW1/GaIIWMyWBzts4w1hMu27hTG/uUMjkfDMo=";
+  cargoHash = "sha256-RdBnW8HKSgjVnyafycGFTSTc5j1A9WRDvUuZu8upRWY=";
 
   nativeBuildInputs = [
     cmake

pkgs/kde/frameworks/extra-cmake-modules/default.nix

@@ -1,5 +1,6 @@
 {
   mkKdeDerivation,
+  fetchpatch,
   python3,
 }:
 mkKdeDerivation {
@@ -7,6 +8,16 @@ mkKdeDerivation {
 
   outputs = [ "out" ];
 
+  patches = [
+    # Cherry-pick fix for not finding libmount include path correctly
+    # Upstream PR: https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/486
+    # FIXME: remove in next update
+    (fetchpatch {
+      url = "https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/1cc17521fefd7adb0631d24a03497bcf63b9512d.patch";
+      hash = "sha256-4NbhsVf14YuFHumbnXRgMcS3i/LZUDdrCWHrjHSjuo0=";
+    })
+  ];
+
   # Packages that have an Android APK (e.g. KWeather) require Python3 at build time.
   # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57
   propagatedNativeBuildInputs = [

pkgs/kde/frameworks/kwallet/default.nix

@@ -1,7 +1,6 @@
 {
   mkKdeDerivation,
   libgcrypt,
-  kcrash,
   kdoctools,
 }:
 mkKdeDerivation {
@@ -9,7 +8,6 @@ mkKdeDerivation {
 
   extraBuildInputs = [
     libgcrypt
-    kcrash
     kdoctools
   ];
 }

pkgs/kde/gear/kmailtransport/default.nix

@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  kconfigwidgets,
+}:
 mkKdeDerivation {
   pname = "kmailtransport";
+
+  extraBuildInputs = [ kconfigwidgets ];
 }

pkgs/kde/generated/dependencies.json

@@ -162,7 +162,6 @@
       "kxmlgui"
     ],
     "amarok": [
-      "attica",
       "extra-cmake-modules",
       "karchive",
       "kcmutils",
@@ -172,7 +171,6 @@
       "kcoreaddons",
       "kcrash",
       "kdbusaddons",
-      "kdeclarative",
       "kdnssd",
       "kdoctools",
       "kglobalaccel",
@@ -184,6 +182,7 @@
       "knewstuff",
       "knotifications",
       "kpackage",
+      "kstatusnotifieritem",
       "ktexteditor",
       "kwidgetsaddons",
       "kwindowsystem",
@@ -192,17 +191,6 @@
       "solid",
       "threadweaver"
     ],
-    "amor": [
-      "extra-cmake-modules",
-      "kconfig",
-      "kcoreaddons",
-      "kdbusaddons",
-      "kdoctools",
-      "ki18n",
-      "kwidgetsaddons",
-      "kwindowsystem",
-      "kxmlgui"
-    ],
     "analitza": [
       "extra-cmake-modules"
     ],
@@ -267,9 +255,6 @@
       "kirigami",
       "knewstuff"
     ],
-    "atcore": [
-      "extra-cmake-modules"
-    ],
     "atlantik": [
       "extra-cmake-modules",
       "kconfig",
@@ -508,7 +493,6 @@
       "kjobwidgets",
       "knotifications",
       "knotifyconfig",
-      "kparts",
       "ktextwidgets",
       "kwidgetsaddons",
       "kwindowsystem",
@@ -573,24 +557,6 @@
       "ktextwidgets",
       "kwidgetsaddons"
     ],
-    "choqok": [
-      "extra-cmake-modules",
-      "kcmutils",
-      "kconfigwidgets",
-      "kcoreaddons",
-      "kdoctools",
-      "kglobalaccel",
-      "ki18n",
-      "kio",
-      "knotifications",
-      "knotifyconfig",
-      "ktextwidgets",
-      "kwallet",
-      "kwidgetsaddons",
-      "kxmlgui",
-      "purpose",
-      "sonnet"
-    ],
     "codevis": [
       "extra-cmake-modules",
       "kcmutils",
@@ -618,6 +584,10 @@
     "croutons": [
       "extra-cmake-modules"
     ],
+    "crow-translate": [
+      "extra-cmake-modules",
+      "kwayland"
+    ],
     "daykountdown": [
       "extra-cmake-modules",
       "kcoreaddons",
@@ -953,6 +923,7 @@
       "kconfig",
       "kconfigwidgets",
       "kcoreaddons",
+      "kcrash",
       "kfilemetadata",
       "ki18n",
       "kiconthemes",
@@ -1023,6 +994,7 @@
     "itinerary": [
       "extra-cmake-modules",
       "karchive",
+      "kcolorscheme",
       "kconfig",
       "kcontacts",
       "kcoreaddons",
@@ -1049,6 +1021,7 @@
       "prison",
       "qqc2-breeze-style",
       "qqc2-desktop-style",
+      "qtkeychain",
       "selenium-webdriver-at-spi"
     ],
     "juk": [
@@ -1413,8 +1386,8 @@
     "kbookmarks": [
       "extra-cmake-modules",
       "kconfig",
-      "kconfigwidgets",
+      "kcoreaddons",
-      "kcoreaddons"
+      "kwidgetsaddons"
     ],
     "kbounce": [
       "extra-cmake-modules",
@@ -1972,9 +1945,15 @@
     ],
     "kdev-python": [
       "extra-cmake-modules",
+      "kconfig",
+      "kcoreaddons",
       "kdevelop",
       "ki18n",
+      "kparts",
+      "kservice",
       "ktexteditor",
+      "kwidgetsaddons",
+      "kxmlgui",
       "threadweaver"
     ],
     "kdev-ruby": [
@@ -2149,6 +2128,7 @@
     "keysmith": [
       "extra-cmake-modules",
       "kconfig",
+      "kcoreaddons",
       "kdbusaddons",
       "kguiaddons",
       "ki18n",
@@ -2380,7 +2360,7 @@
       "extra-cmake-modules",
       "karchive",
       "kcolorscheme",
-      "kconfigwidgets",
+      "kconfig",
       "ki18n",
       "kwidgetsaddons"
     ],
@@ -2517,7 +2497,6 @@
       "kcolorscheme",
       "kcompletion",
       "kconfig",
-      "kconfigwidgets",
       "kcoreaddons",
       "kcrash",
       "kdbusaddons",
@@ -2603,16 +2582,6 @@
       "ki18n",
       "kio"
     ],
-    "kipi-plugins": [
-      "extra-cmake-modules",
-      "kconfig",
-      "ki18n",
-      "kio",
-      "kwindowsystem",
-      "kxmlgui",
-      "libkipi",
-      "libmediawiki"
-    ],
     "kirigami": [
       "extra-cmake-modules"
     ],
@@ -2695,23 +2664,6 @@
       "knotifications",
       "kwidgetsaddons"
     ],
-    "kjots": [
-      "akonadi",
-      "akonadi-notes",
-      "extra-cmake-modules",
-      "kbookmarks",
-      "kcmutils",
-      "kconfig",
-      "kconfigwidgets",
-      "kio",
-      "kmime",
-      "kontactinterface",
-      "kparts",
-      "kpimtextedit",
-      "ktextaddons",
-      "ktexttemplate",
-      "kxmlgui"
-    ],
     "kjournald": [
       "extra-cmake-modules",
       "kcoreaddons",
@@ -3096,39 +3048,6 @@
       "libkdegames",
       "libplasma"
     ],
-    "knotes": [
-      "akonadi",
-      "akonadi-notes",
-      "akonadi-search",
-      "extra-cmake-modules",
-      "grantleetheme",
-      "kcalutils",
-      "kcmutils",
-      "kcompletion",
-      "kconfig",
-      "kcoreaddons",
-      "kcrash",
-      "kdnssd",
-      "kdoctools",
-      "kglobalaccel",
-      "kiconthemes",
-      "kitemmodels",
-      "kitemviews",
-      "kmime",
-      "knewstuff",
-      "knotifications",
-      "knotifyconfig",
-      "kontactinterface",
-      "kparts",
-      "kstatusnotifieritem",
-      "ktextaddons",
-      "ktexttemplate",
-      "ktextwidgets",
-      "kwidgetsaddons",
-      "kwindowsystem",
-      "kxmlgui",
-      "pimcommon"
-    ],
     "knotifications": [
       "extra-cmake-modules",
       "kconfig"
@@ -3138,8 +3057,7 @@
       "ki18n",
       "kio",
       "knotifications",
-      "kxmlgui",
+      "kxmlgui"
-      "phonon"
     ],
     "kodaskanna": [
       "extra-cmake-modules",
@@ -3238,8 +3156,10 @@
     "kongress": [
       "extra-cmake-modules",
       "kcalendarcore",
+      "kcolorscheme",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kirigami",
@@ -3374,25 +3294,6 @@
       "kholidays",
       "ki18n"
     ],
-    "kopete": [
-      "extra-cmake-modules",
-      "kcmutils",
-      "kconfig",
-      "kcontacts",
-      "kcoreaddons",
-      "kcrash",
-      "kdbusaddons",
-      "kdnssd",
-      "kdoctools",
-      "ki18n",
-      "kidentitymanagement",
-      "knotifyconfig",
-      "kparts",
-      "ktexteditor",
-      "kwallet",
-      "libkleo",
-      "phonon"
-    ],
     "korganizer": [
       "akonadi",
       "akonadi-calendar",
@@ -3486,7 +3387,6 @@
       "kwidgetsaddons",
       "kxmlgui",
       "libkdcraw",
-      "marble",
       "phonon",
       "purpose"
     ],
@@ -3591,7 +3491,6 @@
       "kcrash",
       "kdoctools",
       "ki18n",
-      "kiconthemes",
       "ktextwidgets",
       "kwidgetsaddons",
       "kxmlgui"
@@ -3697,6 +3596,7 @@
       "kitemviews",
       "knotifications",
       "kparts",
+      "kstatusnotifieritem",
       "ktextwidgets",
       "kwallet",
       "kwidgetsaddons",
@@ -3951,7 +3851,6 @@
       "kio",
       "kjobwidgets",
       "kparts",
-      "ktextwidgets",
       "kxmlgui",
       "sonnet",
       "syntax-highlighting"
@@ -3961,9 +3860,9 @@
     ],
     "ktextwidgets": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kcompletion",
       "kconfig",
-      "kconfigwidgets",
       "ki18n",
       "kwidgetsaddons",
       "sonnet"
@@ -3987,6 +3886,7 @@
       "kcmutils",
       "kconfig",
       "kconfigwidgets",
+      "kcrash",
       "kdbusaddons",
       "kdoctools",
       "ki18n",
@@ -4050,6 +3950,7 @@
       "kconfig",
       "kcontacts",
       "kcoreaddons",
+      "kcrash",
       "ki18n",
       "kirigami",
       "kirigami-addons",
@@ -4095,6 +3996,15 @@
       "kxmlgui",
       "libkdegames"
     ],
+    "kuickshow": [
+      "extra-cmake-modules",
+      "kdoctools",
+      "ki18n",
+      "kiconthemes",
+      "kio",
+      "kwindowsystem",
+      "kxmlgui"
+    ],
     "kunifiedpush": [
       "extra-cmake-modules",
       "kcmutils",
@@ -4112,6 +4022,7 @@
       "kcmutils",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kidletime",
@@ -4131,6 +4042,7 @@
       "kcolorscheme",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kiconthemes",
@@ -4392,12 +4304,6 @@
       "kcontacts",
       "kwallet"
     ],
-    "libkipi": [
-      "extra-cmake-modules",
-      "kconfig",
-      "kservice",
-      "kxmlgui"
-    ],
     "libkleo": [
       "extra-cmake-modules",
       "kcodecs",
@@ -4468,10 +4374,6 @@
       "kio",
       "solid"
     ],
-    "libmediawiki": [
-      "extra-cmake-modules",
-      "kcoreaddons"
-    ],
     "libplasma": [
       "extra-cmake-modules",
       "karchive",
@@ -4497,9 +4399,6 @@
     "libqaccessibilityclient": [
       "extra-cmake-modules"
     ],
-    "libqmycroft": [
-      "extra-cmake-modules"
-    ],
     "licensedigger": [
       "extra-cmake-modules"
     ],
@@ -4550,6 +4449,7 @@
       "libkdepim",
       "mailimporter",
       "messagelib",
+      "phonon",
       "pimcommon"
     ],
     "mailimporter": [
@@ -5344,6 +5244,7 @@
       "extra-cmake-modules",
       "kcmutils",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kirigami-addons"
@@ -5406,7 +5307,8 @@
       "solid"
     ],
     "plasma-wayland-protocols": [
-      "extra-cmake-modules"
+      "extra-cmake-modules",
+      "wayland"
     ],
     "plasma-welcome": [
       "extra-cmake-modules",
@@ -5659,6 +5561,7 @@
       "extra-cmake-modules",
       "kcontacts",
       "kcoreaddons",
+      "kcrash",
       "ki18n",
       "kio",
       "kirigami",
@@ -5847,6 +5750,7 @@
       "knewstuff",
       "knotifyconfig",
       "kparts",
+      "krunner",
       "kwallet",
       "kwidgetsaddons",
       "kwindowsystem",
@@ -5892,6 +5796,7 @@
       "kconfig",
       "kcontacts",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kio",
@@ -6025,6 +5930,7 @@
       "extra-cmake-modules",
       "kconfig",
       "kconfigwidgets",
+      "kcrash",
       "kdoctools",
       "kfilemetadata",
       "ki18n",
@@ -6065,6 +5971,7 @@
       "kcolorscheme",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "kdeclarative",
       "ki18n",
@@ -6081,6 +5988,11 @@
       "qtkeychain",
       "selenium-webdriver-at-spi"
     ],
+    "trojita": [
+      "akonadi-contacts",
+      "extra-cmake-modules",
+      "sonnet"
+    ],
     "umbrello": [
       "extra-cmake-modules",
       "karchive",
@@ -6192,6 +6104,7 @@
     "xwaylandvideobridge": [
       "extra-cmake-modules",
       "kcoreaddons",
+      "kcrash",
       "ki18n",
       "knotifications",
       "kpipewire",
@@ -6229,5 +6142,5 @@
       "kwindowsystem"
     ]
   },
-  "version": "10b4e2ea"
+  "version": "9fe21091"
 }

pkgs/kde/generated/licenses.json

@@ -1921,6 +1921,7 @@
     "MIT"
   ],
   "ktexttemplate": [
+    "BSD-2-Clause",
     "CC0-1.0",
     "LGPL-2.0-or-later",
     "LGPL-2.1-or-later"

pkgs/kde/generated/projects.json

@@ -372,7 +372,7 @@
     "repo_path": "games/atlantik"
   },
   "attica": {
-    "description": "Attica is a Qt library that implements the Open Collaboration Services API.\n\nMailing list: https://lists.freedesktop.org/mailman/listinfo/ocs\nInternet Relay Chat: #ocs@freenode",
+    "description": "Attica is a Qt library that implements the Open Collaboration Services API.",
     "name": "attica",
     "project_path": "frameworks/attica",
     "repo_path": "frameworks/attica"
@@ -744,7 +744,7 @@
     "repo_path": "packaging/craft-blueprints-community"
   },
   "craft-blueprints-kde": {
-    "description": "Project build blueprints for Craft \u2014 the meta build system and package manager",
+    "description": "Project build blueprints for Craft - the meta build system and package manager",
     "name": "craft-blueprints-kde",
     "project_path": "kdesupport/craft-blueprints-kde",
     "repo_path": "packaging/craft-blueprints-kde"
@@ -1073,6 +1073,12 @@
     "project_path": "extragear/edu/gcompris-data",
     "repo_path": "education/gcompris-data"
   },
+  "geonames-data": {
+    "description": "Cache of geo name exports from geonames.org",
+    "name": "geonames-data",
+    "project_path": "playground/packaging/geonames-data",
+    "repo_path": "packaging/geonames-data"
+  },
   "gestures-kde": {
     "description": "Handles gestures of multi touch input devices",
     "name": "gestures-kde",
@@ -1739,6 +1745,18 @@
     "project_path": "extragear/system/kde-inotify-survey",
     "repo_path": "system/kde-inotify-survey"
   },
+  "kde-linux": {
+    "description": "",
+    "name": "kde-linux",
+    "project_path": "kde-linux/kde-linux",
+    "repo_path": "kde-linux/kde-linux"
+  },
+  "kde-linux-packages": {
+    "description": "",
+    "name": "kde-linux-packages",
+    "project_path": "kde-linux/kde-linux-packages",
+    "repo_path": "kde-linux/kde-linux-packages"
+  },
   "kde-nomodeset": {
     "description": "Safe Graphics Mode Startup Utility",
     "name": "kde-nomodeset",
@@ -3494,7 +3512,7 @@
   "krdp": {
     "description": "Library and examples for creating an RDP server.",
     "name": "krdp",
-    "project_path": "playground/libs/krdp",
+    "project_path": "kde/workspace/krdp",
     "repo_path": "plasma/krdp"
   },
   "krecipes": {
@@ -3668,7 +3686,7 @@
   "ksanecore": {
     "description": "Library providing logic to interface scanners",
     "name": "ksanecore",
-    "project_path": "libraries/ksanecore",
+    "project_path": "extragear/libraries/ksanecore",
     "repo_path": "libraries/ksanecore"
   },
   "ksaneplugin": {
@@ -4106,7 +4124,7 @@
   "kunifiedpush": {
     "description": "UnifiedPush client components",
     "name": "kunifiedpush",
-    "project_path": "libraries/kunifiedpush",
+    "project_path": "playground/libraries/kunifiedpush",
     "repo_path": "libraries/kunifiedpush"
   },
   "kunitconversion": {
@@ -4850,7 +4868,7 @@
   "mimetreeparser": {
     "description": "Parser for MIME trees",
     "name": "mimetreeparser",
-    "project_path": "playground/pim/mimetreeparser",
+    "project_path": "kde/pim/mimetreeparser",
     "repo_path": "pim/mimetreeparser"
   },
   "ministro": {
@@ -5802,7 +5820,7 @@
     "repo_path": "libraries/pykde5"
   },
   "qca": {
-    "description": "Qt Cryptographic Architecture \u2014 straightforward cross-platform crypto API",
+    "description": "Qt Cryptographic Architecture - straightforward cross-platform crypto API",
     "name": "qca",
     "project_path": "kdesupport/qca",
     "repo_path": "libraries/qca"
@@ -5966,7 +5984,7 @@
   "repo-management": {
     "description": "This project contains the hooks and scripts that power the KDE git infrastructure.",
     "name": "repo-management",
-    "project_path": "repo-management",
+    "project_path": "sysadmin/repo-management",
     "repo_path": "sysadmin/repo-management"
   },
   "ring-kde": {
@@ -6852,7 +6870,7 @@
     "repo_path": null
   },
   "websites-20years-kde-org": {
-    "description": "Website for the \"20 years of KDE\" book \u2014 20years.kde.org",
+    "description": "Website for the \"20 years of KDE\" book - 20years.kde.org",
     "name": "websites-20years-kde-org",
     "project_path": "websites/20years-kde-org",
     "repo_path": "websites/20years-kde-org"
@@ -6918,61 +6936,61 @@
     "repo_path": "websites/akademy-registration"
   },
   "websites-akademy-schedule-kde-org": {
-    "description": "Website for the Akademy schedule \u2014 akademy-schedule.kde.org",
+    "description": "Website for the Akademy schedule - akademy-schedule.kde.org",
     "name": "websites-akademy-schedule-kde-org",
     "project_path": "websites/akademy-schedule-kde-org",
     "repo_path": "websites/akademy-schedule-kde-org"
   },
   "websites-akademy2004-kde-org": {
-    "description": "Static copy of the 2004 Conference (Akademy) website \u2014 conference2004.kde.org",
+    "description": "Static copy of the 2004 Conference (Akademy) website - conference2004.kde.org",
     "name": "websites-akademy2004-kde-org",
     "project_path": "websites/akademy2004-kde-org",
     "repo_path": "websites/akademy2004-kde-org"
   },
   "websites-akademy2005-kde-org": {
-    "description": "Static copy of the 2005 Conference (Akademy) website \u2014 conference2005.kde.org",
+    "description": "Static copy of the 2005 Conference (Akademy) website - conference2005.kde.org",
     "name": "websites-akademy2005-kde-org",
     "project_path": "websites/akademy2005-kde-org",
     "repo_path": "websites/akademy2005-kde-org"
   },
   "websites-akademy2006-kde-org": {
-    "description": "Static copy of the Akademy 2006 website \u2014 akademy2006.kde.org",
+    "description": "Static copy of the Akademy 2006 website - akademy2006.kde.org",
     "name": "websites-akademy2006-kde-org",
     "project_path": "websites/akademy2006-kde-org",
     "repo_path": "websites/akademy2006-kde-org"
   },
   "websites-akademy2007-kde-org": {
-    "description": "Static copy of the Akademy 2007 website \u2014 akademy2007.kde.org",
+    "description": "Static copy of the Akademy 2007 website - akademy2007.kde.org",
     "name": "websites-akademy2007-kde-org",
     "project_path": "websites/akademy2007-kde-org",
     "repo_path": "websites/akademy2007-kde-org"
   },
   "websites-akademy2008-kde-org": {
-    "description": "Static copy of the Akademy 2008 website \u2014 akademy2008.kde.org",
+    "description": "Static copy of the Akademy 2008 website - akademy2008.kde.org",
     "name": "websites-akademy2008-kde-org",
     "project_path": "websites/akademy2008-kde-org",
     "repo_path": "websites/akademy2008-kde-org"
   },
   "websites-akademy2009-kde-org": {
-    "description": "Static copy of the Akademy 2009 website \u2014 akademy2009.kde.org",
+    "description": "Static copy of the Akademy 2009 website - akademy2009.kde.org",
     "name": "websites-akademy2009-kde-org",
     "project_path": "websites/akademy2009-kde-org",
     "repo_path": "websites/akademy2009-kde-org"
   },
   "websites-akademy2010-kde-org": {
-    "description": "Static copy of the Akademy 2010 website \u2014 akademy2010.kde.org",
+    "description": "Static copy of the Akademy 2010 website - akademy2010.kde.org",
     "name": "websites-akademy2010-kde-org",
     "project_path": "websites/akademy2010-kde-org",
     "repo_path": "websites/akademy2010-kde-org"
   },
   "websites-akademy2012-kde-org": {
-    "description": "Static copy of the Akademy 2012 website \u2014 akademy2012.kde.org",
+    "description": "Static copy of the Akademy 2012 website - akademy2012.kde.org",
     "name": "websites-akademy2012-kde-org",
     "project_path": "websites/akademy2012-kde-org",
     "repo_path": "websites/akademy2012-kde-org"
   },
   "websites-amarok-kde-org": {
-    "description": "Static copy of the Amarok website \u2014 amarok.kde.org",
+    "description": "Static copy of the Amarok website - amarok.kde.org",
     "name": "websites-amarok-kde-org",
     "project_path": "websites/amarok-kde-org",
     "repo_path": "websites/amarok-kde-org"
@@ -6984,7 +7002,7 @@
     "repo_path": "websites/api-kde-org"
   },
   "websites-apps-kde-org": {
-    "description": "KDE application catalog \u2014 apps.kde.org",
+    "description": "KDE application catalog - apps.kde.org",
     "name": "websites-apps-kde-org",
     "project_path": "websites/apps-kde-org",
     "repo_path": "websites/apps-kde-org"
@@ -7008,7 +7026,7 @@
     "repo_path": "websites/autoconfig-kde-org"
   },
   "websites-ballot-kde-org": {
-    "description": "Ugly, simple, and very secure voting system \u2014 ballot.kde.org",
+    "description": "Ugly, simple, and very secure voting system - ballot.kde.org",
     "name": "websites-ballot-kde-org",
     "project_path": "websites/ballot-kde-org",
     "repo_path": "websites/ballot-kde-org"
@@ -7020,13 +7038,13 @@
     "repo_path": "websites/blogs-kde-org"
   },
   "websites-br-qtcon-org": {
-    "description": "Website for QtCon Brazil \u2014 br.qtcon.org",
+    "description": "Website for QtCon Brazil - br.qtcon.org",
     "name": "websites-br-qtcon-org",
     "project_path": "websites/br-qtcon-org",
     "repo_path": "websites/br-qtcon-org"
   },
   "websites-bugs-kde-org": {
-    "description": "Modified sources for the KDE Bugtracking System \u2014 bugs.kde.org",
+    "description": "Modified sources for the KDE Bugtracking System - bugs.kde.org",
     "name": "websites-bugs-kde-org",
     "project_path": "websites/bugs-kde-org",
     "repo_path": "websites/bugs-kde-org"
@@ -7038,7 +7056,7 @@
     "repo_path": "websites/buzz-kde-org"
   },
   "websites-calligra-org": {
-    "description": "Website for Calligra \u2014 calligra.org",
+    "description": "Website for Calligra - calligra.org",
     "name": "websites-calligra-org",
     "project_path": "websites/calligra-org",
     "repo_path": "websites/calligra-org"
@@ -7050,7 +7068,7 @@
     "repo_path": "websites/camp-kde-org"
   },
   "websites-cantor-kde-org": {
-    "description": "Website for Cantor \u2014 cantor.kde.org",
+    "description": "Website for Cantor - cantor.kde.org",
     "name": "websites-cantor-kde-org",
     "project_path": "websites/cantor-kde-org",
     "repo_path": "websites/cantor-kde-org"
@@ -7062,55 +7080,55 @@
     "repo_path": "websites/capacity"
   },
   "websites-choqok-kde-org": {
-    "description": "Website for Choqok \u2014 choqok.kde.org",
+    "description": "Website for Choqok - choqok.kde.org",
     "name": "websites-choqok-kde-org",
     "project_path": "websites/choqok-kde-org",
     "repo_path": "websites/choqok-kde-org"
   },
   "websites-commit-digest-kde-org": {
-    "description": "Static copy of the KDE Commit Digest \u2014 commit-digest.kde.org",
+    "description": "Static copy of the KDE Commit Digest - commit-digest.kde.org",
     "name": "websites-commit-digest-kde-org",
     "project_path": "websites/commit-digest-kde-org",
     "repo_path": "websites/commit-digest-kde-org"
   },
   "websites-conf-kde-in": {
-    "description": "Website for the KDE India Conference \u2014 conf.kde.in",
+    "description": "Website for the KDE India Conference - conf.kde.in",
     "name": "websites-conf-kde-in",
     "project_path": "websites/conf-kde-in",
     "repo_path": "websites/conf-kde-in"
   },
   "websites-conf-kde-org": {
-    "description": "Conference planning and management system \u2014 conf.kde.org",
+    "description": "Conference planning and management system - conf.kde.org",
     "name": "websites-conf-kde-org",
     "project_path": "websites/conf-kde-org",
     "repo_path": "websites/conf-kde-org"
   },
   "websites-conf-qtcon-org": {
-    "description": "Static archive of the QtCon Conference Organization system \u2014 conf.qtcon.org",
+    "description": "Static archive of the QtCon Conference Organization system - conf.qtcon.org",
     "name": "websites-conf-qtcon-org",
     "project_path": "websites/conf-qtcon-org",
     "repo_path": "websites/conf-qtcon-org"
   },
   "websites-contents-neon-kde-org": {
-    "description": "REST API for Neon package contents queries \u2014 contents.neon.kde.org",
+    "description": "REST API for Neon package contents queries - contents.neon.kde.org",
     "name": "websites-contents-neon-kde-org",
     "project_path": "websites/contents-neon-kde-org",
     "repo_path": "websites/contents-neon-kde-org"
   },
   "websites-cutehmi-kde-org": {
-    "description": "Website for CuteHMI \u2014 cutehmi.kde.org",
+    "description": "Website for CuteHMI - cutehmi.kde.org",
     "name": "websites-cutehmi-kde-org",
     "project_path": "websites/cutehmi-kde-org",
     "repo_path": "websites/cutehmi-kde-org"
   },
   "websites-desktopsummit-org": {
-    "description": "Static copy of the DesktopSummit website \u2014 desktopsummit.org",
+    "description": "Static copy of the DesktopSummit website - desktopsummit.org",
     "name": "websites-desktopsummit-org",
     "project_path": "websites/desktopsummit-org",
     "repo_path": "websites/desktopsummit-org"
   },
   "websites-digikam-org": {
-    "description": "Website for digiKam \u2014 digikam.org",
+    "description": "Website for digiKam - digikam.org",
     "name": "websites-digikam-org",
     "project_path": "websites/digikam-org",
     "repo_path": "websites/digikam-org"
@@ -7122,7 +7140,7 @@
     "repo_path": "websites/discover-kde-org"
   },
   "websites-docs-glaxnimate-org": {
-    "description": "Documentation website for Glaxnimate \u2014 docs.glaxnimate.org",
+    "description": "Documentation website for Glaxnimate - docs.glaxnimate.org",
     "name": "websites-docs-glaxnimate-org",
     "project_path": "websites/docs-glaxnimate-org",
     "repo_path": "websites/docs-glaxnimate-org"
@@ -7140,7 +7158,7 @@
     "repo_path": "websites/dot-kde-org"
   },
   "websites-download-kde-org": {
-    "description": "MirrorBrain configuration, templates, etc. \u2014 download.kde.org",
+    "description": "MirrorBrain configuration, templates, etc. - download.kde.org",
     "name": "websites-download-kde-org",
     "project_path": "websites/download-kde-org",
     "repo_path": "websites/download-kde-org"
@@ -7152,25 +7170,25 @@
     "repo_path": "websites/eco-kde-org"
   },
   "websites-edu-kde-org": {
-    "description": "Website for KDE's educational software \u2014 edu.kde.org",
+    "description": "Website for KDE's educational software - edu.kde.org",
     "name": "websites-edu-kde-org",
     "project_path": "websites/edu-kde-org",
     "repo_path": "websites/edu-kde-org"
   },
   "websites-elisa-kde-org": {
-    "description": "Website for Elisa \u2014 elisa.kde.org",
+    "description": "Website for Elisa - elisa.kde.org",
     "name": "websites-elisa-kde-org",
     "project_path": "websites/elisa-kde-org",
     "repo_path": "websites/elisa-kde-org"
   },
   "websites-ev-kde-org": {
-    "description": "Website for KDE e.V. \u2014 ev.kde.org",
+    "description": "Website for KDE e.V. - ev.kde.org",
     "name": "websites-ev-kde-org",
     "project_path": "websites/ev-kde-org",
     "repo_path": "websites/ev-kde-org"
   },
   "websites-events-kde-org": {
-    "description": "Conference and sprint attendance management system \u2014 events.kde.org",
+    "description": "Conference and sprint attendance management system - events.kde.org",
     "name": "websites-events-kde-org",
     "project_path": "websites/events-kde-org",
     "repo_path": "websites/events-kde-org"
@@ -7188,13 +7206,13 @@
     "repo_path": "websites/extensions-krita-org"
   },
   "websites-falkon-org": {
-    "description": "Website for Falkon \u2014 falkon.org",
+    "description": "Website for Falkon - falkon.org",
     "name": "websites-falkon-org",
     "project_path": "websites/falkon-org",
     "repo_path": "websites/falkon-org"
   },
   "websites-forum-kde-org": {
-    "description": "KDE Community Forum version of phpBB \u2014 forum.kde.org",
+    "description": "KDE Community Forum version of phpBB - forum.kde.org",
     "name": "websites-forum-kde-org",
     "project_path": "websites/forum-kde-org",
     "repo_path": "websites/forum-kde-org"
@@ -7212,13 +7230,13 @@
     "repo_path": "websites/fosdem-2021-website-static"
   },
   "websites-fr-kde-org": {
-    "description": "Website for the French KDE community \u2014 fr.kde.org",
+    "description": "Website for the French KDE community - fr.kde.org",
     "name": "websites-fr-kde-org",
     "project_path": "websites/fr-kde-org",
     "repo_path": "websites/fr-kde-org"
   },
   "websites-freebsd-kde-org": {
-    "description": "Website of the KDE/FreeBSD initiative \u2014 freebsd.kde.org",
+    "description": "Website of the KDE/FreeBSD initiative - freebsd.kde.org",
     "name": "websites-freebsd-kde-org",
     "project_path": "websites/freebsd-kde-org",
     "repo_path": "websites/freebsd-kde-org"
@@ -7230,13 +7248,13 @@
     "repo_path": "websites/fund-krita-org"
   },
   "websites-games-kde-org": {
-    "description": "Website for KDE's games \u2014 games.kde.org",
+    "description": "Website for KDE's games - games.kde.org",
     "name": "websites-games-kde-org",
     "project_path": "websites/games-kde-org",
     "repo_path": "websites/games-kde-org"
   },
   "websites-gcompris-net": {
-    "description": "Website for GCompris \u2014 gcompris.net",
+    "description": "Website for GCompris - gcompris.net",
     "name": "websites-gcompris-net",
     "project_path": "websites/gcompris-net",
     "repo_path": "websites/gcompris-net"
@@ -7248,7 +7266,7 @@
     "repo_path": "websites/ghostwriter-kde-org"
   },
   "websites-glaxnimate-org": {
-    "description": "Website for Glaxnimate \u2014 glaxnimate.org",
+    "description": "Website for Glaxnimate - glaxnimate.org",
     "name": "websites-glaxnimate-org",
     "project_path": "websites/glaxnimate-org",
     "repo_path": "websites/glaxnimate-org"
@@ -7290,7 +7308,7 @@
     "repo_path": "websites/hugo-kde-template"
   },
   "websites-i-kaidan-im": {
-    "description": "Easy XMPP invitation landing page for Kaidan \u2014 i.kaidan.im",
+    "description": "Easy XMPP invitation landing page for Kaidan - i.kaidan.im",
     "name": "websites-i-kaidan-im",
     "project_path": "websites/i-kaidan-im",
     "repo_path": "websites/i-kaidan-im"
@@ -7302,13 +7320,13 @@
     "repo_path": "websites/identity-kde-org"
   },
   "websites-inqlude": {
-    "description": "Tools for Inqlude, the Qt library archive \u2014 inqlude.org",
+    "description": "Tools for Inqlude, the Qt library archive - inqlude.org",
     "name": "websites-inqlude",
     "project_path": "websites/inqlude",
     "repo_path": "websites/inqlude"
   },
   "websites-inqlude-data": {
-    "description": "Metadata for Inqlude, the Qt library archive \u2014 inqlude.org",
+    "description": "Metadata for Inqlude, the Qt library archive - inqlude.org",
     "name": "websites-inqlude-data",
     "project_path": "websites/inqlude-data",
     "repo_path": "websites/inqlude-data"
@@ -7326,49 +7344,49 @@
     "repo_path": "websites/jointhegame-kde-org"
   },
   "websites-jp-kde-org": {
-    "description": "Website for the Japanese KDE community / \u65e5\u672c KDE \u30e6\u30fc\u30b6\u4f1a\u306e\u30a6\u30a7\u30d6\u30b5\u30a4\u30c8 \u2014 jp.kde.org",
+    "description": "Website for the Japanese KDE community / \u65e5\u672c KDE \u30e6\u30fc\u30b6\u4f1a\u306e\u30a6\u30a7\u30d6\u30b5\u30a4\u30c8 - jp.kde.org",
     "name": "websites-jp-kde-org",
     "project_path": "websites/jp-kde-org",
     "repo_path": "websites/jp-kde-org"
   },
   "websites-juk-kde-org": {
-    "description": "Website for JuK \u2014 juk.kde.org",
+    "description": "Website for JuK - juk.kde.org",
     "name": "websites-juk-kde-org",
     "project_path": "websites/juk-kde-org",
     "repo_path": "websites/juk-kde-org"
   },
   "websites-kaidan-im": {
-    "description": "Website for Kaidan \u2014 kaidan.im",
+    "description": "Website for Kaidan - kaidan.im",
     "name": "websites-kaidan-im",
     "project_path": "websites/kaidan-im",
     "repo_path": "websites/kaidan-im"
   },
   "websites-kate-editor-org": {
-    "description": "Website for Kate \u2014 kate-editor.org",
+    "description": "Website for Kate - kate-editor.org",
     "name": "websites-kate-editor-org",
     "project_path": "websites/kate-editor-org",
     "repo_path": "websites/kate-editor-org"
   },
   "websites-kde-china-org": {
-    "description": "Website for the Chinese KDE community \u2014 kde-china.org",
+    "description": "Website for the Chinese KDE community - kde-china.org",
     "name": "websites-kde-china-org",
     "project_path": "websites/kde-china-org",
     "repo_path": "websites/kde-china-org"
   },
   "websites-kde-in": {
-    "description": "Website for the Indian KDE community \u2014 kde.in",
+    "description": "Website for the Indian KDE community - kde.in",
     "name": "websites-kde-in",
     "project_path": "websites/kde-in",
     "repo_path": "websites/kde-in"
   },
   "websites-kde-org": {
-    "description": "Main KDE Community website \u2014 kde.org",
+    "description": "Main KDE Community website - kde.org",
     "name": "websites-kde-org",
     "project_path": "websites/kde-org",
     "repo_path": "websites/kde-org"
   },
   "websites-kde-org-announcements-releases": {
-    "description": "Website for KDE.org release announcements \u2014 kde.org/announcements/releases",
+    "description": "Website for KDE.org release announcements - kde.org/announcements/releases",
     "name": "websites-kde-org-announcements-releases",
     "project_path": "websites/kde-org-announcements-releases",
     "repo_path": "websites/kde-org-announcements-releases"
@@ -7380,25 +7398,25 @@
     "repo_path": "websites/kde-org-applications-extractor"
   },
   "websites-kde-ru": {
-    "description": "Website for the Russian KDE community \u2014 kde.ru",
+    "description": "Website for the Russian KDE community - kde.ru",
     "name": "websites-kde-ru",
     "project_path": "websites/kde-ru",
     "repo_path": "websites/kde-ru"
   },
   "websites-kdeconnect-kde-org": {
-    "description": "Website for KDE Connect \u2014 kdeconnect.kde.org",
+    "description": "Website for KDE Connect - kdeconnect.kde.org",
     "name": "websites-kdeconnect-kde-org",
     "project_path": "websites/kdeconnect-kde-org",
     "repo_path": "websites/kdeconnect-kde-org"
   },
   "websites-kdeitalia-it": {
-    "description": "Website for the Italian KDE community \u2014 kdeitalia.it",
+    "description": "Website for the Italian KDE community - kdeitalia.it",
     "name": "websites-kdeitalia-it",
     "project_path": "websites/kdeitalia-it",
     "repo_path": "websites/kdeitalia-it"
   },
   "websites-kdemail-net": {
-    "description": "E-mail service for KDE contributors \u2014 kdemail.net",
+    "description": "E-mail service for KDE contributors - kdemail.net",
     "name": "websites-kdemail-net",
     "project_path": "websites/kdemail-net",
     "repo_path": "websites/kdemail-net"
@@ -7410,13 +7428,13 @@
     "repo_path": "websites/kdenlive-org"
   },
   "websites-kdesrc-build-kde-org": {
-    "description": "Website for kdesrc-build \u2014 kdesrc-build.kde.org",
+    "description": "Website for kdesrc-build - kdesrc-build.kde.org",
     "name": "websites-kdesrc-build-kde-org",
     "project_path": "websites/kdesrc-build-kde-org",
     "repo_path": "websites/kdesrc-build-kde-org"
   },
   "websites-kdetalk-net": {
-    "description": "Website for KDE's Jabber server \u2014 kdetalk.net",
+    "description": "Website for KDE's Jabber server - kdetalk.net",
     "name": "websites-kdetalk-net",
     "project_path": "websites/kdetalk-net",
     "repo_path": "websites/kdetalk-net"
@@ -7440,19 +7458,19 @@
     "repo_path": "websites/kgeotag-kde-org"
   },
   "websites-kid3-kde-org": {
-    "description": "Website for Kid3 \u2014 kid3.kde.org",
+    "description": "Website for Kid3 - kid3.kde.org",
     "name": "websites-kid3-kde-org",
     "project_path": "websites/kid3-kde-org",
     "repo_path": "websites/kid3-kde-org"
   },
   "websites-kirogi-org": {
-    "description": "Website for Kirogi \u2014 kirogi.org",
+    "description": "Website for Kirogi - kirogi.org",
     "name": "websites-kirogi-org",
     "project_path": "websites/kirogi-org",
     "repo_path": "websites/kirogi-org"
   },
   "websites-kmymoney-org": {
-    "description": "Website for KMyMoney \u2014 kmymoney.org",
+    "description": "Website for KMyMoney - kmymoney.org",
     "name": "websites-kmymoney-org",
     "project_path": "websites/kmymoney-org",
     "repo_path": "websites/kmymoney-org"
@@ -7464,31 +7482,31 @@
     "repo_path": "websites/konqueror-org"
   },
   "websites-konsole-kde-org": {
-    "description": "Website for Konsole \u2014 konsole.kde.org",
+    "description": "Website for Konsole - konsole.kde.org",
     "name": "websites-konsole-kde-org",
     "project_path": "websites/konsole-kde-org",
     "repo_path": "websites/konsole-kde-org"
   },
   "websites-kontact-kde-org": {
-    "description": "Website for Kontact \u2014 kontact.kde.org",
+    "description": "Website for Kontact - kontact.kde.org",
     "name": "websites-kontact-kde-org",
     "project_path": "websites/kontact-kde-org",
     "repo_path": "websites/kontact-kde-org"
   },
   "websites-konversation-kde-org": {
-    "description": "Website for Konversation \u2014 konversation.kde.org",
+    "description": "Website for Konversation - konversation.kde.org",
     "name": "websites-konversation-kde-org",
     "project_path": "websites/konversation-kde-org",
     "repo_path": "websites/konversation-kde-org"
   },
   "websites-kpdf-kde-org": {
-    "description": "Static copy of the KPDF website \u2014 kpdf.kde.org",
+    "description": "Static copy of the KPDF website - kpdf.kde.org",
     "name": "websites-kpdf-kde-org",
     "project_path": "websites/kpdf-kde-org",
     "repo_path": "websites/kpdf-kde-org"
   },
   "websites-kphotoalbum-org": {
-    "description": "Website for KPhotoAlbum \u2014 kphotoalbum.org",
+    "description": "Website for KPhotoAlbum - kphotoalbum.org",
     "name": "websites-kphotoalbum-org",
     "project_path": "websites/kphotoalbum-org",
     "repo_path": "websites/kphotoalbum-org"
@@ -7506,31 +7524,31 @@
     "repo_path": "websites/krita-org-theme"
   },
   "websites-krusader-org": {
-    "description": "Website for Krusader \u2014 krusader.org",
+    "description": "Website for Krusader - krusader.org",
     "name": "websites-krusader-org",
     "project_path": "websites/krusader-org",
     "repo_path": "websites/krusader-org"
   },
   "websites-kst-plot-kde-org": {
-    "description": "Static copy of the Kst Plot website \u2014 kst-plot.kde.org",
+    "description": "Static copy of the Kst Plot website - kst-plot.kde.org",
     "name": "websites-kst-plot-kde-org",
     "project_path": "websites/kst-plot-kde-org",
     "repo_path": "websites/kst-plot-kde-org"
   },
   "websites-kstars-kde-org": {
-    "description": "Website for KStars \u2014 kstars.kde.org",
+    "description": "Website for KStars - kstars.kde.org",
     "name": "websites-kstars-kde-org",
     "project_path": "websites/kstars-kde-org",
     "repo_path": "websites/kstars-kde-org"
   },
   "websites-kube-kde-org": {
-    "description": "Website for Kube \u2014 kube-project.com",
+    "description": "Website for Kube - kube-project.com",
     "name": "websites-kube-kde-org",
     "project_path": "websites/kube-kde-org",
     "repo_path": "websites/kube-kde-org"
   },
   "websites-lakademy-kde-org": {
-    "description": "Website for LaKademy \u2014 lakademy.kde.org",
+    "description": "Website for LaKademy - lakademy.kde.org",
     "name": "websites-lakademy-kde-org",
     "project_path": "websites/lakademy-kde-org",
     "repo_path": "websites/lakademy-kde-org"
@@ -7548,13 +7566,13 @@
     "repo_path": "websites/lokalize-kde-org"
   },
   "websites-manifesto-kde-org": {
-    "description": "Website for the KDE Manifesto \u2014 manifesto.kde.org",
+    "description": "Website for the KDE Manifesto - manifesto.kde.org",
     "name": "websites-manifesto-kde-org",
     "project_path": "websites/manifesto-kde-org",
     "repo_path": "websites/manifesto-kde-org"
   },
   "websites-marble-kde-org": {
-    "description": "Website for Marble \u2014 marble.kde.org",
+    "description": "Website for Marble - marble.kde.org",
     "name": "websites-marble-kde-org",
     "project_path": "websites/marble-kde-org",
     "repo_path": "websites/marble-kde-org"
@@ -7590,13 +7608,13 @@
     "repo_path": "websites/mentorship-kde-org"
   },
   "websites-minuet-kde-org": {
-    "description": "Website for Minuet \u2014 minuet.kde.org",
+    "description": "Website for Minuet - minuet.kde.org",
     "name": "websites-minuet-kde-org",
     "project_path": "websites/minuet-kde-org",
     "repo_path": "websites/minuet-kde-org"
   },
   "websites-multimedia-kde-org": {
-    "description": "Website for KDE's multimedia software \u2014 multimedia.kde.org",
+    "description": "Website for KDE's multimedia software - multimedia.kde.org",
     "name": "websites-multimedia-kde-org",
     "project_path": "websites/multimedia-kde-org",
     "repo_path": "websites/multimedia-kde-org"
@@ -7620,7 +7638,7 @@
     "repo_path": "websites/necessitas-kde-org"
   },
   "websites-neon-kde-org": {
-    "description": "Website for Neon \u2014 neon.kde.org",
+    "description": "Website for Neon - neon.kde.org",
     "name": "websites-neon-kde-org",
     "project_path": "websites/neon-kde-org",
     "repo_path": "websites/neon-kde-org"
@@ -7632,7 +7650,7 @@
     "repo_path": "websites/neverland"
   },
   "websites-okular-kde-org": {
-    "description": "Website for Okular \u2014 okular.kde.org",
+    "description": "Website for Okular - okular.kde.org",
     "name": "websites-okular-kde-org",
     "project_path": "websites/okular-kde-org",
     "repo_path": "websites/okular-kde-org"
@@ -7644,13 +7662,13 @@
     "repo_path": "websites/paste-kde-org"
   },
   "websites-pe-kde-org": {
-    "description": "Website for the Peruvian KDE community \u2014 pe.kde.org",
+    "description": "Website for the Peruvian KDE community - pe.kde.org",
     "name": "websites-pe-kde-org",
     "project_path": "websites/pe-kde-org",
     "repo_path": "websites/pe-kde-org"
   },
   "websites-peruse-kde-org": {
-    "description": "Website for Peruse \u2014 peruse.kde.org",
+    "description": "Website for Peruse - peruse.kde.org",
     "name": "websites-peruse-kde-org",
     "project_path": "websites/peruse-kde-org",
     "repo_path": "websites/peruse-kde-org"
@@ -7662,13 +7680,13 @@
     "repo_path": "websites/phonon-kde-org"
   },
   "websites-planet-kde-org": {
-    "description": "Planet KDE website code and configuration \u2014 planet.kde.org",
+    "description": "Planet KDE website code and configuration - planet.kde.org",
     "name": "websites-planet-kde-org",
     "project_path": "websites/planet-kde-org",
     "repo_path": "websites/planet-kde-org"
   },
   "websites-plasma-bigscreen-org": {
-    "description": "Website for Plasma BigScreen \u2014 plasma-bigscreen.org",
+    "description": "Website for Plasma BigScreen - plasma-bigscreen.org",
     "name": "websites-plasma-bigscreen-org",
     "project_path": "websites/plasma-bigscreen-org",
     "repo_path": "websites/plasma-bigscreen-org"
@@ -7680,13 +7698,13 @@
     "repo_path": "websites/plasma-kde-org"
   },
   "websites-plasma-mobile-org": {
-    "description": "Website for Plasma Mobile \u2014 plasma-mobile.org",
+    "description": "Website for Plasma Mobile - plasma-mobile.org",
     "name": "websites-plasma-mobile-org",
     "project_path": "websites/plasma-mobile-org",
     "repo_path": "websites/plasma-mobile-org"
   },
   "websites-product-screenshots": {
-    "description": "Screenshots of KDE software for promotional use \u2014 cdn.kde.org/screenshots",
+    "description": "Screenshots of KDE software for promotional use - cdn.kde.org/screenshots",
     "name": "websites-product-screenshots",
     "project_path": "websites/product-screenshots",
     "repo_path": "websites/product-screenshots"
@@ -7728,7 +7746,7 @@
     "repo_path": "websites/rekonq-kde-org"
   },
   "websites-releases-neon-kde-org": {
-    "description": "Metadata of Neon releases \u2014 releases.neon.kde.org",
+    "description": "Metadata of Neon releases - releases.neon.kde.org",
     "name": "websites-releases-neon-kde-org",
     "project_path": "websites/releases-neon-kde-org",
     "repo_path": "websites/releases-neon-kde-org"
@@ -7746,13 +7764,13 @@
     "repo_path": "websites/reservoir"
   },
   "websites-rkward-kde-org": {
-    "description": "Website for RKWard \u2014 rkward.kde.org",
+    "description": "Website for RKWard - rkward.kde.org",
     "name": "websites-rkward-kde-org",
     "project_path": "websites/rkward-kde-org",
     "repo_path": "websites/rkward-kde-org"
   },
   "websites-rolisteam-org": {
-    "description": "Website for Rolisteam \u2014 rolisteam.org",
+    "description": "Website for Rolisteam - rolisteam.org",
     "name": "websites-rolisteam-org",
     "project_path": "websites/rolisteam-org",
     "repo_path": "websites/rolisteam-org"
@@ -7764,19 +7782,19 @@
     "repo_path": "websites/scripting-krita-org"
   },
   "websites-season-kde-org": {
-    "description": "Website to organize programs like Season of KDE \u2014 season.kde.org",
+    "description": "Website to organize programs like Season of KDE - season.kde.org",
     "name": "websites-season-kde-org",
     "project_path": "websites/season-kde-org",
     "repo_path": "websites/season-kde-org"
   },
   "websites-simon-kde-org": {
-    "description": "Static copy of the Drupal-based Simon website \u2014 simon.kde.org",
+    "description": "Static copy of the Drupal-based Simon website - simon.kde.org",
     "name": "websites-simon-kde-org",
     "project_path": "websites/simon-kde-org",
     "repo_path": "websites/simon-kde-org"
   },
   "websites-skrooge-org": {
-    "description": "Website for Skrooge \u2014 skrooge.org",
+    "description": "Website for Skrooge - skrooge.org",
     "name": "websites-skrooge-org",
     "project_path": "websites/skrooge-org",
     "repo_path": "websites/skrooge-org"
@@ -7812,13 +7830,13 @@
     "repo_path": "websites/sysadmin-kde-org-trellis"
   },
   "websites-telemetry-krita-org": {
-    "description": "Telemetry backend for Krita \u2014 telemetry.krita.org",
+    "description": "Telemetry backend for Krita - telemetry.krita.org",
     "name": "websites-telemetry-krita-org",
     "project_path": "websites/telemetry-krita-org",
     "repo_path": "websites/telemetry-krita-org"
   },
   "websites-timeline-kde-org": {
-    "description": "Website for community history timeline \u2014 timeline.kde.org",
+    "description": "Website for community history timeline - timeline.kde.org",
     "name": "websites-timeline-kde-org",
     "project_path": "websites/timeline-kde-org",
     "repo_path": "websites/timeline-kde-org"
@@ -7830,13 +7848,13 @@
     "repo_path": "websites/tr-kde-org"
   },
   "websites-umbrello-kde-org": {
-    "description": "Website for Umbrello \u2014 umbrello.kde.org",
+    "description": "Website for Umbrello - umbrello.kde.org",
     "name": "websites-umbrello-kde-org",
     "project_path": "websites/umbrello-kde-org",
     "repo_path": "websites/umbrello-kde-org"
   },
   "websites-utils-kde-org": {
-    "description": "Website for KDE's utilities \u2014 utils.kde.org",
+    "description": "Website for KDE's utilities - utils.kde.org",
     "name": "websites-utils-kde-org",
     "project_path": "websites/utils-kde-org",
     "repo_path": "websites/utils-kde-org"
@@ -7854,13 +7872,13 @@
     "repo_path": "websites/video-subtitles"
   },
   "websites-volunteers-akademy-kde-org": {
-    "description": "Volunteer management and coordination system \u2014 volunteers.akademy.kde.org",
+    "description": "Volunteer management and coordination system - volunteers.akademy.kde.org",
     "name": "websites-volunteers-akademy-kde-org",
     "project_path": "websites/volunteers-akademy-kde-org",
     "repo_path": "websites/volunteers-akademy-kde-org"
   },
   "websites-vvave-kde-org": {
-    "description": "Website for Vvave \u2014 vvave.kde.org",
+    "description": "Website for Vvave - vvave.kde.org",
     "name": "websites-vvave-kde-org",
     "project_path": "websites/vvave-kde-org",
     "repo_path": "websites/vvave-kde-org"
@@ -7872,25 +7890,25 @@
     "repo_path": "websites/vvave-stream-kde-org"
   },
   "websites-websvn-kde-org": {
-    "description": "KDE SVN repository browser \u2014 websvn.kde.org",
+    "description": "KDE SVN repository browser - websvn.kde.org",
     "name": "websites-websvn-kde-org",
     "project_path": "websites/websvn-kde-org",
     "repo_path": "websites/websvn-kde-org"
   },
   "websites-wiki-desktopsummit-org": {
-    "description": "Static copy of the DesktopSummit wiki \u2014 wiki.desktopsummit.org",
+    "description": "Static copy of the DesktopSummit wiki - wiki.desktopsummit.org",
     "name": "websites-wiki-desktopsummit-org",
     "project_path": "websites/wiki-desktopsummit-org",
     "repo_path": "websites/wiki-desktopsummit-org"
   },
   "websites-wiki-kde-org": {
-    "description": "Landing wiki list website \u2014 wiki.kde.org",
+    "description": "Landing wiki list website - wiki.kde.org",
     "name": "websites-wiki-kde-org",
     "project_path": "websites/wiki-kde-org",
     "repo_path": "websites/wiki-kde-org"
   },
   "websites-wiki-rolisteam-org": {
-    "description": "Rolisteam documentation (wiki) \u2014 doc.rolisteam.org",
+    "description": "Rolisteam documentation (wiki) - doc.rolisteam.org",
     "name": "websites-wiki-rolisteam-org",
     "project_path": "websites/wiki-rolisteam-org",
     "repo_path": "websites/wiki-rolisteam-org"
@@ -7914,7 +7932,7 @@
     "repo_path": "websites/yakuake-kde-org"
   },
   "websites-zanshin-kde-org": {
-    "description": "Website for Zanshin \u2014 zanshin.kde.org",
+    "description": "Website for Zanshin - zanshin.kde.org",
     "name": "websites-zanshin-kde-org",
     "project_path": "websites/zanshin-kde-org",
     "repo_path": "websites/zanshin-kde-org"
@@ -8108,7 +8126,7 @@
   "xwaylandvideobridge": {
     "description": "Utility to allow streaming Wayland windows to X applications",
     "name": "xwaylandvideobridge",
-    "project_path": "system/xwaylandvideobridge",
+    "project_path": "playground/system/xwaylandvideobridge",
     "repo_path": "system/xwaylandvideobridge"
   },
   "yakuake": {

pkgs/kde/generated/sources/frameworks.json

@@ -1,362 +1,362 @@
 {
   "attica": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/attica-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/attica-6.8.0.tar.xz",
-    "hash": "sha256-2qXAe0dImeFrQnEOA9BZCTa84PVIACOdYz1IyqO+DX0="
+    "hash": "sha256-RDAKLQ7UZdmtsAI/rG1ns7Kb7CmaVP6j/zR32RGNH90="
   },
   "baloo": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/baloo-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/baloo-6.8.0.tar.xz",
-    "hash": "sha256-zowYoh7XrNWRLH0nPKxfbLGttSSgQV1Wxv3eLpZ/Z8w="
+    "hash": "sha256-WaWWl+fSvsUNqoPeUmh3W953z5g1EnfQ9KxVEiNLrv0="
   },
   "bluez-qt": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/bluez-qt-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/bluez-qt-6.8.0.tar.xz",
-    "hash": "sha256-sGQBBphiE+Gyjyy6E9nMIu49JZdV8nUh8uhhY0M4+Ts="
+    "hash": "sha256-NxqJ98WpyI397rLcxtGtl7OXoj7BC9b86uCoNeB0DXY="
   },
   "breeze-icons": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/breeze-icons-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/breeze-icons-6.8.0.tar.xz",
-    "hash": "sha256-OQN+P8u7emUBFoXEmMrjH/SWpfJJMmnJVbspyUpoi3Q="
+    "hash": "sha256-de4R/EQcJ1BOGZ42VpMpbtzUZfiQ22qryw3soKziLTo="
   },
   "extra-cmake-modules": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/extra-cmake-modules-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/extra-cmake-modules-6.8.0.tar.xz",
-    "hash": "sha256-2B3oJpLT0rt3EQMyplyCZiUr7MLD8wfOgUmQzlYHuNw="
+    "hash": "sha256-/4oL9yKFvsF2jjrNj3xmWibVWhUn6W1z41eJ3J8ONHI="
   },
   "frameworkintegration": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/frameworkintegration-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/frameworkintegration-6.8.0.tar.xz",
-    "hash": "sha256-iQEBhUu7s5N9Mh8qw1sqCo886DNCIpfd2lm9qMjKxp0="
+    "hash": "sha256-FBvFnf2yRskFAaSIy/ATufC7wcJ6ePLyV0QzlXbtrzc="
   },
   "kapidox": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kapidox-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kapidox-6.8.0.tar.xz",
-    "hash": "sha256-czjx4xjrLSTLlbVtUwamHQoZLpCXe+rWBRd0HIMF4kA="
+    "hash": "sha256-RL24w9VRMOLkqPtndDKmVt3A8lTcu4MixQqcpKbTUlo="
   },
   "karchive": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/karchive-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/karchive-6.8.0.tar.xz",
-    "hash": "sha256-60JD5if1HxIkqZr10Kb44wn55du3R496eONOK4VBOYo="
+    "hash": "sha256-6QPrVLh1JYcn/VJLJInSpQGZc+J99nszu1b7qR5O7DQ="
   },
   "kauth": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kauth-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kauth-6.8.0.tar.xz",
-    "hash": "sha256-FzZU7uKJGs1BU40xrOi5165ghjvH+u8crOx+IcfrEiM="
+    "hash": "sha256-u/g6OYcPdWqu+5r7005iHV/FMoDF63Dbm9Nn/FH4x0k="
   },
   "kbookmarks": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kbookmarks-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kbookmarks-6.8.0.tar.xz",
-    "hash": "sha256-vUGjnfdlFe40598HsmAOHltnsYEsyVnsUVhfLrzFZXM="
+    "hash": "sha256-DL0hXdG/L3wwU1bRNiw+sFhbDenhlb4SURD0sJ/KUBU="
   },
   "kcalendarcore": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcalendarcore-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kcalendarcore-6.8.0.tar.xz",
-    "hash": "sha256-jlKC2NegzgoaG9syEzukEC0GBwEFUT5xLa/nbjJkffs="
+    "hash": "sha256-zF/DwwSxF0cHRGiYKelLr4XGzk3CRZO5lY8d6JnIdBI="
   },
   "kcmutils": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcmutils-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kcmutils-6.8.0.tar.xz",
-    "hash": "sha256-QRg4j49iql8ROe14gjtYsAnp6/fzdV6alKtfnrpkTL4="
+    "hash": "sha256-+BBsg++FofybQYW4EmAEjr2KZM3wXI0Ccv+D1mZcscA="
   },
   "kcodecs": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcodecs-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kcodecs-6.8.0.tar.xz",
-    "hash": "sha256-mrSUBV4Gvc5FVot8R+2yqp7Kqd7AwPsVI2e0MhkhufI="
+    "hash": "sha256-lslTXG95VxzXFwNg3Atkoz1SnVnL2UV5NL/Az2z0sn8="
   },
   "kcolorscheme": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcolorscheme-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kcolorscheme-6.8.0.tar.xz",
-    "hash": "sha256-G0xuhPHdlrLuYr51X2DaYNYbqA1nCe6zGG2IgucuITA="
+    "hash": "sha256-L9oHaFRpGdQn40qQSb9cXo/mGh1rfnbfSbtC4iwSNN0="
   },
   "kcompletion": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcompletion-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kcompletion-6.8.0.tar.xz",
-    "hash": "sha256-ftWparDSqxe7Uh7Kr0TW7Gt8mj1uCUAzYLpJsk2UVg8="
+    "hash": "sha256-ipFfQqSeAhyHKbQlp5kGgzSQybqhskrwHNT8gltYxGE="
   },
   "kconfig": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kconfig-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kconfig-6.8.0.tar.xz",
-    "hash": "sha256-vi1d22PlZwO8CX5dmRKzmrxROsUWVN4uDYOhrtLFSxs="
+    "hash": "sha256-P488LvOEpSga5aORij48wr4BaOsUvs/aphcQZV2LFqw="
   },
   "kconfigwidgets": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kconfigwidgets-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kconfigwidgets-6.8.0.tar.xz",
-    "hash": "sha256-wHnGfFeJMLqvriQbtPJSxj/dEl5E8fuVLjm648mFnNE="
+    "hash": "sha256-ncOoLx+zJ1Dm7PeKhjpDImow4vyt11Ue7HiGkW4ctPE="
   },
   "kcontacts": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcontacts-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kcontacts-6.8.0.tar.xz",
-    "hash": "sha256-KS+BBPnzHWLFkomjqCF2bR7FQPT8UT/8O29xl2AtQsU="
+    "hash": "sha256-RjgiYW8R2iNo+v7Y9x4cmK1HEDyJ2/qMiP5lpBrhUFE="
   },
   "kcoreaddons": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcoreaddons-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kcoreaddons-6.8.0.tar.xz",
-    "hash": "sha256-SFEenasfLoCzxIIruHwumBGG3juJd9kggtNNADsSg8U="
+    "hash": "sha256-KJd/R4vl19X1ZQh2v3uAZnTtb8YJ1wPuoymoGfpK2Zw="
   },
   "kcrash": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kcrash-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kcrash-6.8.0.tar.xz",
-    "hash": "sha256-HcLGXY72LvmEV/irQjt2ht4+cTdmwG5k1jIqqdsm7qQ="
+    "hash": "sha256-pwKUTIfJY07v1SKT9iU1UxRHPmxMJLRy7nhUy4xolX8="
   },
   "kdav": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kdav-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kdav-6.8.0.tar.xz",
-    "hash": "sha256-ZinyrwBC6x4NwMCLUYCse0ja5rWZnh3Qtniu2Lh0wdc="
+    "hash": "sha256-2JXjttT/mRbRhexQ+UsIpwY2IC4oc5/MdHcuLs2SGCw="
   },
   "kdbusaddons": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kdbusaddons-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kdbusaddons-6.8.0.tar.xz",
-    "hash": "sha256-6H0I9tADfY+jPx59FqTjqhfX0LEsaqlvdjI/eDROFRs="
+    "hash": "sha256-bHYKDcNyrwovgltlV1v6vRlQx2wON/h94h1HzsjVi8c="
   },
   "kdeclarative": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kdeclarative-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kdeclarative-6.8.0.tar.xz",
-    "hash": "sha256-8fgE9rrCsilQPP0WXr2K4JNTOIiuFeDmFHTG4yjVNbk="
+    "hash": "sha256-rUYQhce/wqxo8dwlLGZpWSYe+y/6gOeSPna3gccjNqE="
   },
   "kded": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kded-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kded-6.8.0.tar.xz",
-    "hash": "sha256-IqobZUO0DglDRhOFFhMcD363inDocpaThFf9E4ZoCi8="
+    "hash": "sha256-UpJj+xqXqlWCji4MeBEYcAphId9Jrb7R7lboecjsUSE="
   },
   "kdesu": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kdesu-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kdesu-6.8.0.tar.xz",
-    "hash": "sha256-QQkepFxuIuFBHYnRU4ssi9mL3B841Z3z6cQjqsAiTig="
+    "hash": "sha256-DooAfEE/rKT6fiQ4KgGbrs/mtmB2ALpkEcdh57yVOY8="
   },
   "kdnssd": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kdnssd-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kdnssd-6.8.0.tar.xz",
-    "hash": "sha256-6RQEdfxuTuHg/jmiGBajwAP8sQkiIgefQi/QKtKpAqE="
+    "hash": "sha256-SdmskRrGQSFwszDIMUIERhCukPVxxgMYsi4ZfiiYlz4="
   },
   "kdoctools": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kdoctools-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kdoctools-6.8.0.tar.xz",
-    "hash": "sha256-n+U53/7QGDaUD6Twb5U6xO0M1PtfAjL+W2bCI2TBaS8="
+    "hash": "sha256-YGhj6G1qqRars+N2C3P+nbGDLB5BcnNJ0CzcjDq5a6c="
   },
   "kfilemetadata": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kfilemetadata-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kfilemetadata-6.8.0.tar.xz",
-    "hash": "sha256-piQqeeZytSPr8bJVTr+DrKep1QZZKbbxUnMemFHQCNA="
+    "hash": "sha256-UEZrNpm74wF+2ww8sJRjpX4t07ZtYPX2ENnuOiHjSJQ="
   },
   "kglobalaccel": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kglobalaccel-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kglobalaccel-6.8.0.tar.xz",
-    "hash": "sha256-KjW54GxmAdYCs6ReJ4xJ4R5GJ5Oc+s/7H97ggmpvbgs="
+    "hash": "sha256-yqbYWwiGfLg38Ip4l5iERyTVOSMgGTeCqD4UE19ml4M="
   },
   "kguiaddons": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kguiaddons-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kguiaddons-6.8.0.tar.xz",
-    "hash": "sha256-rEN8prr1CwF4vIvwtN0ebnDg5O8ax3AllzihxC0DW8w="
+    "hash": "sha256-ac5pgDyNab280b7OvXW9SWqdHp6m5y1cb0pc/adqI4Y="
   },
   "kholidays": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kholidays-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kholidays-6.8.0.tar.xz",
-    "hash": "sha256-K1Q9/etqUvQQH9+fFIAt11nQqf/wYOo3Hx87kA3TNas="
+    "hash": "sha256-FiuK3kLegEFTgPZHaihfv6tbsnDzWw19E7qhw0pfsWQ="
   },
   "ki18n": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/ki18n-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/ki18n-6.8.0.tar.xz",
-    "hash": "sha256-VVtbwZVGw6eRxpck4jjF0XEKlXXPh0ABL4/FRvNUEis="
+    "hash": "sha256-cdc6BY5SZ4l60/2CAnTkyO13Djwu7uyryAub6NTyho4="
   },
   "kiconthemes": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kiconthemes-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kiconthemes-6.8.0.tar.xz",
-    "hash": "sha256-viW/8fX2Xt1Fsk/5vtpEsEwOItGT5yRYyWpcWRtwuWg="
+    "hash": "sha256-zF4RarvYEADSHYdfeeWGrwULMaF5M70gZLIQBDcUzao="
   },
   "kidletime": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kidletime-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kidletime-6.8.0.tar.xz",
-    "hash": "sha256-YKbHA4e2PmEUcCnOV/FwI3JxQRYwozcqDo1yQLgAaq8="
+    "hash": "sha256-UQFgWPrzklFep/WC0lxmar3fOO9mq/GHUCz0bF4R5BA="
   },
   "kimageformats": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kimageformats-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kimageformats-6.8.0.tar.xz",
-    "hash": "sha256-cihQZIrBZ+TA7mMVcf3knp/RXQBKEn3YBKFPn1ebcx8="
+    "hash": "sha256-2fJiZBzEfl8t0b3VbukuN5q0yzTUYN/IhP2ZElDXtBc="
   },
   "kio": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kio-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kio-6.8.0.tar.xz",
-    "hash": "sha256-3yNQGaB6zVeZIPbGVQUOAtrPhHxwb0uCeedVvkb52ZA="
+    "hash": "sha256-y4rCWlMk6LYXgX/u/N93Oesg3DXc9ERLiGwdy7maVr4="
   },
   "kirigami": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kirigami-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kirigami-6.8.0.tar.xz",
-    "hash": "sha256-TWRaA3TTO5Rl554+FxcIguLL2hUm9FvFtrF22t2nfXY="
+    "hash": "sha256-DguQrJa6SWMOLAHYl3vYxRyasYCDE/yI9g3heXAHQqI="
   },
   "kitemmodels": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kitemmodels-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kitemmodels-6.8.0.tar.xz",
-    "hash": "sha256-CqAgUyO68tUZ67j5bOftVSSoFkp0QNkF+XdBi/vm00k="
+    "hash": "sha256-THraGyliGAOxZMMd42WNW9odXUzxAelzYoucL+GYI2U="
   },
   "kitemviews": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kitemviews-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kitemviews-6.8.0.tar.xz",
-    "hash": "sha256-XmNRYpk8nx4V86EQnKMifQ0s5Xz3BwYVZRtlz3kNsEk="
+    "hash": "sha256-62gx/b/tozKFAP8PP1ewkBwEz75zpac4N64LEbIpJa8="
   },
   "kjobwidgets": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kjobwidgets-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kjobwidgets-6.8.0.tar.xz",
-    "hash": "sha256-Ftfnq1QjXW+h6yE9PWNxguIvy9vLe0sUAyQwoCoviIo="
+    "hash": "sha256-hvIwHdm+heYt7ml4df9acxhj2wgyM7SwxgSdq2SphQE="
   },
   "knewstuff": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/knewstuff-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/knewstuff-6.8.0.tar.xz",
-    "hash": "sha256-pBhGItQwtk7HzEx3ET32fIhvNZzInMYxP7zHF2TSP6c="
+    "hash": "sha256-NhUFCfm3+h68k1FfxHRgGWKvHkcSy9RfsTYQrhvtRMo="
   },
   "knotifications": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/knotifications-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/knotifications-6.8.0.tar.xz",
-    "hash": "sha256-npcvAV2bMbMoO/hCoy0nAJYiTRJ8E6bnlFD08EUt5ec="
+    "hash": "sha256-GznXfAJeBv0hxxYAD1EkaBCixettoqP3+zzl3oLM+K8="
   },
   "knotifyconfig": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/knotifyconfig-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/knotifyconfig-6.8.0.tar.xz",
-    "hash": "sha256-Qifaehj5uoOzS/VLbT/BaNwHJryhSdL4lYW7VKsTgpU="
+    "hash": "sha256-yaMdb0VmsBzd12DehPXSlihxzQOHmTgXBC/CkWmTiL8="
   },
   "kpackage": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kpackage-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kpackage-6.8.0.tar.xz",
-    "hash": "sha256-kWwR9ZcnYNmlA5ZD+8Vc3p0R7BjyeNPWN5Mzb/pEKGU="
+    "hash": "sha256-0y5vYUjZzZPzIaZSz6TTP98jSa8QGWQSROKE4dLA0rY="
   },
   "kparts": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kparts-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kparts-6.8.0.tar.xz",
-    "hash": "sha256-CxswUFDWH8vvpwJrCW3GtHcJ10NcabGKtWp+LqV9dZ4="
+    "hash": "sha256-CiHSq/TEQGAV99Wr6+/sBJNXWEfqTsNOoj1T21JVsyc="
   },
   "kpeople": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kpeople-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kpeople-6.8.0.tar.xz",
-    "hash": "sha256-02JGusUPW/QG9oP+YcksteYjpR3p/+0RBGZeXxNe+Ig="
+    "hash": "sha256-2QmzyTlktqnS/Cn2P+AEBhrc5O8CXcbc/e0Up6a7lTA="
   },
   "kplotting": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kplotting-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kplotting-6.8.0.tar.xz",
-    "hash": "sha256-Ew7twjTw/tryxBXeiVyXlFT2TDsEkEMyfUPNUJ4jhrM="
+    "hash": "sha256-c2yV93YcoGJYXtK1tyZWubtqXnBlSMvZ8H2k9iyPuos="
   },
   "kpty": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kpty-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kpty-6.8.0.tar.xz",
-    "hash": "sha256-QswbH3DuC9rNJoEoV9MQR9IY4fWFrDX+kWWQhQGplGo="
+    "hash": "sha256-+8fzkKC4OXpRY/FrFAwGYsmU9hSgX35aUWFJPDy8PjY="
   },
   "kquickcharts": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kquickcharts-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kquickcharts-6.8.0.tar.xz",
-    "hash": "sha256-ZkBH57YiwLhl10ZoFxeUVfs4UcuxWo8sOLirnPhQmKQ="
+    "hash": "sha256-NugREaf67SCDYnRvhmRu0QTj4xShgukofPLSFPJhAjk="
   },
   "krunner": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/krunner-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/krunner-6.8.0.tar.xz",
-    "hash": "sha256-GH/+kYDpjoP7rFvTZE7GZxuh6AZspgE6mLTx10Oc/zo="
+    "hash": "sha256-RigsSTTfvC0l33Cwu/ZRgsMNjDnCGjp0n+VmHjs0w/s="
   },
   "kservice": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kservice-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kservice-6.8.0.tar.xz",
-    "hash": "sha256-OdJULjj7NDTFQFyS1bReDVumUNJlMJrfk8eHp0HVf6E="
+    "hash": "sha256-Iwls8j7j8mJgnAk/NskME5NQ6rHRMhMuC/wCrYuBgSg="
   },
   "kstatusnotifieritem": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kstatusnotifieritem-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kstatusnotifieritem-6.8.0.tar.xz",
-    "hash": "sha256-gOriaTzbXaZptO1qgii93DmBasoP3pKPIx5IlIJ9HeA="
+    "hash": "sha256-bk/4G4DXhC0qEOe3WOSXs3JPxU6jptpvCb7oBjZDmDI="
   },
   "ksvg": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/ksvg-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/ksvg-6.8.0.tar.xz",
-    "hash": "sha256-u998eGyVlwfNnGfASmflGhXbzdbv96tSsDwJVE5m8YQ="
+    "hash": "sha256-/mWwhS10rHO6S1l/41LpG/dM9h//+ARqG9URyKhQhOM="
   },
   "ktexteditor": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/ktexteditor-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/ktexteditor-6.8.0.tar.xz",
-    "hash": "sha256-7Xb3IyQiWpJuAMLJcNSNfxGldulC5I0JLpg3vaedaZE="
+    "hash": "sha256-alirdMTv3fMWEXToYNIRQmRUEi6ESyX8Je9igqHnonA="
   },
   "ktexttemplate": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/ktexttemplate-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/ktexttemplate-6.8.0.tar.xz",
-    "hash": "sha256-1rdfGT9NjYF883SHKldCdInGFzYSHHKmnE3X7mLh4jM="
+    "hash": "sha256-OoPa+0B1rwuwFVVqZCBQlPzKK6xbn7De5hTq/yUqBBI="
   },
   "ktextwidgets": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/ktextwidgets-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/ktextwidgets-6.8.0.tar.xz",
-    "hash": "sha256-I7txRQ459DfAa9mvSOeJMlPDGtEGSbCQHQqOwe4YrgE="
+    "hash": "sha256-XR0uMhM8v3frYNJE3PT9EMKFVeONpTdsAjtGK5tosrg="
   },
   "kunitconversion": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kunitconversion-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kunitconversion-6.8.0.tar.xz",
-    "hash": "sha256-swNgHGI81m7bZqZv1y6VdBW43TPnAwW+gTb6a0OxpAo="
+    "hash": "sha256-5iBUeIHmNcyKqXcabsqal6bLQJJawHXTPvd0T6zB2VQ="
   },
   "kuserfeedback": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kuserfeedback-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kuserfeedback-6.8.0.tar.xz",
-    "hash": "sha256-Te+NDW7yJ4B7YGbLdizsNSRSoY4OKLVq7M6O8861J2E="
+    "hash": "sha256-fp3FceNeJjT9Q9QqRobJIQl4KPulVD1KegHvf5udrbU="
   },
   "kwallet": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kwallet-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kwallet-6.8.0.tar.xz",
-    "hash": "sha256-/7MZzg3+6pU4nhovSDPRCZuJTIHx33q1Dc+3luqH/6I="
+    "hash": "sha256-4LUxHYjZLKW95MJK6HXcOk/GfpMZ0N4qSeJdBEYehig="
   },
   "kwidgetsaddons": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kwidgetsaddons-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kwidgetsaddons-6.8.0.tar.xz",
-    "hash": "sha256-vTY0KJOGPmEQxfEkX4rgs6M4J19OrxJLFVhdL+SSMpo="
+    "hash": "sha256-z4Zm7A8Kcg/qtkHqPhla8UBqQAgNEY0c9P+vEjxvqwg="
   },
   "kwindowsystem": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kwindowsystem-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kwindowsystem-6.8.0.tar.xz",
-    "hash": "sha256-YsDwtKlQeTnYSu7aVbvUMAuIwE43lT5RibE5ADMQqPQ="
+    "hash": "sha256-e0xSDnnC6xD5ih17TXVjPukNGHOvut+fYHUeZ7wOJDY="
   },
   "kxmlgui": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/kxmlgui-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/kxmlgui-6.8.0.tar.xz",
-    "hash": "sha256-pFHBbXClkd4TlzB5EV81kF48QjAvXIyK4+x112oG/KE="
+    "hash": "sha256-mX8xCkbsLBUwEPxZZ3UzkKmbxQYh0Z+SZIgWQXLFH8w="
   },
   "modemmanager-qt": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/modemmanager-qt-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/modemmanager-qt-6.8.0.tar.xz",
-    "hash": "sha256-/EXc2K2iQ7r3kACZBi8xK2d79pT4jzZ0bVNK/pB7+PM="
+    "hash": "sha256-CiLuylr897QgWbvfUGkk8lutFN9zfIhPqP0+J146Fxs="
   },
   "networkmanager-qt": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/networkmanager-qt-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/networkmanager-qt-6.8.0.tar.xz",
-    "hash": "sha256-VjIxZEWHkYyVC8vl/aC/ajXpehL2sOm/nqpM4xQdMSI="
+    "hash": "sha256-FYeSUe8aXohGW3j49Z4r49HylpTFyRUfoNVC6niUl2c="
   },
   "prison": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/prison-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/prison-6.8.0.tar.xz",
-    "hash": "sha256-CgU6gL6uIyzvXaP2UlsU7mSbJ1zqZN4MD/rUHD8uwmA="
+    "hash": "sha256-uue1p2xG4ri3yBwaqvIHIdBQz99IKR0rzGb1dZCy3rM="
   },
   "purpose": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/purpose-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/purpose-6.8.0.tar.xz",
-    "hash": "sha256-T4u/GQIscN8dw0Wkq9gWd6UFouj+9kMxEof+jpIS1Wo="
+    "hash": "sha256-fugYJlElHIKAp99iiNP2JXadzYtKbU/ufv5WmVQ18Go="
   },
   "qqc2-desktop-style": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/qqc2-desktop-style-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/qqc2-desktop-style-6.8.0.tar.xz",
-    "hash": "sha256-tmAtIbqJGmNGGCeqRROUau8NjgFB9KgxqvssTS4/syk="
+    "hash": "sha256-6WkvANebljvcrnFsqrlkwlNHUMhdf+AvznqQgAPrTaM="
   },
   "solid": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/solid-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/solid-6.8.0.tar.xz",
-    "hash": "sha256-NnPxd3bDDZUj/kC4845ivhA3YQBQ94LBNtoawEsg5uc="
+    "hash": "sha256-rOUUX1nbVIvPQjy2tw/YcP77o38HpkkWQ5SoArPKeUE="
   },
   "sonnet": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/sonnet-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/sonnet-6.8.0.tar.xz",
-    "hash": "sha256-L5cNSQ7/1mjmTdk//vNEqA235jEwuyPfT6DWsUFQ5Yg="
+    "hash": "sha256-xCG0YCFPOiWEKryyYFJRudqJtimtk2Fg051KpQJAVjY="
   },
   "syndication": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/syndication-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/syndication-6.8.0.tar.xz",
-    "hash": "sha256-wqSFIp2KQwhY1/Rz/osTNzfZPTOnduRu7fp3u54wuiQ="
+    "hash": "sha256-v84kBvpM+D8ikRwc19uvwleLYV+EM2i1UGm4/2MOK6k="
   },
   "syntax-highlighting": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/syntax-highlighting-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/syntax-highlighting-6.8.0.tar.xz",
-    "hash": "sha256-bvUnqUF0C53f4FPrCOrX4RwSooOqiKXd8aGFIM2dLKc="
+    "hash": "sha256-7Tx9PZLBVNmvOaGro5FmsH5kEcGMMQARYgjzpEI7Elc="
   },
   "threadweaver": {
-    "version": "6.7.0",
+    "version": "6.8.0",
-    "url": "mirror://kde/stable/frameworks/6.7/threadweaver-6.7.0.tar.xz",
+    "url": "mirror://kde/stable/frameworks/6.8/threadweaver-6.8.0.tar.xz",
-    "hash": "sha256-GsP8gFHzGsT3bf1dFX5cN10YO8B2IVKkThgxz1gWqVY="
+    "hash": "sha256-iGTdMLelX3UcG6gavaeJo5NJZL4YuhyOaU4rxIdov94="
   }
 }

pkgs/kde/misc/klevernotes/default.nix

@@ -4,6 +4,7 @@
   fetchurl,
   qtsvg,
   qtwebengine,
+  kconfigwidgets,
 }:
 mkKdeDerivation rec {
   pname = "klevernotes";
@@ -17,6 +18,7 @@ mkKdeDerivation rec {
   extraBuildInputs = [
     qtsvg
     qtwebengine
+    kconfigwidgets
   ];
 
   meta.license = with lib.licenses; [

pkgs/os-specific/linux/isgx/default.nix

@@ -41,5 +41,9 @@ stdenv.mkDerivation rec {
     license = with licenses; [ bsd3 /* OR */ gpl2Only ];
     maintainers = [ ];
     platforms = [ "x86_64-linux" ];
+    # This kernel module is now in mainline so newer kernels should
+    # use that rather than this out-of-tree version (officially
+    # deprecated by Intel)
+    broken = kernel.kernelAtLeast "6.4";
   };
 }

pkgs/os-specific/linux/kernel/kernels-org.json

@@ -1,30 +1,30 @@
 {
     "testing": {
-        "version": "6.12-rc5",
+        "version": "6.12-rc6",
-        "hash": "sha256:18zh3nwhsz1hpyhmlim9a2hz8yvx5psrrav4346k46x9ybfardqy"
+        "hash": "sha256:1cllyav4pg2z22a52j8vq1sdk8qrr6h8w2f3blrs4ispbhxa8xsb"
     },
     "6.1": {
-        "version": "6.1.115",
+        "version": "6.1.116",
-        "hash": "sha256:0vxs6zj4p0ihcp11h3svqy3wa1yph0f1vzc8dlvqh60zgs1bmn0g"
+        "hash": "sha256:109vhc1hcfx6sacw4553xmwbj1gqx3zqjq5zg11z7a72dqrnisqp"
     },
     "5.15": {
-        "version": "5.15.170",
+        "version": "5.15.171",
-        "hash": "sha256:1ag7fvixhdcyxv6rqfsvq2wh02g64r4rx8izvfb33nfnld2nangx"
+        "hash": "sha256:0fra5zwcixgl6fg9hgdzlfcqng6pg09h2j7xqhi4qg0jv1jf0lr9"
     },
     "5.10": {
-        "version": "5.10.228",
+        "version": "5.10.229",
-        "hash": "sha256:0wkvn49sdy9ykyz6cqdqd9yplqfhc6b255w6wc17ky182mzqvk3n"
+        "hash": "sha256:1q6di05rk4bsy91r03zw6vz14zzcpvv25dv7gw0yz1gzpgkbb9h8"
     },
     "5.4": {
-        "version": "5.4.284",
+        "version": "5.4.285",
-        "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp"
+        "hash": "sha256:1722sc365ajxmqyr4r49yp73mzdckay3rx5c2gx29xzny9zc6cmy"
     },
     "6.6": {
-        "version": "6.6.59",
+        "version": "6.6.60",
-        "hash": "sha256:0vd76ccd4li4wsg04gc4nai9f4y1nknz967qby0i53y0v046hq93"
+        "hash": "sha256:1vsjb7ifmf6ic6zv16fbrxjvffqc1mkndza76hjr9aw2a0ny7yaj"
     },
     "6.11": {
-        "version": "6.11.6",
+        "version": "6.11.7",
-        "hash": "sha256:1kiky6viwrgm47slpv234lfq1wrwj29p5rx168gix3q0jw0zcm69"
+        "hash": "sha256:1cpbycx79nl517rz573mja52bgzm249mhqzp424r5mqp91jfrx8b"
     }
 }

pkgs/os-specific/linux/kernel/linux-libre.nix

@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "19643";
+    rev = "19663";
-    sha256 = "1gnji0hglzh6kj9ssawlrix1vlbcyfjdjx5d9qwpnn2p0sgsq7nj";
+    sha256 = "126b05v6hcdag3pfaxwbabfwkrp4c7010v52rk2dqh9i631ykavd";
   }
 , ...
 } @ args:

pkgs/os-specific/linux/kernel/linux-rt-5.15.nix

@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "5.15.167-rt79"; # updated by ./update-rt.sh
+  version = "5.15.170-rt81"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -19,14 +19,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi";
+    sha256 = "1ag7fvixhdcyxv6rqfsvq2wh02g64r4rx8izvfb33nfnld2nangx";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0z9yhg0vxzrqn2vyg973pd8qy5iq30jkza8c0mrjjpjzyc8jvm57";
+      sha256 = "0vr6c93dr0gcszx0hfnfhqbg5flkvxmkpf2hw13gi4rg8x4bx5ll";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 

pkgs/os-specific/linux/kernel/linux-rt-6.1.nix

@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "6.1.111-rt42"; # updated by ./update-rt.sh
+  version = "6.1.112-rt43"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -19,14 +19,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-    sha256 = "1c7d49kppv8xgqlsrfm1286mnvz8vcnbqqh6zgfca2s13px9hwn4";
+    sha256 = "094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "16yb962fkkvgppbx8glp5ph3h1jl2q1b4m2s8gsf3k9i9yim7v5c";
+      sha256 = "0qvil92xkbwmyrmj0zlg0ssg95ncscmr4ga4380903bqhhh74d6h";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 

pkgs/os-specific/linux/kernel/linux-rt-6.6.nix

@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "6.6.52-rt43"; # updated by ./update-rt.sh
+  version = "6.6.58-rt45"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -19,14 +19,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-    sha256 = "1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m";
+    sha256 = "1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0g33n9idc3lhbj5z637zm3bgqh601a05cl1s8ji8zbnfh971jcgh";
+      sha256 = "0npvydlk2z33c5xqhg31xky045s5rvjnvfqml30nycmzbsmqjc7c";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 

pkgs/os-specific/linux/kernel/update-mainline.py

@@ -87,9 +87,8 @@ def get_hash(kernel: KernelRelease):
     return f"sha256:{hash}"
 
 
-def get_oldest_branch() -> Version:
+def get_oldest_branch(kernels) -> Version:
-    with open(VERSIONS_FILE) as f:
+    return min(parse_version(v) for v in kernels.keys() if v != "testing")
-        return parse_version(sorted(json.load(f).keys())[0])
 
 
 def predates_oldest_branch(oldest: Version, to_compare: str) -> bool:
@@ -118,8 +117,7 @@ def main():
         if (parsed := parse_release(release)) is not None
     ]
     all_kernels = json.load(VERSIONS_FILE.open())
-
+    oldest_branch = get_oldest_branch(all_kernels)
-    oldest_branch = get_oldest_branch()
 
     for (branch, kernels) in groupby(parsed_releases, lambda kernel: kernel.branch):
         kernel = max(kernels, key=lambda kernel: kernel.parsed_version)

pkgs/servers/home-automation/evcc/default.nix

@@ -16,13 +16,13 @@
 
 buildGoModule rec {
   pname = "evcc";
-  version = "0.131.3";
+  version = "0.131.4";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     rev = version;
-    hash = "sha256-HbZ/KlsiuHVsDKvCUz7+Xq6Y+XkfZ9Oe7tD3rfZrRRE=";
+    hash = "sha256-sU5h29sXz1am44iFGNrVfMzrI1aAc/m355Aevm81sQc=";
   };
 
   vendorHash = "sha256-hPCTAK4u79r9EoHkv6g1QvkRDZ95hXzyiiQpRD+0aLQ=";

pkgs/servers/monitoring/prometheus/consul-exporter.nix

@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "consul_exporter";
-  version = "0.12.1";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "consul_exporter";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cB3tpRa2sZBte5Rk7v9rvxvuRh2Ff3vPxmMYwhxxPSA=";
+    hash = "sha256-2X1nJIUwp7kqqz/D3x4bq6vHg1N8zC9AWCn02qsAyAQ=";
   };
 
-  vendorHash = "sha256-naEbalwVRUFW2wRU3gxb/Zeu4oSnO6+bOZimxaySSyA=";
+  vendorHash = "sha256-z9+WrJDgjQYf4G90sdqY+SOGJa/r5Ie9GFVrihbaGGU=";
 
   ldflags = [
     "-s"