From 99d62657f5eefac06c177d3e9e777266a93f21d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 13 Apr 2026 10:51:17 -0700
Subject: [PATCH 01/49] proj: 9.8.0 -> 9.8.1

Diff: https://github.com/OSGeo/PROJ/compare/9.8.0...9.8.1

Changelog: https://github.com/OSGeo/PROJ/blob/9.8.1/NEWS.md
---
 pkgs/by-name/pr/proj/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/proj/package.nix b/pkgs/by-name/pr/proj/package.nix
index daa00097c6df..cd72a4a99b79 100644
--- a/pkgs/by-name/pr/proj/package.nix
+++ b/pkgs/by-name/pr/proj/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "proj";
-  version = "9.8.0";
+  version = "9.8.1";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
     tag = finalAttrs.version;
-    hash = "sha256-LvzQ2sW+h5uHJg+6z8/Nf99EVIPUQfWoaNr0iFUpD/0=";
+    hash = "sha256-sOAxWihgU1TAMWcju5LN4cPenHHoGgd4oYJ4HA3F/Ks=";
   };
 
   patches = [

From ff90b2c1192d96d39da067e2e1561765cd50b279 Mon Sep 17 00:00:00 2001
From: XYenon <i@xyenon.bid>
Date: Fri, 27 Feb 2026 11:39:37 +0800
Subject: [PATCH 02/49] hat-trie: init at 0.7.1

---
 pkgs/by-name/ha/hat-trie/package.nix | 39 ++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/ha/hat-trie/package.nix

diff --git a/pkgs/by-name/ha/hat-trie/package.nix b/pkgs/by-name/ha/hat-trie/package.nix
new file mode 100644
index 000000000000..f2ae604bd2b4
--- /dev/null
+++ b/pkgs/by-name/ha/hat-trie/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "hat-trie";
+  version = "0.7.1";
+
+  src = fetchFromGitHub {
+    owner = "Tessil";
+    repo = "hat-trie";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5L3qSlwYc2G60GPFrEz06eAWdUcdBQTVBLLOf1sLP0c=";
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/include
+    cp -r include/tsl $out/include/
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "C++ implementation of a fast and memory efficient HAT-trie";
+    homepage = "https://github.com/Tessil/hat-trie";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ xyenon ];
+    platforms = lib.platforms.all;
+  };
+})

From 0d8ad9a1ee9f9169440216bf627e30c1fa50083f Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 8 May 2026 21:05:31 +0700
Subject: [PATCH 03/49] lsd2dsl: fix build with boost 1.89

---
 pkgs/by-name/ls/lsd2dsl/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ls/lsd2dsl/package.nix b/pkgs/by-name/ls/lsd2dsl/package.nix
