Merge master into staging-next

nixos/modules/hardware/fw-fanctrl.nix

@@ -4,21 +4,18 @@
   pkgs,
   ...
 }:
-
 let
-  cfg = config.hardware.fw-fanctrl;
-
   configFormat = pkgs.formats.json { };
-  configOption = configFormat.generate "config.json" cfg.config;
-
-  configFile = pkgs.runCommand "configFile" { } ''
-    ${lib.getExe pkgs.jq} -s '.[0] * .[1]' ${pkgs.fw-fanctrl}/share/fw-fanctrl/config.json ${configOption} > $out
-  '';
+  cfg = config.hardware.fw-fanctrl;
 in
 {
   options.hardware.fw-fanctrl = {
     enable = lib.mkEnableOption "the fw-fanctrl systemd service and install the needed packages";
 
+    package = lib.mkPackageOption pkgs "fw-fanctrl" { };
+
+    ectoolPackage = lib.mkPackageOption pkgs "fw-ectool" { };
+
     disableBatteryTempCheck = lib.mkOption {
       type = lib.types.bool;
       default = false;
@@ -98,30 +95,36 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      fw-fanctrl
-      fw-ectool
-    ];
+  config =
+    let
+      defaultConfig = builtins.fromJSON (builtins.readFile "${cfg.package}/share/fw-fanctrl/config.json");
+      finalConfig = lib.attrsets.recursiveUpdate defaultConfig cfg.config;
+      configFile = configFormat.generate "custom.json" finalConfig;
+    in
+    lib.mkIf cfg.enable {
+      environment.systemPackages = [
+        cfg.package
+        cfg.ectoolPackage
+      ];
 
-    systemd.services.fw-fanctrl = {
-      description = "Framework Fan Controller";
-      after = [ "multi-user.target" ];
-      serviceConfig = {
-        Type = "simple";
-        Restart = "always";
-        ExecStart = "${lib.getExe pkgs.fw-fanctrl} --output-format JSON run --config ${configFile} --silent ${lib.optionalString cfg.disableBatteryTempCheck "--no-battery-sensors"}";
-        ExecStopPost = "${lib.getExe pkgs.fw-ectool} autofanctrl";
+      systemd.services.fw-fanctrl = {
+        description = "Framework Fan Controller";
+        after = [ "multi-user.target" ];
+        serviceConfig = {
+          Type = "simple";
+          Restart = "always";
+          ExecStart = "${lib.getExe cfg.package} --output-format JSON run --config ${configFile} --silent ${lib.optionalString cfg.disableBatteryTempCheck "--no-battery-sensors"}";
+          ExecStopPost = "${lib.getExe cfg.ectoolPackage} autofanctrl";
+        };
+        wantedBy = [ "multi-user.target" ];
       };
-      wantedBy = [ "multi-user.target" ];
+
+      # Create suspend config
+      environment.etc."systemd/system-sleep/fw-fanctrl-suspend.sh".source =
+        "${cfg.package}/share/fw-fanctrl/fw-fanctrl-suspend";
     };
 
-    # Create suspend config
-    environment.etc."systemd/system-sleep/fw-fanctrl-suspend.sh".source =
-      "${pkgs.fw-fanctrl}/share/fw-fanctrl/fw-fanctrl-suspend";
-  };
-
   meta = {
-    maintainers = pkgs.fw-fanctrl.meta.maintainers;
+    maintainers = [ lib.maintainers.Svenum ];
   };
 }

pkgs/applications/editors/vscode/extensions/default.nix

@@ -2033,8 +2033,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "vscode-pull-request-github";
-          version = "0.114.2";
-          hash = "sha256-TLsvewvmqwKEBPsuzrlMhlsjdi3jbA7E1xz9B8aU1LA=";
+          version = "0.114.3";
+          hash = "sha256-ZrutAYL0HphkSDh2BRA4wZUA/s1Uf6IvPWs4dfqfEDk=";
         };
         meta = {
           license = lib.licenses.mit;
@@ -2365,8 +2365,8 @@ let
         mktplcRef = {
           name = "vscode-vibrancy-continued";
           publisher = "illixion";
-          version = "1.1.58";
-          hash = "sha256-oBm2j7fZBYALkstk1WMgC+o1sq2HY7tX+zLfo5PBMiM=";
+          version = "1.1.59";
+          hash = "sha256-ClzUxKdiYZqAlmXJ3W54kJddLRov5XKo0t8PPWA/Qq8=";
         };
         meta = {
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";

pkgs/applications/video/obs-studio/default.nix

@@ -82,13 +82,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-studio";
-  version = "31.1.1";
+  version = "31.1.2";
 
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-studio";
     rev = finalAttrs.version;
-    hash = "sha256-FZTWuT9eANITzdCopDyr11CTyfGvMtSgaFMPSPlmrTU=";
+    hash = "sha256-QZoIyjliVruDPZj8hzTABaDn+nCTVs5qQCdBLtSOKvI=";
     fetchSubmodules = true;
   };
 

pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix

@@ -28,13 +28,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-hyprland";
-  version = "1.3.9";
+  version = "1.3.10";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "xdg-desktop-portal-hyprland";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sAObJHBZjJHzYR62g+BLNBNq19cqb5LTw73H8m57K0w=";
+    hash = "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=";
   };
 
   depsBuildBuild = [

pkgs/by-name/am/amazon-q-cli/package.nix

@@ -7,20 +7,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "amazon-q-cli";
-  version = "1.12.6";
+  version = "1.12.7";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli-autocomplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IjM9eFoFfy/WV6lPJB1mnRZYoXLIiVozjzmnXEnU2MA=";
+    hash = "sha256-K9OwA7qEv+yPYL4vv/ZhDK2mhW/jYmGFLEQ9oX2pjUE=";
   };
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
 
-  cargoHash = "sha256-XZX8EisHQ1vqbrV8VnXrah3o1h3iKCxzPsKk6Z+aKzU=";
+  cargoHash = "sha256-C8uc9/g70fBpEeSagNcSfv/KHpW2zJdRvWe2bpTzHRU=";
 
   cargoBuildFlags = [
     "-p"

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

@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "14.4.3";
+  version = "14.6.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    hash = "sha256-w6rdWb2w6kM5sFbymXL5LuGf3FL2jreNMtLkyvTYDDo=";
+    hash = "sha256-vsZ/No/GFnPEyelCnSATWkK6gKLH+FkrkS5fl+KJv8A=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/ej/ejabberd/package.nix

@@ -141,7 +141,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ejabberd";
-  version = "25.04";
+  version = "25.07";
 
   nativeBuildInputs = [
     makeWrapper
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "processone";
     repo = "ejabberd";
     tag = finalAttrs.version;
-    hash = "sha256-BIt5kLEtvMUlyntQ98Mgidmo6lJHbt/LJYrbxPaJxPo=";
+    hash = "sha256-DDvxmRennd9tAC9LqV8eAAzcF+kZemvgsOviWD9CHlM=";
   };
 
   passthru.tests = {
@@ -224,6 +224,7 @@ stdenv.mkDerivation (finalAttrs: {
       sander
       abbradar
       chuangzhu
+      toastal
     ];
   };
 })

pkgs/by-name/ej/ejabberd/rebar-deps.nix

@@ -14,11 +14,11 @@ let
   packages = with self; {
     unicode_util_compat = builder {
       name = "unicode_util_compat";
-      version = "0.7.0";
+      version = "0.7.1";
       src = fetchHex {
         pkg = "unicode_util_compat";
-        version = "0.7.0";
-        sha256 = "sha256-Je7m1n32GWDPanlCOVZlmbCeF+Zo03ACR7xJhjgVJSE=";
+        version = "0.7.1";
+        sha256 = "sha256-s6kXhUzjriM2GXRK0eAQLgVnMTZ3b7L6diNPPgOyNkI=";
       };
       beamDeps = [ ];
     };
@@ -44,21 +44,21 @@ let
     };
     yconf = builder {
       name = "yconf";
-      version = "1.0.18";
+      version = "1.0.20";
       src = fetchHex {
         pkg = "yconf";
-        version = "1.0.18";
-        sha256 = "sha256-+pUOxlA/ktZBf7jMHZgkA/BBaX6OG79NRYj7kZuVYuo=";
+        version = "1.0.20";
+        sha256 = "sha256-8rPXMHVvwuSv0cCwq277mfDkSJUtJdwV7XWsFjW/iII=";
       };
       beamDeps = [ fast_yaml ];
     };
     xmpp = builder {
       name = "xmpp";
-      version = "1.10.0";
+      version = "1.11.0";
       src = fetchHex {
         pkg = "xmpp";
-        version = "1.10.0";
-        sha256 = "sha256-zurkO4/pdknY+FRrP38rOOz8kxwM3Vx0Rf+z+A/LfYU=";
+        version = "1.11.0";
+        sha256 = "sha256-NKGR1qO3To8KQjRvhZ4sq1s6Kuflwo85Lly1ZhLnzoU=";
       };
       beamDeps = [
         ezlib
@@ -71,11 +71,11 @@ let
     };
     stun = builder {
       name = "stun";
-      version = "1.2.17";
+      version = "1.2.20";
       src = fetchHex {
         pkg = "stun";
-        version = "1.2.17";
-        sha256 = "sha256-azGCRMIehSSpquOsmgXNgjTumUwcLIFd5o0wYIatdo0=";
+        version = "1.2.20";
+        sha256 = "sha256-eeSfgmpPfVIsk5q2M9k1x519ayKeTLfgX2LzO1AXdBQ=";
       };
       beamDeps = [
         fast_tls
@@ -84,11 +84,11 @@ let
     };
     stringprep = builder {
       name = "stringprep";
-      version = "1.0.31";
+      version = "1.0.33";
       src = fetchHex {
         pkg = "stringprep";
-        version = "1.0.31";
-        sha256 = "sha256-6WmciOjbFrOkHw5FrGh0pNqBpuSFSnfXbt5tCbCONTA=";
+        version = "1.0.33";
+        sha256 = "sha256-lvizC8UIh/YFsztGvKHSSMGah5MZuMSCeQ47TaXamMA=";
       };
       beamDeps = [ p1_utils ];
     };
@@ -114,21 +114,21 @@ let
     };
     p1_utils = builder {
       name = "p1_utils";
-      version = "1.0.26";
+      version = "1.0.28";
       src = fetchHex {
         pkg = "p1_utils";
-        version = "1.0.27";
-        sha256 = "sha256-8a+UKwpivPoNWfvjBnm+T/614kGgxJ7V8JTbL1uA9eA=";
+        version = "1.0.28";
+        sha256 = "sha256-xJvUS8SkCtmWaRr4Jt1+CqVtTQzXMIFxkKH4TRp/ADM=";
       };
       beamDeps = [ ];
     };
     p1_pgsql = builder {
       name = "p1_pgsql";
-      version = "1.1.32";
+      version = "1.1.34";
       src = fetchHex {
         pkg = "p1_pgsql";
-        version = "1.1.32";
-        sha256 = "sha256-JosB6PTrdcIRoxSVolwoFcVJrszi8N8aFhxuCizeBh4=";
+        version = "1.1.34";
+        sha256 = "sha256-yw4y4IbJw10OPpZuOGPYMnN8e00rXxRzFqRlwLJD6n8=";
       };
       beamDeps = [ xmpp ];
     };
@@ -154,11 +154,11 @@ let
     };
     p1_acme = builder {
       name = "p1_acme";
-      version = "1.0.25";
+      version = "1.0.27";
       src = fetchHex {
         pkg = "p1_acme";
-        version = "1.0.25";
-        sha256 = "sha256-p7VbR0ld20+YoV5lRR7DrUP0Y3uVXHTNaV2Y5qZF0Iw=";
+        version = "1.0.27";
+        sha256 = "sha256-qmS2qIVrGiKaEovqJ2Md4uGiIZg146gz+hETcUOo13M=";
       };
       beamDeps = [
         base64url
@@ -170,11 +170,11 @@ let
     };
     mqtree = builder {
       name = "mqtree";
-      version = "1.0.17";
+      version = "1.0.19";
       src = fetchHex {
         pkg = "mqtree";
-        version = "1.0.17";
-        sha256 = "sha256-X+i3z4+8R4PQ/OuUZUrCu/MkKljNA5fSSd7YrgIb4qM=";
+        version = "1.0.19";
+        sha256 = "sha256-yBBlcVxJoYgoEvgKWuLYQugN0/LRMFMN81mQJIv4zjw=";
       };
       beamDeps = [ p1_utils ];
     };
@@ -210,51 +210,51 @@ let
     };
     fast_yaml = builder {
       name = "fast_yaml";
-      version = "1.0.37";
+      version = "1.0.39";
       src = fetchHex {
         pkg = "fast_yaml";
-        version = "1.0.37";
-        sha256 = "sha256-jehochv34hckFPfTFI7eDzySK0lkVc1iXdXEQpUVp2k=";
+        version = "1.0.39";
+        sha256 = "sha256-JMe5q54rkmnWTkX0oqEoCWatsX0x5jNlz9PuJ3+wp40=";
       };
       beamDeps = [ p1_utils ];
     };
     fast_xml = builder {
       name = "fast_xml";
-      version = "1.1.55";
+      version = "1.1.57";
       src = fetchHex {
         pkg = "fast_xml";
-        version = "1.1.55";
-        sha256 = "sha256-g/PiOngO1fVnzexzlT8GyVuDjXCdv6hrWamKjSPJn4U=";
+        version = "1.1.57";
+        sha256 = "sha256-7sNOkK2sr+Rn1d2rY1oBTe1zuYtAYVVLLRlyFz2SnDk=";
       };
       beamDeps = [ p1_utils ];
     };
     fast_tls = builder {
       name = "fast_tls";
-      version = "1.1.22";
+      version = "1.1.24";
       src = fetchHex {
         pkg = "fast_tls";
-        version = "1.1.22";
-        sha256 = "sha256-5ld5rvt6sVxHVSMP74B35ofSDMWjmEpZdPn2V+jiSFs=";
+        version = "1.1.24";
+        sha256 = "sha256-//iK2jn60QRkVnoWBkP0Up70rtSdFWkZ9dH0FbbNu7Y=";
       };
       beamDeps = [ p1_utils ];
     };
     ezlib = builder {
       name = "ezlib";
-      version = "1.0.13";
+      version = "1.0.15";
       src = fetchHex {
         pkg = "ezlib";
-        version = "1.0.13";
-        sha256 = "sha256-nuYqs/jtVaD9EalWn8uORYaD+VV1QXJyGSsGnwkqv7s=";
+        version = "1.0.15";
+        sha256 = "sha256-3RS6bBJSGvXP5pI+c+PVRfSgiX3Ga/q1KH+7euOWLqs=";
       };
       beamDeps = [ p1_utils ];
     };
     esip = builder {
       name = "esip";
-      version = "1.0.57";
+      version = "1.0.58";
       src = fetchHex {
         pkg = "esip";
-        version = "1.0.57";
-        sha256 = "sha256-GcNX4YF7HgR5LvNZv5AEAPPm0OWt6Sn9cviOqbRK8u0=";
+        version = "1.0.58";
+        sha256 = "sha256-4PQgSl7eD6fQDaPMQvZECqNiusf69Tb3HqKfo/D6fHU=";
       };
       beamDeps = [
         fast_tls
@@ -284,21 +284,21 @@ let
     };
     eimp = builder {
       name = "eimp";
-      version = "1.0.24";
+      version = "1.0.26";
       src = fetchHex {
         pkg = "eimp";
-        version = "1.0.24";
-        sha256 = "sha256-fWFDLrikVlnAvkdfROde62UXQ6pkod6K33hc2tgZYa0=";
+        version = "1.0.26";
+        sha256 = "sha256-2W1OhXK538QPJx5H8MsdiEk3O8mKISIyaHgXZe1SBEw=";
       };
       beamDeps = [ p1_utils ];
     };
     cache_tab = builder {
       name = "cache_tab";
-      version = "1.0.31";
+      version = "1.0.33";
       src = fetchHex {
         pkg = "cache_tab";
-        version = "1.0.31";
-        sha256 = "sha256-hYK2CkoJskfvhjVbqeB/zp4R7cA0WndckXH5cccrY1E=";
+        version = "1.0.33";
+        sha256 = "sha256-QlgAnrBQsiqr4MhI4jC7pYQBpolcWML/dN+2NePDWQA=";
       };
       beamDeps = [ p1_utils ];
     };

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

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "haven";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "bitvora";
     repo = "haven";
     tag = "v${version}";
-    hash = "sha256-rSycrHW53TgqbsfgaRn3492EWtpu440GtbegozqnzMQ=";
+    hash = "sha256-ddOZydweF3wVH81Bm8LIuP2HHGrGooIDeAH/Ro5LKu4=";
   };
 
-  vendorHash = "sha256-5d6C2sNG8aCaC+z+hyLgOiEPWP/NmAcRRbRVC4KuCEw=";
+  vendorHash = "sha256-JJ5kcTgjMB9d5JdMg2FiOOoAFeDhcEAsxWynd1aGNfs=";
 
   postInstall = ''
     mkdir -p $out/share/haven

pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lasuite-docs-collaboration-server";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
     tag = "v${version}";
-    hash = "sha256-QAWwyFp9l+C0XfVu975zjiv61e/S2nYKkUSv4/p7gxw=";
+    hash = "sha256-uo49y+tJXdc8gfFIHSIEk0DEowMsHWA64IxlHpFHUTU=";
   };
 
   sourceRoot = "source/src/frontend";

