Merge staging-next into staging

lib/systems/doubles.nix

@@ -114,6 +114,4 @@ in {
   genode        = filterDoubles predicates.isGenode;
 
   embedded      = filterDoubles predicates.isNone;
-
-  mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin" "riscv64-linux"];
 }

nixos/tests/all-tests.nix

@@ -188,6 +188,7 @@ in {
   ceph-multi-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix {};
   ceph-single-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix {};
   ceph-single-node-bluestore = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node-bluestore.nix {};
+  ceph-single-node-bluestore-dmcrypt = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node-bluestore-dmcrypt.nix {};
   certmgr = handleTest ./certmgr.nix {};
   cfssl = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cfssl.nix {};
   cgit = handleTest ./cgit.nix {};

nixos/tests/ceph-single-node-bluestore-dmcrypt.nix

@@ -0,0 +1,270 @@
+import ./make-test-python.nix (
+  { pkgs, lib, ... }:
+
+  let
+    # the single node ipv6 address
+    ip = "2001:db8:ffff::";
+    # the global ceph cluster id
+    cluster = "54465b37-b9d8-4539-a1f9-dd33c75ee45a";
+    # the fsids of OSDs
+    osd-fsid-map = {
+      "0" = "1c1b7ea9-06bf-4d30-9a01-37ac3a0254aa";
+      "1" = "bd5a6f49-69d5-428c-ac25-a99f0c44375c";
+      "2" = "c90de6c7-86c6-41da-9694-e794096dfc5c";
+    };
+
+  in
+  {
+    name = "basic-single-node-ceph-cluster-bluestore-dmcrypt";
+    meta = with pkgs.lib.maintainers; {
+      maintainers = [ benaryorg nh2 ];
+    };
+
+    nodes = {
+      ceph =
+        { pkgs, config, ... }:
+        {
+          # disks for bluestore
+          virtualisation.emptyDiskImages = [
+            20480
+            20480
+            20480
+          ];
+
+          # networking setup (no external connectivity required, only local IPv6)
+          networking.useDHCP = false;
+          systemd.network = {
+            enable = true;
+            wait-online.extraArgs = [
+              "-i"
+              "lo"
+            ];
+            networks = {
+              "40-loopback" = {
+                enable = true;
+                name = "lo";
+                DHCP = "no";
+                addresses = [ { Address = "${ip}/128"; } ];
+              };
+            };
+          };
+
+          # do not start the ceph target by default so we can format the disks first
+          systemd.targets.ceph.wantedBy = lib.mkForce [ ];
+
+          # add the packages to systemPackages so the testscript doesn't run into any unexpected issues
+          # this shouldn't be required on production systems which have their required packages in the unit paths only
+          # but it helps in case one needs to actually run the tooling anyway
+          environment.systemPackages = with pkgs; [
+            ceph
+            cryptsetup
+            lvm2
+          ];
+
+          services.ceph = {
+            enable = true;
+            client.enable = true;
+            extraConfig = {
+              public_addr = ip;
+              cluster_addr = ip;
+              # ipv6
+              ms_bind_ipv4 = "false";
+              ms_bind_ipv6 = "true";
+              # msgr2 settings
+              ms_cluster_mode = "secure";
+              ms_service_mode = "secure";
+              ms_client_mode = "secure";
+              ms_mon_cluster_mode = "secure";
+              ms_mon_service_mode = "secure";
+              ms_mon_client_mode = "secure";
+              # less default modules, cuts down on memory and startup time in the tests
+              mgr_initial_modules = "";
+              # distribute by OSD, not by host, as per https://docs.ceph.com/en/reef/cephadm/install/#single-host
+              osd_crush_chooseleaf_type = "0";
+            };
+            client.extraConfig."mon.0" = {
+              host = "ceph";
+              mon_addr = "v2:[${ip}]:3300";
+              public_addr = "v2:[${ip}]:3300";
+            };
+            global = {
+              fsid = cluster;
+              clusterNetwork = "${ip}/64";
+              publicNetwork = "${ip}/64";
+              monInitialMembers = "0";
+            };
+
+            mon = {
+              enable = true;
+              daemons = [ "0" ];
+            };
+
+            osd = {
+              enable = true;
+              daemons = builtins.attrNames osd-fsid-map;
+            };
+
+            mgr = {
+              enable = true;
+              daemons = [ "ceph" ];
+            };
+          };
+
+          systemd.services =
+            let
+              osd-name = id: "ceph-osd-${id}";
+              osd-pre-start = id: [
+                "!${config.services.ceph.osd.package.out}/bin/ceph-volume lvm activate --bluestore ${id} ${osd-fsid-map.${id}} --no-systemd"
+                "${config.services.ceph.osd.package.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${id} --cluster ${config.services.ceph.global.clusterName}"
+              ];
+              osd-post-stop = id: [
+                "!${config.services.ceph.osd.package.out}/bin/ceph-volume lvm deactivate ${id}"
+              ];
+              map-osd = id: {
+                name = osd-name id;
+                value = {
+                  serviceConfig.ExecStartPre = lib.mkForce (osd-pre-start id);
+                  serviceConfig.ExecStopPost = osd-post-stop id;
+                  unitConfig.ConditionPathExists = lib.mkForce [ ];
+                  unitConfig.StartLimitBurst = lib.mkForce 4;
+                  path = with pkgs; [
+                    util-linux
+                    lvm2
+                    cryptsetup
+                  ];
+                };
+              };
+            in
+            lib.pipe config.services.ceph.osd.daemons [
+              (builtins.map map-osd)
+              builtins.listToAttrs
+            ];
+        };
+    };
+
+    testScript =
+      { ... }:
+      ''
+        start_all()
+
+        ceph.wait_for_unit("default.target")
+
+        # Bootstrap ceph-mon daemon
+        ceph.succeed(
+            "mkdir -p /var/lib/ceph/bootstrap-osd",
+            "ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'",
+            "ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
+            "ceph-authtool --create-keyring /var/lib/ceph/bootstrap-osd/ceph.keyring --gen-key -n client.bootstrap-osd --cap mon 'profile bootstrap-osd' --cap mgr 'allow r'",
+            "ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
+            "ceph-authtool /tmp/ceph.mon.keyring --import-keyring /var/lib/ceph/bootstrap-osd/ceph.keyring",
+            "monmaptool --create --fsid ${cluster} --addv 0 'v2:[${ip}]:3300/0' --clobber /tmp/ceph.initial-monmap",
+            "mkdir -p /var/lib/ceph/mon/ceph-0",
+            "ceph-mon --mkfs -i 0 --monmap /tmp/ceph.initial-monmap --keyring /tmp/ceph.mon.keyring",
+            "chown ceph:ceph -R /tmp/ceph.mon.keyring /var/lib/ceph",
+            "systemctl start ceph-mon-0.service",
+        )
+
+        ceph.wait_for_unit("ceph-mon-0.service")
+        # should the mon not start or bind for some reason this gives us a better error message than the config commands running into a timeout
+        ceph.wait_for_open_port(3300, "${ip}")
+        ceph.succeed(
+            # required for HEALTH_OK
+            "ceph config set mon auth_allow_insecure_global_id_reclaim false",
+            # IPv6
+            "ceph config set global ms_bind_ipv4 false",
+            "ceph config set global ms_bind_ipv6 true",
+            # the new (secure) protocol
+            "ceph config set global ms_bind_msgr1 false",
+            "ceph config set global ms_bind_msgr2 true",
+            # just a small little thing
+            "ceph config set mon mon_compact_on_start true",
+        )
+
+        # Can't check ceph status until a mon is up
+        ceph.succeed("ceph -s | grep 'mon: 1 daemons'")
+
+        # Bootstrap OSDs (do this before starting the mgr because cryptsetup and the mgr both eat a lot of memory)
+        ceph.succeed(
+            # this will automatically do what's required for LVM, cryptsetup, and stores all the data in Ceph's internal databases
+            "ceph-volume lvm prepare --bluestore --data /dev/vdb --dmcrypt --no-systemd --osd-id 0 --osd-fsid ${osd-fsid-map."0"}",
+            "ceph-volume lvm prepare --bluestore --data /dev/vdc --dmcrypt --no-systemd --osd-id 1 --osd-fsid ${osd-fsid-map."1"}",
+            "ceph-volume lvm prepare --bluestore --data /dev/vdd --dmcrypt --no-systemd --osd-id 2 --osd-fsid ${osd-fsid-map."2"}",
+            "sudo ceph-volume lvm deactivate 0",
+            "sudo ceph-volume lvm deactivate 1",
+            "sudo ceph-volume lvm deactivate 2",
+            "chown -R ceph:ceph /var/lib/ceph",
+        )
+
+        # Start OSDs (again, argon2id eats memory, so this happens before starting the mgr)
+        ceph.succeed(
+            "systemctl start ceph-osd-0.service",
+            "systemctl start ceph-osd-1.service",
+            "systemctl start ceph-osd-2.service",
+        )
+        ceph.wait_until_succeeds("ceph -s | grep 'quorum 0'")
+        ceph.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'")
+
+        # Start the ceph-mgr daemon, after copying in the keyring
+        ceph.succeed(
+            "mkdir -p /var/lib/ceph/mgr/ceph-ceph/",
+            "ceph auth get-or-create -o /var/lib/ceph/mgr/ceph-ceph/keyring mgr.ceph mon 'allow profile mgr' osd 'allow *' mds 'allow *'",
+            "chown -R ceph:ceph /var/lib/ceph/mgr/ceph-ceph/",
+            "systemctl start ceph-mgr-ceph.service",
+        )
+        ceph.wait_for_unit("ceph-mgr-ceph")
+        ceph.wait_until_succeeds("ceph -s | grep 'quorum 0'")
+        ceph.wait_until_succeeds("ceph -s | grep 'mgr: ceph(active,'")
+        ceph.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'")
+        ceph.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
+
+        # test the actual storage
+        ceph.succeed(
+            "ceph osd pool create single-node-test 32 32",
+            "ceph osd pool ls | grep 'single-node-test'",
+
+            # We need to enable an application on the pool, otherwise it will
+            # stay unhealthy in state POOL_APP_NOT_ENABLED.
+            # Creating a CephFS would do this automatically, but we haven't done that here.
+            # See: https://docs.ceph.com/en/reef/rados/operations/pools/#associating-a-pool-with-an-application
+            # We use the custom application name "nixos-test" for this.
+            "ceph osd pool application enable single-node-test nixos-test",
+
+            "ceph osd pool rename single-node-test single-node-other-test",
+            "ceph osd pool ls | grep 'single-node-other-test'",
+        )
+        ceph.wait_until_succeeds("ceph -s | grep '2 pools, 33 pgs'")
+        ceph.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
+        ceph.wait_until_succeeds("ceph -s | grep '33 active+clean'")
+        ceph.fail(
+            # the old pool should be gone
+            "ceph osd pool ls | grep 'multi-node-test'",
+            # deleting the pool should fail without setting mon_allow_pool_delete
+            "ceph osd pool delete single-node-other-test single-node-other-test --yes-i-really-really-mean-it",
+        )
+
+        # rebooting gets rid of any potential tmpfs mounts or device-mapper devices
+        ceph.shutdown()
+        ceph.start()
+        ceph.wait_for_unit("default.target")
+
+        # Start it up (again OSDs first due to memory constraints of cryptsetup and mgr)
+        ceph.systemctl("start ceph-mon-0.service")
+        ceph.wait_for_unit("ceph-mon-0")
+        ceph.systemctl("start ceph-osd-0.service")
+        ceph.wait_for_unit("ceph-osd-0")
+        ceph.systemctl("start ceph-osd-1.service")
+        ceph.wait_for_unit("ceph-osd-1")
+        ceph.systemctl("start ceph-osd-2.service")
+        ceph.wait_for_unit("ceph-osd-2")
+        ceph.systemctl("start ceph-mgr-ceph.service")
+        ceph.wait_for_unit("ceph-mgr-ceph")
+
+        # Ensure the cluster comes back up again
+        ceph.succeed("ceph -s | grep 'mon: 1 daemons'")
+        ceph.wait_until_succeeds("ceph -s | grep 'quorum 0'")
+        ceph.wait_until_succeeds("ceph osd stat | grep -E '3 osds: 3 up[^,]*, 3 in'")
+        ceph.wait_until_succeeds("ceph -s | grep 'mgr: ceph(active,'")
+        ceph.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
+      '';
+  }
+)

pkgs/applications/kde/gwenview/default.nix

@@ -4,7 +4,7 @@
   exiv2, lcms2, cfitsio,
   baloo, kactivities, kio, kipi-plugins, kitemmodels, kparts, libkdcraw, libkipi,
   phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator,
-  wayland, wayland-protocols
+  wayland, wayland-protocols, wayland-scanner
 }:
 
 mkDerivation {
@@ -20,7 +20,7 @@ mkDerivation {
   # Fix build with versioned kImageAnnotator
   patches = [./kimageannotator.patch];
 
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ];
   buildInputs = [
     baloo kactivities kio kitemmodels kparts libkdcraw libkipi phonon
     exiv2 lcms2 cfitsio

pkgs/applications/kde/spectacle.nix

@@ -5,13 +5,13 @@
 , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
 , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
 , qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire
-, wrapGAppsHook3
+, wrapGAppsHook3, wayland-scanner
 }:
 
 mkDerivation {
   pname = "spectacle";
 
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 wayland-scanner ];
   buildInputs = [
     kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
     kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor

pkgs/applications/misc/inlyne/default.nix

@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "inlyne";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
-    owner = "trimental";
+    owner = "Inlyne-Project";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Kae8WnahA/6k6QT5htYU2+diAFkmxVsbVaxRUlhf39o=";
+    hash = "sha256-j4DEau7LZxIoVIIYwCUgqmkSgdRxWzF5/vOS0lvjgUk=";
   };
 
-  cargoHash = "sha256-M6daK2y9HBRDV2wQjw87g1QYOqiJBfRf9uW1Eg6z6C8=";
+  cargoHash = "sha256-fMovzaP+R0CUwJy1HKATH2tPrIPwzGtubF1WHUoQDRY=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -65,8 +65,8 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "GPU powered browserless markdown viewer";
-    homepage = "https://github.com/trimental/inlyne";
+    homepage = "https://github.com/Inlyne-Project/inlyne";
-    changelog = "https://github.com/trimental/inlyne/releases/tag/${src.rev}";
+    changelog = "https://github.com/Inlyne-Project/inlyne/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];
     mainProgram = "inlyne";

pkgs/applications/misc/rivercarro/default.nix

@@ -6,6 +6,7 @@
 , river
 , wayland
 , wayland-protocols
+, wayland-scanner
 , zig_0_12
 }:
 