index 6a7179a7f1c3..bc6b740d0713 100644
--- a/pkgs/by-name/ls/lsd2dsl/package.nix
+++ b/pkgs/by-name/ls/lsd2dsl/package.nix
@@ -35,7 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
-    substituteInPlace CMakeLists.txt --replace "-Werror" ""
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "-Werror" "" \
+      --replace-fail 'COMPONENTS system program_options' 'COMPONENTS program_options'
+    substituteInPlace lib/common/CMakeLists.txt lib/duden/CMakeLists.txt lib/lingvo/CMakeLists.txt \
+      --replace-fail 'Boost::system' ""
   '';
 
   nativeBuildInputs = [

From 78f08517872118be75fdbc456d239014e6385d24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 May 2026 00:41:50 +0000
Subject: [PATCH 04/49] pgbouncer: 1.25.1 -> 1.25.2

---
 pkgs/by-name/pg/pgbouncer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pg/pgbouncer/package.nix b/pkgs/by-name/pg/pgbouncer/package.nix
index 045017ac259e..9f982e2aa6ae 100644
--- a/pkgs/by-name/pg/pgbouncer/package.nix
+++ b/pkgs/by-name/pg/pgbouncer/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pgbouncer";
-  version = "1.25.1";
+  version = "1.25.2";
 
   src = fetchurl {
     url = "https://www.pgbouncer.org/downloads/files/${finalAttrs.version}/pgbouncer-${finalAttrs.version}.tar.gz";
-    hash = "sha256-blZq6S/j739qG54m1gSffXyjnEDinns49tVQCuFdhGU=";
+    hash = "sha256-kkrTURP9CnHI4tvoW10DRFUy4rezep+KSJg77qI4szI=";
   };
 
   nativeBuildInputs = [

From f31bc6de6fbea4f59def0e2575f6e13dc4973012 Mon Sep 17 00:00:00 2001
From: XYenon <i@xyenon.bid>
Date: Fri, 27 Feb 2026 11:39:49 +0800
Subject: [PATCH 05/49] kvrocks: init at 2.15.0

---
 pkgs/by-name/kv/kvrocks/package.nix | 330 ++++++++++++++++++++++++++++
 1 file changed, 330 insertions(+)
 create mode 100644 pkgs/by-name/kv/kvrocks/package.nix

diff --git a/pkgs/by-name/kv/kvrocks/package.nix b/pkgs/by-name/kv/kvrocks/package.nix
new file mode 100644
index 000000000000..79da29d3d7b4
--- /dev/null
+++ b/pkgs/by-name/kv/kvrocks/package.nix
@@ -0,0 +1,330 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  # keep-sorted start
+  cmake,
+  ninja,
+  pkg-config,
+  # keep-sorted end
+
+  # keep-sorted start
+  cpptrace,
+  fmt,
+  gtest,
+  hat-trie,
+  jemalloc,
+  jsoncons,
+  libevent,
+  lz4,
+  onetbb,
+  openssl,
+  pegtl,
+  range-v3,
+  rocksdb,
+  snappy,
+  span-lite,
+  spdlog,
+  xxhash,
+  zlib-ng,
+  zstd,
+  # keep-sorted end
+}:
+
+let
+  # Generate a cmake file that replaces FetchContent with system library finders.
+  #   findPackage: optional package name for find_package(name REQUIRED)
+  #   pkgConfig:   optional { varName; modules; } for pkg_check_modules
+  #   libraries:   list of { name; target?; linkLibs?; compileDefs?; }
+  #                  - if 'target' is set: add_library(name ALIAS target)
+  #                  - otherwise: add_library(name INTERFACE) with optional link/defs
+  #   extraLines:  optional list of extra cmake lines appended at the end
+  mkCmakeFile =
+    cmakeFile:
+    {
+      findPackage ? null,
+      pkgConfig ? null,
+      libraries ? [ ],
+      extraLines ? [ ],
+    }:
+    let
+      mkLibEntry =
+        entry:
+        if entry ? target then
+          [ "add_library(${entry.name} ALIAS ${entry.target})" ]
+        else
+          [ "add_library(${entry.name} INTERFACE)" ]
+          ++ lib.optional (
+            entry ? linkLibs
+          ) "target_link_libraries(${entry.name} INTERFACE ${entry.linkLibs})"
+          ++ lib.optional (
+            entry ? compileDefs
+          ) "target_compile_definitions(${entry.name} INTERFACE ${entry.compileDefs})";
+      lines = [
+        "include_guard()"
+      ]
+      ++ lib.optional (pkgConfig != null) "find_package(PkgConfig REQUIRED)"
+      ++ lib.optional (findPackage != null) "find_package(${findPackage} REQUIRED)"
+      ++ lib.optional (
+        pkgConfig != null
+      ) "pkg_check_modules(${pkgConfig.varName} REQUIRED IMPORTED_TARGET ${pkgConfig.modules})"
+      ++ lib.concatMap mkLibEntry libraries
+      ++ extraLines;
+      content = lib.concatStringsSep "\n" lines;
+    in
+    ''
+      cat > cmake/${cmakeFile}.cmake << 'EOF'
+      ${content}
+      EOF
+    '';
+
+  luajit-src = fetchFromGitHub {
+    owner = "RocksLabs";
+    repo = "LuaJIT";
+    rev = "c0a8e68325ec261a77bde1c8eabad398168ffe74";
+    hash = "sha256-Wjh14d0JR5ecAwdYVBjQYIHb2vJ1I61oR0N0LMmtq4E=";
+  };
+
+  zlib-ng' = zlib-ng.override { withZlibCompat = true; };
+  rocksdb' =
+    (rocksdb.override {
+      zlib = zlib-ng';
+      enableJemalloc = true;
+    }).overrideAttrs
+      (oldAttrs: {
+        cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [ (lib.cmakeBool "WITH_TBB" true) ];
+        buildInputs = (oldAttrs.buildInputs or [ ]) ++ [ onetbb ];
+        # On aarch64-darwin, libc++ hardening can trigger a SIGTRAP in
+        # RocksDB's startup path via unique_ptr<T[]> bounds checks.
+        hardeningDisable =
+          (oldAttrs.hardeningDisable or [ ])
+          ++ (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+            "libcxxhardeningfast"
+          ]);
+      });
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "kvrocks";
+  version = "2.15.0";
+
+  src = fetchFromGitHub {
+    owner = "apache";
+    repo = "kvrocks";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-s4saKuezPYvcmKSqVBVDbPJcQXr6pVfIWjff7Txg8tY=";
+  };
+
+  __structuredAttrs = true;
+
+  postPatch = ''
+    # Replace FetchContent-based cmake files with system library finders
+    ${mkCmakeFile "rocksdb" {
+      pkgConfig = {
+        varName = "ROCKSDB";
+        modules = "rocksdb";
+      };
+      libraries = [
+        {
+          name = "rocksdb_with_headers";
+          linkLibs = "PkgConfig::ROCKSDB";
+        }
+      ];
+    }}
+    ${mkCmakeFile "libevent" {
+      pkgConfig = {
+        varName = "LIBEVENT";
+        modules = "libevent libevent_pthreads";
+      };
+      libraries = [
+        {
+          name = "event_with_headers";
+          linkLibs = "PkgConfig::LIBEVENT";
+        }
+      ];
+      extraLines = [
+        "if(ENABLE_OPENSSL)"
+        "  pkg_check_modules(LIBEVENT_OPENSSL REQUIRED IMPORTED_TARGET libevent_openssl)"
+        "  target_link_libraries(event_with_headers INTERFACE PkgConfig::LIBEVENT_OPENSSL)"
+        "endif()"
+      ];
+    }}
+    ${mkCmakeFile "fmt" { findPackage = "fmt"; }}
+    ${mkCmakeFile "spdlog" { findPackage = "spdlog"; }}
+    ${mkCmakeFile "snappy" {
+      pkgConfig = {
+        varName = "SNAPPY";
+        modules = "snappy";
+      };
+      libraries = [
+        {
+          name = "snappy";
+          target = "PkgConfig::SNAPPY";
+        }
+      ];
+    }}
+    ${mkCmakeFile "lz4" {
+      pkgConfig = {
+        varName = "LZ4";
+        modules = "liblz4";
+      };
+      libraries = [
+        {
+          name = "lz4";
+          target = "PkgConfig::LZ4";
+        }
+      ];
+    }}
+    ${mkCmakeFile "zstd" {
+      pkgConfig = {
+        varName = "ZSTD";
+        modules = "libzstd";
+      };
+      libraries = [
+        {
+          name = "zstd";
+          target = "PkgConfig::ZSTD";
+        }
+      ];
+    }}
+    ${mkCmakeFile "zlib" {
+      findPackage = "ZLIB";
+      libraries = [
+        {
+          name = "zlib_with_headers";
+          linkLibs = "ZLIB::ZLIB";
+        }
+      ];
+    }}
+    ${mkCmakeFile "tbb" {
+      findPackage = "TBB";
+      libraries = [
+        {
+          name = "tbb";
+          target = "TBB::tbb";
+        }
+      ];
+    }}
+    ${mkCmakeFile "gtest" {
+      findPackage = "GTest";
+      libraries = [
+        {
+          name = "gtest_main";
+          linkLibs = "GTest::gtest_main GTest::gtest";
+        }
+        {
+          name = "gmock";
+          linkLibs = "GTest::gmock GTest::gtest";
+        }
+      ];
+    }}
+    ${mkCmakeFile "xxhash" {
+      pkgConfig = {
+        varName = "XXHASH";
+        modules = "libxxhash";
+      };
+      libraries = [
+        {
+          name = "xxhash";
+          target = "PkgConfig::XXHASH";
+        }
+      ];
+    }}
+    ${mkCmakeFile "jemalloc" {
+      pkgConfig = {
+        varName = "JEMALLOC";
+        modules = "jemalloc";
+      };
+      libraries = [
+        {
+          name = "jemalloc";
+          linkLibs = "PkgConfig::JEMALLOC";
+          compileDefs = "ENABLE_JEMALLOC";
+        }
+      ];
+    }}
+    ${mkCmakeFile "jsoncons" { libraries = [ { name = "jsoncons"; } ]; }}
+    ${mkCmakeFile "span" { libraries = [ { name = "span-lite"; } ]; }}
+    ${mkCmakeFile "trie" { libraries = [ { name = "tsl_hat_trie"; } ]; }}
+    ${mkCmakeFile "pegtl" { libraries = [ { name = "pegtl"; } ]; }}
+    ${mkCmakeFile "rangev3" { findPackage = "range-v3"; }}
+    ${mkCmakeFile "cpptrace" { findPackage = "cpptrace"; }}
+
+    # Remove static linking flags and git requirement
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'set(CMAKE_EXE_LINKER_FLAGS "''${CMAKE_EXE_LINKER_FLAGS} -static-libgcc")' "" \
+      --replace-fail 'set(CMAKE_EXE_LINKER_FLAGS "''${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++")' "" \
+      --replace-fail 'find_package(Git REQUIRED)' "" \
+      --replace-fail 'target_include_directories(kvrocks_objs PUBLIC src src/common src/vendor' \
+                     'target_include_directories(kvrocks_objs PUBLIC src src/common src/config src/vendor'
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    # keep-sorted start
+    cmake
+    ninja
+    pkg-config
+    # keep-sorted end
+  ];
+
+  buildInputs = [
+    # keep-sorted start
+    cpptrace
+    fmt
+    gtest
+    hat-trie
+    jemalloc
+    jsoncons
+    libevent
+    lz4
+    onetbb
+    openssl
+    pegtl
+    range-v3
+    rocksdb'
+    snappy
+    span-lite
+    spdlog
+    xxhash
+    zlib-ng'
+    zstd
+    # keep-sorted end
+  ];
+
+  preConfigure = ''
+    # Copy LuaJIT to writable location for in-source build
+    cp -r ${luajit-src} $TMPDIR/luajit
+    chmod -R u+w $TMPDIR/luajit
+    # LuaJIT defaults to gcc, which may be unavailable (e.g. Darwin stdenv).
+    substituteInPlace $TMPDIR/luajit/src/Makefile \
+      --replace-fail "DEFAULT_CC = gcc" "DEFAULT_CC = $CC"
+    cmakeFlagsArray+=("-DFETCHCONTENT_SOURCE_DIR_LUAJIT=$TMPDIR/luajit")
+  '';
+
+  cmakeFlags = [
+    (lib.cmakeBool "DISABLE_JEMALLOC" false)
+    (lib.cmakeBool "ENABLE_STATIC_LIBSTDCXX" false)
+    (lib.cmakeBool "ENABLE_LUAJIT" true)
+    (lib.cmakeBool "ENABLE_OPENSSL" true)
+    (lib.cmakeFeature "PORTABLE" "1")
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 kvrocks -t $out/bin
+    install -Dm755 kvrocks2redis -t $out/bin
+    install -Dm644 $src/kvrocks.conf -t $out/etc
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Distributed key value NoSQL database that uses RocksDB as storage engine and is compatible with Redis protocol";
+    homepage = "https://kvrocks.apache.org/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ xyenon ];
+    platforms = lib.platforms.unix;
+    mainProgram = "kvrocks";
+  };
+})

