Merge master into staging-next

maintainers/maintainer-list.nix

@@ -7240,6 +7240,11 @@
     name = "Duncan Dean";
     keys = [ { fingerprint = "9484 44FC E03B 05BA 5AB0  591E C37B 1C1D 44C7 86EE"; } ];
   };
+  DuskyElf = {
+    name = "jan Lemata";
+    github = "DuskyElf";
+    githubId = 91879372;
+  };
   dustyhorizon = {
     name = "Kenneth Tan";
     email = "i.am@kennethtan.xyz";

pkgs/build-support/php/builders/v2/build-composer-project.nix

@@ -107,8 +107,7 @@ let
       # Projects providing a lockfile from upstream can be automatically updated.
       passthru = passthru // {
         updateScript =
-          args.passthru.updateScript
-            or (if finalAttrs.composerVendor.composerLock == null then nix-update-script { } else null);
+          args.passthru.updateScript or (if composerLock == null then nix-update-script { } else null);
       };
 
       meta = meta // {

pkgs/by-name/as/ascii/package.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ascii";
-  version = "3.30";
+  version = "3.31";
 
   src = fetchFromGitLab {
     owner = "esr";
     repo = "ascii";
     tag = finalAttrs.version;
-    hash = "sha256-TE9YR5Va9tXaf2ZyNxz7d8lZRTgnD4Lz7FyqRDl1HNY=";
+    hash = "sha256-fXVREwjiSpLdwNAm6hbuPiCNFqFlpeBiwKsXGaMiY6s=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/de/devcontainer/package.nix

@@ -19,18 +19,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "devcontainer";
-  version = "0.82.0";
+  version = "0.83.0";
 
   src = fetchFromGitHub {
     owner = "devcontainers";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ztHlP3LxjxNDPnNWZqSkAN4+AiRA6j5cwDZrmwB4PDM=";
+    hash = "sha256-rFp7u+swJdA3wKR6bAfPUIXomwyN5v1oKfu/Y/hflx0=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-bK8M2oZJT0Jr6nqHPOixg+22OWALFiPORiBmd3CHV08=";
+    hash = "sha256-aVjhIb46CjUS+IEfS5O7I2apAC51UfjPj16q/GNsIzI=";
   };
 
   nativeBuildInputs = [

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

@@ -0,0 +1,50 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "ha-mcp";
+  version = "6.6.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "homeassistant-ai";
+    repo = "ha-mcp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-yAJbvfIH5ewRTip8whbOKxE479qAihESaiLFTnhpRkY=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies =
+    with python3Packages;
+    [
+      cryptography
+      fastmcp
+      httpx
+      jq
+      pydantic
+      python-dotenv
+      truststore
+      websockets
+    ]
+    ++ httpx.optional-dependencies.socks;
+
+  # Tests require a running Home Assistant instance
+  doCheck = false;
+
+  pythonImportsCheck = [ "ha_mcp" ];
+
+  meta = {
+    description = "MCP server for controlling Home Assistant via natural language";
+    homepage = "https://github.com/homeassistant-ai/ha-mcp";
+    changelog = "https://github.com/homeassistant-ai/ha-mcp/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+    mainProgram = "ha-mcp";
+  };
+})

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

@@ -0,0 +1,51 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  makeWrapper,
+  nix,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "niks3";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "Mic92";
+    repo = "niks3";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-taQgMTbC+k/b+9mJH5vx7BMM3gKSI+MZWL26ZhePThk=";
+  };
+
+  vendorHash = "sha256-MoYTq1rY1GMmBBP/ypx6DqrHLGtccgsHa+2rpoztI4U=";
+
+  subPackages = [
+    "cmd/niks3"
+    "cmd/niks3-server"
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  # The niks3 client shells out to `nix path-info` which differs between Nix and Lix; pinning Nix
+  # here allows the format to be consistent. See https://github.com/Mic92/niks3/issues/181
+  postInstall = ''
+    wrapProgram $out/bin/niks3 --prefix PATH : ${lib.makeBinPath [ nix ]}
+  '';
+
+  meta = {
+    description = "S3-backed Nix binary cache with garbage collection";
+    homepage = "https://github.com/Mic92/niks3";
+    changelog = "https://github.com/Mic92/niks3/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      mic92
+      philiptaron
+    ];
+    mainProgram = "niks3";
+  };
+})

