Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot] 2026-05-11 18:38:49 +00:00 committed by GitHub
commit ac42d9b657
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
45 changed files with 553 additions and 108 deletions

View file

@ -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}");

View file

@ -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
}
}

View file

@ -33,6 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-gA+dpodk6u8dv9VaKNi/xzI8ys39iztQdia+eGkzXs4=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -24,6 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-uR0wm2+zmcec3esfYwgq4pRqSHkZnd3O8XhgnANf/1Q=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -32,6 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-xXq8Dckg3YOf2AT9uOZqVfq00FhZp/X5UU8hLmAln1U=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -34,6 +34,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
libcosmicAppHook
pkg-config

View file

@ -24,6 +24,7 @@ rustPlatform.buildRustPackage {
cargoHash = "sha256-czfDtiSEmzmcLfpqv0/8sP8zDAEKh+pkQkGXdd5NskM=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -34,6 +34,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
'';
__structuredAttrs = true;
nativeBuildInputs = [
just
pkg-config

View file

@ -25,6 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-tMSqyl75XK2rgqRtgHAPtr+KFotx61HGqzv0iqzakS8=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -37,6 +37,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoBuildFlags = [ "--all" ];
__structuredAttrs = true;
nativeBuildInputs = [
rustPlatform.bindgenHook
cmake

View file

@ -19,6 +19,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
hash = "sha256-3owl4M4vRyzjR4v74clyAxpNDu77rieSpYAVYfADHzY=";
};
__structuredAttrs = true;
strictDeps = true;
nativeBuildInputs = [ just ];
justFlags = [

View file

@ -29,6 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-wAjFC6qAC3nllbnZf0KVaZTEztNYo6GTvwcp5FYmXLw=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -38,6 +38,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
# https://github.com/rust-secure-code/cargo-auditable/issues/225
auditable = false;
__structuredAttrs = true;
nativeBuildInputs = [
libcosmicAppHook
just

View file

@ -24,6 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-wZgxlq9MVCeESH093MaQybVMyq50L7aYwj//2r/B0QM=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -25,6 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-EIwYabYWSHTMnNFcammidn3bI4fc6JFdcVkGj7RmWqA=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -28,6 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-1YRWWI2qhCI0GrxBAAkGT/AbtkTHgdbYsG8obriZ+zg=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -24,6 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-vU++jreNHCRjxyyoj53LB2Sa7cdVUWGAvECcqoDofF8=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -31,6 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-YPxbOSz/E3hoMT4dutk60jWJMpJHqOWpCSA91b+mHaE=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -18,6 +18,9 @@ stdenv.mkDerivation {
hash = "sha256-KO7VTxomhrnwzFlkkXSoP0eh3NRShBD4srW5W6temxo=";
};
__structuredAttrs = true;
strictDeps = true;
makeFlags = [ "PREFIX=${placeholder "out"}" ];
nativeBuildInputs = [ wayland-scanner ];

View file

@ -25,6 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-QWSPj7bxxWh5/KeNEtUsfDKg+JMONLjomrMcn57j6fw=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -31,6 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-p0dg5RNXkzbi+/RB5k+jr34RNOp+Irahj0BiFUddfnk=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -24,6 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-q0RJST1yeqPBjU5MseNZIrZw+brfDtQLKiw7wyViflE=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -34,6 +34,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '/usr/bin/start-cosmic' "${placeholder "out"}/bin/start-cosmic"
'';
__structuredAttrs = true;
buildInputs = [ bash ];
nativeBuildInputs = [ just ];

View file

@ -36,6 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-pvoCqFvMVqNTfdU5WidGijfFNsC9i2XNuNV33F8aKZw=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [ pkg-config ];

View file

@ -40,6 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-O6d47H+vcSn9G6EIMpSshfL+cBJWZMYXHHKsu2n/huk=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
cmake

View file

@ -28,6 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-DCqEXoJ1qTwKemSCGe7AwQCdOFw7Qh3PoxbB9XdLfHk=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -28,6 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-9iHcmImA2tscpRuRKE/nUrwhR5RU5xA2zxJpcDt+2sE=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just

View file

@ -21,6 +21,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
makeFlags = [ "prefix=${placeholder "out"}" ];
__structuredAttrs = true;
strictDeps = true;
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"

View file

@ -28,6 +28,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
pkg-config
libcosmicAppHook

View file

@ -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 = [

View file

@ -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;
};
})

View file

@ -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";
};
})

View file

@ -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 = [

View file

@ -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 = [

View file

@ -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 = {

View file

@ -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";
};

View file

@ -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 = [

View file

@ -21,6 +21,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
hash = "sha256-Db3Lj1GuhoEP2iMwgEF8HnGAUkz0IIr3ZQWmNd1EaOY=";
};
__structuredAttrs = true;
nativeBuildInputs = [
just
pkg-config

View file

@ -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 = [

View file

@ -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 = [

View file

@ -30,6 +30,8 @@ stdenv.mkDerivation {
strictDeps = true;
__structuredAttrs = true;
dontStrip = true;
installPhase = ''
runHook preInstall

View file

@ -30,7 +30,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-/7jxEktXW1+4nFK7ZFUO3oJhmLNuKMwErnqwgjBQiao=";
separateDebugInfo = true;
strictDeps = true;
__structuredAttrs = true;
nativeBuildInputs = [
libcosmicAppHook

View file

@ -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;

View file

@ -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 = [

View file

@ -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 ];