From 72bc38b8176e39148e268b10ad236e84d2840b49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 05:20:37 +0000
Subject: [PATCH 06/49] streamlink: 8.3.0 -> 8.4.0

---
 pkgs/by-name/st/streamlink/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix
index 55ade72d5ae1..6dd2a98702b0 100644
--- a/pkgs/by-name/st/streamlink/package.nix
+++ b/pkgs/by-name/st/streamlink/package.nix
@@ -11,12 +11,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "streamlink";
-  version = "8.3.0";
+  version = "8.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bP/lW0LfOzwubdHAzEH8AUd6+8SWuoZ0D/pe7FwzPTQ=";
+    hash = "sha256-9HfpSTM2vLfDorEO6nKmCumn9J6WitoNTQG/946sRLs=";
   };
 
   patches = [

From 9ee7d6e54c1c6e29e63f97addf941db119348d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 10 May 2026 12:08:02 -0700
Subject: [PATCH 07/49] python3Packages.pyproj: skip failing tests

---
 pkgs/development/python-modules/pyproj/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix
index 08af3c39b38c..d4ceed75a4ca 100644
--- a/pkgs/development/python-modules/pyproj/default.nix
+++ b/pkgs/development/python-modules/pyproj/default.nix
@@ -43,14 +43,6 @@ buildPythonPackage rec {
       url = "https://github.com/pyproj4/pyproj/pull/1560.diff?full_index=1";
       hash = "sha256-fr+lvDeVFDagc9aHzaQhyZtWK2sy5kR7iImJsuxW8Z4=";
     })