pkgs/by-name/la/lasuite-docs-frontend/package.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lasuite-docs-frontend";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
     tag = "v${version}";
-    hash = "sha256-QAWwyFp9l+C0XfVu975zjiv61e/S2nYKkUSv4/p7gxw=";
+    hash = "sha256-uo49y+tJXdc8gfFIHSIEk0DEowMsHWA64IxlHpFHUTU=";
   };
 
   sourceRoot = "source/src/frontend";

pkgs/by-name/la/lasuite-docs/package.nix

@@ -24,14 +24,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "lasuite-docs";
-  version = "3.4.1";
+  version = "3.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
     tag = "v${version}";
-    hash = "sha256-QAWwyFp9l+C0XfVu975zjiv61e/S2nYKkUSv4/p7gxw=";
+    hash = "sha256-uo49y+tJXdc8gfFIHSIEk0DEowMsHWA64IxlHpFHUTU=";
   };
 
   sourceRoot = "source/src/backend";

pkgs/by-name/la/lasuite-meet-frontend/package.nix

@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "lasuite-meet-frontend";
-  version = "0.1.30";
+  version = "0.1.33";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-Ow2xi3twW6FeG88Ya5AeRNk6MIY5JGqd7e1qukKTfQs=";
+    hash = "sha256-NXE+Kt41NlJ5F9Y5ftWBAPzCcFyTHZj7/2Os7ZFM72Y=";
   };
 
   sourceRoot = "source/src/frontend";