@@ -26,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     river
     wayland
     wayland-protocols
+    wayland-scanner
     zig_0_12.hook
   ];
 

pkgs/applications/office/planify/default.nix

@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planify";
-  version = "4.10.8";
+  version = "4.11.0";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
     rev = version;
-    hash = "sha256-gbwpNlWtJocKQqTFLoroUbXn4FOOA7LO1H/IduEsyrg=";
+    hash = "sha256-jAQXe7g+u4tHca4QL8Ae8Yvl+esvGQpCHbDlycAwFZ4=";
   };
 
   nativeBuildInputs = [

pkgs/applications/science/astronomy/gravit/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake, mesa }:
 
 stdenv.mkDerivation rec {
   pname = "gravit";
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
       view in 3D and zoom in and out.
     '';
 
-    platforms = lib.platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     hydraPlatforms = lib.platforms.linux; # darwin times out
   };
 }

pkgs/applications/science/chemistry/avogadro2/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, cmake, eigen, avogadrolibs, molequeue, hdf5
-, openbabel, qttools, wrapQtAppsHook
+, openbabel, qttools, wrapQtAppsHook, mesa
 }:
 
 let
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
     mainProgram = "avogadro2";
     maintainers = with maintainers; [ sheepforce ];
     homepage = "https://github.com/OpenChemistry/avogadroapp";
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     license = licenses.bsd3;
   };
 }

pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix

@@ -5,6 +5,7 @@
 , ninja
 , pkg-config
 , wayfire
+, wayland-scanner
 , wf-config
 , libevdev
 , libinput
@@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
+    wayland-scanner
   ];
 
   buildInputs = [

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

@@ -29,6 +29,7 @@
   vulkan-headers,
   vulkan-loader,
   wayland,
+  wayland-scanner,
   wrapGAppsHook3,
   wxGTK32,
   zarchive,
@@ -73,6 +74,7 @@ in stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     wxGTK32
+    wayland-scanner
   ];
 
   buildInputs = [

pkgs/by-name/es/eslint/package.nix

@@ -0,0 +1,33 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage rec {
+  pname = "eslint";
+  version = "9.9.1";
+
+  src = fetchFromGitHub {
+    owner = "eslint";
+    repo = "eslint";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-n07a50bigglwr3ItZqbyQxu0mPZawTSVunwIe8goJBQ=";
+  };
+
+  postPatch = ''
+    cp ${./package-lock.json} package-lock.json
+  '';
+
+  npmDepsHash = "sha256-/E1JUsbPyHzWJ4kuNRg/blYRaAdATYbk+jnJFJyzHLE=";
+
+  dontNpmBuild = true;
+  dontNpmPrune = true;
+
+  meta = {
+    description = "Find and fix problems in your JavaScript code";
+    homepage = "https://eslint.org";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.onny ];
+  };
+}

pkgs/by-name/hy/hypridle/package.nix

@@ -5,6 +5,7 @@
 , cmake
 , wayland
 , wayland-protocols
+, wayland-scanner
 , hyprlang
 , sdbus-cpp
 , systemd
@@ -24,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
+    wayland-scanner
   ];
 
   buildInputs = [

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

@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitLab,
+  stdenv,
+  cmake,
+  kdePackages,
+  libsForQt5,
+}:
+stdenv.mkDerivation {
+  pname = "licensedigger";
+  version = "0-unstable-2024-08-28";
+
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    owner = "SDK";
+    repo = "licensedigger";
+    rev = "cc4b24d3fb67afa8fb0a9ef61210588958eaf0f5";
+    hash = "sha256-/ZEja+iDx0lVkJaLshPd1tZD4ZUspVeFHY1TNXjr4qg=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    kdePackages.extra-cmake-modules
+    libsForQt5.qtbase
+  ];
+
+  dontWrapQtApps = true;
+
+  meta = {
+    description = "Tools to convert existing license headers to SPDX compliant headers";
+    homepage = "https://invent.kde.org/sdk/licensedigger";
+    license = with lib.licenses; [
+      gpl2Only
+      gpl3Only
+    ];
+    maintainers = with lib.maintainers; [ onny ];
+  };
+}

pkgs/by-name/ma/matrix-commander-rs/package.nix

@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "matrix-commander-rs";
-  version = "0.3.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "8go";
     repo = "matrix-commander-rs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-aecmd7LtHowH+nqLcRNDSfAxZDKtBTrG1KNyRup8CYI=";
+    hash = "sha256-UoqddgXrwaKtIE0cuAFkfrgmvLIDRpGjl5jBQvh9mdI=";
   };
 
-  cargoHash = "sha256-2biUWLWE0XtmB79yxFahQqLmqwH/6q50IhkcbUrBifU=";
+  cargoHash = "sha256-cMXnMCiMeM4Tykquco7G3kcZC2xxoDl+uWqrQLFp1VM=";
 
   nativeBuildInputs = [ pkg-config ];
 

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

@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.16.101";
+  version = "1.16.107";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-gK54K48s+5u2uv9ZxR0PVekZHdtgguCb+qHOVb2awAE=";
+    hash = "sha256-U3m8daxJzM5lp6AAPOgNdaxWaHvhkt7KRCisHQghY9Y=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

pkgs/by-name/ro/roon-tui/Cargo.lock

@@ -608,6 +608,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-traits"
 version = "0.2.17"