-    (fetchpatch2 {
-      url = "https://github.com/pyproj4/pyproj/pull/1568.diff?full_index=1";
-      hash = "sha256-fVFg3/ikOk6LiRHA/u14g+ZFsROGE7me878Vvq4mxG4=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/pyproj4/pyproj/pull/1581.diff?full_index=1";
-      hash = "sha256-EdzUCt4P99ENS2qCBU30FUNnJYD0B2CqcmZXwEYLdVA=";
-    })
   ];
 
   build-system = [
@@ -90,6 +82,10 @@ buildPythonPackage rec {
     "test_sync__source_id__list"
     "test_sync_download"
     "test_transformer_group__download_grids"
+    # https://github.com/pyproj4/pyproj/issues/1588
+    "test_coordinate_operation__from_string"
+    "test_transformer_from_pipeline__input_types"
+    "test_transformer_from_pipeline__wkt_json"
   ];
 
   pythonImportsCheck = [

From 4faefc9c75603a115e37025aecc5d1f01b40a9ca Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Mon, 11 May 2026 08:58:28 +0200
Subject: [PATCH 08/49] claude-code: 2.1.137 -> 2.1.138

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 pkgs/by-name/cl/claude-code/manifest.json | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index 5502e19ec7b6..d094ae0572dd 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,46 +1,46 @@
 {
-  "version": "2.1.137",
-  "commit": "88a017e5d1d4c7de4e6de6a496ac08c9c1b77d79",
-  "buildDate": "2026-05-08T23:09:27Z",
+  "version": "2.1.138",
+  "commit": "d6d494651eb469be2ff763ef8d1b882aba8ca635",
+  "buildDate": "2026-05-09T04:12:33Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "6d91ce741b8aa129fd43c2f844b39dcc1fec8cfd77e8e5a1ed0f0e7ba54cfea9",
+      "checksum": "759d23ce626193c89bc8b35c5c6ca8a9e33b9c2e504ee143e4cd119988774097",
       "size": 205062416
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "bc71e2701a196c1eee65d0cda675f40118aaf11ce469831bb45092fc342527ff",
+      "checksum": "d99d3a7afd63841943906b11ed8791b0ee47fe5cf95601a8b805c20900014f54",
       "size": 207568336
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "8198e7c845a4f3806504b7350424158970c24c56724de400675d6597507d6183",
+      "checksum": "693ecca41a62d58fee660884bd982ca5cdeab5b277925fcdfe880cdf02f98671",
       "size": 230471304
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "ae29f87fdee2d42b5e9ff05c84256bf50a0e7edaa2d58975f9b4b2bd2c29897c",
+      "checksum": "c3c56ffbc12cf16e40c33687c9fe6361ed250c35a9e1718d0c38d49049f5f8c3",
       "size": 230577872
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "a0fc2fc56e36e281bf2849c6edb7403fa2d97a4ca68d555cfa18c9232fdd7d8d",
+      "checksum": "55652a05de92d2e374b5252834f013263df92450f0d9d43dbb7594fc33f448d4",
       "size": 223326040
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "35e6c7fd0e03717a74e3fe8b016ca7ee448131d3edf060f82164a573cb818449",
+      "checksum": "98c58173ea8237177ba82655c179b5ca9d2b011ecfb42e8fd5f7e1f227dac81b",
       "size": 224971824
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "4bb6443d136278fbb8acf637cdf3481e5db5c547a7f9bc4658dcd8630279dfe4",
-      "size": 226494112
+      "checksum": "dc693422b5323196042459ce3eeb6d4b8dcded302ec30f4fad4c10340231f708",
+      "size": 226494624
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "83db287224382522157ecbb733f63f51cbc1fb5d048a3950ee2a05c779edbfb5",
+      "checksum": "ebf483b9cee98d13f65f9ea16ac5bdeaef3a6dae8f203242cc84379cda3308f0",
       "size": 222451872
     }
   }

From c6a9a126a85640bbadabf1baa801e89ee2b17136 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Mon, 11 May 2026 08:58:33 +0200
Subject: [PATCH 09/49] vscode-extensions.anthropic.claude-code: 2.1.133 ->
 2.1.138

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 .../extensions/anthropic.claude-code/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index ad82fb7f6711..482ca93db108 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-6+fMMB8Vgvmi3JO6YMqMiiHWdlq+PfTD1/zemIqf5sw=";
+          hash = "sha256-6mLUxHFQOlDRsNrmS8HoczrxhBxKMnku47SZzLCW87k=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-HA2I2+4F5NSLWJJpArTDcEHIAJShARjgomM2GcVwj5Q=";
+          hash = "sha256-x5HBuPHDH81gXoCAA0UhsyDfKmq37C7FauAMDTXsVv0=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-MaclGEzgUAHLV2Fe8O3ex6yjfnM73Clory0n+BVNZIs=";
+          hash = "sha256-geBnM2AmZPSmxF6uHGNysRM7ujx3tluda6yYW5nzaXQ=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-YR/geLezoi+UPa7Eo0M4wQmRGuHiRTK74BdkGGOxPis=";
+          hash = "sha256-13LvDqpmzYmRi2EugJH1t7h6azzGcJAusOSMXcnXC40=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.133";
+      version = "2.1.138";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From fbde1999f6cc2d340eade2bac2b7f9120103142b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 11 May 2026 11:39:38 +0200
Subject: [PATCH 10/49] python3Packages.iamdata: 0.1.202605101 -> 0.1.202605111

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202605101...v0.1.202605111

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202605111
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index c7e420ee7502..a065a6ade3de 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202605101";
+  version = "0.1.202605111";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j6shiMU0zlxr8ehgMe6fcpN6CUKznGKeqbBLM1XHcmQ=";
+    hash = "sha256-EPxbxVV+zWq1n5FY1BVXDvlqRudbAaErNdUpVgRcr/U=";
   };
 
   __darwinAllowLocalNetworking = true;

From a5f8363c23bd6e62834861f4fbbe4bab0a73fafe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 11 May 2026 11:41:49 +0200
Subject: [PATCH 11/49] python3Packages.tencentcloud-sdk-python: 3.1.92 ->
 3.1.93

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.92...3.1.93

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.93/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index ba978ea6f19a..41b3cfbd43c7 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.92";
+  version = "3.1.93";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-uvBMYVnYx6fSDmRk4me2wjQHMNwILtE6ANpvtKWX/xg=";
+    hash = "sha256-Yo0noD/CrwIdvOM7BaS8QCj3KAMaGPzLyp8xz+TNWsQ=";
   };
 
   build-system = [ setuptools ];

From a075f1311ce40ae1b9008fdc43b38d0b2e53b961 Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Mon, 11 May 2026 08:47:42 -0300
Subject: [PATCH 12/49] opencode: 1.14.35 -> 1.14.48

- https://github.com/anomalyco/opencode/releases/tag/v1.14.48
- https://github.com/anomalyco/opencode/releases/tag/v1.14.47
- https://github.com/anomalyco/opencode/releases/tag/v1.14.46
- https://github.com/anomalyco/opencode/releases/tag/v1.14.45
- https://github.com/anomalyco/opencode/releases/tag/v1.14.44
- https://github.com/anomalyco/opencode/releases/tag/v1.14.43
- https://github.com/anomalyco/opencode/releases/tag/v1.14.42
- https://github.com/anomalyco/opencode/releases/tag/v1.14.41
- https://github.com/anomalyco/opencode/releases/tag/v1.14.40
- https://github.com/anomalyco/opencode/releases/tag/v1.14.39
- https://github.com/anomalyco/opencode/releases/tag/v1.14.38
- https://github.com/anomalyco/opencode/releases/tag/v1.14.37
---
 pkgs/by-name/op/opencode/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 1c3d1a2b63ac..d4bcfb1d45a5 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -16,13 +16,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.14.35";