@@ -21,7 +21,7 @@ buildNpmPackage rec {
   npmDeps = fetchNpmDeps {
     inherit version src;
     sourceRoot = "source/src/frontend";
-    hash = "sha256-Id4taAuW/tu9YhbGxjNegdSqyNmUFRQOLF3glkFw0Vc=";
+    hash = "sha256-s5HgGFY7yPct7P2nutYab1KsMbzHWBHKEm4W74qsgIw=";
   };
 
   buildPhase = ''

pkgs/by-name/la/lasuite-meet/package.nix

@@ -13,14 +13,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "lasuite-meet";
-  version = "0.1.30";
+  version = "0.1.33";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-Ow2xi3twW6FeG88Ya5AeRNk6MIY5JGqd7e1qukKTfQs=";
+    hash = "sha256-NXE+Kt41NlJ5F9Y5ftWBAPzCcFyTHZj7/2Os7ZFM72Y=";
   };
 
   sourceRoot = "source/src/backend";

pkgs/by-name/lu/lux-cli/package.nix

@@ -17,18 +17,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lux-cli";
 
-  version = "0.9.1";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "nvim-neorocks";
     repo = "lux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RbJ/jR/LrOIn4R4In21Rj5QNr3GrPwPp+6Wy/GPlAM4=";