@@ -834,7 +840,7 @@ dependencies = [
 
 [[package]]
 name = "roon-tui"
-version = "0.3.0"
+version = "0.3.2"
 dependencies = [
  "any_ascii",
  "chrono",
@@ -1075,13 +1081,14 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
  "libc",
+ "num-conv",
  "num_threads",
  "powerfmt",
  "serde",
@@ -1097,10 +1104,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 

pkgs/by-name/ro/roon-tui/package.nix

@@ -5,13 +5,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "roon-tui";
-  version = "0.3.0";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "TheAppgineer";
     repo = "roon-tui";
     rev = version;
-    hash = "sha256-rwZPUa6NyKs+jz0+JQC0kSrw0T/EL+ms2m+AzHvrI7o=";
+    hash = "sha256-ocPSqj9/xJ2metetn6OY+IEFWysbstPmh2N5Jd8NDPM=";
   };
 
   cargoLock = {

pkgs/by-name/sf/sfwbar/package.nix

@@ -14,6 +14,7 @@
   alsa-lib,
   makeWrapper,
   docutils,
+  wayland-scanner,
 }:
 let
   version = "1.0_beta15";
@@ -45,6 +46,7 @@ stdenv.mkDerivation {
     ninja
     pkg-config
     makeWrapper
+    wayland-scanner
   ];
 
   postFixup = ''

pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix

@@ -7,6 +7,7 @@
 , libpulseaudio
 , wayland
 , wayland-protocols
+, wayland-scanner
 }:
 stdenv.mkDerivation {
   pname = "sway-audio-idle-inhibit";
@@ -20,7 +21,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    meson ninja pkg-config
+    meson ninja pkg-config wayland-scanner
   ];
 
   buildInputs = [

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

@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "troubadix";
-  version = "24.8.0";
+  version = "24.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "troubadix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hH2U+ScR3OspFzbVO4CcQFb/1mn7vRTpvhVeLlAxluM=";
+    hash = "sha256-rBExXotfI4uG4ns3x1cJTQ0PGABG7ZlziBrqcsa3dOg=";
   };
 
   pythonRelaxDeps = [ "validators" ];

pkgs/by-name/uv/uv/Cargo.lock

@@ -4492,7 +4492,7 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 
 [[package]]
 name = "uv"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "anstream",
  "anyhow",
@@ -4898,6 +4898,7 @@ dependencies = [
  "path-slash",
  "serde",
  "tempfile",
+ "tokio",
  "tracing",
  "urlencoding",
  "uv-warnings",
@@ -5042,6 +5043,8 @@ dependencies = [
  "uv-state",
  "uv-warnings",
  "which",
+ "windows-registry",
+ "windows-result",
  "windows-sys 0.59.0",
  "winsafe 0.0.22",
 ]
@@ -5246,7 +5249,7 @@ dependencies = [
 
 [[package]]
 name = "uv-version"
-version = "0.4.0"
+version = "0.4.1"
 
 [[package]]
 name = "uv-virtualenv"
@@ -5281,6 +5284,7 @@ dependencies = [
  "fs-err",
  "glob",
  "insta",
+ "itertools 0.13.0",
  "pep440_rs",
  "pep508_rs",
  "pypi-types",

pkgs/by-name/uv/uv/package.nix

@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "uv";
-  version = "0.4.0";
+  version = "0.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     rev = "refs/tags/${version}";
-    hash = "sha256-JEGcX4dT/cVLb07n2Y0nai17jW0tXpV18qaYVnoEpew=";
+    hash = "sha256-gjACm0q9j5Kx9E1rxiR7Bvg4FoAATesQyO0y8kbsTJI=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {

pkgs/by-name/we/werf/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "werf";
-  version = "2.10.4";
+  version = "2.10.5";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     rev = "v${version}";
-    hash = "sha256-1PpnUTlxjUu7jptpd4U7MRKJfRM8WTeMSgbNcQJeZlM=";
+    hash = "sha256-pNKcBiZSZa8F8E5grEXbgPpqk9H+mu/TeiU3FSAalQE=";
   };
 
   vendorHash = "sha256-OR2nIR2q3iRfaSQSQRKn+jbygETx2+WmkOIjOCIB9O8=";

pkgs/by-name/wl/wl-kbptr/package.nix

@@ -10,6 +10,7 @@
   stdenv,
   wayland,
   wayland-protocols,
+  wayland-scanner,
 }:
 let
   pname = "wl-kbptr";
@@ -30,6 +31,7 @@ stdenv.mkDerivation {
     meson
     ninja
     pkg-config
+    wayland-scanner
   ];
 
   buildInputs = [

pkgs/by-name/wl/wlinhibit/package.nix

@@ -7,6 +7,7 @@
   pkg-config,
   wayland,
   wayland-protocols,
+  wayland-scanner,
 }:
 stdenv.mkDerivation rec {
   pname = "wlinhibit";
@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
+    wayland-scanner
   ];
 
   meta = {

pkgs/by-name/wl/wlvncc/package.nix

@@ -19,6 +19,7 @@
 , pkg-config
 , pixman
 , wayland
+, wayland-scanner
 , zlib
 }:
 stdenv.mkDerivation {
@@ -36,6 +37,7 @@ stdenv.mkDerivation {
     meson
     ninja
     pkg-config
+    wayland-scanner
   ];
 
   buildInputs = [

pkgs/desktops/deepin/core/dde-control-center/default.nix

@@ -8,6 +8,7 @@
   doxygen,
   wrapQtAppsHook,
   wrapGAppsHook3,
+  wayland-scanner,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
@@ -46,6 +47,7 @@ stdenv.mkDerivation rec {
     doxygen
     wrapQtAppsHook
     wrapGAppsHook3
+    wayland-scanner
   ];
   dontWrapGApps = true;
 

pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix

@@ -16,6 +16,7 @@
   libportal,
   packagekit,
   wayland,
+  wayland-scanner,
   wingpanel,
 }:
 
@@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     vala
+    wayland-scanner
   ];
 
   buildInputs = [

pkgs/development/libraries/SDL2/default.nix

@@ -5,7 +5,7 @@
   fetchFromGitHub,
   nix-update-script,
   pkg-config,
-  libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms,
+  libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms,
   openglSupport ? libGLSupported,
   libGL,
   alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid,

pkgs/development/libraries/SDL_compat/default.nix

@@ -7,7 +7,8 @@
 , libiconv
 , Cocoa
 , autoSignDarwinBinariesHook
-, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
+, mesa
+, libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms
 , openglSupport ? libGLSupported
 , libGLU
 }:

pkgs/development/libraries/fox/fox-1.6.nix

@@ -13,6 +13,7 @@
 , libXext
 , libXft
 , libXfixes
+, mesa
 , xinput
 , CoreServices
 }:
@@ -50,6 +51,6 @@ stdenv.mkDerivation rec {
     homepage = "http://fox-toolkit.org";
     license = lib.licenses.lgpl3;
     maintainers = [ ];
-    platforms = lib.platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
   };
 }

pkgs/development/libraries/glew/1.10.nix

@@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl, libGLU, libXmu, libXi, libXext
 , AGL, OpenGL
 , testers
+, mesa
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -52,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.free; # different files under different licenses
       #["BSD" "GLX" "SGI-B" "GPL2"]
     pkgConfigModules = [ "glew" ];
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
   };
 })

pkgs/development/libraries/glew/default.nix

@@ -10,6 +10,7 @@
 , OpenGL
 , enableEGL ? (!stdenv.isDarwin)
 , testers
+, mesa
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -74,8 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
     pkgConfigModules = [ "glew" ];
     platforms = with platforms;
       if enableEGL then
-        subtractLists darwin mesaPlatforms
+        subtractLists darwin mesa.meta.platforms
       else
-        mesaPlatforms;
+        mesa.meta.platforms;
   };
 })

pkgs/development/libraries/libdevil/default.nix

@@ -15,6 +15,7 @@
 , runtimeShell
 , withXorg ? true
 , testers
+, mesa
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -65,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "ilur";
     license = licenses.lgpl2;
     pkgConfigModules = [ "IL" ];
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     maintainers = [ ];
   };
 })

pkgs/development/libraries/libnbd/default.nix

@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libnbd";
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchurl {
     url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
-    hash = "sha256-AoTfX6Ov9Trj9a9i+K+NYCwxhQ9C5YYqx/15RBtgJYw=";
+    hash = "sha256-7DgviwGPPLccTPvomyH+0CMknXmR2wENsxpXD97OP84=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/mesa/common.nix

@@ -29,7 +29,11 @@ rec {
     homepage = "https://www.mesa3d.org/";
     changelog = "https://www.mesa3d.org/relnotes/${version}.html";
     license = with lib.licenses; [ mit ]; # X11 variant, in most files
-    platforms = lib.platforms.mesaPlatforms;
+    platforms = [
+      "i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux"
+      "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux"
+      "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin" "riscv64-linux"
+    ];
     maintainers = with lib.maintainers; [ primeos vcunat ]; # Help is welcome :)
   };
 }

pkgs/development/libraries/waffle/default.nix

@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     mainProgram = "wflinfo";
     homepage = "https://www.waffle-gl.org/";
     license = licenses.bsd2;
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     maintainers = with maintainers; [ Flakebi ];
   };
 }

pkgs/development/node-packages/aliases.nix

@@ -84,7 +84,8 @@ mapAliases {
   inherit (pkgs) dotenv-cli; # added 2024-06-26
   eask = pkgs.eask; # added 2023-08-17
   inherit (pkgs.elmPackages) elm-test;
-  eslint_d = pkgs.eslint_d; # Added 2023-05-26
+  inherit (pkgs) eslint; # Added 2024-08-28
+  inherit (pkgs) eslint_d; # Added 2023-05-26
   inherit (pkgs) firebase-tools; # added 2023-08-18
   inherit (pkgs) fixjson; # added 2024-06-26
   flood = pkgs.flood; # Added 2023-07-25

pkgs/development/node-packages/node-packages.json

@@ -92,7 +92,6 @@
 , "emoj"
 , "emojione"
 , "escape-string-regexp"
-, "eslint"
 , "esy"
 , "expo-cli"
 , "fast-cli"

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

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.116";
+  version = "9.2.117";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "ailment";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BRT6yboFdQ9/S+XYJAz885QbxbRx/BmL18o3ic4fv7o=";
+    hash = "sha256-OYbLaMtelNxohrOfb4A9NC9Zado+0qvm3i2zgkgt6p4=";
   };
 
   build-system = [ setuptools ];

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

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "aiokafka";
-  version = "0.10.0";
+  version = "0.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "aiokafka";
     rev = "refs/tags/v${version}";
-    hash = "sha256-G9Q77nWUUW+hG/wm9z/S8gea4U1wHZdj7WdK2LsKBos=";
+    hash = "sha256-CeEPRCsf2SFI5J5FuQlCRRtlOPcCtRiGXJUIQOAbyCc=";
   };
 
   build-system = [

pkgs/development/python-modules/aliyun-python-sdk-config/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "aliyun-python-sdk-config";
-  version = "2.2.13";
+  version = "2.2.14";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-w4YJe3Bngg4A2KVlpIqf80FHhscLMMMk0AVkr/NfbPM=";
+    hash = "sha256-drmk41/k/JJ6Zs6MrnMQa7xwpkO7MZEaSeyfm2QimKo=";
   };
 
   propagatedBuildInputs = [ aliyun-python-sdk-core ];

pkgs/development/python-modules/aliyun-python-sdk-core/default.nix

@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "aliyun-python-sdk-core";
-  version = "2.15.1";
+  version = "2.15.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UYVQ0H9TfNOvrDtsk7XJl840QOTQwFTjrL2qgmHpCt8=";
+    hash = "sha256-VPZqU+GTxhxeFupFBaDKtDVD+K0u8igz9pxNXlFRwX0=";
   };
 
   pythonRelaxDeps = true;

pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "aliyun-python-sdk-kms";
-  version = "2.16.4";
+  version = "2.16.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-DVuxZcB7apcpOXU6EoUHOT9IAReS7g7E9ZtgIeq9l1I=";
+    hash = "sha256-8yiooZ2D7LuWX/zg7B6ZMHVSFtEEY4zZXs02J1O4E7M=";
   };
 
   build-system = [ setuptools ];

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

@@ -36,7 +36,7 @@
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.2.116";
+  version = "9.2.117";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "angr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-g/MQ/xbzBjFYbSz8+6pzZBox0ym5GzD6a5crVicOp7E=";
+    hash = "sha256-woIid0DdaZqn7BZJrQ3UoOfGC1cP8r+t+++Sw8ZtX80=";
   };
 
   pythonRelaxDeps = [ "capstone" ];

pkgs/development/python-modules/apricot-select/default.nix

@@ -2,10 +2,10 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   apricot-select,
   numba,
   numpy,
-  nose,
   pytestCheckHook,
   pythonOlder,
   scikit-learn,
@@ -29,9 +29,13 @@ buildPythonPackage rec {
     hash = "sha256-v9BHFxmlbwXVipPze/nV35YijdFBuka3gAl85AlsffQ=";
   };
 
