Merge staging-next into staging
This commit is contained in:
@@ -7644,6 +7644,12 @@
|
||||
name = "Zhenbo Li";
|
||||
matrix = "@zhenbo:matrix.org";
|
||||
};
|
||||
enkarterisi = {
|
||||
name = "xNefas";
|
||||
email = "enkarterisi@proton.me";
|
||||
github = "xNefas";
|
||||
githubId = 199727225;
|
||||
};
|
||||
enorris = {
|
||||
name = "Eric Norris";
|
||||
email = "erictnorris@gmail.com";
|
||||
@@ -9392,6 +9398,11 @@
|
||||
githubId = 5549373;
|
||||
name = "Jochen Kiemes";
|
||||
};
|
||||
ginkogruen = {
|
||||
name = "Jasper Wolter";
|
||||
github = "ginkogruen";
|
||||
githubId = 93037574;
|
||||
};
|
||||
giodamelio = {
|
||||
name = "Giovanni d'Amelio";
|
||||
email = "gio@damelio.net";
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
services.renovate = {
|
||||
enable = true;
|
||||
settings = {
|
||||
platform = "gitea";
|
||||
platform = "forgejo";
|
||||
endpoint = "http://localhost:3000";
|
||||
autodiscover = true;
|
||||
gitAuthor = "Renovate <renovate@example.com>";
|
||||
@@ -34,24 +34,24 @@
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
def gitea(command):
|
||||
return machine.succeed(f"cd /var/lib/forgejo && sudo --user=forgejo GITEA_WORK_DIR=/var/lib/forgejo GITEA_CUSTOM=/var/lib/forgejo/custom gitea {command}")
|
||||
def forgejo(command):
|
||||
return machine.succeed(f"cd /var/lib/forgejo && sudo --user=forgejo FORGEJO_WORK_DIR=/var/lib/forgejo FORGEJO_CUSTOM=/var/lib/forgejo/custom forgejo {command}")
|
||||
|
||||
machine.wait_for_unit("forgejo.service")
|
||||
machine.wait_for_open_port(3000)
|
||||
|
||||
machine.systemctl("stop forgejo.service")
|
||||
|
||||
gitea("admin user create --username meow --email meow@example.com --password meow")
|
||||
forgejo("admin user create --username meow --email meow@example.com --password meow")
|
||||
|
||||
machine.systemctl("start forgejo.service")
|
||||
machine.wait_for_unit("forgejo.service")
|
||||
machine.wait_for_open_port(3000)
|
||||
|
||||
accessToken = gitea("admin user generate-access-token --raw --username meow --scopes all | tr -d '\n'")
|
||||
accessToken = forgejo("admin user generate-access-token --raw --username meow --scopes all | tr -d '\n'")
|
||||
|
||||
machine.succeed(f"tea login add --name default --user meow --token '{accessToken}' --password meow --url http://localhost:3000")
|
||||
machine.succeed("tea repo create --name kitty --init")
|
||||
machine.succeed("tea repo create --login default --name kitty --init")
|
||||
machine.succeed("git config --global user.name Meow")
|
||||
machine.succeed("git config --global user.email meow@example.com")
|
||||
machine.succeed(f"git clone http://meow:{accessToken}@localhost:3000/meow/kitty.git /tmp/kitty")
|
||||
@@ -63,8 +63,8 @@
|
||||
machine.succeed(f"echo '{accessToken}' > /etc/renovate-token")
|
||||
machine.systemctl("start --wait renovate.service")
|
||||
|
||||
machine.succeed("tea pulls list --repo meow/kitty | grep 'Configure Renovate'")
|
||||
machine.succeed("tea pulls merge --repo meow/kitty 1")
|
||||
machine.succeed("tea pulls list --login default --repo meow/kitty | grep 'Configure Renovate'")
|
||||
machine.succeed("tea pulls merge --login default --repo meow/kitty 1")
|
||||
|
||||
machine.systemctl("start --wait renovate.service")
|
||||
'';
|
||||
|
||||
@@ -42,6 +42,7 @@ mapAliases (
|
||||
blueballs-neovim = throw "`blueballs-neovim` has been removed"; # added 2025-06-17
|
||||
BufOnly = BufOnly-vim;
|
||||
calendar = calendar-vim;
|
||||
coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # addedd 2025-10-01
|
||||
coffee-script = vim-coffee-script;
|
||||
coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18
|
||||
Solarized = vim-colors-solarized;
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
coc-clangd,
|
||||
coc-css,
|
||||
coc-diagnostic,
|
||||
coc-docker,
|
||||
coc-pyright,
|
||||
coc-toml,
|
||||
}:
|
||||
@@ -28,6 +29,11 @@ final: prev: {
|
||||
src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
|
||||
};
|
||||
|
||||
coc-docker = buildVimPlugin {
|
||||
inherit (coc-docker) pname version meta;
|
||||
src = "${coc-docker}/lib/node_modules/coc-docker";
|
||||
};
|
||||
|
||||
coc-pyright = buildVimPlugin {
|
||||
pname = "coc-pyright";
|
||||
inherit (coc-pyright) version meta;
|
||||
|
||||
@@ -12834,12 +12834,12 @@ final: prev: {
|
||||
|
||||
project-nvim = buildVimPlugin {
|
||||
pname = "project.nvim";
|
||||
version = "2025-09-26";
|
||||
version = "2025-10-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DrKJeff16";
|
||||
repo = "project.nvim";
|
||||
rev = "8010402e3b10264eb832f5ebbeb853decaa97433";
|
||||
sha256 = "0lfyv2hl453pxm3kkmb2d6gq2a7g5c5kycvhhnc1kkgznvr5872z";
|
||||
rev = "7008545417848450c6dad83fcc6b3e58f0450990";
|
||||
sha256 = "sha256-ZGKC/r+1/TcAqZvkzTHPtpcBC7eRfvuuMNTVeMR4qLQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
|
||||
@@ -7,7 +7,6 @@ final: prev:
|
||||
let
|
||||
nodePackageNames = [
|
||||
"coc-cmake"
|
||||
"coc-docker"
|
||||
"coc-emmet"
|
||||
"coc-eslint"
|
||||
"coc-explorer"
|
||||
@@ -26,7 +25,6 @@ let
|
||||
"coc-pairs"
|
||||
"coc-prettier"
|
||||
"coc-r-lsp"
|
||||
"coc-rls"
|
||||
"coc-rust-analyzer"
|
||||
"coc-sh"
|
||||
"coc-smartf"
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "143.0-1",
|
||||
"packageVersion": "143.0.3-1",
|
||||
"source": {
|
||||
"rev": "143.0-1",
|
||||
"hash": "sha256-eR5ArTe/XVz5CCEzgZ061i4ta+opX+hvbcChscsTBcs="
|
||||
"rev": "143.0.3-1",
|
||||
"hash": "sha256-0gOt8YEnyDcMHy+EdSi2MLtRZMnMzfeBBKiMa2QO3uQ="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "143.0",
|
||||
"hash": "sha512-Sf5eXbt1Ob4+TFF9PKxFPqm3OeYQQMSsGrzz1mZXMvul/5H7BA88ApSvD4woJCNalOYKycJuJcsU2J1LUMipEQ=="
|
||||
"version": "143.0.3",
|
||||
"hash": "sha512-wJK9Oqx5+FaoBMkIt21AQJzgUrABdiaeowKbWjpohdTSHOJr12yeoTgn/3VFm2tLBWb1qkkDWsI0rliQxnhFsA=="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -903,13 +903,13 @@
|
||||
"vendorHash": "sha256-pez5anuq3hHXH7XMthT7y8+rjCHsMV3Vqk/DBCpbkdg="
|
||||
},
|
||||
"nomad": {
|
||||
"hash": "sha256-0ShkpPAxCT9lmfrVUoyjx7DhwlSYz9uEIujsKSB+dgA=",
|
||||
"hash": "sha256-+lWAVb9ffyTfnkR3qZzgggRVjizdrgQ96Tj/K4ngZWQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/nomad",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-nomad",
|
||||
"rev": "v2.5.0",
|
||||
"rev": "v2.5.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-U8eA/9og4LIedhPSEN9SyInLQuJSzvm0AeFhzC3oqyQ="
|
||||
"vendorHash": "sha256-CIR59EIgC5kkwfITQYrzoU8quCx5iCDRNOdYphVVk6Y="
|
||||
},
|
||||
"ns1": {
|
||||
"hash": "sha256-xIl0jUYmXe2tom8HwXLQRbdSWWyZkRtdDc0XqkQ0RcQ=",
|
||||
|
||||
@@ -29,28 +29,28 @@
|
||||
},
|
||||
"beta": {
|
||||
"linux": {
|
||||
"version": "8.11.12-26.BETA",
|
||||
"version": "8.11.14-19.BETA",
|
||||
"sources": {
|
||||
"x86_64": {
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.12-26.BETA.x64.tar.gz",
|
||||
"hash": "sha256-1i8DqaNSsWj2dIVKOrRH07OjqeunZ/y12m01gJwuQZA="
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-19.BETA.x64.tar.gz",
|
||||
"hash": "sha256-b9D+1iSkXJ23ZImB2XtNL/3uA4mcHw5o0blNU2sZX4Y="
|
||||
},
|
||||
"aarch64": {
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.12-26.BETA.arm64.tar.gz",
|
||||
"hash": "sha256-0naWYmWKqTgiYbEO8aSXMJTLGTLlRBgvrGxWIyTrZtE="
|
||||
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-19.BETA.arm64.tar.gz",
|
||||
"hash": "sha256-hDrmXWPdlmyc9gtbMJ+M3tGlL6QdavrYi5vH4HF8a/Q="
|
||||
}
|
||||
}
|
||||
},
|
||||
"darwin": {
|
||||
"version": "8.11.12-26.BETA",
|
||||
"version": "8.11.14-19.BETA",
|
||||
"sources": {
|
||||
"x86_64": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.12-26.BETA-x86_64.zip",
|
||||
"hash": "sha256-0zv4U4x4dxdrsjthHrXszL5JGpe//xVsqE+VCXD1F4U="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.14-19.BETA-x86_64.zip",
|
||||
"hash": "sha256-ULmPdLwFObQBM0CrEkBVgSFIEEeHtn3G0grC0WhWmbs="
|
||||
},
|
||||
"aarch64": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.12-26.BETA-aarch64.zip",
|
||||
"hash": "sha256-0/ZDkeyGcnA7P41FLYk4xNLdG89Y2BWDhApNSaYcKg8="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.14-19.BETA-aarch64.zip",
|
||||
"hash": "sha256-lK0ATvTCPrwkLkPkkTBuPo8S2g/W4q9BNdSv3fdZorM="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bcachefs-tools";
|
||||
version = "1.31.3";
|
||||
version = "1.31.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sXv6YFM91T08WF5dPU7iQNqWbB/QiL2kMaXm6ZtIDqI=";
|
||||
hash = "sha256-9oiXMMrMMfu9VR0zSFM4yCAQaBgThDdEILSrxH9a84k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
src = finalAttrs.src;
|
||||
hash = "sha256-04YrgYfhZ5NfA2BcF2H6Np1SXRiH6CJpkgc9hzlbMAo=";
|
||||
hash = "sha256-E2d9uAaja6OsCMhmWFyqIVbGdad5fJ+tw3S7+X7YzpM=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "coc-docker";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "josa42";
|
||||
repo = "coc-docker";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-orSwQys+w2TKLau0gROyKh54vq7AwlVLsoU1EzALIDQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ow9viEFfyBUM2yDa63+pQCg6R5cAmznanqfI131fRxc=";
|
||||
|
||||
meta = {
|
||||
description = "Docker language server extension using dockerfile-language-server-nodejs for coc.nvim";
|
||||
homepage = "https://github.com/josa42/coc-docker";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pyrox0 ];
|
||||
};
|
||||
})
|
||||
@@ -1,60 +1,61 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
openssl,
|
||||
nodejs,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cook-cli";
|
||||
version = "0.14.0";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cooklang";
|
||||
repo = "cookcli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jaAgmqUuqldcBlrwqXsausXPP35RZqM1VasYyA0pPO8=";
|
||||
hash = "sha256-alrmQOt9PY155fIWXmp1m2dfhhkMOd4PkfkBWS2XXRg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JVWa5vQcskXEgOqAxr2CKQDMjYakA1HqinDbKfRp/Wo=";
|
||||
cargoHash = "sha256-tYD49UrLzPPS8G2zy2GKFBK4SGYXQ7UEjFWKcHvUTSY=";
|
||||
|
||||
# Build without the self-updating feature
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
openssl
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm -rf "ui/public"
|
||||
ln -s ${passthru.ui} "ui/public"
|
||||
'';
|
||||
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
passthru.ui = buildNpmPackage {
|
||||
name = "ui";
|
||||
src = "${src}/ui";
|
||||
npmDepsHash = "sha256-zx8G6Raop1EZAVy1YCF5ag5aL9NutRxbPfTARmjP2SY=";
|
||||
makeCacheWritable = true;
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mv public/ $out
|
||||
runHook postInstall
|
||||
'';
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-HxC9Tf+PZvvETuNqm1W3jaZx7SpYXlxZlI8FwGouK+s=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
npm run build-css
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/cooklang/cookcli/releases/tag/v${version}";
|
||||
description = "Suite of tools to create shopping lists and maintain recipes";
|
||||
homepage = "https://cooklang.org/";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "cook";
|
||||
maintainers = [ lib.maintainers.emilioziniades ];
|
||||
maintainers = [
|
||||
lib.maintainers.emilioziniades
|
||||
lib.maintainers.ginkogruen
|
||||
];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dq";
|
||||
version = "20250201";
|
||||
version = "20251001";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janmojzis";
|
||||
repo = "dq";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-SFX71SNLvBTxDC8xWOMAp2gYz+8K5fod2hSTzQAXpo8=";
|
||||
hash = "sha256-+3NGtHx9DI7s3V8aIJkW25apYAoFuLuiQ4TGsr981c8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -31,7 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Recursive DNS/DNSCurve server and comandline tool";
|
||||
homepage = "https://github.com/janmojzis/dq";
|
||||
changelog = "https://github.com/janmojzis/dq/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.cc0;
|
||||
license = with lib.licenses; [
|
||||
bsd0
|
||||
cc0
|
||||
mit
|
||||
mit0
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
};
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geographiclib";
|
||||
version = "2.5.2";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geographiclib";
|
||||
repo = "geographiclib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bFErzgjxBCtN12UNtnGPuS6bg1sI31gR7WZjawsY3Yo=";
|
||||
hash = "sha256-G0D44iP3ApYlxNxF+hrB20v3X+4gp2p94gQLygqgB3E=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "immich-cli";
|
||||
version = "2.2.92";
|
||||
version = "2.2.94";
|
||||
inherit (immich) src pnpmDeps;
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
}:
|
||||
let
|
||||
pnpm = pnpm_10;
|
||||
version = "1.143.1";
|
||||
version = "1.144.1";
|
||||
|
||||
esbuild' = buildPackages.esbuild.override {
|
||||
buildGoModule =
|
||||
@@ -108,14 +108,14 @@ let
|
||||
owner = "immich-app";
|
||||
repo = "immich";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lP/IrKV2B1Gq43jqVa1hIpx4HOJoiYBDUOvyTJB0t7k=";
|
||||
hash = "sha256-lSe50nbVWNWej137JgfJawIOPhtMVoolHahfrd1ENJc=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
pname = "immich";
|
||||
inherit version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-ShKgfsYc9n+B+NnSaJOSyLb4ev43ZsympYhRgPZtlxs=";
|
||||
hash = "sha256-+CwwTqjI+xOGCAb66lZplNMBwR2xJZBs6E0OyGHbSAE=";
|
||||
};
|
||||
|
||||
web = stdenv.mkDerivation {
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "media-downloader";
|
||||
version = "5.4.2";
|
||||
version = "5.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhogomchungu";
|
||||
repo = "media-downloader";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-QW6wPljY259baHHucJjIBihinocafNALfLVN4s/gN1Q=";
|
||||
hash = "sha256-PaKMwLoBKqrZyAaveriD0vu/8giHnj/LGlil8mWPZlU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
gdal,
|
||||
proj,
|
||||
protobuf,
|
||||
qt5,
|
||||
qt6,
|
||||
withGeoimage ? true,
|
||||
exiv2,
|
||||
withGpsdlib ? (!stdenv.hostPlatform.isDarwin),
|
||||
@@ -25,24 +25,25 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstreetmap";
|
||||
repo = "merkaartor";
|
||||
rev = version;
|
||||
tag = version;
|
||||
hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qt5.qttools
|
||||
qt5.wrapQtAppsHook
|
||||
qt6.qttools
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gdal
|
||||
proj
|
||||
protobuf
|
||||
qt5.qtnetworkauth
|
||||
qt5.qtsvg
|
||||
qt5.qtwebengine
|
||||
qt6.qt5compat
|
||||
qt6.qtnetworkauth
|
||||
qt6.qtsvg
|
||||
qt6.qtwebengine
|
||||
]
|
||||
++ lib.optional withGeoimage exiv2
|
||||
++ lib.optional withGpsdlib gpsd
|
||||
|
||||
@@ -31,9 +31,9 @@ let
|
||||
|
||||
phome = "$out/lib/olympus";
|
||||
# The following variables are to be updated by the update script.
|
||||
version = "25.09.09.02";
|
||||
buildId = "5131"; # IMPORTANT: This line is matched with regex in update.sh.
|
||||
rev = "fa3f1a9aaca5e57bfa6d2e18a0a8688c7608b747";
|
||||
version = "25.09.30.01";
|
||||
buildId = "5195"; # IMPORTANT: This line is matched with regex in update.sh.
|
||||
rev = "f377dc2703a08b0871208a56a87b1796bf41b50d";
|
||||
in
|
||||
buildDotnetModule {
|
||||
pname = "olympus-unwrapped";
|
||||
@@ -44,7 +44,7 @@ buildDotnetModule {
|
||||
owner = "EverestAPI";
|
||||
repo = "Olympus";
|
||||
fetchSubmodules = true; # Required. See upstream's README.
|
||||
hash = "sha256-MJzrQDMsnbjua76twT+swZ1fMiRqokqlxg0ce1fnvLU=";
|
||||
hash = "sha256-eE7DU4hUlawza7Q0CD3U7QQrw4T8RnT0todJz6UIZlM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -76,13 +76,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "5.6.1";
|
||||
version = "5.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-i1AXjLg28VV5vHMdywlCHB9kIALXToVx/4ujaNe9Dc0=";
|
||||
hash = "sha256-VVPwnzcGOm3UDHtoLbP1I+9NIluMU/wHuerM+ePiKhg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "polymake";
|
||||
version = "4.14";
|
||||
version = "4.15";
|
||||
|
||||
src = fetchurl {
|
||||
# "The minimal version is a packager friendly version which omits
|
||||
# the bundled sources of cdd, lrs, libnormaliz, nauty and jReality."
|
||||
url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2";
|
||||
sha256 = "sha256-4nZncZpZECwbJ/X5j6g807QUf2MpKUBZLyFxUd79v40=";
|
||||
sha256 = "sha256-MOCo+JATz3qaRO2Q2y9pxJvxgQUGZMfmvbhhxhCxvbk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/src-tauri/src/qf_client/modules/analytics.rs b/src-tauri/src/qf_client/modules/analytics.rs
|
||||
index 3b31cfa..562e0b4 100644
|
||||
index f68e185..355723e 100644
|
||||
--- a/src-tauri/src/qf_client/modules/analytics.rs
|
||||
+++ b/src-tauri/src/qf_client/modules/analytics.rs
|
||||
@@ -37,7 +37,7 @@ impl AnalyticsModule {
|
||||
@@ -11,26 +11,32 @@ index 3b31cfa..562e0b4 100644
|
||||
last_user_activity: Arc::new(Mutex::new(Instant::now())),
|
||||
metricAndLabelPairsScheduledToSend: vec![],
|
||||
}
|
||||
@@ -96,69 +96,6 @@ impl AnalyticsModule {
|
||||
// Create Timer for sending metrics
|
||||
let mut last_metric_time = Instant::now();
|
||||
|
||||
@@ -77,90 +77,7 @@ impl AnalyticsModule {
|
||||
}
|
||||
pub fn init(&mut self) -> Result<(), AppError> {
|
||||
let app = states::app_state()?;
|
||||
- if self.is_init {
|
||||
- return Ok(());
|
||||
- }
|
||||
- self.is_init = true;
|
||||
- self.update_state();
|
||||
-
|
||||
- let is_first_install = app.is_first_install.clone();
|
||||
- tauri::async_runtime::spawn({
|
||||
- async move {
|
||||
- // Create a new instance of the QFClient and store it in the app state
|
||||
- let qf = states::qf_client().expect("Failed to get qf client");
|
||||
-
|
||||
- // Create Timer for sending metrics
|
||||
- let mut last_metric_time = Instant::now();
|
||||
-
|
||||
- if is_first_install {
|
||||
- logger::info(
|
||||
- &&qf.analytics().get_component("init"),
|
||||
- "Detected first install",
|
||||
- LoggerOptions::default(),
|
||||
- );
|
||||
- match qf
|
||||
- .analytics()
|
||||
- .try_send_analytics("install", 3, json!({}))
|
||||
- .await
|
||||
- {
|
||||
- Ok(_) => {}
|
||||
- Err(e) => {
|
||||
- error::create_log_file("analytics.log", &e);
|
||||
- }
|
||||
- };
|
||||
- qf.analytics()
|
||||
- .metricAndLabelPairsScheduledToSend
|
||||
- .push(HashMap::from([(
|
||||
- "First_Install".to_string(),
|
||||
- "true".to_string(),
|
||||
- )]));
|
||||
- }
|
||||
- loop {
|
||||
- let send_metrics = qf.analytics().send_metrics;
|
||||
@@ -38,50 +44,66 @@ index 3b31cfa..562e0b4 100644
|
||||
- tokio::time::sleep(std::time::Duration::from_secs(60)).await;
|
||||
- continue;
|
||||
- }
|
||||
- if last_metric_time.elapsed() > Duration::from_secs(15)
|
||||
- || qf.analytics().is_user_active()
|
||||
- {
|
||||
- if last_metric_time.elapsed() > Duration::from_secs(60)
|
||||
- && qf.analytics().is_user_active()
|
||||
- {
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- last_metric_time = Instant::now();
|
||||
- // logger::info_con(
|
||||
- // &qf.analytics().get_component("TrySendAnalytics"),
|
||||
- // "Sending user activity",
|
||||
- // );
|
||||
- match qf
|
||||
- .analytics()
|
||||
- .try_send_analytics(
|
||||
- "metrics/periodic",
|
||||
- 3,
|
||||
- json!(qf.analytics().metricAndLabelPairsScheduledToSend),
|
||||
- )
|
||||
- .await
|
||||
- {
|
||||
- Ok(_) => {
|
||||
- qf.analytics().clear_metrics();
|
||||
- }
|
||||
- Err(e) => {
|
||||
- if e.cause().contains("Unauthorized")
|
||||
- || e.cause().contains("Banned")
|
||||
- || e.cause().contains("WFMBanned")
|
||||
- {
|
||||
- error::create_log_file("analytics.log", &e);
|
||||
- break;
|
||||
- }
|
||||
- error::create_log_file("analytics.log", &e);
|
||||
- }
|
||||
- };
|
||||
- if last_metric_time.elapsed() < Duration::from_secs(15)
|
||||
- || !qf.analytics().is_user_active()
|
||||
- {
|
||||
- tokio::time::sleep(std::time::Duration::from_secs(5)).await;
|
||||
- continue;
|
||||
- }
|
||||
- tokio::time::sleep(std::time::Duration::from_secs(5)).await;
|
||||
-
|
||||
- if last_metric_time.elapsed() < Duration::from_secs(60)
|
||||
- && !qf.analytics().is_user_active()
|
||||
- {
|
||||
- tokio::time::sleep(std::time::Duration::from_secs(5)).await;
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- last_metric_time = Instant::now();
|
||||
- // logger::info_con(
|
||||
- // &qf.analytics().get_component("TrySendAnalytics"),
|
||||
- // "Sending user activity",
|
||||
- // );
|
||||
- match qf
|
||||
- .analytics()
|
||||
- .try_send_analytics(
|
||||
- "users/metrics/periodic",
|
||||
- 3,
|
||||
- json!(qf.analytics().metricAndLabelPairsScheduledToSend),
|
||||
- )
|
||||
- .await
|
||||
- {
|
||||
- Ok(_) => {
|
||||
- qf.analytics().clear_metrics();
|
||||
- }
|
||||
- Err(e) => {
|
||||
- if e.cause().contains("Unauthorized")
|
||||
- || e.cause().contains("Banned")
|
||||
- || e.cause().contains("WFMBanned")
|
||||
- {
|
||||
- error::create_log_file("analytics.log", &e);
|
||||
- break;
|
||||
- } else if e.cause().contains("429") {
|
||||
- logger::info(
|
||||
- &qf.analytics().get_component("TrySendAnalytics"),
|
||||
- "Rate limit reached, waiting for 60 seconds",
|
||||
- LoggerOptions::default(),
|
||||
- );
|
||||
- tokio::time::sleep(std::time::Duration::from_secs(60)).await;
|
||||
- continue;
|
||||
- }
|
||||
- error::create_log_file("analytics.log", &e);
|
||||
- }
|
||||
- };
|
||||
- }
|
||||
qf.analytics().is_init = false;
|
||||
}
|
||||
});
|
||||
@@ -174,45 +111,6 @@ impl AnalyticsModule {
|
||||
- qf.analytics().is_init = false;
|
||||
- }
|
||||
- });
|
||||
+ self.is_init = false;
|
||||
Ok(())
|
||||
}
|
||||
pub fn set_send_metrics(&mut self, send_metrics: bool) {
|
||||
@@ -173,45 +90,6 @@ impl AnalyticsModule {
|
||||
mut retry_count: i64,
|
||||
data: Value,
|
||||
) -> Result<(), AppError> {
|
||||
@@ -94,7 +116,7 @@ index 3b31cfa..562e0b4 100644
|
||||
- let err = match self
|
||||
- .client
|
||||
- .post::<Value>(
|
||||
- format!("analytics/{}?{}", url, parameters.join("&")).as_str(),
|
||||
- format!("{}?{}", url, parameters.join("&")).as_str(),
|
||||
- data.clone(),
|
||||
- )
|
||||
- .await
|
||||
@@ -124,12 +146,11 @@ index 3b31cfa..562e0b4 100644
|
||||
- );
|
||||
- tokio::time::sleep(std::time::Duration::from_secs(5)).await;
|
||||
- }
|
||||
- Ok(())
|
||||
+ return Ok(())
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
diff --git a/src/contexts/app.context.tsx b/src/contexts/app.context.tsx
|
||||
index 8b3ced9..5da811f 100644
|
||||
index 7897db9..1945ab9 100644
|
||||
--- a/src/contexts/app.context.tsx
|
||||
+++ b/src/contexts/app.context.tsx
|
||||
@@ -160,7 +160,7 @@ export function AppContextProvider({ children }: AppContextProviderProps) {
|
||||
|
||||
@@ -15,16 +15,15 @@
|
||||
gtk3,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "quantframe";
|
||||
version = "1.4.3";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kenya-DK";
|
||||
repo = "quantframe-react";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ls6c9xLmjjx0kSh1s+HkdClrcTOvsAemjzqNwMeOd9c=";
|
||||
hash = "sha256-afTiQzHat6k+BF8EhYhd0o0FzYjq7GpnOnjRhjXASG8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -35,17 +34,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false'
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./0001-disable-telemetry.patch
|
||||
];
|
||||
patches = [ ./0001-disable-telemetry.patch ];
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-3IHwwbl1aH3Pzh9xq2Jfev9hj6/LXZaVaIJOPbgsquE=";
|
||||
hash = "sha256-ncoxliXnLxWEXL1Z7ixOULI/uYkxmfLiDWu1tDSRsrM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UyfSmlr+5mWmlisNtjF6jZKx92kdQziG26mgeZtkySY=";
|
||||
cargoHash = "sha256-0IgQK0jMVN6u5i4lBKK8njbMyRQCLguTdDcSBnFnyso=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
@@ -75,6 +72,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
homepage = "https://quantframe.app/";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ nyukuru ];
|
||||
maintainers = with lib.maintainers; [
|
||||
nyukuru
|
||||
enkarterisi
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "qwen-code";
|
||||
version = "0.0.13";
|
||||
version = "0.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QwenLM";
|
||||
repo = "qwen-code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-h7CtdZap+D+qRzEvkXJq1Ui4SFg4ldWjqdna/7Ggokk=";
|
||||
hash = "sha256-Rld6k0MPfOOncK240zOJbcvheV4UKU2yF7luBrTrnFs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: {
|
||||
./add-missing-resolved-integrity-fields.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-ClLXCjcFahbMerkyz3AZ12kiJU8CzUEvd9tYpK6BRUE=";
|
||||
npmDepsHash = "sha256-43s13HncNKv4uOKVwNvqIF+Ih3rJBWrpVJnE3hCKD2w=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "renovate";
|
||||
version = "41.81.0";
|
||||
version = "41.132.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "renovatebot";
|
||||
repo = "renovate";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-iFcq8TbUXcEf0q/ifAC4dXJkG7pYvTM78FHPZucky8g=";
|
||||
hash = "sha256-Sgs2WL/rZ4zLYWqw7wXTpHQz2j5NhDMUpzFNte+3h/E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmDeps = pnpm_10.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-HQEN+gBvI9s5WEXrH/3WTMSCg0ERykeKit8z8BBUe6w=";
|
||||
hash = "sha256-r2/BTBsBvks1M0oPn4mYjdUYkYRvZDmlZgSxUd7WbEM=";
|
||||
};
|
||||
|
||||
env.COREPACK_ENABLE_STRICT = 0;
|
||||
|
||||
@@ -43,13 +43,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sdrangel";
|
||||
version = "7.22.8";
|
||||
version = "7.22.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f4exb";
|
||||
repo = "sdrangel";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Uj6BzMUhhi/0Jz8jKe/MCiXinoKcyXy4DqC/USdkcpA=";
|
||||
hash = "sha256-VYSM9ldzx/8tWKQb++qGROSXdeEXIDhGqnnHUmkW4+k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "slade";
|
||||
version = "3.2.7-unstable-2025-09-03";
|
||||
version = "3.2.7-unstable-2025-09-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sirjuddington";
|
||||
repo = "SLADE";
|
||||
rev = "00dc589de708595013cefd42397f7a890b269e68";
|
||||
hash = "sha256-w+ZBchsGNUCFXnkcNstNrhe7Bu0vNRrzVYEK/NSfIts=";
|
||||
rev = "8ad6609784de6fef6b35f1508b6d5d8a3084aa17";
|
||||
hash = "sha256-XYg0k5ZOZ/M/4X0+6pjJEMK0sIVqu/1LtmJaeq6iOvM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasm-language-tools";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g-plane";
|
||||
repo = "wasm-language-tools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FjBRz2vAc5qmOeuDiqn8WkMqJmkeyrZDcJ2FoOaR2PY=";
|
||||
hash = "sha256-lZWrrxMqtAPeSMLUS0HSgv9wwNaQYlrWj0E34zRtkhw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-a3bLXdKCXWH7bSmU6G5X9vHOPaBkn/EUG894BB8/dHs=";
|
||||
cargoHash = "sha256-d94k0hBKEFjCcQFwy3eeP5nPlaMUXYLgYltqHzCj6X8=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/wat_server";
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
{
|
||||
"version": "0.166.0",
|
||||
"version": "0.168.0",
|
||||
"binaries": {
|
||||
"aarch64-darwin": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.166.0/darwin/arm64/yc",
|
||||
"hash": "sha256-2G5wfpadVkuaW3fHZASTNv/3nP9cOUUlXoRmsGRSqEM="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/darwin/arm64/yc",
|
||||
"hash": "sha256-BeaUE3hSFNw9xoIsqfPVI3d4c2mE/mXQPGKx43DEE38="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.166.0/linux/arm64/yc",
|
||||
"hash": "sha256-UdE0wEsbessSKUYIWdB1KzvWz2n500+PKdZbA+8AzKo="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/linux/arm64/yc",
|
||||
"hash": "sha256-H0H+V94jQJCLJODcUj1ekK7v3PpipFLpuPaCtAKtEh0="
|
||||
},
|
||||
"i686-linux": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.166.0/linux/386/yc",
|
||||
"hash": "sha256-NQaVZgjoEjmcAOPVr8T0MBHIwIQx7XSBebM0iC5juYg="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/linux/386/yc",
|
||||
"hash": "sha256-TgqkCo3kitCLd8LhmJH5uaf6dA2Zq1HkPczGk7NBpJ4="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.166.0/darwin/amd64/yc",
|
||||
"hash": "sha256-Kl3QPn43IsPYszgUuV6GiWtkVd8CjxjI0v0Yu1c2UUY="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/darwin/amd64/yc",
|
||||
"hash": "sha256-xom3Ml8+3IHew2CskcnDj+VWQdD+A7DjEjq3pGrwlIU="
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.166.0/linux/amd64/yc",
|
||||
"hash": "sha256-yCpACnkkgD1p9wsYerCJbKHbWp8iahY9FtZeY/T02pc="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/linux/amd64/yc",
|
||||
"hash": "sha256-hj1zCcq4FYvWhfX0t9P/8wl94M0Rl6ieROPt4szYRZo="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "zsh-forgit";
|
||||
version = "25.09.0";
|
||||
version = "25.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-hbPiuuiyPOCtnByInhoA0atVDwNaMRfzp1n9dusg59I=";
|
||||
hash = "sha256-MG60GzRG0NFQsGXBXBedSweucxo88S/NACXTme7ixRM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -73,10 +73,12 @@ mapAliases {
|
||||
inherit (pkgs) coc-clangd; # added 2024-06-29
|
||||
inherit (pkgs) coc-css; # added 2024-06-29
|
||||
inherit (pkgs) coc-diagnostic; # added 2024-06-29
|
||||
inherit (pkgs) coc-docker; # added 2025-10-01
|
||||
coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
|
||||
inherit (pkgs) coc-pyright; # added 2024-07-14
|
||||
coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
|
||||
coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
|
||||
coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
|
||||
inherit (pkgs) coc-toml;
|
||||
coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
|
||||
coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
, "cdktf-cli"
|
||||
, "clipboard-cli"
|
||||
, "coc-cmake"
|
||||
, "coc-docker"
|
||||
, "coc-emmet"
|
||||
, "coc-eslint"
|
||||
, "coc-explorer"
|
||||
@@ -43,7 +42,6 @@
|
||||
, "coc-pairs"
|
||||
, "coc-prettier"
|
||||
, "coc-r-lsp"
|
||||
, "coc-rls"
|
||||
, "coc-rust-analyzer"
|
||||
, "coc-sh"
|
||||
, "coc-smartf"
|
||||
|
||||
-98
@@ -15666,24 +15666,6 @@ let
|
||||
sha512 = "ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==";
|
||||
};
|
||||
};
|
||||
"dockerfile-ast-0.4.2" = {
|
||||
name = "dockerfile-ast";
|
||||
packageName = "dockerfile-ast";
|
||||
version = "0.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.4.2.tgz";
|
||||
sha512 = "k770mVWaCm3KbyOSPFizP6WB2ucZjfAv8aun4UsKl+IivowK7ItwBixNbziBjN05yNpvCL1/IxBdZiSz6KQIvA==";
|
||||
};
|
||||
};
|
||||
"dockerfile-language-server-nodejs-0.9.0" = {
|
||||
name = "dockerfile-language-server-nodejs";
|
||||
packageName = "dockerfile-language-server-nodejs";
|
||||
version = "0.9.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.9.0.tgz";
|
||||
sha512 = "QPWcUxbbNTaWaRQrJKUBmCXI6iE8l7f81bCVaZizCIkVg4py/4o2mho+AKlLUsZcCml5ss8MkJ257SFV2BZWCg==";
|
||||
};
|
||||
};
|
||||
"dockerfile-language-service-0.9.0" = {
|
||||
name = "dockerfile-language-service";
|
||||
packageName = "dockerfile-language-service";
|
||||
@@ -15693,15 +15675,6 @@ let
|
||||
sha512 = "sDUkTR4LUimEAWXDIbUTEx2CytCBlx+XlJkg4B2Ptvak9HkwPD4JpXesaWxXPpp6YHCzxqwsTDY7Gf79ic340g==";
|
||||
};
|
||||
};
|
||||
"dockerfile-utils-0.10.0" = {
|
||||
name = "dockerfile-utils";
|
||||
packageName = "dockerfile-utils";
|
||||
version = "0.10.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.10.0.tgz";
|
||||
sha512 = "gnEhxITHpOXNXdlwJgJEq3xnJokm0IZOmrmHlJv8zCB2EDsgZWwdYWuktMMslIywK2YT22gxgZEoFjtEaJqzhQ==";
|
||||
};
|
||||
};
|
||||
"dockerode-4.0.4" = {
|
||||
name = "dockerode";
|
||||
packageName = "dockerode";
|
||||
@@ -41282,15 +41255,6 @@ let
|
||||
sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg==";
|
||||
};
|
||||
};
|
||||
"vscode-languageserver-types-3.17.0-next.3" = {
|
||||
name = "vscode-languageserver-types";
|
||||
packageName = "vscode-languageserver-types";
|
||||
version = "3.17.0-next.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.3.tgz";
|
||||
sha512 = "VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg==";
|
||||
};
|
||||
};
|
||||
"vscode-languageserver-types-3.17.2" = {
|
||||
name = "vscode-languageserver-types";
|
||||
packageName = "vscode-languageserver-types";
|
||||
@@ -48209,50 +48173,6 @@ in
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
coc-docker = nodeEnv.buildNodePackage {
|
||||
name = "coc-docker";
|
||||
packageName = "coc-docker";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/coc-docker/-/coc-docker-1.0.2.tgz";
|
||||
sha512 = "6As7Y7yhU0aI5UwI/QOuJzmAluoDMUcOcNg0yJZOMsnpjw9ezrPdNMIo+vRImXp1V/STU0j27CztwnH8vofOQQ==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."dockerfile-ast-0.4.2"
|
||||
sources."dockerfile-language-server-nodejs-0.9.0"
|
||||
(
|
||||
sources."dockerfile-language-service-0.9.0"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."vscode-languageserver-types-3.17.0-next.3"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."dockerfile-utils-0.10.0"
|
||||
sources."tslib-2.8.1"
|
||||
sources."vscode-jsonrpc-8.1.0"
|
||||
sources."vscode-languageserver-8.1.0"
|
||||
(
|
||||
sources."vscode-languageserver-protocol-3.17.3"
|
||||
// {
|
||||
dependencies = [
|
||||
sources."vscode-languageserver-types-3.17.3"
|
||||
];
|
||||
}
|
||||
)
|
||||
sources."vscode-languageserver-textdocument-1.0.12"
|
||||
sources."vscode-languageserver-types-3.17.5"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "docker extension for coc";
|
||||
homepage = "https://github.com/josa42/coc-docker#readme";
|
||||
license = "MIT";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
coc-emmet = nodeEnv.buildNodePackage {
|
||||
name = "coc-emmet";
|
||||
packageName = "coc-emmet";
|
||||
@@ -48680,24 +48600,6 @@ in
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
coc-rls = nodeEnv.buildNodePackage {
|
||||
name = "coc-rls";
|
||||
packageName = "coc-rls";
|
||||
version = "1.1.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/coc-rls/-/coc-rls-1.1.6.tgz";
|
||||
sha512 = "/XUM5UjOtnVBHghxBtwHz6C2lWnWgF8kX2+uocc356c2Bn8msQa6mrN0lijhlpDlsomSMPkGpZiY4zS1tNakMw==";
|
||||
};
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Rust language support - code completion, Intellisense, refactoring, reformatting, errors, snippets. A client for the Rust Language Server, built by the RLS team";
|
||||
homepage = "https://github.com/neoclide/coc-rls#readme";
|
||||
license = "MIT";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
coc-rust-analyzer = nodeEnv.buildNodePackage {
|
||||
name = "coc-rust-analyzer";
|
||||
packageName = "coc-rust-analyzer";
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "alcotest";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz";
|
||||
hash = "sha256-4jhxNsqFTfK0FSE53U1LOVOmRugElIBz3t/gojLwihU=";
|
||||
hash = "sha256-HinDtB1DKQYhBbcj39o6/4a4zvXnx1ANDkkfxf145II=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml-syntax-shims ];
|
||||
|
||||
@@ -359,7 +359,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.40.41";
|
||||
version = "1.40.42";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -367,7 +367,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-MTBrKVDl+0d4Y/4DEN/Ml1XtKKZHohXshACBN88zo40=";
|
||||
hash = "sha256-ELtE4zJfrpwHwP4eupmLz3Fsd0f/LC0DBOuwEZgOstU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "click-odoo-contrib";
|
||||
version = "1.21";
|
||||
version = "1.22";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "click_odoo_contrib";
|
||||
inherit version;
|
||||
hash = "sha256-EllrOAUW9ONJ0sUHfL7BYIaKTXeHjw8KF5as9l4W/cE=";
|
||||
hash = "sha256-L0Slv0ExVsnlMH23FX06aAEYMqzQEAc4mrKb96TtjRY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
@@ -15,17 +15,21 @@
|
||||
exceptiongroup,
|
||||
httpx,
|
||||
mcp,
|
||||
openai,
|
||||
openapi-core,
|
||||
openapi-pydantic,
|
||||
pydantic,
|
||||
pyperclip,
|
||||
python-dotenv,
|
||||
rich,
|
||||
websockets,
|
||||
|
||||
# tests
|
||||
dirty-equals,
|
||||
email-validator,
|
||||
fastapi,
|
||||
inline-snapshot,
|
||||
psutil,
|
||||
pytest-asyncio,
|
||||
pytest-httpx,
|
||||
pytestCheckHook,
|
||||
@@ -33,14 +37,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastmcp";
|
||||
version = "2.11.3";
|
||||
version = "2.12.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jlowin";
|
||||
repo = "fastmcp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jIXrMyNnyPE2DUgg+sxT6LD4dTmKQglh4cFuaw179Z0=";
|
||||
hash = "sha256-d8DOdyoyYDxZOpiUSxsYXnGrgFYN9CjdmAeHmJiDBP0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -56,10 +60,17 @@ buildPythonPackage rec {
|
||||
mcp
|
||||
openapi-core
|
||||
openapi-pydantic
|
||||
pydantic
|
||||
pyperclip
|
||||
python-dotenv
|
||||
rich
|
||||
];
|
||||
websockets
|
||||
]
|
||||
++ pydantic.optional-dependencies.email;
|
||||
|
||||
optional-dependencies = {
|
||||
openai = [ openai ];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "fastmcp" ];
|
||||
|
||||
@@ -67,25 +78,34 @@ buildPythonPackage rec {
|
||||
dirty-equals
|
||||
email-validator
|
||||
fastapi
|
||||
pydantic
|
||||
inline-snapshot
|
||||
psutil
|
||||
pytest-asyncio
|
||||
pytest-httpx
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ pydantic.optional-dependencies.email;
|
||||
++ lib.flatten (lib.attrValues optional-dependencies)
|
||||
++ inline-snapshot.optional-dependencies.dirty-equals;
|
||||
|
||||
disabledTests = [
|
||||
"test_logging_middleware_with_payloads"
|
||||
"test_structured_logging_middleware_produces_json"
|
||||
|
||||
# AssertionError: assert 'INFO' == 'DEBUG'
|
||||
"test_temporary_settings"
|
||||
|
||||
# RuntimeError: Client failed to connect: Connection close
|
||||
# RuntimeError: Client failed to connect: Connection closed
|
||||
"test_keep_alive_maintains_session_across_multiple_calls"
|
||||
"test_keep_alive_false_starts_new_session_across_multiple_calls"
|
||||
"test_keep_alive_false_exit_scope_kills_server"
|
||||
"test_keep_alive_starts_new_session_if_manually_closed"
|
||||
"test_keep_alive_true_exit_scope_kills_client"
|
||||
"test_keep_alive_maintains_session_if_reentered"
|
||||
"test_close_session_and_try_to_use_client_raises_error"
|
||||
"test_parallel_calls"
|
||||
"test_run_mcp_config"
|
||||
"test_settings_from_environment_issue_1749"
|
||||
"test_uv_transport"
|
||||
"test_uv_transport_module"
|
||||
"test_github_api_schema_performance"
|
||||
@@ -98,6 +118,9 @@ buildPythonPackage rec {
|
||||
"test_multi_client"
|
||||
"test_canonical_multi_client_with_transforms"
|
||||
|
||||
# AssertionError: assert {'annotations...object'}, ...} == {'annotations...sers']}}, ...}
|
||||
"test_list_tools"
|
||||
|
||||
# fastmcp.exceptions.ToolError: Unknown tool
|
||||
"test_multi_client_with_logging"
|
||||
"test_multi_client_with_elicitation"
|
||||
|
||||
@@ -41,14 +41,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mcp";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modelcontextprotocol";
|
||||
repo = "python-sdk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LHc2G5mzyfZ2GvUIuaXYp8AHOVGs6Xtk4MTDYtUcySI=";
|
||||
hash = "sha256-pvbrNkGfQaZX95JZyYXuuH2gMzWouuGXjaDxPyKW0Zw=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.buildPlatform.isDarwin ''
|
||||
|
||||
@@ -206,8 +206,8 @@ rec {
|
||||
"sha256-knAtab953lppnI8SioY6V3nMN6pt/l5p4XEsE3CpDGc=";
|
||||
|
||||
mypy-boto3-chime-sdk-voice =
|
||||
buildMypyBoto3Package "chime-sdk-voice" "1.40.19"
|
||||
"sha256-HQWGDqUurjpbCTJJ+GDZn/UvVz421D3Ls7EHemTa8uY=";
|
||||
buildMypyBoto3Package "chime-sdk-voice" "1.40.42"
|
||||
"sha256-axa2niA9HlLpV9Tf01p0fG2GhK2lNlCM/O8LLPHQVRc=";
|
||||
|
||||
mypy-boto3-cleanrooms =
|
||||
buildMypyBoto3Package "cleanrooms" "1.40.37"
|
||||
@@ -350,8 +350,8 @@ rec {
|
||||
"sha256-nAOKVy+aH2gw8NZ8cNSYqQ0kFWV4Gb4oU6y1vHz3fpI=";
|
||||
|
||||
mypy-boto3-connectcases =
|
||||
buildMypyBoto3Package "connectcases" "1.40.0"
|
||||
"sha256-dDHPNM+HVEIBXu9GFRtnnY+j5J31Z0gNfv/cd91QX4I=";
|
||||
buildMypyBoto3Package "connectcases" "1.40.42"
|
||||
"sha256-DJcEbPyJZVRVF1FnTSQpuUZlBTEYcOXJ42yN1o4yUwU=";
|
||||
|
||||
mypy-boto3-connectparticipant =
|
||||
buildMypyBoto3Package "connectparticipant" "1.40.18"
|
||||
@@ -366,8 +366,8 @@ rec {
|
||||
"sha256-QRwEUkDj7S0/VuQrcwuPWqKnzXEN6NYUSakhT+9T2wk=";
|
||||
|
||||
mypy-boto3-customer-profiles =
|
||||
buildMypyBoto3Package "customer-profiles" "1.40.0"
|
||||
"sha256-fMWdXDlTjSkf5R5U+cd85E5qEEHAyl4Mc0v1W2rW4WA=";
|
||||
buildMypyBoto3Package "customer-profiles" "1.40.42"
|
||||
"sha256-9zxTdvAc7+MgUM1KZJndXBCc0qL6jp50u7I93zZXrJY=";
|
||||
|
||||
mypy-boto3-databrew =
|
||||
buildMypyBoto3Package "databrew" "1.40.20"
|
||||
@@ -382,8 +382,8 @@ rec {
|
||||
"sha256-VBJsQqd5m5RfO+tJklYHd+pk2zqpqyDXO4BmRGdFxS4=";
|
||||
|
||||
mypy-boto3-datasync =
|
||||
buildMypyBoto3Package "datasync" "1.40.0"
|
||||
"sha256-I5xvx5UCp1h2H1c2xI6mSI4ZaXsONs/09/BJfRXCr3A=";
|
||||
buildMypyBoto3Package "datasync" "1.40.42"
|
||||
"sha256-utMenSLve20f+TKyA5xeoAGTEPlizo7uQJSEKt2gq68=";
|
||||
|
||||
mypy-boto3-dax =
|
||||
buildMypyBoto3Package "dax" "1.40.38"
|
||||
@@ -430,8 +430,8 @@ rec {
|
||||
"sha256-dtw54zAzP4HddWx0kZr7SzxmWiKCiiP6g4+aDRRid2k=";
|
||||
|
||||
mypy-boto3-ds =
|
||||
buildMypyBoto3Package "ds" "1.40.19"
|
||||
"sha256-tAZhpQXC0FqcE3eviZLyzwURR0JNeYdTTXvy4uVesnY=";
|
||||
buildMypyBoto3Package "ds" "1.40.42"
|
||||
"sha256-gKzshS6Q6O/lTAsrkuXOvKkGz+ECRlmSeb5NxNCBim8=";
|
||||
|
||||
mypy-boto3-dynamodb =
|
||||
buildMypyBoto3Package "dynamodb" "1.40.20"
|
||||
@@ -462,8 +462,8 @@ rec {
|
||||
"sha256-mkaBmHn3LsOHnH4kTWkGbCsL4w/TrPBt/pBXnj+1Ai8=";
|
||||
|
||||
mypy-boto3-ecs =
|
||||
buildMypyBoto3Package "ecs" "1.40.29"
|
||||
"sha256-EDI1QRd8X3KbDuqb42Kfoe8YtWBll5T+zwkGNj3JYaQ=";
|
||||
buildMypyBoto3Package "ecs" "1.40.42"
|
||||
"sha256-1U8AdbZK5u7HVuuCPoeyMqSzQDZEzfYfJzqf1mAjqVI=";
|
||||
|
||||
mypy-boto3-efs =
|
||||
buildMypyBoto3Package "efs" "1.40.0"
|
||||
@@ -558,8 +558,8 @@ rec {
|
||||
"sha256-BpY3WWeFvaGfDaGk/dxJijSK3giz7wrgvHk/lKOaxzk=";
|
||||
|
||||
mypy-boto3-fsx =
|
||||
buildMypyBoto3Package "fsx" "1.40.10"
|
||||
"sha256-E9s3Mh66bXUsy/BUPorYaOp58hkY0HpkyX3dX0OsXz4=";
|
||||
buildMypyBoto3Package "fsx" "1.40.42"
|
||||
"sha256-phgje7MZt9KoKUb6bQYqZ4/BqjYflEDPJ/uN7J04zuE=";
|
||||
|
||||
mypy-boto3-gamelift =
|
||||
buildMypyBoto3Package "gamelift" "1.40.0"
|
||||
@@ -889,8 +889,8 @@ rec {
|
||||
"sha256-hkzc8MTCssJPCjME7CMCVewYgNf9Gz/c68hAC3fuKnE=";
|
||||
|
||||
mypy-boto3-mediatailor =
|
||||
buildMypyBoto3Package "mediatailor" "1.40.0"
|
||||
"sha256-1uTPx4K0dGJfRPupXqkRKTOifmVzNhDgvaBYPpd0A4c=";
|
||||
buildMypyBoto3Package "mediatailor" "1.40.42"
|
||||
"sha256-wTzLtvXBVTEs1ywAw8sL92Xzyo9TOscaIptPE1oHrUg=";
|
||||
|
||||
mypy-boto3-medical-imaging =
|
||||
buildMypyBoto3Package "medical-imaging" "1.40.31"
|
||||
@@ -1073,8 +1073,8 @@ rec {
|
||||
"sha256-g5Mh+Uz/YrF4v7GV3kPUarzTr0miTUioaMaxwYUX4p0=";
|
||||
|
||||
mypy-boto3-quicksight =
|
||||
buildMypyBoto3Package "quicksight" "1.40.29"
|
||||
"sha256-SaFCAROxWpTo4sqW3FOhFeu9haAy4fX1IxfEPOXTnVI=";
|
||||
buildMypyBoto3Package "quicksight" "1.40.42"
|
||||
"sha256-N2azeTi2ixXGbVbeYYFly4/Mui56T6DlLKnZRD0Kp14=";
|
||||
|
||||
mypy-boto3-ram =
|
||||
buildMypyBoto3Package "ram" "1.40.18"
|
||||
@@ -1085,8 +1085,8 @@ rec {
|
||||
"sha256-zye0xv5P6GemZiH+T/cIyzx9qaeOKitEWpW6LOkc8KM=";
|
||||
|
||||
mypy-boto3-rds =
|
||||
buildMypyBoto3Package "rds" "1.40.29"
|
||||
"sha256-groMjFopUdDaTOuQlBUgIF4fA/0/n133wLG2oWSZJ2Q=";
|
||||
buildMypyBoto3Package "rds" "1.40.42"
|
||||
"sha256-d9jOB2pCQA+HFUxODEwpg1jLsSvGoC7EH7baqXU50TI=";
|
||||
|
||||
mypy-boto3-rds-data =
|
||||
buildMypyBoto3Package "rds-data" "1.40.0"
|
||||
@@ -1369,8 +1369,8 @@ rec {
|
||||
"sha256-i50560hic1ItkD0zJjAyHraepEyxioFBvHwMWkfg0kk=";
|
||||
|
||||
mypy-boto3-transfer =
|
||||
buildMypyBoto3Package "transfer" "1.40.0"
|
||||
"sha256-BMsYO2mBrK/CtWRj9jVNO2sC4IarhQ+1hYd9FeJDIEw=";
|
||||
buildMypyBoto3Package "transfer" "1.40.42"
|
||||
"sha256-1jkEh4zfoBl1sOPdAY++CheU6by2ps53OqBTN+FhwAc=";
|
||||
|
||||
mypy-boto3-translate =
|
||||
buildMypyBoto3Package "translate" "1.40.17"
|
||||
|
||||
@@ -45,6 +45,10 @@ buildPythonPackage rec {
|
||||
# Upstream hardcoded the check for the command `gdb-multiarch`;
|
||||
# Forcefully use the provided debugger as `gdb`.
|
||||
sed -i 's/gdb-multiarch/${debuggerName}/' pwnlib/gdb.py
|
||||
|
||||
# Disable update checks
|
||||
substituteInPlace pwnlib/update.py \
|
||||
--replace-fail 'disabled = False' 'disabled = True'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -23,8 +23,8 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "24.8.0";
|
||||
sha256 = "1c03b362ebf4740d4758b9a3d3087e3de989f54823650ec80b47090ef414b2e0";
|
||||
version = "24.9.0";
|
||||
sha256 = "f17bc4cb01f59098c34a288c1bb109a778867c14eeb0ebbd608d0617b1193bbf";
|
||||
patches =
|
||||
(
|
||||
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
|
||||
|
||||
@@ -155,7 +155,11 @@ let
|
||||
substituteInPlace ./config/zfs-build.m4 \
|
||||
--replace-fail "bashcompletiondir=/etc/bash_completion.d" \
|
||||
"bashcompletiondir=$out/share/bash-completion/completions"
|
||||
|
||||
''
|
||||
+ lib.optionalString (lib.versionOlder version "2.4.0") ''
|
||||
substituteInPlace ./cmd/arc_summary --replace-fail "/sbin/modinfo" "modinfo"
|
||||
''
|
||||
+ lib.optionalString (lib.versionAtLeast version "2.4.0") ''
|
||||
substituteInPlace ./cmd/zarcsummary --replace-fail "/sbin/modinfo" "modinfo"
|
||||
''
|
||||
+ ''
|
||||
|
||||
Reference in New Issue
Block a user