+    hash = "sha256-yjd8nqrypgdS2UtAANv1TtuGtZPaWm7LhVrHPghf5hg=";
   };
 
   buildAndTestSubdir = "lux-cli";
 
-  cargoHash = "sha256-rQ4zJQSlIUC63a4UdkA6+Y63vvkZ7TyXV0EWXzXmjPM=";
+  cargoHash = "sha256-iKZ4FJ0IL1lnKuYTmFvx8umoB0z8M8xnvgb/GMfGKkI=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

pkgs/by-name/pa/parallel-disk-usage/package.nix

@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "parallel-disk-usage";
-  version = "0.13.1";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "KSXGitHub";
     repo = "parallel-disk-usage";
     rev = version;
-    hash = "sha256-gzjNi7ujYe7OZKYyrYk1xqqo/k8yBJdIwRoNASm5Db4=";
+    hash = "sha256-Xzc+1cPs84o58G7n8hEN9vtaz3bw3TrwodphK45Iq2g=";
   };
 
-  cargoHash = "sha256-3U61AkCicX7VNh1bf0IHPH5YX7qAtp4PvWi8FRKoBQI=";
+  cargoHash = "sha256-qSQpjYydpjVUP5AO2sPshP/HZzeVihwlJxyabml67js=";
 
   meta = with lib; {
     description = "Highly parallelized, blazing fast directory tree analyzer";

pkgs/by-name/st/stac-validator/package.nix

@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "stac-validator";
-  version = "3.10.0";
+  version = "3.10.1";
   pyproject = true;
   disabled = python3Packages.pythonOlder "3.8";
 
@@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec {
     owner = "stac-utils";
     repo = "stac-validator";
     tag = "v${version}";
-    hash = "sha256-diaiF2wJyS/1DuUwPkdMyqpMfvKWvTnRo2H4O7FxYBM=";
+    hash = "sha256-tqguaptVRo6k6QALOOOL8dysMGDZx07eRJoHG24JirQ=";
   };
 
   build-system = [ python3Packages.setuptools ];

pkgs/by-name/to/tootik/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "tootik";
-  version = "0.17.1";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "dimkr";
     repo = "tootik";
     tag = version;
-    hash = "sha256-C3jljz1ftpSlgmwY5ktTJSiZ2DVxbctFT7LZXBow73s=";
+    hash = "sha256-j+1oMfeuE4gZjhWsDORsDhF+EUcNeCv0EDz6Q7DNPzQ=";
   };
 