+  version = "1.14.48";
 
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i2Ct4QC0Tf+UWNWAQoW/IPtRKrVyZSC1/FTzQNpou2g=";
+    hash = "sha256-gyybqabTco+5ZeWv4lCX8t/R9Jm3tYsA8wVvkrxkEYQ=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-JwkXBlXS4AG0rquzdOSE5Atzm0Hm9UVEBmDMAnTlbyg=";
+    outputHash = "sha256-94uXrhyGqW016U6LPE/xIfZGoDOzyUto5DyQrYYePds=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

From 0a23fbeecacdbb6bdf9fdf7cfd4a5fe1147ed72d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 11 May 2026 15:42:53 +0200
Subject: [PATCH 13/49] nixpkgs-review: 3.7.0 -> 3.8.0

Diff: https://github.com/Mic92/nixpkgs-review/compare/3.7.0...3.8.0

Changelog: https://github.com/Mic92/nixpkgs-review/releases/tag/3.8.0
---
 pkgs/by-name/ni/nixpkgs-review/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
index 8b134dc85e0c..d918f38e926d 100644
--- a/pkgs/by-name/ni/nixpkgs-review/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -22,14 +22,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "nixpkgs-review";
-  version = "3.7.0";
+  version = "3.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixpkgs-review";
     tag = finalAttrs.version;
