gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-08-25 06:06:17 +00:00
committed by GitHub
parent e905b0a572 57f07c205e
commit e7553bffa9
14 changed files with 80 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ar/artichoke/package.nix
+3 -3
View File
@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage {
pname = "artichoke";
version = "0-unstable-2025-08-03";
version = "0-unstable-2025-08-18";
src = fetchFromGitHub {
owner = "artichoke";
repo = "artichoke";
rev = "ff0b17820a5f64ea9e8b744cef4a9111df3ed252";
hash = "sha256-0SUU/1gp7A0gjluc8ZyF9C4ZxAgNsM6jwuT3E8GxFQY=";
rev = "2dc4c45dc3f925b9aaefc44c33e75dec7586b6ad";
hash = "sha256-miZWT1oMyKJLA+6zO881cy4kJrkkmOpfm/l7Su/ECUw=";
};
cargoHash = "sha256-JD+qt0pu5wxIuLa3Bd9eadQFE7dyKzqxsAKPebG7+Zg=";
pkgs/by-name/eu/euphonica/package.nix
+13 -3
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
cargo,
meson,
ninja,
@@ -25,21 +26,30 @@
stdenv.mkDerivation (finalAttrs: {
pname = "euphonica";
version = "0.96.1-beta";
version = "0.96.3-beta";
src = fetchFromGitHub {
owner = "htkhiem";
repo = "euphonica";
tag = "v${finalAttrs.version}";
hash = "sha256-MMrTabKE+zqVSmbjOg0NCsI47eSu1c73RnsPDgCbhCo=";
hash = "sha256-IxU0LXSh516I2x8keLuuoFwfjVF+Xp0Dc56ryYY6w10=";
fetchSubmodules = true;
};
passthru.updateScript = nix-update-script {
# to be dropped once there are stable releases
extraArgs = [
"--version=unstable"
];
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-zFGFmiPozfBSIYxCu4fHynb2eh9emfVPtj3grPAoZeA=";
hash = "sha256-j4btvkBIQ+SppqE1rvIHWbQSgBn8ORcKGFDXYypEqsA=";
};
mesonBuildType = "release";
nativeBuildInputs = [
cargo
meson
pkgs/by-name/fi/firefly-iii/package.nix
+4 -4
View File
@@ -13,13 +13,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "firefly-iii";
version = "6.2.21";
version = "6.3.2";
src = fetchFromGitHub {
owner = "firefly-iii";
repo = "firefly-iii";
tag = "v${finalAttrs.version}";
hash = "sha256-zyaur3CjSZ8Or2E0rQKubQ440xjwwzJE7i6QXfmn5vk=";
hash = "sha256-pXnz2a8Z9KRl6L4PUOq/zfxYaRZmxB9whE4fS6d+5x4=";
};
buildInputs = [ php84 ];
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
composerNoScripts = true;
composerStrictValidation = true;
strictDeps = true;
vendorHash = "sha256-mo2oHmFtuY62AcT+ti/zPxxS39a6Qb0cPStyyvyVCag=";
vendorHash = "sha256-I/SoFoCquuLqRoe6ibqkwPXg66uZQt+0zx3BQ/S9ucs=";
};
npmDeps = fetchNpmDeps {
inherit (finalAttrs) src;
name = "${finalAttrs.pname}-npm-deps";
hash = "sha256-T8Kv4vbr5n+tVQntFEaNozvSu6CKJCA3V256Ml7yzHA=";
hash = "sha256-XxQseVs11XxxgBMBOxM5aCq2acfzEj5gD+HTQolwEUs=";
};
preInstall = ''
pkgs/by-name/fo/fosrl-pangolin/package.nix
+3 -3
View File
@@ -28,16 +28,16 @@ in
buildNpmPackage (finalAttrs: {
pname = "pangolin";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "fosrl";
repo = "pangolin";
tag = finalAttrs.version;
hash = "sha256-Cy5COyZAH0NPQDMpKUmweYWkyupDC2sNf2CP+EJ5GiE=";
hash = "sha256-X8Jvk/1gDj4cqXP3vlsrhWEM5lR42FsQ0HaSNeNxTXg=";
};
npmDepsHash = "sha256-OGqYmOO6pizcOrdaoSGgjDQgqpjU0SIw3ceh57eyjr4=";
npmDepsHash = "sha256-OygskQhveT9CiymOOd5gx+aR9v3nMUZj72k/om3IF/c=";
nativeBuildInputs = [
esbuild
pkgs/by-name/ma/mat2/package.nix
+9
View File
@@ -0,0 +1,9 @@
{
# On Python 3.13, `tests/test_libmat2.py::TestCleaning::test_html` fails with
#
# ValueError: The closing tag title doesn't have a corresponding opening one in ./tests/data/clean.html.
python312Packages,
}:
with python312Packages;
toPythonApplication mat2
pkgs/by-name/to/tombi/package.nix
+3 -3
View File
@@ -7,19 +7,19 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tombi";
version = "0.5.6";
version = "0.5.18";
src = fetchFromGitHub {
owner = "tombi-toml";
repo = "tombi";
tag = "v${finalAttrs.version}";
hash = "sha256-EjKvVBIiG20qsr4XmGtjx7I39/tvl9HGPza5fpbwMeg=";
hash = "sha256-bzoBNSAqTBbdwsbxFJ2Gosh7s9/ZLx3D7bZ+PFLV+so=";
};
# Tests relies on the presence of network
doCheck = false;
cargoBuildFlags = [ "--package tombi-cli" ];
cargoHash = "sha256-TlGGkj0YtVp00swQfgjRqmYkKHDBxEUh3e4FYh6vRgk=";
cargoHash = "sha256-rq7uuyHCrsSpRUeTiSbsv7HtwJUhMUigyZ2e8JOzEeI=";
postPatch = ''
substituteInPlace Cargo.toml \
pkgs/by-name/up/upbound/sources-stable.json
+17 -17
View File
@@ -8,38 +8,38 @@
"fetchurlAttrSet": {
"docker-credential-up": {
"aarch64-darwin": {
"hash": "sha256-IDF8VsXux30yPRf6tn0ZVzUjYWOH8M9RxkuCJeiQI9s=",
"url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/darwin_arm64.tar.gz"
"hash": "sha256-RuYUtOeraMygkwwlwbqcSfhLfKclbhInkppOVFBxwuU=",
"url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/darwin_arm64.tar.gz"
},
"aarch64-linux": {
"hash": "sha256-25NSIXdbXa6RYiAgfRo9GIAP79uvbKMopQsO+nFcDLQ=",
"url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/linux_arm64.tar.gz"
"hash": "sha256-qvZFOXKnj27h69/JPhqH5wu86nqAa/7pHZzzTxwSTcg=",
"url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/linux_arm64.tar.gz"
},
"x86_64-darwin": {
"hash": "sha256-z469M2QsNPXhES06tPJUrHVvgp2UomBLBeWKMujX+AI=",
"url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/darwin_amd64.tar.gz"
"hash": "sha256-o7JMbBeCHAN0pqUzAGDHTuIzS+9QRLeQuQnDQU2aCLw=",
"url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/darwin_amd64.tar.gz"
},
"x86_64-linux": {
"hash": "sha256-EAHYUYUWwXOWIuZCQnvp1quu3c2CsaO9nWcqBpNGMi0=",
"url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/linux_amd64.tar.gz"
"hash": "sha256-eU9GsVmJtQZ5T6YrnrvV3cNZPCBD29JCqDIhyLt37Hk=",
"url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/linux_amd64.tar.gz"
}
},
"up": {
"aarch64-darwin": {
"hash": "sha256-euLretQd2QML9t9F/vEhopJRA0gWgfuIPA7vdAFQsOE=",
"url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/darwin_arm64.tar.gz"
"hash": "sha256-9gwYejmN5mu2tYYHOiaC/R/38IdksZKP36BUXec/K9U=",
"url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/darwin_arm64.tar.gz"
},
"aarch64-linux": {
"hash": "sha256-Td0OBK37mRBUgXBAV+ayBfMDn+/ycLS5WTaW42SMzOc=",
"url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/linux_arm64.tar.gz"
"hash": "sha256-XiGtOrWEfF8CQvsrutyiP2XXGaAft0WC02sqiXTOBqs=",
"url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/linux_arm64.tar.gz"
},
"x86_64-darwin": {
"hash": "sha256-l5ApNOnc+j9z/ghW+reo+S60UHBaJdJGhS46tu59ZLM=",
"url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/darwin_amd64.tar.gz"
"hash": "sha256-kt2pvAJSDK91BrHD21HPX1+XnkeQaPfXPpr0Gwk6+8M=",
"url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/darwin_amd64.tar.gz"
},
"x86_64-linux": {
"hash": "sha256-XXuotsGjY6nKDXbobBOa0Yaw4qRSX3hF89DZ/m8wfmg=",
"url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/linux_amd64.tar.gz"
"hash": "sha256-17C2Igba/apKI4iTu8hIzlcI7PkXAAwM/eqoBeuWcpw=",
"url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/linux_amd64.tar.gz"
}
}
},
@@ -49,5 +49,5 @@
"x86_64-darwin",
"x86_64-linux"
],
"version": "0.40.1"
"version": "0.40.3"
}
pkgs/by-name/wa/wasilibc/package.nix
+12 -14
View File
@@ -1,23 +1,21 @@
{
stdenvNoLibc,
buildPackages,
fetchFromGitHub,
lib,
firefox-unwrapped,
firefox-esr-unwrapped,
enablePosixThreads ? false,
}:
let
stdenvNoLibc.mkDerivation (finalAttrs: {
pname = "wasilibc";
version = "22-unstable-2024-10-16";
in
stdenvNoLibc.mkDerivation {
inherit pname version;
version = "27";
src = buildPackages.fetchFromGitHub {
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "wasi-libc";
rev = "98897e29fcfc81e2b12e487e4154ac99188330c4";
hash = "sha256-NFKhMJj/quvN3mR7lmxzA9w46KhX92iG0rQA9qDeS8I=";
tag = "wasi-sdk-${finalAttrs.version}";
hash = "sha256-RIjph1XdYc1aGywKks5JApcLajbNFEuWm+Wy/GMHddg=";
fetchSubmodules = true;
};
@@ -31,6 +29,7 @@ stdenvNoLibc.mkDerivation {
postPatch = ''
substituteInPlace Makefile \
--replace "-Werror" ""
patchShebangs scripts/
'';
preBuild = ''
@@ -42,10 +41,8 @@ stdenvNoLibc.mkDerivation {
"SYSROOT_LIB:=$SYSROOT_LIB"
"SYSROOT_INC:=$SYSROOT_INC"
"SYSROOT_SHARE:=$SYSROOT_SHARE"
# https://bugzilla.mozilla.org/show_bug.cgi?id=1773200
"BULK_MEMORY_SOURCES:="
${lib.strings.optionalString enablePosixThreads "THREAD_MODEL:=posix"}
)
'';
enableParallelBuilding = true;
@@ -62,13 +59,14 @@ stdenvNoLibc.mkDerivation {
};
meta = with lib; {
changelog = "https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-${version}";
changelog = "https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-${finalAttrs.version}";
description = "WASI libc implementation for WebAssembly";
homepage = "https://wasi.dev";
platforms = platforms.wasi;
maintainers = with maintainers; [
matthewbauer
rvolosatovs
wucke13
];
license = with licenses; [
asl20
@@ -76,4 +74,4 @@ stdenvNoLibc.mkDerivation {
mit
];
};
}
})
pkgs/development/python-modules/albucore/default.nix
+7 -3
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "albucore";
version = "0.0.33";
version = "0.0.24";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "albumentations-team";
repo = "albucore";
tag = version;
hash = "sha256-OQYIvJM3pLna5rr1H7pVDhUR9sLmx032AZ9SWXQqMjc=";
hash = "sha256-frVMPW3au/6vPRY89GIt7chCPkUMl13DpPqCPqIjz/o=";
};
pythonRelaxDeps = [ "opencv-python" ];
@@ -40,10 +40,14 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
# albumentations doesn't support newer versions of albucore
# and has been archived upstream in favor of relicensed `albumentationsx`
passthru.skipBulkUpdate = true;
meta = {
description = "High-performance image processing library to optimize and extend Albumentations with specialized functions for image transformations";
homepage = "https://github.com/albumentations-team/albucore";
changelog = "https://github.com/albumentations-team/albucore/releases/tag/${src.tag}";
changelog = "https://github.com/albumentations-team/albucore/releases/tag/${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bcdarwin ];
};
pkgs/development/python-modules/pyssim/default.nix
+8 -17
View File
@@ -6,7 +6,6 @@
scipy,
pillow,
pywavelets,
fetchpatch,
setuptools,
}:
@@ -15,6 +14,14 @@ buildPythonPackage rec {
version = "0.7.1";
pyproject = true;
# PyPI tarball doesn't contain test images so let's use GitHub
src = fetchFromGitHub {
owner = "jterrace";
repo = "pyssim";
tag = "v${version}";
hash = "sha256-6393EATaXg12pYXPaHty+8LepUM6kgtZ0zSjZ1Izytg=";
};
build-system = [
setuptools
];
@@ -26,22 +33,6 @@ buildPythonPackage rec {
pywavelets
];
# PyPI tarball doesn't contain test images so let's use GitHub
src = fetchFromGitHub {
owner = "jterrace";
repo = "pyssim";
tag = "v${version}";
sha256 = "sha256-6393EATaXg12pYXPaHty+8LepUM6kgtZ0zSjZ1Izytg=";
};
patches = [
# "Use PyWavelets for continuous wavelet transform"; signal.cwt was removed and broke the build
(fetchpatch {
url = "https://github.com/jterrace/pyssim/commit/64a58687f261eb397e9c22609b5d48497ef02762.patch?full_index=1";
hash = "sha256-u6okuWZgGcYlf/SW0QLrAv0IYuJi7D8RHHEr8DeXKcw=";
})
];
# Tests are copied from .github/workflows/python-package.yml
checkPhase = ''
runHook preCheck
pkgs/development/python-modules/vcver/default.nix
-33
View File
@@ -1,33 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
packaging,
}:
buildPythonPackage {
pname = "vcver";
version = "0.2.12";
format = "setuptools";
src = fetchFromGitHub {
owner = "toumorokoshi";
repo = "vcver-python";
rev = "c5d8a6f1f0e49bb25f5dbb07312e42cb4da096d6";
sha256 = "1cvgs70jf7ki78338zaglaw2dkvyndmx15ybd6k4zqwwsfgk490b";
};
propagatedBuildInputs = [ packaging ];
# circular dependency on test tool uranium https://pypi.org/project/uranium/
doCheck = false;
pythonImportsCheck = [ "vcver" ];
meta = with lib; {
description = "Reference Implementation of vcver";
homepage = "https://github.com/toumorokoshi/vcver-python";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
}
pkgs/top-level/all-packages.nix
-2
View File
@@ -2228,8 +2228,6 @@ with pkgs;
maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { };
mat2 = with python3.pkgs; toPythonApplication mat2;
materialx = with python3Packages; toPythonApplication materialx;
# while building documentation meson may want to run binaries for host
pkgs/top-level/python-aliases.nix
+1
View File
@@ -836,6 +836,7 @@ mapAliases ({
uuid = throw "uuid is a Python standard module"; # added 2024-04-18
validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07
validphys2 = throw "validphys2 has been removed, since it had a broken dependency that was removed"; # added 2023-07-07
vcver = throw "vcver has been removed, since it was an unused leaf package"; # added 2025-08-25
vega_datasets = vega-datasets; # added 2023-11-04
ViennaRNA = viennarna; # added 2023-08-23
virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07
pkgs/top-level/python-packages.nix
-2
View File
@@ -19465,8 +19465,6 @@ self: super: with self; {
vcrpy = callPackage ../development/python-modules/vcrpy { };
vcver = callPackage ../development/python-modules/vcver { };
vcversioner = callPackage ../development/python-modules/vcversioner { };
vdf = callPackage ../development/python-modules/vdf { };