-  vendorHash = "sha256-Imnh/f+6pybALRnefxaTyZ95orhAQfLWdMsIIkOOurc=";
+  vendorHash = "sha256-dQcmpYaSWvgF3B/rMs36+Snxh24JTPmkKGamkzcqqeM=";
 
   nativeBuildInputs = [ openssl ];
 

pkgs/by-name/us/ustreamer/package.nix

@@ -21,13 +21,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "ustreamer";
-  version = "6.31";
+  version = "6.39";
 
   src = fetchFromGitHub {
     owner = "pikvm";
     repo = "ustreamer";
-    rev = "v${version}";
-    hash = "sha256-SvvIY52FMO6Y4B6TOfk7dLtci4OayPX6+d8voKenKbQ=";
+    tag = "v${version}";
+    hash = "sha256-Lc0cwzt7rGfbJSLdZTDVdmkub6Z2KnTz5PRpEvtHsKM=";
   };
 
   buildInputs = [

pkgs/by-name/wa/warp-terminal/versions.json

@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-nRI0xtLFyFqqNCZjIH07Dxut4OdZMO3KHHyPeNT3XKo=",
-    "version": "0.2025.07.09.08.11.stable_01"
+    "hash": "sha256-JAqWQ3dfk4B+CNV5knj4HCnpVu3Q5STnyriqaeLPQD0=",
+    "version": "0.2025.07.23.08.12.stable_02"
   },
   "linux_x86_64": {
-    "hash": "sha256-zk3yHo3aimdmgA9bxbQrrZXXWYzNjJRB619PB/MRIG4=",
-    "version": "0.2025.07.09.08.11.stable_01"
+    "hash": "sha256-C9p95LRS/ma5FEIq6ZQqda+dQhgbVT8dhDJIDpCilWI=",
+    "version": "0.2025.07.23.08.12.stable_02"
   },
   "linux_aarch64": {
-    "hash": "sha256-b208xahTJ0e0wABB2m2M7x6CAyHKr/7uHMF/cY4LVfM=",
-    "version": "0.2025.07.09.08.11.stable_01"
+    "hash": "sha256-KGmkuL/4I+oN99ubjtGMrEt6Ijlak9yv39LksPAo8/U=",
+    "version": "0.2025.07.23.08.12.stable_02"
   }
 }