-    hash = "sha256-AYizZ36di7DOtmaqMtWTvMVfe4DqJfCdhvxypweEArs=";
+    hash = "sha256-Z8pOct9DtuRo4LERqhVpDxX9uoLNQGgqPFUh0Fn3MrI=";
   };
 
   build-system = [

From 7904411005aed7be610808a5c04b5d51c2984498 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:15 +0530
Subject: [PATCH 14/49] cosmic-applets: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-applets/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix
index 3ce4f40d613d..e2491669e99d 100644
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@@ -33,6 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-gA+dpodk6u8dv9VaKNi/xzI8ys39iztQdia+eGkzXs4=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From b71d3550c96ef029ea1fa5405b58182f314527f0 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:16 +0530
Subject: [PATCH 15/49] cosmic-applibrary: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-applibrary/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index fcf0f57db747..b1b3a70f8c11 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -24,6 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-uR0wm2+zmcec3esfYwgq4pRqSHkZnd3O8XhgnANf/1Q=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From 953495de1d32a3aec7f54580d1de6bec1f25700f Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:16 +0530
Subject: [PATCH 16/49] cosmic-bg: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-bg/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index f6faac03213d..c2cc636e9823 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -32,6 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-xXq8Dckg3YOf2AT9uOZqVfq00FhZp/X5UU8hLmAln1U=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From bb95a91ce7db92246835369247335c37d2164d52 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:16 +0530
Subject: [PATCH 17/49] cosmic-comp: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-comp/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index dfc8da54c91f..7521c5b9cbde 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -34,6 +34,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   separateDebugInfo = true;
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     libcosmicAppHook
     pkg-config

From 173d0adbe997e55b4c8c0685b8489cb0b0ee0bfd Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:16 +0530
Subject: [PATCH 18/49] cosmic-design-demo: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-design-demo/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-design-demo/package.nix b/pkgs/by-name/co/cosmic-design-demo/package.nix
index cb867206f2af..9579eb8924e5 100644
--- a/pkgs/by-name/co/cosmic-design-demo/package.nix
+++ b/pkgs/by-name/co/cosmic-design-demo/package.nix
@@ -24,6 +24,7 @@ rustPlatform.buildRustPackage {
   cargoHash = "sha256-czfDtiSEmzmcLfpqv0/8sP8zDAEKh+pkQkGXdd5NskM=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From be66639fca68769c30a7a55c27f33bd3fb7ab2da Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:17 +0530
Subject: [PATCH 19/49] cosmic-edit: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-edit/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index 54b8edceaa97..5bfbf3196277 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -34,6 +34,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
   '';
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     just
     pkg-config

From a16d5f1c423ea5fbfc297542f41711aba6d8794c Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:17 +0530
Subject: [PATCH 20/49] cosmic-files: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-files/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index cfb5953c87fa..a0fd646b6c87 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -25,6 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-tMSqyl75XK2rgqRtgHAPtr+KFotx61HGqzv0iqzakS8=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From a811a031b287e3a97bc9d5f750e6aeeffea6811b Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:17 +0530
Subject: [PATCH 21/49] cosmic-greeter: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-greeter/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index b13bf4d6ac0d..21ffc2a98e61 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -37,6 +37,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--all" ];
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     rustPlatform.bindgenHook
     cmake

From 3c97da0cdb8d606555b6e9afb39bfdeb92477e4b Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:17 +0530
Subject: [PATCH 22/49] cosmic-icons: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-icons/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix
index 0bc5a0168044..3e96fefb273d 100644
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -19,6 +19,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hash = "sha256-3owl4M4vRyzjR4v74clyAxpNDu77rieSpYAVYfADHzY=";
   };
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [ just ];
 
   justFlags = [

From c7562bddde61708dee0127359cb79d4f4d789aab Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:18 +0530
Subject: [PATCH 23/49] cosmic-idle: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-idle/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix
index 6f5f330f6e63..273dc32db11a 100644
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -29,6 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-wAjFC6qAC3nllbnZf0KVaZTEztNYo6GTvwcp5FYmXLw=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From f388ab71a68754e2484619767b9e848405ca926e Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:18 +0530
Subject: [PATCH 24/49] cosmic-initial-setup: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-initial-setup/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix
index 4931bcaa4f45..162a005de8ae 100644
--- a/pkgs/by-name/co/cosmic-initial-setup/package.nix
+++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix
@@ -38,6 +38,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # https://github.com/rust-secure-code/cargo-auditable/issues/225
   auditable = false;
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     libcosmicAppHook
     just

From 0c3e1c4a6668c44a2df10ee664e263b39b77105f Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:18 +0530
Subject: [PATCH 25/49] cosmic-launcher: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-launcher/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index 915f52afab71..ebd15f4a78e1 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -24,6 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-wZgxlq9MVCeESH093MaQybVMyq50L7aYwj//2r/B0QM=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From a7076a4afa6d3577a6d0325f8f65336132641d4b Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:18 +0530
Subject: [PATCH 26/49] cosmic-notifications: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-notifications/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index 142677ddd32f..d1269df6d353 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -25,6 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-EIwYabYWSHTMnNFcammidn3bI4fc6JFdcVkGj7RmWqA=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From 431a178c347bcf5c61676173648e046754d4af68 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:18 +0530
Subject: [PATCH 27/49] cosmic-osd: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-osd/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix
index fb06fa292ef4..ffddd73dacab 100644
--- a/pkgs/by-name/co/cosmic-osd/package.nix
+++ b/pkgs/by-name/co/cosmic-osd/package.nix
@@ -28,6 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-1YRWWI2qhCI0GrxBAAkGT/AbtkTHgdbYsG8obriZ+zg=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From 142d6df1365987a20473e393bc04326953950c11 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:19 +0530
Subject: [PATCH 28/49] cosmic-panel: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-panel/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix
index b93d7a2adf1e..5637e5168235 100644
--- a/pkgs/by-name/co/cosmic-panel/package.nix
+++ b/pkgs/by-name/co/cosmic-panel/package.nix
@@ -24,6 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-vU++jreNHCRjxyyoj53LB2Sa7cdVUWGAvECcqoDofF8=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From 3acc2fd0d0d930f6f27ab6680d5f3ae184d96eb5 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:19 +0530
Subject: [PATCH 29/49] cosmic-player: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-player/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index a10afe5e47de..e282b90ce106 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -31,6 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-YPxbOSz/E3hoMT4dutk60jWJMpJHqOWpCSA91b+mHaE=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From 62fad2caa7e412ac2870be6cd8f59a5516bd89f4 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:19 +0530
Subject: [PATCH 30/49] cosmic-protocols: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-protocols/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix
index eeab9c237007..7a8a6b2bc405 100644
--- a/pkgs/by-name/co/cosmic-protocols/package.nix
+++ b/pkgs/by-name/co/cosmic-protocols/package.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
     hash = "sha256-KO7VTxomhrnwzFlkkXSoP0eh3NRShBD4srW5W6temxo=";
   };
 
+  __structuredAttrs = true;
+
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
   nativeBuildInputs = [ wayland-scanner ];
 

From 31d660802a4a23021b84cc6fe90617798b2b5145 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:19 +0530
Subject: [PATCH 31/49] cosmic-randr: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-randr/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index 602f4fd2dc79..3e8821dcb032 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -25,6 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-QWSPj7bxxWh5/KeNEtUsfDKg+JMONLjomrMcn57j6fw=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From a0698d2d96203a19ca4f9dff8f6d555ed9d5df8f Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:20 +0530
Subject: [PATCH 32/49] cosmic-reader: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-reader/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-reader/package.nix b/pkgs/by-name/co/cosmic-reader/package.nix
index 3775db740cc1..3bdcd5d8dcc3 100644
--- a/pkgs/by-name/co/cosmic-reader/package.nix
+++ b/pkgs/by-name/co/cosmic-reader/package.nix
@@ -31,6 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-p0dg5RNXkzbi+/RB5k+jr34RNOp+Irahj0BiFUddfnk=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From 602443c3d6feef405fdece7abd6ad75fd6ad171a Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:20 +0530
Subject: [PATCH 33/49] cosmic-screenshot: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-screenshot/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix
index 04078658374d..4fa50f629a66 100644
--- a/pkgs/by-name/co/cosmic-screenshot/package.nix
+++ b/pkgs/by-name/co/cosmic-screenshot/package.nix
@@ -24,6 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-q0RJST1yeqPBjU5MseNZIrZw+brfDtQLKiw7wyViflE=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From 9ed18151d2a52d824015af46822c41cbdbb1c6d6 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:20 +0530
Subject: [PATCH 34/49] cosmic-session: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-session/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix
index 7868a9d356ea..a96f61bf4df9 100644
--- a/pkgs/by-name/co/cosmic-session/package.nix
+++ b/pkgs/by-name/co/cosmic-session/package.nix
@@ -34,6 +34,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/usr/bin/start-cosmic' "${placeholder "out"}/bin/start-cosmic"
   '';
 
+  __structuredAttrs = true;
+
   buildInputs = [ bash ];
   nativeBuildInputs = [ just ];
 

From 7d8e62cdeff16a9ab69c8af39ed8afe8d4a61fd7 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:20 +0530
Subject: [PATCH 35/49] cosmic-settings-daemon: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-settings-daemon/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index 86e4c1fd6313..a79841654259 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -36,6 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-pvoCqFvMVqNTfdU5WidGijfFNsC9i2XNuNV33F8aKZw=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [ pkg-config ];
 

From af5e5f045e2ad63899646ba9480eafaa99429d86 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:20 +0530
Subject: [PATCH 36/49] cosmic-settings: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-settings/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index 86e0956b61d5..c6300e324015 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -40,6 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-O6d47H+vcSn9G6EIMpSshfL+cBJWZMYXHHKsu2n/huk=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     cmake

From 0880b944c5abadefb84f35e7ee84b39728dcd9e1 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:21 +0530
Subject: [PATCH 37/49] cosmic-store: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-store/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index f4a0ca42dcae..9a8ec736a999 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -28,6 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-DCqEXoJ1qTwKemSCGe7AwQCdOFw7Qh3PoxbB9XdLfHk=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From e62e565a055974cf46e716e6175c0f49713572b3 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:21 +0530
Subject: [PATCH 38/49] cosmic-term: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-term/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index 144fd6e58835..b53241ee83d7 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -28,6 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-9iHcmImA2tscpRuRKE/nUrwhR5RU5xA2zxJpcDt+2sE=";
 
   separateDebugInfo = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     just

From 5852d5a659ef363a58eee1064c2a8f5fb606c52b Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:21 +0530
Subject: [PATCH 39/49] cosmic-wallpapers: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-wallpapers/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix
index c27c8e18db3f..1088d5ba18a4 100644
--- a/pkgs/by-name/co/cosmic-wallpapers/package.nix
+++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix
@@ -21,6 +21,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   makeFlags = [ "prefix=${placeholder "out"}" ];
 
+  __structuredAttrs = true;
+
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex"

From 957c99975b8cd98dd92a6de91a41e3dcb43ed877 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:21 +0530
Subject: [PATCH 40/49] cosmic-workspaces-epoch: enable __structuredAttrs

---
 pkgs/by-name/co/cosmic-workspaces-epoch/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index ec2bb120e7a1..2656c8198b12 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -28,6 +28,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   separateDebugInfo = true;
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     pkg-config
     libcosmicAppHook

From 7222f82b00399e5aeabe0a97b934bfd18155bedc Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:21 +0530
Subject: [PATCH 41/49] pop-launcher: enable __structuredAttrs

---
 pkgs/by-name/po/pop-launcher/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/po/pop-launcher/package.nix b/pkgs/by-name/po/pop-launcher/package.nix
index 43f8b1e487c0..74d1c1d37501 100644
--- a/pkgs/by-name/po/pop-launcher/package.nix
+++ b/pkgs/by-name/po/pop-launcher/package.nix
@@ -21,6 +21,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-Db3Lj1GuhoEP2iMwgEF8HnGAUkz0IIr3ZQWmNd1EaOY=";
   };
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     just
     pkg-config

