Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-12-30 06:06:49 +00:00
committed by GitHub
24 changed files with 121 additions and 72 deletions
+6
View File
@@ -29594,6 +29594,12 @@
githubId = 71881325;
name = "Stefan Bordei";
};
ZZBaron = {
email = "zzbarona+nix@gmail.com";
github = "ZZBaron";
githubId = 157318434;
name = "ZZBaron";
};
zzzsy = {
email = "me@zzzsy.top";
github = "zzzsyyy";
@@ -10,12 +10,12 @@
}:
stdenv.mkDerivation rec {
pname = "vdr-epgsearch";
version = "2.4.4";
version = "2.4.5";
src = fetchFromGitHub {
repo = "vdr-plugin-epgsearch";
owner = "vdr-projects";
sha256 = "sha256-hHTb6MbN18gNiovX1BKR6ldxxRDeDXJt4kNm722phRk=";
sha256 = "sha256-ERHy6ks5evYmOUoTXNd63ETIA2PyR67VZ7CXR6kn7x4=";
rev = "v${version}";
};
@@ -7,12 +7,12 @@
}:
stdenv.mkDerivation rec {
pname = "vdr-markad";
version = "4.2.16";
version = "4.2.17";
src = fetchFromGitHub {
repo = "vdr-plugin-markad";
owner = "kfb77";
hash = "sha256-WK4lt/UrXNExs8Dnv3de91Bl6JMgEqjPcBKbbTK1pj4=";
hash = "sha256-27Axgh8brG0Apq06gry7uN95GtJ74FC1RNYVcqTUbE0=";
tag = "V${version}";
};
@@ -1,12 +0,0 @@
diff -Naur 4th-3.64.0-old/sources/Makefile 4th-3.64.0-new/sources/Makefile
--- 4th-3.64.0-old/sources/Makefile 2022-03-15 12:37:45.925122854 -0300
+++ 4th-3.64.0-new/sources/Makefile 2022-03-15 12:38:50.987870211 -0300
@@ -125,7 +125,7 @@
install: mostlyinstall
install -Dm644 ../documentation/4th.1 $(MANDIR)/man1/4th.1
- install -Dm644 ../documentation/4tHmanual.txt $(DOCDIR)/4th/
+ install -Dm644 ../documentation/4tHmanual.pdf $(DOCDIR)/4th/
uninstall:
-rm -f $(LIBRARIES)/lib4th.{a,so*}
+3 -8
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "4th";
version = "3.64.1";
version = "3.64.2";
src = fetchurl {
url = "https://sourceforge.net/projects/forth-4th/files/4th-${finalAttrs.version}/4th-${finalAttrs.version}-unix.tar.gz";
hash = "sha256-+W6nTNsqrf3Dvr+NbSz3uJdrXVbBI3OHR5v/rs7en+M=";
hash = "sha256-ufQiuRDPmcYzFSQf16cuZSrOEbH3itq7yZYo87zPs1g=";
};
outputs = [
@@ -18,11 +18,6 @@ stdenv.mkDerivation (finalAttrs: {
"man"
];
patches = [
# Fix install manual; report this patch to upstream
./001-install-manual-fixup.diff
];
dontConfigure = true;
makeFlags = [
@@ -50,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Portable Forth compiler";
license = lib.licenses.lgpl3Plus;
mainProgram = "4th";
maintainers = [ ];
maintainers = with lib.maintainers; [ chillcicada ];
platforms = lib.platforms.unix;
};
})
+2 -2
View File
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "ansible-doctor";
version = "8.0.1";
version = "8.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "thegeeklab";
repo = "ansible-doctor";
tag = "v${version}";
hash = "sha256-vbI1VEtSQW+kUCIcqrHE+Ogmjjmpstgu2cpl3fDZ2rE=";
hash = "sha256-izgSdHK+vVS0UcK32gYDwBn3b1yDCzp2ImjDXZbMrzs=";
};
build-system = with python3Packages; [
+9 -9
View File
@@ -11,15 +11,15 @@
let
pkg = buildGoModule rec {
pkg = buildGoModule (finalAttrs: {
pname = "arduino-cli";
version = "1.3.1";
version = "1.4.0";
src = fetchFromGitHub {
owner = "arduino";
repo = "arduino-cli";
tag = "v${version}";
hash = "sha256-vUa/Mgztyu5jKVIIhp+Cg79n+ulN94mlfVpxecRb6PA=";
tag = "v${finalAttrs.version}";
hash = "sha256-H7vccxDzJt0e/91PIV6Qg8nRD0beb/3g7AZ4uk2ebXU=";
};
nativeBuildInputs = [
@@ -31,7 +31,7 @@ let
subPackages = [ "." ];
vendorHash = "sha256-msv+ZG6uabTtPDVcRksRd8UTSpoztMKw3YGxvhJr26w=";
vendorHash = "sha256-GPZLvEgL/2Ekfj58d8dsbc6e2hHB2zUapvFdIT43hhQ=";
postPatch =
let
@@ -62,7 +62,7 @@ let
ldflags = [
"-s"
"-w"
"-X github.com/arduino/arduino-cli/internal/version.versionString=${version}"
"-X github.com/arduino/arduino-cli/internal/version.versionString=${finalAttrs.version}"
"-X github.com/arduino/arduino-cli/internal/version.commit=unknown"
]
++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" ];
@@ -75,10 +75,10 @@ let
'';
meta = {
inherit (src.meta) homepage;
inherit (finalAttrs.src.meta) homepage;
description = "Arduino from the command line";
mainProgram = "arduino-cli";
changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}";
changelog = "https://github.com/arduino/arduino-cli/releases/tag/${finalAttrs.version}";
license = with lib.licenses; [
gpl3Only
asl20
@@ -89,7 +89,7 @@ let
];
};
};
});
in
if stdenv.hostPlatform.isLinux then
+2 -2
View File
@@ -10,13 +10,13 @@
}:
buildGoModule rec {
pname = "aws-vault";
version = "7.8.5";
version = "7.8.6";
src = fetchFromGitHub {
owner = "ByteNess";
repo = "aws-vault";
rev = "v${version}";
hash = "sha256-tJqqJl+X5LpVJXB6QGqNkjZxTSo44IK/IY/yVk2DLjQ=";
hash = "sha256-nULl68DMTqrVXlPmJlp7M3EZ+MiGR9FsWKIRaa2i91I=";
};
proxyVendor = true;
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "carapace";
version = "1.5.5";
version = "1.5.7";
src = fetchFromGitHub {
owner = "carapace-sh";
repo = "carapace-bin";
tag = "v${finalAttrs.version}";
hash = "sha256-q7G7odkRwh4/w8H09exXYSC7n4CUeoG2iKb/k2D/gek=";
hash = "sha256-gYgROZAmhgU/H4XsFXdIHRrS72EVRHxAalx8K7hmnDE=";
};
vendorHash = "sha256-eADiOSLqouH9saTgbbQY18wc3DxCBvqdVKI32I7sTWQ=";
vendorHash = "sha256-4k9iX47PjEEsJO1lB7xOwCnakhkd+OelaAr/zv3A1l8=";
ldflags = [
"-s"
+3 -3
View File
@@ -24,18 +24,18 @@
stdenv.mkDerivation rec {
pname = "diebahn";
version = "2.9.3";
version = "2.9.4";
src = fetchFromGitLab {
owner = "schmiddi-on-mobile";
repo = "railway";
tag = version;
hash = "sha256-Bs+qn6QZnY37Kk7Xl4QE9k41T2W8gIvtcP4I5qLERNI=";
hash = "sha256-eGXTBrzKd7dV74wAOzZV9UnIhuR/Xtb20fIWOjfPqtM=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-ijbVyVC0Vq5Olo3odzRv078CosAiIZ6KJNx0Gv5YunI=";
hash = "sha256-YSki/pKhaKnUqyEMibpg/j06zR6E003AzRTK795NFQo=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "doublecmd";
version = "1.1.30";
version = "1.1.31";
src = fetchFromGitHub {
owner = "doublecmd";
repo = "doublecmd";
tag = "v${finalAttrs.version}";
hash = "sha256-QEjwZ4jYkmgym4ap7GGD02O2yvEHFOw0jp6f65dfO+w=";
hash = "sha256-aIdjLpfGr98v4i/ssMNPBUJGwugEG612p4LtGUmo3cU=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,13 +8,13 @@
}:
let
version = "1.8.2";
version = "1.8.3";
src = fetchFromGitHub {
owner = "GopeedLab";
repo = "gopeed";
tag = "v${version}";
hash = "sha256-KezASQIqyu4GsKaGAhge7gEYMe57GMgzjXlAbmyDI3Y=";
hash = "sha256-ze0hoTR3e3Wrgtv2FlM81faXmij61NEcPLzO4WDXIak=";
};
metaCommon = {
@@ -29,7 +29,7 @@ let
inherit version src;
pname = "libgopeed";
vendorHash = "sha256-x9M9zwS5FhsIyGGBi0szWHMfLXCFVgqv8bfSxhHZT2Y=";
vendorHash = "sha256-rIj4T+NEqWla6/+ofosTwagL4/VMovDp1NEYMuzbOrQ=";
buildPhase = ''
runHook preBuild
@@ -0,0 +1,43 @@
{
stdenv,
lib,
cmake,
fetchFromGitHub,
imgui,
nix-update-script,
}:
stdenv.mkDerivation rec {
pname = "imgui-file-dialog";
version = "0.6.8";
src = fetchFromGitHub {
owner = "aiekick";
repo = "ImGuiFileDialog";
tag = "v${version}";
hash = "sha256-v5ROW4o4of3tUGMN/p/CNH1eWT+RNRlWvhI84HUMEGo=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ imgui ];
# Propagate imgui so users can find the headers (ImGuiFileDialog.h includes imgui.h)
propagatedBuildInputs = [ imgui ];
outputs = [
"out"
"dev"
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Full featured file dialog for Dear ImGui";
homepage = "https://github.com/aiekick/ImGuiFileDialog";
changelog = "https://github.com/aiekick/ImGuiFileDialog/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ZZBaron ];
platforms = lib.platforms.all;
};
}
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "mlkit";
version = "4.7.14";
version = "4.7.17";
src = fetchFromGitHub {
owner = "melsman";
repo = "mlkit";
rev = "v${version}";
sha256 = "sha256-0nAQHBcQgGdcWd4SFhDon7I0zi5U+YRTdGvG78tri6A=";
sha256 = "sha256-1MLxBK/XYk4flBac34D2y6MJMuuxT6wT+Yo1WFaiYI4=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "multitime";
version = "1.4";
version = "1.5";
src = fetchFromGitHub {
owner = "ltratt";
repo = "multitime";
rev = "multitime-${version}";
sha256 = "1p6m4gyy6dw7nxnpsk32qiijagmiq9vwch0fbc25qvmybwqp8qc0";
sha256 = "sha256-oLtBUJbu+tVhzsUv+toz2oLeXCVLYKHQXUNsqpCZBGc=";
};
nativeBuildInputs = [ autoreconfHook ];
+1 -1
View File
@@ -55,7 +55,7 @@ buildGoModule (finalAttrs: {
homepage = "https://github.com/containers/podman-tui";
description = "Podman Terminal UI";
license = lib.licenses.asl20;
maintainers = [ ];
maintainers = with lib.maintainers; [ aaronjheng ];
mainProgram = "podman-tui";
};
})
+3 -3
View File
@@ -14,16 +14,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "stasis";
version = "0.8.5";
version = "0.9.0";
src = fetchFromGitHub {
owner = "saltnpepper97";
repo = "stasis";
tag = "v${finalAttrs.version}";
hash = "sha256-K5aKcmmWltsX2rz85+NIGdD8249TphTmxFZyPEAdIJI=";
hash = "sha256-ILv0TY1x7DdZw+AqTSs1+TW8bdxlCIN0/tiLsAuIpXc=";
};
cargoHash = "sha256-LQCxCFMabbsMHhGyqSReyklJTliVVi+CUCF2yL2NeuE=";
cargoHash = "sha256-reu0SJt5gQ/+XOx508PXzg9VL1+iBFwvUiyJyQC+oR0=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "tfmigrate";
version = "0.4.3";
version = "0.4.4";
src = fetchFromGitHub {
owner = "minamijoyo";
repo = "tfmigrate";
tag = "v${finalAttrs.version}";
hash = "sha256-tuLbcxJj8TsG3I/o3cHO2DtQm9ql3wlhYBtYiMbRW7o=";
hash = "sha256-633b7VZ0/JNWuBh0C9CtbG5XdgTD2zLuotBbgv0a2e8=";
};
vendorHash = "sha256-TqZi5NZ+4eSzq98/ZM4Gab7Sud7bz1DNHrp5nGaGHDE=";
+2 -2
View File
@@ -12,11 +12,11 @@
}:
stdenv.mkDerivation rec {
pname = "xsnow";
version = "3.8.5";
version = "3.9.0";
src = fetchurl {
url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz";
sha256 = "sha256-NkoD/oMxdJwnx9QCBM8dwFOTPg7YzOZLnNiEOQt36cU=";
sha256 = "sha256-PMZsxZUmVHZwU6+KBPMq8sjyt42jlrXazgk7DGc9bvo=";
};
nativeBuildInputs = [
@@ -75,9 +75,17 @@ buildPythonPackage rec {
# Chains will be drawn sequentially. If you are running MCMC in CPU, consider using `numpyro.set_host_device_count(2)` at the beginning of your program.
# You can double-check how many devices are available in your system using `jax.local_device_count()`.
"-Wignore::UserWarning"
# FutureWarning: In the future `np.object` will be defined as the corresponding NumPy scalar.
"-Wignore::FutureWarning"
];
disabledTests = [
# ValueError: Found unexpected Arrays on value of type <class 'list'> in static attribute 'layers'
# of Pytree type '<class 'test_module.test_random_nnx_module_mcmc_sequence_params.<locals>.MLP'>'.
# This is an error starting from Flax version 0.12.0.
"test_random_nnx_module_mcmc_sequence_param"
# AssertionError, assert GLOBAL["count"] == 4 (assert 5 == 4)
"test_mcmc_parallel_chain"
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "session-info2";
version = "0.2.3";
version = "0.3";
pyproject = true;
src = fetchFromGitHub {
owner = "scverse";
repo = "session-info2";
tag = "v${version}";
hash = "sha256-fw5FG22MzxPibC9GrWZsRLnhMcuo/eBPNRggvkkz8ms=";
hash = "sha256-Li7Ik7AnWiG742x01m49iEYuOBg0FFx8amv/7KTe9gE=";
};
build-system = [
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "xdot";
version = "1.4";
version = "1.6";
pyproject = true;
src = fetchFromGitHub {
owner = "jrfonseca";
repo = "xdot.py";
rev = version;
hash = "sha256-fkO1bINRkCCzVRrQg9+vIODbN+bpXq2OHBKkzzZUZNA=";
hash = "sha256-eOuD8q7qN2MAFklIy28lfR0nEMsKDqVO+HE3+M0k5T0=";
};
build-system = [ setuptools ];
+8 -8
View File
@@ -1,18 +1,18 @@
generic: {
v74 = generic {
version = "7.4.5";
hash = "sha256-Pq5LxxL1MLLfZiTLoDziPimyoRrvrAttTCemTUJf38g=";
version = "7.4.6";
hash = "sha256-zMGw1psEFzsOeu7KlHi7b11JmccdTtUPgXNRvwEaaYs=";
};
v72 = generic {
version = "7.2.14";
hash = "sha256-KgXP+c5x0R+dFBtPAJSirJVWmsy1awGWMfyEdQrqCVA=";
version = "7.2.15";
hash = "sha256-twEwY7nGJWoYX25gAe/31DuDGxg6o5Ez1u5STQVw6Fw=";
};
v70 = generic {
version = "7.0.21";
hash = "sha256-p/gsFhC8AuSsQvUlfAJl+S4ytR+14EtK0p9y6XGJ0+8=";
version = "7.0.22";
hash = "sha256-enR5SyEkYH2ANr42zBBNoFai+2U4EchKy+KfP22Xhgo=";
};
v60 = generic {
version = "6.0.42";
hash = "sha256-Ale517dbuqzjmBMYqJlAtY01F9Bd+W7spegjTHyTJWA=";
version = "6.0.43";
hash = "sha256-FsRgW9sd1AYIIUjyz+eM8zV6uJuDdpVS4xfw+MB+HpY=";
};
}
@@ -17,6 +17,7 @@
ncurses,
clangStdenv,
nixpkgs-review,
nixpkgs-reviewFull,
nix-direnv,
nix-fast-build,
haskell,
@@ -107,6 +108,14 @@ let
nix = self.lix;
};
# surprisingly nixpkgs-reviewFull.override { nix = self.lix; }
# doesn't work, as the way nix-reviewFull is defined uses callPackage
# which does it's own makeOverridable and hides the .override
# from the derivation.
nixpkgs-reviewFull = nixpkgs-reviewFull.override {
nixpkgs-review = self.nixpkgs-review;
};
nix-direnv = nix-direnv.override {
nix = self.lix;
};