pkgs/by-name/xw/xwin/package.nix

@@ -0,0 +1,45 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "xwin";
+  version = "0.6.6";
+
+  src = fetchFromGitHub {
+    owner = "Jake-Shadle";
+    repo = "xwin";
+    tag = finalAttrs.version;
+    hash = "sha256-bow/TJ6aIXoNZDqCTlQYAMxEUiolby1axsKiLMk/jiA=";
+  };
+
+  cargoHash = "sha256-S/3EjlG0Dr/KKAYSFaX/aFh/CIc19Bv+rKYzKPWC+MI=";
+
+  doCheck = true;
+  # Requires network access
+  checkFlags = [
+    "--skip verify_compiles"
+    "--skip verify_deterministic"
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = placeholder "out" + "/bin/xwin";
+
+  meta = {
+    description = "Utility for downloading the Microsoft CRT & Windows SDK libraries";
+    homepage = "https://github.com/Jake-Shadle/xwin";
+    changelog = "https://github.com/Jake-Shadle/xwin/releases/tag/" + finalAttrs.version;
+    mainProgram = "xwin";
+    license = [
+      lib.licenses.mit
+      lib.licenses.asl20
+    ];
+    maintainers = with lib.maintainers; [ RossSmyth ];
+    platforms = with lib.platforms; linux ++ darwin ++ windows;
+  };
+})

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