pkgs/by-name/op/opencode-desktop/package.nix

@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ;
 
   cargoRoot = "packages/desktop/src-tauri";
-  cargoHash = "sha256-6ScxLZVldKL8ChDoH13Q55W3Zqz9kNshWzAGOij5jqs=";
+  cargoHash = "sha256-Sfw/1380knqusED8OJcCn0D7erkX1sLtQq9m6Dd0v4Y=";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
   nativeBuildInputs = [

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

@@ -14,12 +14,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.1.59";
+  version = "1.1.65";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+vvNQzfhuP91mK/BjBufWGdS+2vHJAtB8iDl14z4y48=";
+    hash = "sha256-U8hx8MeyhCe+o3uj3GL3LbkkFkduvxVtPgZeVGoIE0s=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -70,9 +70,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     outputHash =
       if stdenvNoCC.hostPlatform.isDarwin then
-        "sha256-BMTXCu31OBxHF0hz/NVEs5a7M6CytXwe7fOlDgnECk4="
+        "sha256-KlE4U87sVWoB2eXngUU7w+Z3F7oqh3NPhoCRHQqQm1s="
       else
-        "sha256-lPGQxvK8WUqBQs25I+U8V+0y12jCZumEFGHMkEmOR34=";
+        "sha256-yza9eeMOWAd9ggGPMDs6ALjg7ptfk4iuN5y1rcUTIpc=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
@@ -166,6 +166,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       delafthi
       graham33
+      DuskyElf
     ];
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
     platforms = [

pkgs/development/python-modules/oelint-data/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "oelint-data";
-  version = "1.3.6";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = finalAttrs.version;
-    hash = "sha256-l7UJ5pHhHI22dLOJD4kj40gW7EZFwBn5krTDVYY08Dw=";
+    hash = "sha256-OrKwf7ADi0WUsFgsroFJvQxVB5RRsqjyZn6aZTixmFA=";
   };
 
   build-system = [

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

@@ -277,6 +277,13 @@ buildPythonPackage (finalAttrs: {
 
         # ptxas fatal   : Unknown option 'sass'
         "python/test/unit/tools/test_disasm.py"
+
+        # assert 'mma.sync.aligned.m16n8k16.row.col.f32.f16.f16.f32' in ptx
+        # AssertionError: assert 'mma.sync.aligned.m16n8k16.row.col.f32.f16.f16.f32' in ...
+        "python/test/unit/language/test_core.py::test_dot[1-1-2-32-1-False-False-None-ieee-float8e5-float32-1-None]"
+
+        # AssertionError: Tensor-likes are not close!
+        "python/test/unit/language/test_core.py::test_scaled_dot[64-128-128-True-False-True-e4m3-fp16-4-16-1]"
       ];
 
       enabledTestPaths = [

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

@@ -0,0 +1,26 @@
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "homeassistant-ai";
+  domain = "ha_mcp_tools";
+  version = "6.6.1";
+
+  src = fetchFromGitHub {
+    owner = "homeassistant-ai";
+    repo = "ha-mcp";
+    tag = "v${version}";
+    hash = "sha256-yAJbvfIH5ewRTip8whbOKxE479qAihESaiLFTnhpRkY=";
+  };
+
+  meta = {
+    changelog = "https://github.com/homeassistant-ai/ha-mcp/releases/tag/v${version}";
+    description = "Home Assistant custom component for the MCP (Model Context Protocol) server";
+    homepage = "https://github.com/homeassistant-ai/ha-mcp";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}