Merge master into staging-next

nixos/modules/services/misc/comfyui.nix

@@ -9,6 +9,19 @@ let
 
   # By default a StateDirectory is used; anything else needs its own directory and a hole in the unit's mount namespace.
   isDefaultDataDir = cfg.dataDir == "/var/lib/comfyui";
+
+  modelDrvs = map (m: {
+    inherit m;
+    drv = pkgs.fetchurl (lib.filterAttrs (n: _: n == "name" || n == "url" || n == "hash") m);
+  }) cfg.models;
+
+  modelSymlinks = lib.concatMapStringsSep "\n" (
+    x:
+    lib.concatMapStringsSep "\n" (p: ''
+      mkdir -p ${lib.escapeShellArg "${cfg.dataDir}/models/${p}"}
+      ln -sn ${lib.escapeShellArg "${x.drv}"} ${lib.escapeShellArg "${cfg.dataDir}/models/${p}/${x.m.name}"}
+    '') x.m.installPaths
+  ) modelDrvs;
 in
 {
   options = {
@@ -67,6 +80,64 @@ in
           Flags set by the module are prepended with `lib.mkBefore`, so any user supplied flag wins over that.
         '';
       };
+
+      models = lib.mkOption {
+        type = lib.types.listOf (
+          lib.types.submodule {
+            options = {
+              name = lib.mkOption {
+                type = lib.types.str;
+                description = ''
+                  The model file name, used as the link name in `models/<installPath>/<name>`.
+                  It must be unique within the same `<installPath>`, to avoid conflicts.
+                '';
+              };
+              url = lib.mkOption {
+                type = lib.types.str;
+                description = ''
+                  The download URL of the model file.
+                  Pinned-resolve URLs (e.g. HuggingFace's `/resolve/<commit>/<file>`) are recommended to have a stable hash.
+                '';
+              };
+              hash = lib.mkOption {
+                type = lib.types.str;
+                example = lib.fakeHash;
+                description = ''
+                  The SRI hash of the model file. Generate it with `nix-prefetch-url <url>`,
+                  or set this to `lib.fakeHash`, build once and copy the hash from the error message.
+                '';
+              };
+              installPaths = lib.mkOption {
+                # A directory string is converted to a list.
+                type =
+                  with lib.types;
+                  coercedTo (strMatching "[A-Za-z0-9_-]+") lib.singleton (
+                    nonEmptyListOf (strMatching "[A-Za-z0-9_-]+")
+                  );
+                description = ''
+                  String or list of target subdirectory names below `models/`, such as `upscale_models`, `loras`, `checkpoints`.
+                  Write bare directory names (the module assembles them into `models/<installPath>`,
+                  one symlink per install path); a single string is also accepted and upgraded to a one-element list.
+                '';
+                example = [ "upscale_models" ];
+              };
+            };
+          }
+        );
+        default = [ ];
+        example = lib.literalExpression ''
+          [ {
+            name = "RealESRGAN_x4plus_anime_6B.pth";
+            url = "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth";
+            hash = "sha256-+HLYN9PJDtLgUie+1xGvVnGm/RyffX6RyRGmHxVemdo=";
+            installPaths = "upscale_models";
+          } ]
+        '';
+        description = ''
+          ComfyUI models to fetch and symlink into `''${services.comfyui.dataDir}/models/<installPath>/<name>`.
+          Files placed manually in the `models` directory are left untouched.
+        '';
+      };
     };
   };
 
@@ -98,6 +169,17 @@ in
             cp --no-preserve=all -r ${cfg.package}/share/comfyui/$d "${cfg.dataDir}/"
           fi
         done