@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "evaluate";
-  version = "0.4.4";
+  version = "0.4.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "huggingface";
     repo = "evaluate";
     tag = "v${version}";
-    hash = "sha256-zN0Kud4CJMM5gazWKOR9kmwTVHYgT7DsZqbHjFIe47w=";
+    hash = "sha256-YcKlGun9zZdr8l2Oz49J8OYV9/VUHyyGyaJk/7PGS0o=";
   };
 
   build-system = [ setuptools ];

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

@@ -2,33 +2,33 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  hatchling,
+  poetry-core,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "filecheck";
-  version = "0.0.24";
-  format = "pyproject";
+  version = "1.0.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "mull-project";
-    repo = "FileCheck.py";
+    owner = "AntonLydike";
+    repo = "filecheck";
     tag = "v${version}";
-    hash = "sha256-VbMlCqGd3MVpj0jEKjSGC2L0s/3e/d53b+2eZcXZneo=";
+    hash = "sha256-73HQ8dGp52+SyuwacthCjSQsA5v3LU49sabI066wuwU=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "filecheck" ];
 
   meta = with lib; {
-    changelog = "https://github.com/mull-project/FileCheck.py/releases/tag/v${version}";
-    homepage = "https://github.com/mull-project/FileCheck.py";
+    changelog = "https://github.com/antonlydike/filecheck/releases/tag/v${version}";
+    homepage = "https://github.com/antonlydike/filecheck";
     license = licenses.asl20;
-    description = "Python port of LLVM's FileCheck, flexible pattern matching file verifier";
+    description = "Python-native clone of LLVMs FileCheck tool";
     mainProgram = "filecheck";
     maintainers = with maintainers; [ yorickvp ];
   };

pkgs/tools/package-management/nix/default.nix

@@ -204,14 +204,14 @@ lib.makeExtensible (
       nix_2_29 = addTests "nix_2_29" self.nixComponents_2_29.nix-everything;
 
       nixComponents_2_30 = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.30.1";
+        version = "2.30.2";
         inherit (self.nix_2_24.meta) maintainers teams;
         otherSplices = generateSplicesForNixComponents "nixComponents_2_30";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
           tag = version;
-          hash = "sha256-4+xPVJBeYLlIn+fOS5F0iq/DclpCXnmh4Y7VzAIr/a8=";
+          hash = "sha256-U46fAs+j2PfWWqP1zNi1odhnV4030SQ0RoEC8Eah1OQ=";
         };
       };