-  postPatch = ''
+  patches = [
-    sed -i '/"nose"/d' setup.py
+    # migrate to pytest, https://github.com/jmschrei/apricot/pull/43
-  '';
+    (fetchpatch2 {
+      url = "https://github.com/jmschrei/apricot/commit/ffa5cce97292775c0d6890671a19cacd2294383f.patch?full_index=1";
+      hash = "sha256-9A49m4587kAPK/kzZBqMRPwuA40S3HinLXaslYUcWdM=";
+    })
+  ];
 
   build-system = [ setuptools ];
 
@@ -44,10 +48,7 @@ buildPythonPackage rec {
     tqdm
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = [ pytestCheckHook ];
-    nose
-    pytestCheckHook
-  ];
 
   pythonImportsCheck = [ "apricot" ];
 

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

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.116";
+  version = "9.2.117";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "archinfo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ckRLWOtwvY/37noomEyfscycifNvm1CbrIQIU1hZzGM=";
+    hash = "sha256-eMhj+OQEfkD4AgwNEEVil7p/XoaREsM+72/bN72XnzE=";
   };
 
   build-system = [ setuptools ];

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.116";
+  version = "9.2.117";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "claripy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-anBIIiFTptdTNKesA2dH2cq2wxd3DJTb4lCjAMRMz3I=";
+    hash = "sha256-f9rb5UvkEB3SkxqFQI82m4RrY6jWnD7YTjIGLVSx4gk=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

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

@@ -18,14 +18,14 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.116";
+  version = "9.2.117";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
     owner = "angr";
     repo = "binaries";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FtJ093771M5imQCtBxwDsXn7HctyShaV0QRlU37zCSc=";
+    hash = "sha256-yTCE0QjUoHIGW0xJvCsC01w75SxzTW2zQ/UUhSqY1mQ=";
   };
 in
 buildPythonPackage rec {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "cle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-syA0ULbvEP/K9iJLNbmf61eEJh8wckGEEzeGDjhksC8=";
+    hash = "sha256-WpMfHd5mHZp9hp8twYjiIbDCk61LWBF4lJpHZnnIfjk=";
   };
 
   build-system = [ setuptools ];

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

@@ -76,6 +76,9 @@ buildPythonPackage rec {
 
     # ImportError: attempted relative import beyond top-level package
     rm tests/test_greenthreads.py
+
+    # git crashes; https://github.com/jelmer/dulwich/issues/1359
+    rm tests/compat/test_pack.py
   '';
 
   doCheck = !stdenv.isDarwin;

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

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.7.1";
+  version = "1.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "fastai";
     repo = "fastcore";
     rev = "refs/tags/${version}";
-    hash = "sha256-eb4J5aGrcpOcO0GBI1cwOsRxw0guvDiAPZjdFPB5SVQ=";
+    hash = "sha256-3BOsOd3g+SepFUH2czywyaBnA88qLVyu/8eyHGkuEPY=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/langgraph-cli/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "langgraph-cli";
-  version = "0.1.51";
+  version = "0.1.52";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "langchain-ai";
     repo = "langgraph";
     rev = "refs/tags/cli==${version}";
-    hash = "sha256-ynnTS1OAU6BCy7kMHI267gnaiv5ToX0IM30nbGjAzr8=";
+    hash = "sha256-zTBeDJB1Xu/rWsvEC/L4BRzxyh04lPYV7HQNHoJcskk=";
   };
 
   sourceRoot = "${src.name}/libs/cli";

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

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocstrings-python";
-  version = "1.10.8";
+  version = "1.10.9";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "mkdocstrings";
     repo = "python";
     rev = "refs/tags/${version}";
-    hash = "sha256-3fXT2cV9jXkBNqK0LhKh8V11YLz+ulR3yAtq3GVOkTU=";
+    hash = "sha256-ClIWH3JixDI7SMOaDKELeYlX7HqhzJ3JNO8FW/eCpuA=";
   };
 
   build-system = [ pdm-backend ];

pkgs/development/python-modules/moderngl-window/default.nix

@@ -5,6 +5,7 @@
   fetchFromGitHub,
   setuptools,
   glfw,
+  mesa,
   moderngl,
   numpy,
   pillow,
@@ -70,7 +71,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/moderngl/moderngl-window/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ c0deaddict ];
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     broken = stdenv.isDarwin;
   };
 }

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

@@ -41,7 +41,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/moderngl/moderngl/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ c0deaddict ];
-    # should be mesaPlatforms, darwin build breaks.
+    # should be mesa.meta.platforms, darwin build breaks.
     platforms = platforms.linux;
   };
 }

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

@@ -17,6 +17,7 @@
   ffmpeg-full,
   openal,
   libpulseaudio,
+  mesa,
 }:
 
 buildPythonPackage rec {
@@ -109,6 +110,6 @@ buildPythonPackage rec {
     homepage = "http://www.pyglet.org/";
     description = "Cross-platform windowing and multimedia library";
     license = licenses.bsd3;
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
   };
 }

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

@@ -5,6 +5,7 @@
   fetchPypi,
   pkgs,
   pillow,
+  mesa,
 }:
 
 buildPythonPackage rec {
@@ -80,6 +81,6 @@ buildPythonPackage rec {
       liberal BSD-style Open-Source license.
     '';
     license = licenses.bsd3;
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
   };
 }

pkgs/development/python-modules/pyqt/5.x.nix

@@ -13,6 +13,7 @@
   pyqt5-sip,
   pyqt-builder,
   libsForQt5,
+  mesa,
   enableVerbose ? true,
   withConnectivity ? false,
   withMultimedia ? false,
@@ -201,7 +202,7 @@ buildPythonPackage rec {
     description = "Python bindings for Qt5";
     homepage = "https://riverbankcomputing.com/";
     license = licenses.gpl3Only;
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     maintainers = with maintainers; [ sander ];
   };
 }

pkgs/development/python-modules/pyqt/6.x.nix

@@ -13,6 +13,7 @@
   pyqt-builder,
   qt6Packages,
   pythonOlder,
+  mesa,
   withMultimedia ? true,
   withWebSockets ? true,
   withLocation ? true,
@@ -150,7 +151,7 @@ buildPythonPackage rec {
     description = "Python bindings for Qt6";
     homepage = "https://riverbankcomputing.com/";
     license = licenses.gpl3Only;
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     maintainers = with maintainers; [ LunNova ];
   };
 }

pkgs/development/python-modules/pyqt/pyqt6-sip.nix

@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  mesa,
 }:
 
 buildPythonPackage rec {
@@ -23,7 +24,7 @@ buildPythonPackage rec {
     description = "Python bindings for Qt5";
     homepage = "https://www.riverbankcomputing.com/software/sip/";
     license = licenses.gpl3Only;
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     maintainers = with maintainers; [ LunNova ];
   };
 }

pkgs/development/python-modules/pyqt/sip.nix