+
+        # Remove all symlinks pointing into /nix/store, then relink them, so that no stale ones are left behind.
+        readarray -d "" stale < <(find "${cfg.dataDir}/models" -type l -print0)
+        for link in "''${stale[@]}"; do
+          if [[ "$(readlink "$link")" == ${lib.escapeShellArg builtins.storeDir}/* ]]; then
+            rm "$link"
+          fi
+        done
+
+        # Rebuild model symlinks
+        ${modelSymlinks}
       '';
 
       serviceConfig = {

nixos/tests/all-tests.nix

@@ -381,6 +381,7 @@ in
   budgie = runTest ./budgie.nix;
   buildbot = runTest ./buildbot.nix;
   buildkite-agents = runTest ./buildkite-agents.nix;
+  buildstream = runTest ./buildstream.nix;
   bulwark = runTest ./bulwark.nix;
   c2fmzq = runTest ./c2fmzq.nix;
   caddy = runTest ./caddy.nix;

nixos/tests/buildstream.nix

@@ -0,0 +1,71 @@
+{ pkgs, ... }:
+let
+  bst = pkgs.buildstream;
+
+  # `bst` is a buildPythonApplication; its own site-packages only contains
+  # buildstream's own files, not the propagated runtime deps (protobuf,
+  # grpcio, click, ...) that only reach the wrapped `bst` script's PYTHONPATH.
+  # `toPythonModule` reinterprets it as a regular library so its full
+  # dependency closure gets merged in by `withPackages` below.
+  bstModule = pkgs.python3.pkgs.toPythonModule bst;
+
+  # Test fixture plugin package used by test_source_mirror_plugin[pip]; upstream
+  # normally installs this via tox before running the pip-origin plugin loading test.
+  samplePlugins = pkgs.python3Packages.buildPythonPackage {
+    pname = "sample-plugins";
+    version = "1.2.3";
+    pyproject = true;
+    build-system = [ pkgs.python3Packages.setuptools ];
+    src = "${bst.src}/tests/plugins/sample-plugins";
+    dontCheck = true;
+  };
+in
+{
+  name = "buildstream";
+
+  meta.maintainers = with pkgs.lib.maintainers; [ shymega ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      # The default "auto" diskSize only sizes the root filesystem to fit
+      # the system closure, with no scratch space; the suite builds real
+      # CAS/cache artifacts under pytest's basetemp (`./tmp`, per
+      # setup.cfg) for hundreds of parametrized cases, which exhausts that
+      # in a few minutes (`OSError: could not create numbered dir`).
+      virtualisation.diskSize = 16 * 1024;
+      virtualisation.memorySize = 2048;
+
+      environment.systemPackages = [
+        (pkgs.python3.withPackages (
+          ps: with ps; [
+            bstModule
+            pexpect
+            pyftpdlib
+            pytest
+            pytest-datafiles
+            pytest-env
+            pytest-timeout
+            pytest-xdist
+            samplePlugins
+          ]
+        ))
+        bst
+        pkgs.buildbox
+        pkgs.gitMinimal
+      ];
+    };
+
+  testScript = ''
+    machine.succeed("cp -r ${bst.src} /tmp/src && chmod -R u+w /tmp/src")
+
+    # The dummy buildbox-casd scripts spawned by tests/internals/cascache.py use
+    # an `/usr/bin/env sh` shebang, which doesn't exist here either.
+    machine.succeed(
+        "sed -i 's|#!/usr/bin/env sh|#!${pkgs.runtimeShell}|'"
+        + " /tmp/src/tests/internals/cascache.py"
+    )
+
+    machine.succeed("cd /tmp/src && HOME=/root pytest")
+  '';
+}

pkgs/applications/editors/vim/plugins/aliases.nix

@@ -65,6 +65,7 @@ mapAliases (
     todo-nvim = throw "'vimPlugins.todo-nvim' has been removed: abandoned by upstream"; # Added 2023-08-23
     typescript-nvim = throw "'vimPlugins.typescript-nvim' has been removed: upstream deleted repository"; # Added 2026-06-15
     vim-csharp = throw "'vimPlugins.vim-csharp' has been removed: repository deleted"; # Added 2026-05-12
+    vim-gml = throw "'vimPlugins.vim-gml' has been removed because the author deleted their GitHub account"; # Added 2026-10-02
     vim-sourcetrail = throw "'vimPlugins.vim-sourcetrail' has been removed: abandoned by upstream"; # Added 2022-08-14
     vimacs = throw "'vimPlugins.vimacs' has been removed due to lack of maintenance"; # Added 2026-07-07
     # keep-sorted end

pkgs/applications/editors/vim/plugins/generated.nix

@@ -21402,20 +21402,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  vim-gml = buildVimPlugin {
-    pname = "vim-gml";
-    version = "0-unstable-2022-10-04";
-    src = fetchFromGitHub {
-      owner = "JafarDakhan";
-      repo = "vim-gml";
-      rev = "382f7aecf6da88c077f34df2f863e750b4d0fdd3";
-      hash = "sha256-xIchBiNEZbrz0LRIWorJEac8y4DBa4akuM4JPqM0Yp4=";
-    };
-    meta.homepage = "https://github.com/JafarDakhan/vim-gml/";
-    meta.license = getLicenseFromSpdxId "MIT";
-    meta.hydraPlatforms = [ ];
-  };
-
   vim-gnupg = buildVimPlugin {
     pname = "vim-gnupg";
     version = "2.7.1-unstable-2022-05-19";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -1526,7 +1526,6 @@ https://github.com/itchyny/vim-gitbranch/,,
 https://github.com/airblade/vim-gitgutter/,,
 https://github.com/junegunn/vim-github-dashboard/,,
 https://github.com/stykhomyrov/vim-glsl/,,
-https://github.com/JafarDakhan/vim-gml/,,
 https://github.com/jamessan/vim-gnupg/,,
 https://github.com/fatih/vim-go/,,
 https://github.com/habamax/vim-godot/,,

pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix

@@ -18,7 +18,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     # it does not matter which binary is fetched. Using only a single
     # hash makes this easier to maintain.
     arch = "linux-x64";
-    hash = "sha256-v/NDg3lQa/N1NwXmLlDPWFDHD0YpFWGY72QrQ4OoXrU=";
+    hash = "sha256-aAAojb6FvTj1xjS86LAAINRBJxxcEOrKPnaiYwrwSic=";
   };
 
   nativeBuildInputs = [

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -1211,13 +1211,13 @@
     "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
   },
   "selectel_selectel": {
-    "hash": "sha256-IewnjIw4MXAcMb3J1TxON8dz0lelClKgRgpJShWj6b8=",
+    "hash": "sha256-0h2ZkImCnCrfloCi7JgKMofOMiplTcyx9lCZb0ZcRJY=",
     "homepage": "https://registry.terraform.io/providers/selectel/selectel",
     "owner": "selectel",
     "repo": "terraform-provider-selectel",
-    "rev": "v8.3.1",
+    "rev": "v8.6.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-pYvj5toBm4XT5TTSECZiyd5tcPbTp+EREYaxyV0mLAM="
+    "vendorHash": "sha256-Wrtxx3sigeHguKumfbN2a4B0NEBDZTQv5sgOCfQxY7M="
   },
   "siderolabs_talos": {
     "hash": "sha256-G5ZueJ0bS6PTxn429hKQuKsgFvg8nMk5RZUR72jtj+A=",

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

@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "buildbox";
-  version = "1.4.26";
+  version = "1.4.27";
 
   src = fetchFromGitLab {
     owner = "BuildGrid";
     repo = "buildbox/buildbox";
     tag = finalAttrs.version;
-    hash = "sha256-MqJSGyLq6M8cQT3bCPH+piJPbz6cU/CXWneWzBSSgnY=";
+    hash = "sha256-RXCn6xJEWEK/4cPXobIh8Ll5m1nyY+zIVxIGQMOMhnU=";
   };
 
   nativeBuildInputs = [

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

@@ -3,7 +3,7 @@
   python3Packages,
   fetchFromGitHub,
   gitUpdater,
-  runtimeShell,
+  nixosTests,
 
   # buildInputs
   buildbox,
@@ -15,8 +15,6 @@
   installShellFiles,
 
   # tests
-  addBinToPathHook,
-  gitMinimal,
   versionCheckHook,
 
   # Optional features
@@ -73,46 +71,16 @@ python3Packages.buildPythonApplication (finalAttrs: {
     patch
   ];
 
-  # The dummy buildbox-casd scripts spawned by tests/internals/cascache.py use
-  # an `/usr/bin/env sh` shebang, which doesn't exist in the Nix build sandbox.
-  postPatch = ''
-    substituteInPlace tests/internals/cascache.py \
-      --replace-fail '#!/usr/bin/env sh' '#!${runtimeShell}'
-  '';
-
   # /dev/fuse is not available inside the Nix build sandbox, so buildbox-casd's
-  # default FUSE-based staging strategy cannot work here. Force the hardlink/copy
-  # stager instead (this is a real, supported buildbox-casd staging mode, not a
-  # workaround: https://gitlab.com/BuildGrid/buildbox/buildbox/-/blob/main/casd/buildboxcasd_server.cpp).
-  preCheck = ''
-    export BUILDBOX_STAGER=copy-or-link
-  '';
-
+  # default FUSE-based staging strategy cannot work here, and the shebang used
+  # by tests/internals/cascache.py's dummy buildbox-casd scripts
+  # (`/usr/bin/env sh`) doesn't exist there either. The pytest suite is run as
+  # a NixOS VM test instead, where both of those are available; see
+  # `passthru.tests.pytest`.
   pythonImportsCheck = [ "buildstream" ];
 
   nativeCheckInputs = [
-    addBinToPathHook
-    buildbox
-    gitMinimal
-    python3Packages.pexpect
-    python3Packages.pyftpdlib
-    python3Packages.pytest-datafiles
-    python3Packages.pytest-env
-    python3Packages.pytest-timeout
-    python3Packages.pytest-xdist
-    python3Packages.pytestCheckHook
     versionCheckHook
-
-    # Test fixture plugin package used by test_source_mirror_plugin[pip]; upstream
-    # normally installs this via tox before running the pip-origin plugin loading test.
-    (python3Packages.buildPythonPackage {
-      pname = "sample-plugins";
-      version = "1.2.3";
-      pyproject = true;
-      build-system = [ python3Packages.setuptools ];
-      src = "${finalAttrs.src}/tests/plugins/sample-plugins";
-      dontCheck = true;
-    })
   ];
 
   postInstall = ''
@@ -123,8 +91,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   versionCheckProgram = "${placeholder "out"}/bin/bst";
 
-  passthru.updateScript = gitUpdater {
-    ignoredVersions = "dev";
+  passthru = {
+    updateScript = gitUpdater {
+      ignoredVersions = "dev";
+    };
+
+    tests.pytest = nixosTests.buildstream;
   };
 
   meta = {

pkgs/by-name/cd/cddiscid/package.nix

@@ -1,5 +1,5 @@
 {
-  fetchurl,
+  fetchFromGitHub,
   lib,
   stdenv,
 }:
@@ -8,9 +8,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "cd-discid";
   version = "1.4";
 
-  src = fetchurl {
-    url = "http://linukz.org/download/cd-discid-${finalAttrs.version}.tar.gz";
-    sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz";
+  src = fetchFromGitHub {
+    owner = "taem";
+    repo = "cd-discid";
+    tag = finalAttrs.version;
+    hash = "sha256-HHpqMRJr4PkmKgqGTyr8JSErcnQ2jwBqyCr4MvDoP68=";
   };
 
   installFlags = [
@@ -19,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    homepage = "http://linukz.org/cd-discid.shtml";
+    homepage = "https://github.com/taem/cd-discid";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     description = "Command-line utility to get CDDB discid information from a CD-ROM disc";

pkgs/by-name/da/dart-sass/package.nix

@@ -12,24 +12,24 @@
 }:
 
 let
-  embedded-protocol-version = "3.2.0";
+  embedded-protocol-version = "3.3.0";
 
   embedded-protocol = fetchFromGitHub {
     owner = "sass";
     repo = "sass";
     tag = "embedded-protocol-${embedded-protocol-version}";
-    hash = "sha256-yX30i1gbVZalVhefj9c37mpFOIDaQlsLeAh7UnY56ro=";
+    hash = "sha256-CeWxh83mtKT+WA+Y5d8HxzxfIL47Z2Tsv1M/pZsBoR8=";
   };
 in
 buildDartApplication rec {
   pname = "dart-sass";
-  version = "1.104.0";
+  version = "1.105.1";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = "dart-sass";
     tag = version;
-    hash = "sha256-nhe9gIOwmnVeU/wm/GmqDdl5ZCqZFCYGIl2zZyextno=";
+    hash = "sha256-v/0d9DHGSueAC9XzIwVYbwJPwCp08Y1Izkb2weIc+L8=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;

pkgs/by-name/da/dart-sass/pubspec.lock.json

@@ -4,31 +4,31 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "fe18c7e37d5acb3b43224fa255281dec007970d6fd01f6d76fcd88ed3777a117",
+        "sha256": "fdcd9f70f9eb80df3bc5ed0fa67280df2595fd481948df8a9ab082e6a40ad04b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "107.0.0"
+      "version": "108.0.0"
     },
     "analyzer": {
       "dependency": "direct dev",
       "description": {
         "name": "analyzer",
-        "sha256": "f2dde9e50c23fc95b846b4ef334e98c3ae8c0effd5d2453b02fc9fb3f8939791",
+        "sha256": "a51c769bff3b6dfbe9d60199b8606d808290702a296bef0c26a4ca391d414e46",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.0"
+      "version": "14.4.0"
     },
     "archive": {
       "dependency": "direct dev",
       "description": {
         "name": "archive",
-        "sha256": "ace891da0862b0e4cabbb064ee3fd87b2728b898949fdb366d83fe98342c9f19",
+        "sha256": "6c5bcd986e06b94e3c40244af471750840a3d2341d1f9763a1100a14add517b4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.0"
+      "version": "4.3.0"
     },
     "args": {
       "dependency": "direct main",
@@ -94,11 +94,11 @@
       "dependency": "direct main",
       "description": {
         "name": "cli_pkg",
-        "sha256": "1b3915a8924e8a495ec24b8ee076c182211d0bd563699a2c8ed9af33bf296af8",
+        "sha256": "8a75add8e512f7bcd1a8ce2b320ca72374ce674005fa9c55bf04c65400b8290a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.15.2"
+      "version": "2.16.0"
     },
     "cli_repl": {
       "dependency": "direct main",
@@ -464,11 +464,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
+        "sha256": "2f1564aadb14215e478563b5406cb80729d022158c01dc50c96013c2f7eb4790",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.2"
+      "version": "7.1.0"
     },
     "pool": {
       "dependency": "direct main",
@@ -494,21 +494,21 @@
       "dependency": "direct main",
       "description": {
         "name": "protobuf",
-        "sha256": "75ec242d22e950bdcc79ee38dd520ce4ee0bc491d7fadc4ea47694604d22bf06",
+        "sha256": "13b6717366aa7ec3792dd62c19c7d33a785708224365f2db23c5ca01f1c1a0f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.0"
+      "version": "6.1.0"
     },
     "protoc_plugin": {
       "dependency": "direct dev",
       "description": {
         "name": "protoc_plugin",
-        "sha256": "d1ea363e9118f954d9d482c2f7281c5ff5149b059e68672d1faa564d49091f05",
+        "sha256": "e6df1acfca57523537da0ce629bf02d5f8378364f18f8a45bd914abd53e48403",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "25.0.0"
+      "version": "25.1.0"
     },
     "pub_api_client": {
       "dependency": "direct dev",
@@ -804,11 +804,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4",
+        "sha256": "0fe8cc98946def31cbcbc8734aa4067031e6f65ea3a78a508060bfed2200bfeb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.1"
+      "version": "7.1.0"
     },
     "yaml": {
       "dependency": "direct dev",

pkgs/by-name/eg/egl-wayland/package.nix

@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "egl-wayland";
-  version = "1.1.22";
+  version = "1.1.23";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "NVIDIA";
     repo = "egl-wayland";
     tag = finalAttrs.version;
-    hash = "sha256-3adLn4Sa2jzeg1uR00fVVLgVGdORlpp1xm7Il5i8xpQ=";
+    hash = "sha256-M+s2R0vSDCEN9lMma6RiJTqzUgClnszwS4aKBJeBvFQ=";
   };
 
   postPatch = ''

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

@@ -12,7 +12,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "grype";
-  version = "0.119.0";
+  version = "0.120.0";
 
   # required for tests
   __darwinAllowLocalNetworking = true;
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     owner = "anchore";
     repo = "grype";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rOk02ldjuSzLVU8HL8K0dXhSMotv/PUxwmUJdBO7hZk=";
+    hash = "sha256-95XfeVMOW5mHhW8mF6cvNgH2BrE8//F0DP5Vsm85PV4=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -36,7 +36,7 @@ buildGoModule (finalAttrs: {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-b4Wc4E7C7xl3VorXWH4YrWra4HBLXZ48r7G5sN8dHFE=";
+  vendorHash = "sha256-ayZna9aaRwlRq5Z2hviM0jxKA+XQkyVUlEFhZ0K1r5U=";
 
   patches = [
     # several test golden files have unstable paths based on the platform

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

@@ -9,7 +9,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "harper";
-  version = "2.11.0";
+  version = "2.12.0";
   __structuredAttrs = true;
   strictDeps = true;
 
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Automattic";
     repo = "harper";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-bsXHj9jJezAz22aQkQ6YN+09AxR2ASm0Al+xotIbkEQ=";
+    hash = "sha256-id5+LeHKsu9sZJ3QJeZWynFyOABSbL8KjMsk7GEEt9w=";
   };
 
-  cargoHash = "sha256-1scyXlOCp0hVHgHNCPxl0KUY4Q+6rsO507p5Es6rN3E=";
+  cargoHash = "sha256-xRQah0ckm7M1mtB8+xciuD9sYx0qNpH+fTXIHvIFAt0=";
 
   cargoBuildFlags = [
     "--package=harper-cli"

pkgs/by-name/ks/kstars/package.nix

@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kstars";
-  version = "3.8.4.1";
+  version = "3.8.5";
 
   src = fetchurl {
     url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";
-    hash = "sha256-5YymHJ15Y4ku+a740LgviLfp6b56NbE37hqi2CAw6r0=";
+    hash = "sha256-GPV4lEv7qAD3CRrvg1UNiY4MNr3f4pafe7h4B99g5bM=";
   };
 
   nativeBuildInputs = with kdePackages; [

pkgs/by-name/li/libui-ng/package.nix

@@ -53,5 +53,7 @@ stdenv.mkDerivation {
     license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.all;
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

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

@@ -45,5 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

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

@@ -152,5 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.lgpl21Plus;
     maintainers = [ ];
     platforms = lib.platforms.unix;
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

pkgs/by-name/lt/lttoolbox/package.nix

@@ -56,5 +56,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/apertium/lttoolbox/releases/tag/v${version}";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

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

@@ -33,5 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/Interlisp/maiko/releases";
     license = lib.licenses.mit;
     inherit (libx11.meta) platforms;
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

pkgs/by-name/mi/micronucleus/package.nix

@@ -31,6 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
     description = "Upload tool for micronucleus";
     mainProgram = "micronucleus";
     homepage = "https://github.com/micronucleus/micronucleus";

pkgs/by-name/mp/mplayer/package.nix

@@ -303,5 +303,7 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-darwin"
       "aarch64-linux"
     ];
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

pkgs/by-name/ne/neverest/package.nix

@@ -61,5 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://git.sr.ht/~soywod/neverest-cli/tree/v${finalAttrs.version}/item/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ soywod ];
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

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

@@ -51,5 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "nihstro-assemble";
     platforms = lib.platforms.unix ++ lib.platforms.windows;
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

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

@@ -9,17 +9,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "niks3";
-  version = "1.11.0";
+  version = "1.13.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "niks3";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5uAELLs24viJQllCa6xIkvzJUTP0ySOAz5JJrXkkHfM=";
+    hash = "sha256-ZjoIa6EsA3ksAKVR/LS8q6GhKWMumJd8x1aYoKnapdc=";
   };
 
-  vendorHash = "sha256-dAarYako0R2CQG+t03jSSpWPkP5vCFpyrMssTGKOQn0=";
+  vendorHash = "sha256-E45X7N4ZubY10Zdb4JDncwch1SZzJITzLNMdpEaT9cQ=";
 
   subPackages = [
     "cmd/niks3"

pkgs/by-name/no/nodehun/package.nix

@@ -68,5 +68,7 @@ buildNpmPackage {
     homepage = "https://github.com/Wulf/nodehun";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.thomasjm ];
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

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

@@ -43,5 +43,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     license = lib.licenses.cecill20;
     maintainers = [ lib.maintainers.bzizou ];
     platforms = lib.platforms.all;
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

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

@@ -33,5 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
       learning new assembly dialects in order improve or maintain application
       portability.
     '';
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

pkgs/by-name/pm/pmars/package.nix

@@ -98,5 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "pmars";
     maintainers = with lib.maintainers; [ OPNA2608 ];
     platforms = lib.platforms.unix;
+    # pmars-x11 last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin && enableXwinGraphics;
   };
 })

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

@@ -66,5 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       kuflierl
     ];
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

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

@@ -95,5 +95,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     platforms = lib.intersectLists lib.platforms.unix (
       lib.platforms.aarch64 ++ lib.platforms.s390x ++ lib.platforms.riscv64 ++ lib.platforms.x86
     );
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

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

@@ -81,5 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ carlthome ];
     mainProgram = "pd";
     changelog = "https://msp.puredata.info/Pd_documentation/x5.htm#s1";
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

pkgs/by-name/qg/qgrep/package.nix

@@ -47,5 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.yrashk ];
     platforms = lib.platforms.all;
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

pkgs/by-name/ra/ratpoints/package.nix

@@ -57,5 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ lib.maintainers.raskin ];
     platforms = lib.platforms.unix;
     homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/";
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

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

@@ -85,5 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       thoughtpolice
     ];
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

pkgs/by-name/sm/smartgit/package.nix

@@ -17,13 +17,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "smartgit";
-  version = "26.1.052";
+  version = "26.1.055";
 
   src = fetchurl {
     url = "https://download.smartgit.dev/smartgit/smartgit-${
       builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
     }-no-git-linux-amd64.tar.gz";
-    hash = "sha256-7fROWENB++s33v5TmSw94o3HimSMHr5nHsq4TJq2vac=";
+    hash = "sha256-NuFVvWqtFS/8EYa5+oNwo3IJfPlG+wqI6A4e7l8ZzeI=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook3 ];
@@ -109,7 +109,10 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://www.smartgit.dev/changelogs/changelog-${lib.versions.majorMinor finalAttrs.version}.txt";
     license = lib.licenses.unfree;
     mainProgram = "smartgit";
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
     maintainers = with lib.maintainers; [
       jraygauthier
       tmssngr

pkgs/by-name/sy/systemc/package.nix

@@ -16,6 +16,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-v/PcQu0m/7zyx2TtpZrLFbHtknahgVCkzcRi3lgrRGw=";
   };
 
+  # consumers must see the SC_CPLUSPLUS the library was built with, otherwise it follows their own -std and fails to link
+  postPatch = ''
+    substituteInPlace src/sysc/kernel/sc_cmnhdr.h \
+      --replace-fail '#  define SC_CPLUSPLUS SC_CPLUSPLUS_AUTO_' '#  define SC_CPLUSPLUS 201703L'
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [

pkgs/development/compilers/mlton/20210117-binary.nix

@@ -78,6 +78,8 @@ stdenv.mkDerivation rec {
           $out/bin/$e
       done
     '';
-
-  meta = import ./meta.nix { inherit lib; };
+  # last successful hydra build on darwin was in 2025
+  meta = (import ./meta.nix { inherit lib; }) // {
+    broken = stdenv.hostPlatform.isDarwin;
+  };
 }

pkgs/development/interpreters/bqn/cbqn/sources.nix

@@ -11,13 +11,13 @@
     let
       self = {
         pname = "cbqn";
-        version = "0.11.0";
+        version = "0.12.0";
 
         src = fetchFromGitHub {
           owner = "dzaima";
           repo = "CBQN";
           rev = "v${self.version}";
-          hash = "sha256-ZXhCFLLUVJTgpJqMd97EMSoE4fwuqBJ742kzV662bnY=";
+          hash = "sha256-QQuquhkD6engjcYG4HZwrJ0MVevwdOB2DM7uVn+r++U=";
         };
       };
     in
@@ -49,13 +49,13 @@
 
   singeli = {
     pname = "singeli";
-    version = "0-unstable-2025-11-19";
+    version = "0-unstable-2026-03-12";
 
     src = fetchFromGitHub {
       owner = "mlochbaum";
       repo = "Singeli";
-      rev = "2936c66b061b9df61cafc1f8d07a7ed53bf10bee";
-      hash = "sha256-vxxGmc0eQxKZN7G0GCGx7xjOWgB1a1jJIcbfbaQd2do=";
+      rev = "5187ed3aa22a2257b63c04a5498ec756fa6263cb";
+      hash = "sha256-7tCXKW/xEbZxlqG2GjqA2oVNel2EWb7I04aMyrZHVOE=";
     };
   };
 }

pkgs/development/octave-modules/optim/default.nix

@@ -4,6 +4,7 @@
   fetchurl,
   struct,
   statistics,
+  autoreconfHook,
   lapack,
   blas,
 }:
@@ -17,6 +18,10 @@ buildOctavePackage rec {
     sha256 = "sha256-Wfs3caLSojE0R1MsWaLgAKanu3pnfz74GD+6qrVJOhQ=";
   };
 
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
   buildInputs = [
     lapack
     blas
@@ -27,6 +32,19 @@ buildOctavePackage rec {
     statistics
   ];
 
+  # autoreconfHook provides an autoreconfPhase that is run as a
+  # preconfigurePhase, which means it runs AFTER the source is un-tarred, and
+  # before buildOctavePackage's buildPhase re-tars it up into a format for later
+  # consumption by Octave's "pkg build" command.
+  preAutoreconf = ''
+    pushd src
+    # Remove any files upstream generated for distribution.
+    rm config.*
+  '';
+  postAutoreconf = ''
+    popd
+  '';
+
   meta = {
     homepage = "https://gnu-octave.github.io/packages/optim/";
     license = with lib.licenses; [

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

@@ -28,7 +28,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "blackjax";
-  version = "1.6.2";
+  version = "1.7.1";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
     owner = "blackjax-devs";
     repo = "blackjax";
     tag = finalAttrs.version;
-    hash = "sha256-NO/CvYtxfAid3ETpj5DcNQPdARP2cwqy9p0kHOybvNg=";
+    hash = "sha256-IyWZbmYIPqvvex1gHkYsFb4gtNLCERXv+UkbvKfGwec=";
   };
 
   build-system = [

pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix

@@ -15,13 +15,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "google-cloud-bigquery-datatransfer";
-  version = "3.23.0";
+  version = "3.24.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_bigquery_datatransfer";
     inherit (finalAttrs) version;
-    hash = "sha256-LQEAqT9uiaEV1mjU/Cq8DwwiPqCZ9bfHNrzgECumI/k=";
+    hash = "sha256-5X6HMhRX71XKAa6f94vRIRcN8HKHZWjjYcpsofQ5Z98=";
   };
 
   build-system = [ setuptools ];

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

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "nuitka";
-  version = "2.8.10";
+  version = "4.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Nuitka";
     repo = "Nuitka";
     tag = version;
-    hash = "sha256-+CevWpYvqY3SX3/QE7SPlbsFtXkdlNTg9m91VtZCHvM=";
+    hash = "sha256-7xiu5QRvk9UTqcYXvibD9AvfvxmkxzTN1F9vQWJaL7U=";
   };
 
   build-system = [

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

@@ -8,18 +8,19 @@
   scipy,
   xmltodict,
   pytestCheckHook,
+  nix-update-script,
 }:
 
 buildPythonPackage rec {
   pname = "pymatreader";
-  version = "1.0.0";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "obob";
     repo = "pymatreader";
     tag = "v${version}";
-    hash = "sha256-cDEGEvBSj3gmjA+8aXULwuBVk09BLQbA91CNAxgtiLA=";
+    hash = "sha256-UQI8bktmS+GycjbY1OHtS4OHT+Q3JyP8xvTbYIJJzC0=";
   };
 
   postPatch = ''
@@ -41,6 +42,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pymatreader" ];
 
+  # avoid autoupdates for *.dev* tags
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=^([\\d.]+)$" ];
+  };
+
   meta = {
     description = "Python package to read all kinds and all versions of Matlab mat files";
     homepage = "https://gitlab.com/obob/pymatreader/";

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

@@ -34,7 +34,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pytensor";
-  version = "3.3.2";
+  version = "3.3.3";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -45,7 +45,7 @@ buildPythonPackage (finalAttrs: {
     postFetch = ''
       sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${finalAttrs.src.tag})"/' $out/pytensor/_version.py
     '';
-    hash = "sha256-tUHBpMyArqM61X3LqNbQQioD1Fe38bQj9jqkHDojVwU=";
+    hash = "sha256-FBTLgb5dqxvMRYMFRRNGndoCp3ldvGl5VOW2DcA9tLs=";
   };
 
   build-system = [

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

@@ -65,5 +65,7 @@ buildGoModule rec {
     license = lib.licenses.asl20;
     homepage = "https://github.com/linuxkit/linuxkit";
     maintainers = with lib.maintainers; [ nicknovitski ];
+    # last successful hydra build on darwin was in 2025
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

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

@@ -28,28 +28,28 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "displaylink";
-  version = "6.2.0-30";
+  version = "6.3.0-48";
 
   src = requireFile rec {
-    name = "displaylink-620.zip";
-    hash = "sha256-JQO7eEz4pdoPkhcn9tIuy5R4KyfsCniuw6eXw/rLaYE=";
+    name = "displaylink-630.zip";
+    hash = "sha256-cmmFbHUnBgxRMhXOG1o2/vB02Oicq4m8qxPfNCrM4Jg=";
     message = ''
       In order to install the DisplayLink drivers, you must first
       comply with DisplayLink's EULA and download the binaries and
       sources from here:
 
-      https://www.synaptics.com/products/displaylink-usb-graphics-software-ubuntu-62
+      https://www.synaptics.com/products/displaylink-usb-graphics-software-ubuntu-63
 
       Once you have downloaded the file, please use the following
       commands and re-run the installation:
 
-      mv $PWD/"DisplayLink USB Graphics Software for Ubuntu6.2-EXE.zip" $PWD/${name}
+      mv $PWD/"DisplayLink USB Graphics Software for Ubuntu6.3-EXE.zip" $PWD/${name}
       nix-prefetch-url file://$PWD/${name}
 
       Alternatively, you can use the following command to download the
       file directly:
 
-      nix-prefetch-url --name ${name} https://www.synaptics.com/sites/default/files/exe_files/2025-09/DisplayLink%20USB%20Graphics%20Software%20for%20Ubuntu6.2-EXE.zip
+      nix-prefetch-url --name ${name} https://www.synaptics.com/sites/default/files/exe_files/2026-06/DisplayLink%20USB%20Graphics%20Software%20for%20Ubuntu6.3-EXE.zip
     '';
   };
 

pkgs/servers/home-assistant/custom-components/spook/package.nix

@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "frenck";
   domain = "spook";
-  version = "5.5.1";
+  version = "5.7.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
     tag = "v${version}";
-    hash = "sha256-FT8hpWz3pv63hjUr/kiIJOzT7z/6tclj7CZ2XpQ2JYY=";
+    hash = "sha256-CYrnPO4m8XFx+HJmErN2jVLe0WMKPLhaK45sXai9W2U=";
   };
 
   patches = [ ./remove-sub-integration-symlink-hack.patch ];