From 46f95e417ec446ca4f8063fdfcfa47bc9ae52961 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:22 +0530
Subject: [PATCH 42/49] xdg-desktop-portal-cosmic: enable __structuredAttrs

---
 pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index c010bf1bc1e8..96ba1eb752a8 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -32,6 +32,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   separateDebugInfo = true;
   strictDeps = true;
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     libcosmicAppHook
     rustPlatform.bindgenHook

From 77753a64c66fe282cc600eb27ac871c6b7305ea2 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:22 +0530
Subject: [PATCH 43/49] cosmic-icons: enable strictDeps

---
 pkgs/by-name/co/cosmic-icons/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix
index 3e96fefb273d..21adcefeb9ee 100644
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -20,6 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   __structuredAttrs = true;
+  strictDeps = true;
 
   nativeBuildInputs = [ just ];
 

From d1682d6dad6fb970794885e769ba325dccc9bb8b Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:22 +0530
Subject: [PATCH 44/49] cosmic-protocols: enable strictDeps

---
 pkgs/by-name/co/cosmic-protocols/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix
index 7a8a6b2bc405..177d299c7550 100644
--- a/pkgs/by-name/co/cosmic-protocols/package.nix
+++ b/pkgs/by-name/co/cosmic-protocols/package.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation {
   };
 
   __structuredAttrs = true;
+  strictDeps = true;
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
   nativeBuildInputs = [ wayland-scanner ];

From 03fc9bdc0f56a7b86aa0587fb4cbf6f28ba6ad1d Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:22 +0530
Subject: [PATCH 45/49] cosmic-wallpapers: enable strictDeps

---
 pkgs/by-name/co/cosmic-wallpapers/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix
index 1088d5ba18a4..97b505e03623 100644
--- a/pkgs/by-name/co/cosmic-wallpapers/package.nix
+++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix
@@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   makeFlags = [ "prefix=${placeholder "out"}" ];
 
   __structuredAttrs = true;