@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  mesa,
 }:
 
 buildPythonPackage rec {
@@ -23,7 +24,7 @@ buildPythonPackage rec {
     description = "Python bindings for Qt5";
     homepage = "https://www.riverbankcomputing.com/software/sip/";
     license = licenses.gpl3Only;
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     maintainers = with maintainers; [ sander ];
   };
 }

pkgs/development/python-modules/pyqt6-charts/default.nix

@@ -8,6 +8,7 @@
   pythonOlder,
   pyqt6,
   python,
+  mesa,
 }:
 
 buildPythonPackage rec {
@@ -67,7 +68,7 @@ buildPythonPackage rec {
     description = "Python bindings for Qt6 QtCharts";
     homepage = "https://riverbankcomputing.com/";
     license = licenses.gpl3Only;
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     maintainers = with maintainers; [ dandellion ];
   };
 }

pkgs/development/python-modules/pyqt6-webengine/default.nix

@@ -10,6 +10,7 @@
   pythonOlder,
   pyqt6,
   python,
+  mesa,
 }:
 
 buildPythonPackage rec {
@@ -84,7 +85,7 @@ buildPythonPackage rec {
     description = "Python bindings for Qt6 WebEngine";
     homepage = "https://riverbankcomputing.com/";
     license = licenses.gpl3Only;
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     maintainers = with maintainers; [
       LunNova
       nrdxp

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

@@ -12,6 +12,7 @@
   pyqt5,
   sip,
   pyqt-builder,
+  mesa,
 }:
 
 let
@@ -98,7 +99,7 @@ buildPythonPackage (
       description = "Python bindings for Qt5";
       homepage = "http://www.riverbankcomputing.co.uk";
       license = lib.licenses.gpl3;
-      hydraPlatforms = lib.lists.intersectLists libsForQt5.qtwebengine.meta.platforms lib.platforms.mesaPlatforms;
+      hydraPlatforms = lib.lists.intersectLists libsForQt5.qtwebengine.meta.platforms mesa.meta.platforms;
     };
   }
   // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {

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

@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "python-kasa";
-  version = "0.7.1";
+  version = "0.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "python-kasa";
     repo = "python-kasa";
     rev = "refs/tags/${version}";
-    hash = "sha256-ASS84thd54R1Z7+J7nMfUOPmQtJoybWis7C2US/mORs=";
+    hash = "sha256-JfTFed591z1ZxTKP5FqYyaMBq8uCs4StlnqKp3Tc7Ug=";
   };
 
   build-system = [ poetry-core ];

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

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.116";
+  version = "9.2.117";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qEmoK8nbxx2HXG+pRsl8Vs1a9DsmiQOn19RDMkftges=";
+    hash = "sha256-hW5uCploPx7+Q8RYZSm6bp/SkbPftkfMkhLvBjHJuBc=";
   };
 
   build-system = [ setuptools ];

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

@@ -54,7 +54,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Experimental Python API for Ruff";
     homepage = "https://github.com/amyreese/ruff-api";
-    changelog = "https://github.com/amyreese/ruff-api/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/amyreese/ruff-api/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/sisyphus-control/default.nix

@@ -3,16 +3,18 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   netifaces,
-  python-engineio,
+  poetry-core,
-  python-socketio,
+  python-engineio-v3,
+  python-socketio-v4,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "sisyphus-control";
-  version = "3.1.3";
+  version = "3.1.4";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -20,20 +22,25 @@ buildPythonPackage rec {
     owner = "jkeljo";
     repo = "sisyphus-control";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FbZWvsm2NT9a7TgHKWh/LHPsse6NBLK2grlOtHDbV2Y=";
+    hash = "sha256-1/trJ/mfiXljNt7ZIBwQ45mIBbqg68e29lvVsPDPzoU=";
   };
 
-  pythonRelaxDeps = [
+  patches = [
-    "python-engineio"
+    # https://github.com/jkeljo/sisyphus-control/pull/9
-    "python-socketio"
+    (fetchpatch2 {
+      name = "specify-build-system.patch";
+      url = "https://github.com/jkeljo/sisyphus-control/commit/dd48079e03a53cdb3af721de0d307209286c38f0.patch";
+      hash = "sha256-573YLPrNbbMXSrZ3gK8cmHmuk2+UeggcKL/+eo4pgrs=";
+    })
   ];
 
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     netifaces
-    python-engineio
+    python-engineio-v3
-    python-socketio
+    python-socketio-v4
   ];
 
   # Module has no tests
@@ -44,7 +51,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Control your Sisyphus Kinetic Art Table";
     homepage = "https://github.com/jkeljo/sisyphus-control";
-    changelog = "https://github.com/jkeljo/sisyphus-control/blob/${version}/CHANGELOG.rst";
+    changelog = "https://github.com/jkeljo/sisyphus-control/blob/${src.rev}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

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

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "ucsmsdk";
-  version = "0.9.18";
+  version = "0.9.19";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "CiscoUcs";
     repo = "ucsmsdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9LCrjelxx8HxIEiSdsvtvm31XiE11Gnp0suapmo2L5Q=";
+    hash = "sha256-PPxslqY8v6WbRiRXnR9jVSGAo8k89lHomXpqgSK0meo=";
   };
 
   propagatedBuildInputs = [

pkgs/development/tools/analysis/valgrind/default.nix

@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = "http://www.valgrind.org/";
+    homepage = "https://valgrind.org/";
     description = "Debugging and profiling tool suite";
 
     longDescription = ''

pkgs/development/tools/database/litestream/default.nix

@@ -30,5 +30,6 @@ buildGoModule rec {
     license = licenses.asl20;
     homepage = "https://litestream.io/";
     maintainers = with maintainers; [ fbrs ];
+    knownVulnerabilities = [ "CVE-2024-41254" ];
   };
 }

pkgs/games/anki/default.nix

@@ -25,6 +25,8 @@
   AVKit,
   CoreAudio,
   swift,
+
+  mesa,
 }:
 
 let
@@ -336,7 +338,7 @@ python3.pkgs.buildPythonApplication {
     '';
     homepage = "https://apps.ankiweb.net";
     license = licenses.agpl3Plus;
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     maintainers = with maintainers; [
       euank
       oxij

pkgs/servers/sunshine/default.nix

@@ -18,6 +18,7 @@
 , pkg-config
 , libdrm
 , wayland
+, wayland-scanner
 , libffi
 , libcap
 , mesa
@@ -90,6 +91,7 @@ stdenv'.mkDerivation rec {
     pkg-config
     python3
     makeWrapper
+    wayland-scanner
     # Avoid fighting upstream's usage of vendored ffmpeg libraries
     autoPatchelfHook
   ] ++ lib.optionals cudaSupport [

pkgs/tools/filesystems/ceph/default.nix

@@ -323,6 +323,11 @@ in rec {
         name = "ceph-reef-ceph-volume-fix-set_dmcrypt_no_workqueue.patch";
         hash = "sha256-r+7hcCz2WF/rJfgKwTatKY9unJlE8Uw3fmOyaY5jVH0=";
       })
+      (fetchpatch {
+        url = "https://github.com/ceph/ceph/commit/607eb34b2c278566c386efcbf3018629cf08ccfd.patch";
+        name = "ceph-volume-fix-set_dmcrypt_no_workqueue-regex.patch";
+        hash = "sha256-q28Q7OIyFoMyMBCPXGA+AdNqp+9/6J/XwD4ODjx+JXY=";
+      })
     ];
 
     postPatch = ''
