Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-09-04 06:06:01 +00:00
committed by GitHub
25 changed files with 84 additions and 144 deletions
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.114";
version = "1.0.115";
src = fetchFromGitHub {
owner = "dtolnay";
repo = "cargo-expand";
rev = version;
hash = "sha256-blq/5ObzHxYjNx0TPiuF1OuDPHNDBV7jBkt1r+ISnVE=";
hash = "sha256-seTprpfPzjlDgzjZIrTkhPlcB9kwA3XBXg5SBSwuUq8=";
};
cargoHash = "sha256-HNmmu9TF7p94bRF/IsStIE5XPdcUM6d505G+wbFNTls=";
cargoHash = "sha256-8VQn1syFpbXdXK5xsL24VHnMqAVqUUGgRxvzXrKNs7U=";
meta = {
description = "Cargo subcommand to show result of macro expansion";
+7 -7
View File
@@ -12,25 +12,25 @@
}:
let
pname = "clash-verge-rev";
version = "2.4.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "clash-verge-rev";
repo = "clash-verge-rev";
tag = "v${version}";
hash = "sha256-Kw2QXePBjDs0kUMPLE7UyN/v9GvsMNYi1rxcy+O6EWs=";
hash = "sha256-mTtHgH+Qf9OaQz7I5IT8SUpXOZVObwEGdKRKq107rLU=";
};
src-service = fetchFromGitHub {
owner = "clash-verge-rev";
repo = "clash-verge-service";
rev = "2b36be1417cb30ce592951cbadb1503e61c2c784"; # no meaningful tags in this repo. The only way is updating manully every time.
hash = "sha256-yTttQpWmqhgOx9wPGE01Bjp52QjTXLAfg+7+kPny+yg=";
rev = "cccf77a22ac78fe2188fd3bf519d368a2549b941"; # no meaningful tags in this repo. The only way is updating manully every time.
hash = "sha256-ADtY3h69JiRw43H+V6mzyDr/XsnAVwXXRZGBSRNA4TY=";
};
service-cargo-hash = "sha256-HET7/Lyc0Ip1f9WMVzUWr0QFuL8YN3dgZdK0adl/rYc=";
pnpm-hash = "sha256-O6JO5sW3eKjOPcnu2JDnXEUnR2Yma+SkRMOfEjG5X/E=";
vendor-hash = "sha256-kUPzKfrcMaGAMGzYy666I9l3ctac7b1xTCO8oMA9fYg=";
service-cargo-hash = "sha256-a6jp3v/AdcWvBCzEfdtfbHUdqh3a1gNN9D8hRdU1RTc=";
pnpm-hash = "sha256-WrJ5iWuPoXe220ZPAbo4Z9Zlk2B9Cob0KOL6Q+xSVys=";
vendor-hash = "sha256-aOXBk3RZfelqdeKwP992rjBJ6Ps2GdEGBqzMBudCqKw=";
service = callPackage ./service.nix {
inherit
+4 -4
View File
@@ -6,13 +6,13 @@
"packages": {
"": {
"dependencies": {
"@anthropic-ai/claude-code": "^1.0.98"
"@anthropic-ai/claude-code": "^1.0.102"
}
},
"node_modules/@anthropic-ai/claude-code": {
"version": "1.0.98",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.98.tgz",
"integrity": "sha512-IV193Eh8STdRcN3VkNcojPIlLnQPch+doBVrDSEV1rPPePISy7pzHFZL0Eg7zIPj9gHkHV1D2s0RMMwzVXJThA==",
"version": "1.0.102",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.102.tgz",
"integrity": "sha512-UIC6qNgKNZi1nLTf1bQvxNfd74xIAqJjIx6vggh3bJOMtuXBiFwrfPk1Pdf9CayYgwZYXgSmxYYaASt6i6ficQ==",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "claude-code";
version = "1.0.98";
version = "1.0.102";
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
hash = "sha256-Dkaj97FuRp6LmZgsmzKRX9PKp7bzvUj7rUD3b/5CxtU=";
hash = "sha256-l7KiRp+V/eFVV6n1pv7tZv/VjXXWGPJnIcnicO5DGfA=";
};
npmDepsHash = "sha256-rcULDhcHZm16LKzceIu6gRH/Q1HBCpIJFfZRMVkhiiQ=";
npmDepsHash = "sha256-iiimBp5GrSeabpN0nsp6vxFom7r4wNbWxiREfLeYs9w=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "django-upgrade";
version = "1.25.0";
version = "1.27.0";
pyproject = true;
src = fetchFromGitHub {
owner = "adamchainz";
repo = "django-upgrade";
tag = version;
hash = "sha256-Y49GNAc1RFGcjQbZhKzf71KxCcPJT4jPhpjq1HvIBWU=";
hash = "sha256-QvjXDnXQuRqnpWbnmqeDL3gNFiYIlG87QQVXsYc99YQ=";
};
build-system = [ python3Packages.setuptools ];
+3 -3
View File
@@ -19,14 +19,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2025-08-14";
version = "0-unstable-2025-09-03";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "11626a4383b458f8dc5ea3237eaa04e8ab1912f3";
hash = "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=";
rev = "30fc1b532645a21e157b6e33e3f8b4c154f86382";
hash = "sha256-XbtRMewPGJwTNhBC4pnBu3w/xT1XejvB0HfohC2Kga8=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -6,16 +6,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mcat-unwrapped";
version = "0.3.0";
version = "0.4.4";
src = fetchFromGitHub {
owner = "Skardyy";
repo = "mcat";
tag = "v${finalAttrs.version}";
hash = "sha256-+uq2mqUpdpO5lStf4dj6nYpOff3LOL45fXB338mnlZ8=";
hash = "sha256-URAgoarWC+GGCF+nUGqhmDmh1PX2/Ry5U8e8HrHFGHk=";
};
cargoHash = "sha256-m1TJ255jwQOEGqz22t5CmrW0zRyGqgQls84yGK5taWU=";
cargoHash = "sha256-c3OJURz6eObjIC6AHUP6l/a5zYFV0QZ3VIxShFCcm4U=";
passthru = {
updateScript = nix-update-script { };
+22 -7
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
# set it to use compression programs from $PATH
substituteInPlace dev/peach.pas --replace " HSYSBIN = 0;" " HSYSBIN = 2;"
substituteInPlace dev/peach.pas --replace-fail " HSYSBIN = 0;" " HSYSBIN = 2;"
'';
nativeBuildInputs = [
@@ -96,12 +96,27 @@ stdenv.mkDerivation (finalAttrs: {
install -D res/share/batch/freedesktop_integration/KDE-servicemenus/KDE3-konqueror/*.desktop -t $out/share/apps/konqueror/servicemenus
# Install desktop entries's icons
mkdir -p $out/share/icons/hicolor/256x256/apps
ln -s $out/share/peazip/icons/peazip.png -t $out/share/icons/hicolor/256x256/apps/
mkdir $out/share/icons/hicolor/256x256/mimetypes
ln -s $out/share/peazip/icons/peazip_{7z,zip,cd}.png $out/share/icons/hicolor/256x256/mimetypes/
mkdir $out/share/icons/hicolor/256x256/actions
ln -s $out/share/peazip/icons/peazip_{add,extract,convert}.png $out/share/icons/hicolor/256x256/actions/
for size in {48,256}; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
mkdir $out/share/icons/hicolor/"$size"x"$size"/mimetypes
mkdir $out/share/icons/hicolor/"$size"x"$size"/actions
done
pushd res/share/batch/freedesktop_integration
cp peazip.png $out/share/icons/hicolor/256x256/apps/
pushd additional-desktop-files
cp peazip_{7z,cd,zip}.png $out/share/icons/hicolor/256x256/mimetypes/
cp peazip_{add,extract,convert}.png $out/share/icons/hicolor/256x256/actions/
popd
pushd alternative-icons/48px
# for some reason the maintainer only made 48px version of *some* icons
cp peazip.png $out/share/icons/hicolor/48x48/apps/
cp peazip_{add,extract}.png $out/share/icons/hicolor/48x48/actions/
popd
popd
runHook postInstall
'';
+5 -13
View File
@@ -10,7 +10,6 @@
bison,
mpi, # generic mpi dependency
mpiCheckPhaseHook,
python3,
python3Packages,
# Build options
@@ -78,7 +77,6 @@ let
petscPackages = lib.makeScope newScope (self: {
inherit
mpi
python3
python3Packages
# global override options
mpiSupport
@@ -111,20 +109,20 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "petsc";
version = "3.23.5";
version = "3.23.6";
src = fetchzip {
url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
hash = "sha256-pfGb/9GlKsZJpdEU6lOr61a8AE5NR9MlZ0mHJ/j+eDs=";
hash = "sha256-sKXLYtOw6xom7c7ARpOY4dcsV5zR5KgbYrt1bnHF/Io=";
};
strictDeps = true;
nativeBuildInputs = [
python3
gfortran
pkg-config
bison
python3Packages.python
]
++ lib.optional mpiSupport mpi
++ lib.optionals pythonSupport [
@@ -154,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
(replaceVars ./fix-petsc4py-install-prefix.patch {
PYTHON_SITEPACKAGES = python3.sitePackages;
PYTHON_SITEPACKAGES = python3Packages.python.sitePackages;
})
];
@@ -181,13 +179,7 @@ stdenv.mkDerivation (finalAttrs: {
"--with-cxx=${lib.getDev mpi}/bin/mpicxx"
"--with-fc=${lib.getDev mpi}/bin/mpif90"
]
++ lib.optionals (!debug) [
"--with-debugging=0"
"COPTFLAGS=-O3"
"FOPTFLAGS=-O3"
"CXXOPTFLAGS=-O3"
"CXXFLAGS=-O3"
]
++ lib.optional (!debug) "--with-debugging=0"
++ lib.optional (!fortranSupport) "--with-fortran-bindings=0"
++ lib.optional pythonSupport "--with-petsc4py=1"
++ lib.optional withMetis "--with-metis=1"
+2 -1
View File
@@ -11,7 +11,7 @@
parmetis,
hdf5-fortran-mpi,
mpiCheckPhaseHook,
python3,
python312Packages,
}:
let
@@ -31,6 +31,7 @@ let
{
withMetis = true;
withParmetis = true;
python3Packages = python312Packages;
};
in
stdenv.mkDerivation (finalAttrs: {
+2 -2
View File
@@ -34,11 +34,11 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "PortfolioPerformance";
version = "0.79.0";
version = "0.79.1";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
hash = "sha256-BdpaueOSz+CH0za2uj7oJXKEgpd0R6yTyVO+Au78oCs=";
hash = "sha256-oJjYnJvgNpYpbJ5QSV4dwaB7FEaIqCbkAmzsYpjyfbc=";
};
nativeBuildInputs = [
+2 -3
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitLab,
python3,
python3Packages,
arpack-mpi,
petsc,
@@ -29,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
# Fix slepc4py install prefix
substituteInPlace config/packages/slepc4py.py \
--replace-fail "slepc.prefixdir,'lib'" \
"slepc.prefixdir,'${python3.sitePackages}'"
"slepc.prefixdir,'${python3Packages.python.sitePackages}'"
patchShebangs lib/slepc/bin
'';
@@ -43,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
nativeBuildInputs = [
python3
python3Packages.python
]
++ lib.optionals pythonSupport [
python3Packages.setuptools
+3 -3
View File
@@ -9,14 +9,14 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "slint-viewer";
version = "1.12.1";
version = "1.13.0";
src = fetchCrate {
inherit (finalAttrs) pname version;
hash = "sha256-xto9oj4ObRxXT29Qi+6HMnVvu0qK+RkTgTm7xlHOk3w=";
hash = "sha256-KasOZia9bIgMi+haXYMbu+fRrM5ZLtaC4rwHZEQOtcY=";
};
cargoHash = "sha256-xcWVkZu4AMTnp6E3JqquDVJ+/gKr7T2Csq5KDHN64nA=";
cargoHash = "sha256-0NuwxRR2BrA9j0uKYfDVFyDZEtx1byRVnLB3TZbAAP0=";
buildInputs = [
qt6.qtbase
@@ -12,13 +12,13 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "authzed";
repo = "zed";
rev = "v${version}";
tag = "v${version}";
hash = "sha256-ftSgp0zxUmSTJ7lFHxFdebKrCKbsRocDkfabVpyQ5Kg=";
};
vendorHash = "sha256-2AkknaufRhv79c9WQtcW5oSwMptkR+FB+1/OJazyGSM=";
ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" ];
ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.tag}'" ];
preCheck = ''
export NO_COLOR=true
@@ -34,6 +34,7 @@ buildGoModule rec {
'';
meta = with lib; {
changelog = "https://github.com/authzed/zed/releases/tag/${src.tag}";
description = "Command line for managing SpiceDB";
mainProgram = "zed";
longDescription = ''
@@ -7,19 +7,19 @@
buildGoModule rec {
pname = "spicedb";
version = "1.45.2";
version = "1.45.3";
src = fetchFromGitHub {
owner = "authzed";
repo = "spicedb";
rev = "v${version}";
hash = "sha256-LDAZdcUfrCWtld6V4GDpAbK+BeT/aeVOQ7G++sMoXU4=";
tag = "v${version}";
hash = "sha256-V+JYWoZclA4agfqXl3oUhxdTlJXeuO3JQIPfqu2idy0=";
};
vendorHash = "sha256-hr+xIfPjlrH9igRsYeqNOPgx/jWhDfu73gA+/NoWWxI=";
ldflags = [
"-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'"
"-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.tag}'"
];
subPackages = [ "cmd/spicedb" ];
@@ -34,6 +34,7 @@ buildGoModule rec {
'';
meta = with lib; {
changelog = "https://github.com/authzed/spicedb/releases/tag/${src.tag}";
description = "Open source permission database";
longDescription = ''
SpiceDB is an open-source permissions database inspired by
+2 -2
View File
@@ -13,14 +13,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "tauno-monitor";
version = "0.2.15";
version = "0.2.16";
pyproject = false;
src = fetchFromGitHub {
owner = "taunoe";
repo = "tauno-monitor";
tag = "v${version}";
hash = "sha256-x2RgjKI+GSrZYY2sZWFTB1OkBF3s3O+XOpj1Es03ZwE=";
hash = "sha256-0fwZc/aAdHsw8/Wa+Efi9lcvoWuJeJvTUaUUGzR1C+E=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "VictoriaLogs";
version = "1.30.0";
version = "1.32.0";
src = fetchFromGitHub {
owner = "VictoriaMetrics";
repo = "VictoriaLogs";
tag = "v${finalAttrs.version}";
hash = "sha256-Jc7crSUV1p1PE3QAeDeBvNV9BUhQLq62ksdnW5Plm88=";
hash = "sha256-VcFgPxsxPjvo92/TiVec6sSPprRQ4sbQwe4teGC60/o=";
};
vendorHash = null;
-65
View File
@@ -1,65 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
meson,
ninja,
pkg-config,
wayland,
wayland-protocols,
fetchpatch,
wayland-scanner,
}:
stdenv.mkDerivation {
pname = "wdomirror";
version = "0-unstable-2021-01-08";
src = fetchFromGitHub {
owner = "progandy";
repo = "wdomirror";
rev = "e4a4934e6f739909fbf346cbc001c72690b5c906";
sha256 = "1fz0sajhdjqas3l6mpik8w1k15wbv65hgh9r9vdgfqvw5l6cx7jv";
};
patches = [
# https://github.com/progandy/wdomirror/pull/7
(fetchpatch {
url = "https://github.com/progandy/wdomirror/commit/142632208e9ea2b4a4ebd784532efdb8cad7b87c.patch";
hash = "sha256-MG71IEwRAjjacAkRoB7Tn45+FbY7LAqTDkVJkoWuQUU=";
})
];
strictDeps = true;
nativeBuildInputs = [
meson
ninja
pkg-config
wayland-scanner
];
buildInputs = [
wayland
wayland-protocols
];
installPhase = ''
runHook preInstall
install -m755 -D wdomirror $out/bin/wdomirror
runHook postInstall
'';
postPatch = ''
substituteInPlace meson.build \
--replace "werror=true" "werror=false"
'';
meta = with lib; {
description = "Mirrors an output of a wlroots compositor to a window";
homepage = "https://github.com/progandy/wdomirror";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ jpas ];
mainProgram = "wdomirror";
};
}
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "wit-bindgen";
version = "0.44.0";
version = "0.45.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wit-bindgen";
rev = "v${version}";
hash = "sha256-iUr0H5m9aGyJ13JqOQjSFHTWzs5pIwmttAa3oWiM3Hw=";
hash = "sha256-xjDktIxNY8b0kAuHfX/EzvKO40xMVS1WfzYtX2fpffg=";
};
cargoHash = "sha256-6OiE+9KMhw3cE1HZRitrcjupiQbr6UfRaWf8PRxqvmk=";
cargoHash = "sha256-eOfHPhxMIE9VGMEW5crn5aXjFnbEHu0A4aUm+VFc3YU=";
# Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
# However, GitHub Actions ensures a proper build.
+3 -3
View File
@@ -5,16 +5,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zeekstd";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "rorosen";
repo = "zeekstd";
tag = "v${finalAttrs.version}-cli";
hash = "sha256-vvFBMDzypiAaLT5R6RTXJQZQhNCuiG3PxMEPmmPd7/I=";
hash = "sha256-aht+QUprnSdBxJajBPgzqWzzOpkyrtzvJ98nqYKDCdc=";
};
cargoHash = "sha256-z1y12v71jxo8z3sZOAkSNvgBvexUGu0Z43HHxLCHSjg=";
cargoHash = "sha256-GEWCR4EaNQkB9mYxcWjlqSt75ko68RIU/10M4+zB+to=";
meta = {
description = "CLI tool that works with the zstd seekable format";
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "knx-frontend";
version = "2025.8.21.181525";
version = "2025.8.24.205840";
pyproject = true;
# TODO: source build, uses yarn.lock
src = fetchPypi {
pname = "knx_frontend";
inherit version;
hash = "sha256-LWLkQBUpICLeRxyCNerDJTcOCLMGFDL/9Bap/8mbLVM=";
hash = "sha256-rwRn/2B9EoK2FppSVinx/I6d/Je1cI89gbmAztqY7xE=";
};
build-system = [ setuptools ];
+2 -2
View File
@@ -14,11 +14,11 @@ else
stdenv.mkDerivation rec {
pname = "dune";
version = "3.20.1";
version = "3.20.2";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
hash = "sha256-8I6V3igo6JHWiQbkQwtRFwMihSB7W8aE/F1FZS6zDgo=";
hash = "sha256-sahrLWC9tKi5u2hhvfL58opufLXYM86Br+zOue+cpUk=";
};
nativeBuildInputs = [
+1
View File
@@ -2503,6 +2503,7 @@ mapAliases {
wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17
wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14
wlroots = wlroots_0_19; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release
wdomirror = throw "'wdomirror' has been removed as it is unmaintained upstream, Consider using 'wl-mirror' instead"; # Added 2025-09-04
wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03
wordpress6_4 = throw "'wordpress6_4' has been removed in favor of the latest version"; # Added 2024-08-03
wordpress6_5 = wordpress_6_5; # Added 2024-08-03
-3
View File
@@ -5230,9 +5230,6 @@ with pkgs;
callPackage ../development/tools/misc/coreboot-toolchain { }
);
spicedb = callPackage ../servers/spicedb { };
spicedb-zed = callPackage ../servers/spicedb/zed.nix { };
tamarin-prover = (
callPackage ../applications/science/logic/tamarin-prover {
# 2025-03-07: dependency fclabels doesn't compile with GHC >= 9.8
-2
View File
@@ -11589,7 +11589,6 @@ self: super: with self; {
petsc4py = toPythonModule (
pkgs.petsc.override {
python3 = python;
python3Packages = self;
pythonSupport = true;
}
@@ -16826,7 +16825,6 @@ self: super: with self; {
slepc4py = toPythonModule (
pkgs.slepc.override {
pythonSupport = true;
python3 = self.python;
python3Packages = self;
petsc = petsc4py;
}