+  strictDeps = true;
 
   passthru.updateScript = nix-update-script {
     extraArgs = [

From d3ba5895324a0b81f9ca713d6e4f33f286e75ee0 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 11 May 2026 20:26:22 +0530
Subject: [PATCH 46/49] xdg-desktop-portal-cosmic: drop unnecessary definition
 of strictDeps

---
 pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index 96ba1eb752a8..a0f5ed4a0d48 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -30,7 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-/7jxEktXW1+4nFK7ZFUO3oJhmLNuKMwErnqwgjBQiao=";
 
   separateDebugInfo = true;
-  strictDeps = true;
 
   __structuredAttrs = true;
 

From 50b75f108d1d0e60dccc694ed98cddedbbe237d7 Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Mon, 11 May 2026 08:48:07 -0300
Subject: [PATCH 47/49] opencode-desktop: rewrite from Tauri to Electron

The upstream desktop app was completely rewritten from Tauri/Rust to
Electron. Rewrite the Nix packaging to match:
- Replace rustPlatform.buildRustPackage with stdenvNoCC.mkDerivation
- Use electron_41 instead of cargo-tauri
- Build with electron-vite and package with electron-builder
- Embed opencode CLI as sidecar binary

opencode-desktop: fix aarch64-linux install path

electron-builder --dir outputs to linux-arm64-unpacked on aarch64
(not linux-unpacked). Use a glob pattern to support both.

opencode-desktop: fix linux install path for aarch64

electron-builder outputs to linux-arm64-unpacked on aarch64-linux
and linux-unpacked on x86_64-linux. Use hostPlatform.isAarch64 to
select the correct directory in installPhase.

Previously used a bash glob (linux-*-unpacked) which failed to match
in the nix build sandbox.
---
 pkgs/by-name/op/opencode-desktop/package.nix | 160 +++++++++++--------
 1 file changed, 96 insertions(+), 64 deletions(-)

diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix
index 24b16ea6f866..9ca30437f227 100644
--- a/pkgs/by-name/op/opencode-desktop/package.nix
+++ b/pkgs/by-name/op/opencode-desktop/package.nix
@@ -1,35 +1,22 @@
 {
   bun,
-  cargo,
-  cargo-tauri,
-  dbus,
-  glib,
-  glib-networking,
-  gst_all_1,
-  gtk4,
-  jq,
+  copyDesktopItems,
+  electron_41,
   lib,
-  libappindicator,
-  librsvg,
-  libsoup_3,
   makeBinaryWrapper,
+  models-dev,
   nodejs,
   opencode,
-  openssl,
-  pkg-config,
-  rustPlatform,
-  rustc,
   stdenvNoCC,
-  webkitgtk_4_1,
-  wrapGAppsHook4,
+  writableTmpDirAsHomeHook,
+
+  commandLineArgs ? "",
 }:
 
 let
-  gtk = gtk4;
-  libsoup = libsoup_3;
-  webkitgtk = webkitgtk_4_1;
+  electron = electron_41;
 in
-rustPlatform.buildRustPackage (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode-desktop";
   inherit (opencode)
     version
@@ -38,55 +25,100 @@ rustPlatform.buildRustPackage (finalAttrs: {
     patches
     ;
 
-  cargoRoot = "packages/desktop/src-tauri";
-  cargoHash = "sha256-WI48iYdxmizF1YgOQtk05dvrBEMqFjHP9s3+zBFAat0=";
-  buildAndTestSubdir = finalAttrs.cargoRoot;
-
   nativeBuildInputs = [
-    pkg-config
-    cargo-tauri.hook
     bun
     nodejs # for patchShebangs node_modules
-    cargo
-    rustc
-    jq
     makeBinaryWrapper
-  ]
-  ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ wrapGAppsHook4 ];
-
-  buildInputs = (
-    lib.optionals stdenvNoCC.isLinux [
-      dbus
-      glib
-      glib-networking
-      gtk
-      libappindicator
-      librsvg
-      libsoup
-      openssl
-      webkitgtk
-    ]
-    ++ (with gst_all_1; [
-      gst-plugins-bad # fakevideosink
-      gst-plugins-base # appsink and autoaudiosink
-      gst-plugins-good # autoaudiosink
-    ])
-  );
-
-  tauriBuildFlags = [
-    "--config"
-    "tauri.conf.json"
-    "--config"
-    "tauri.prod.conf.json"
-    "--no-sign"
+    writableTmpDirAsHomeHook
+    copyDesktopItems
   ];
 
-  preBuild = ''
-    cp -a ${finalAttrs.node_modules}/{node_modules,packages} .
-    chmod -R u+w node_modules packages
-    patchShebangs node_modules packages/desktop/node_modules
-    install -D ${lib.getExe opencode} \
-      packages/desktop/src-tauri/sidecars/opencode-cli-${stdenvNoCC.hostPlatform.rust.rustcTarget}
+  strictDeps = true;
+
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    OPENCODE_CHANNEL = "prod";
+    MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json";
+    OPENCODE_DISABLE_MODELS_FETCH = true;
+  };
+
+  configurePhase = ''
+    runHook preConfigure
+
+    cp -R ${finalAttrs.node_modules}/. .
+    patchShebangs node_modules
+    patchShebangs packages/*/node_modules
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    # Build the opencode node bundle (needed by the desktop sidecar)
+    cd packages/opencode
+    bun --bun ./script/build-node.ts --skip-install
+    cd ../..
+
+    # Prepare desktop app
+    cd packages/desktop
+
+    # Copy prod icons
+    cp -R icons/prod resources/icons
+
+    # Build with electron-vite
+    node_modules/.bin/electron-vite build
+
+    # Copy opencode CLI as sidecar
+    sidecar_name="opencode-cli"
+    install -D ${lib.getExe opencode} "resources/$sidecar_name"
+
+    # Package with electron-builder (unpacked directory mode)
+    cp -r "${electron.dist}" $HOME/.electron-dist
+    chmod -R u+w $HOME/.electron-dist
+
+    node_modules/.bin/electron-builder --dir \
+      --config=electron-builder.config.ts \
+      --config.electronDist="$HOME/.electron-dist" \
+      --config.electronVersion=${electron.version}
+
+    cd ../..
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    mv packages/desktop/dist/mac-*/OpenCode.app "$out/Applications/OpenCode.app"
+  ''
+  + lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
+    mkdir -p $out/opt/opencode-desktop
+    ${
+      if stdenvNoCC.hostPlatform.isAarch64 then
+        ''
+          appDir="packages/desktop/dist/linux-arm64-unpacked"
+        ''
+      else
+        ''
+          appDir="packages/desktop/dist/linux-unpacked"
+        ''
+    }
+    [ -d "$appDir" ] || { echo "no electron-builder output dir found: $appDir"; exit 1; }
+    cp -r "$appDir/resources" $out/opt/opencode-desktop/
+
+    install -Dm644 packages/desktop/resources/icons/icon.png $out/share/icons/opencode-desktop.png
+
+    makeWrapper ${lib.getExe electron} $out/bin/opencode-desktop \
+      --inherit-argv0 \
+      --add-flags $out/opt/opencode-desktop/resources/app.asar \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
+  ''
+  + ''
+    runHook postInstall
   '';
 
   meta = {

From a1954e76ee72393abda658c5b9cd3dd371e22b6c Mon Sep 17 00:00:00 2001
From: Josef Hofer <me@jhofer.de>
Date: Mon, 11 May 2026 19:02:18 +0200
Subject: [PATCH 48/49] tidal: dont strip

The TIDAL.app bundle is a signed Electron app, stripping invalidates
code signatures and crashes newer cctools llvm-strip on
_CodeSignature/CodeResources.
---
 pkgs/by-name/ti/tidal/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ti/tidal/package.nix b/pkgs/by-name/ti/tidal/package.nix
index 2ada01e637fe..8c511ca6f456 100644
--- a/pkgs/by-name/ti/tidal/package.nix
+++ b/pkgs/by-name/ti/tidal/package.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation {
   strictDeps = true;
   __structuredAttrs = true;
 
+  dontStrip = true;
+
   installPhase = ''
     runHook preInstall
 

From 6482b46d61ba9f0c1f0404415f4b5963300754ff Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 2 May 2026 14:00:58 +0200
Subject: [PATCH 49/49] dnsmasq: 2.92 -> 2.92rel2

Fixes CVE-2026-2291
Fixes CVE-2026-4890
Fixes CVE-2026-4891
Fixes CVE-2026-4892
Fixes CVE-2026-4893
Fixes CVE-2026-5172

https://kb.cert.org/vuls/id/471747

Changelog:
```
version 2.92rel2
        2.92 point release incorporating fixes for
	CVE-2026-2291
	CVE-2026-4890
	CVE-2026-4891
	CVE-2026-4892
	CVE-2026-4893
	CVE-2026-5172
```
---
 pkgs/by-name/dn/dnsmasq/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix
index 72f27c99a05f..6665b9776527 100644
--- a/pkgs/by-name/dn/dnsmasq/package.nix
+++ b/pkgs/by-name/dn/dnsmasq/package.nix
@@ -30,11 +30,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dnsmasq";
-  version = "2.92";
+  version = "2.92rel2";
 
   src = fetchurl {
     url = "https://www.thekelleys.org.uk/dnsmasq/dnsmasq-${finalAttrs.version}.tar.xz";
-    hash = "sha256-S/UMLBAY+fvCYDffUbkOzqDLc9RhYoRnY7kt8NbDpFg=";
+    hash = "sha256-Q9crjBKb3zPRe6/tyYgj9j5GtQBRKAZr8NKkcqMs4Go=";
   };
 
   patches = [