@@ -487,7 +492,8 @@ in rec {
         inherit (nixosTests)
           ceph-multi-node
           ceph-single-node
-          ceph-single-node-bluestore;
+          ceph-single-node-bluestore
+          ceph-single-node-bluestore-dmcrypt;
       };
     };
   };

pkgs/tools/graphics/piglit/default.nix

@@ -16,6 +16,7 @@
 , libXrender
 , libxcb
 , libxkbcommon
+, mesa
 }:
 
 stdenv.mkDerivation rec {
@@ -71,7 +72,7 @@ stdenv.mkDerivation rec {
     description = "OpenGL test suite, and test-suite runner";
     homepage = "https://gitlab.freedesktop.org/mesa/piglit";
     license = licenses.free; # custom license. See COPYING in the source repo.
-    platforms = platforms.mesaPlatforms;
+    inherit (mesa.meta) platforms;
     maintainers = with maintainers; [ Flakebi ];
     mainProgram = "piglit";
   };

pkgs/tools/graphics/wdisplays/default.nix

@@ -1,10 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, libepoxy, wayland, wrapGAppsHook3 }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, libepoxy
+, wayland, wayland-scanner, wrapGAppsHook3
+}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wdisplays";
   version = "1.1.1";
 
-  nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook3 ];
+  nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook3 wayland-scanner ];
 
   buildInputs = [ gtk3 libepoxy wayland ];
 

pkgs/tools/inputmethods/keymapper/default.nix

@@ -8,6 +8,7 @@
 , pkg-config
 , udev
 , wayland
+, wayland-scanner
 , libxkbcommon
 , gtk3
 , libayatana-appindicator
@@ -30,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     dbus
     wayland
+    wayland-scanner
     libX11
     udev
     libusb1

pkgs/tools/misc/clipboard-jh/default.nix

@@ -5,6 +5,7 @@
 , libffi
 , pkg-config
 , wayland-protocols
+, wayland-scanner
 , wayland
 , xorg
 , darwin
@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    wayland-scanner
   ];
 
   buildInputs = lib.optionals stdenv.isLinux [

pkgs/tools/misc/rtz/default.nix

@@ -1,6 +1,7 @@
 { lib
 , rustPlatform
 , fetchFromGitHub
+, fetchurl
 , pkg-config
 , bzip2
 , openssl
@@ -11,13 +12,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rtz";
-  version = "0.5.3";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "twitchax";
     repo = "rtz";
     rev = "v${version}";
-    hash = "sha256-cc5yGZ4zHB9V//ywvKv9qgKGDpKotzkJKbfwv1rK2tM=";
+    hash = "sha256-Wfb3FEZHjWYUtRI4Qn3QNunIXuzW1AIEZkIvtVrjBPs=";
   };
 
   cargoLock = {
@@ -27,6 +28,11 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
+  swagger-ui = fetchurl {
+    url = "https://github.com/juhaku/utoipa/raw/master/utoipa-swagger-ui-vendored/res/v5.17.12.zip";
+    hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I=";
+  };
+
   nativeBuildInputs = [
     pkg-config
   ];
@@ -41,9 +47,15 @@ rustPlatform.buildRustPackage rec {
 
   buildFeatures = [ "web" ];
 
+  # ${swagger-ui} is read-only and the copy made by the build script
+  # is as well. Remove it so that checks can copy it again.
+  preCheck = ''
+    find target -name $(basename ${swagger-ui}) -delete
+  '';
+
   env = {
-    # requires nightly features
+    # use local data file instead of requiring network access
-    RUSTC_BOOTSTRAP = true;
+    SWAGGER_UI_DOWNLOAD_URL = "file://${swagger-ui}";
   };
 
   meta = with lib; {

pkgs/tools/security/fierce/default.nix

@@ -1,41 +1,38 @@
-{ lib
+{
-, fetchFromGitHub
+  lib,
-, python3
+  fetchFromGitHub,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "fierce";
-  version = "1.5.0";
+  version = "1.6.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mschwager";
-    repo = pname;
+    repo = "fierce";
-    rev = version;
+    rev = "refs/tags/${version}";
-    sha256 = "sha256-9VTPD5i203BTl2nADjq131W9elgnaHNIWGIUuCiYlHg=";
+    sha256 = "sha256-y5ZSDJCTqslU78kXGyk6DajBpX7xz1CVmbhYerHmyis=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  pythonRelaxDeps = [ "dnspython" ];
-    dnspython
-  ];
 
-  postPatch = ''
+  build-system = with python3.pkgs; [ poetry-core ];
-    substituteInPlace requirements.txt \
-      --replace 'dnspython==1.16.0' 'dnspython'
-  '';
 
-  # tests require network access
+  dependencies = with python3.pkgs; [ dnspython ];
+
+  # Tests require network access
   doCheck = false;
 
-  pythonImportsCheck = [
+  pythonImportsCheck = [ "fierce" ];
-    "fierce"
-  ];
 
   meta = with lib; {
     description = "DNS reconnaissance tool for locating non-contiguous IP space";
-    mainProgram = "fierce";
     homepage = "https://github.com/mschwager/fierce";
+    changelog = "https://github.com/mschwager/fierce/blob/${version}/CHANGELOG.md";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ c0bw3b ];
+    mainProgram = "fierce";
   };
 }

pkgs/tools/wayland/waylogout/default.nix

@@ -6,6 +6,7 @@
 , pkg-config
 , wayland
 , wayland-protocols
+, wayland-scanner
 , libxkbcommon
 , cairo
 , gdk-pixbuf
@@ -28,6 +29,7 @@ stdenv.mkDerivation {
     meson
     ninja
     scdoc
+    wayland-scanner
   ];
 
   buildInputs = [

pkgs/top-level/release-lib.nix

@@ -178,7 +178,7 @@ let
 
 in {
   /* Common platform groups on which to test packages. */
-  inherit (platforms) unix linux darwin cygwin all mesaPlatforms;
+  inherit (platforms) unix linux darwin cygwin all;
 
   inherit
     assertTrue