Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-08-31 06:05:18 +00:00
committed by GitHub
13 changed files with 49 additions and 52 deletions
-2
View File
@@ -1,7 +1,6 @@
{ lib, pkgs, ... }:
{
# Remove perl from activation
boot.initrd.systemd.enable = lib.mkDefault true;
system.etc.overlay.enable = lib.mkDefault true;
@@ -10,7 +9,6 @@
# Random perl remnants
system.tools.nixos-generate-config.enable = lib.mkDefault false;
programs.less.lessopen = lib.mkDefault null;
programs.command-not-found.enable = lib.mkDefault false;
boot.loader.grub.enable = lib.mkDefault false;
environment.defaultPackages = lib.mkDefault [ ];
documentation.info.enable = lib.mkDefault false;
+4 -4
View File
@@ -38,17 +38,17 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "7.42";
version = "7.45";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash =
if stdenv.hostPlatform.isDarwin then
"sha256-3K2cgOwBRwm/S4MRcymKCxRhUMkcfuWzWn1G2m3Dbf4="
"sha256-plXLOJcQbZlSGPgNdjNEPS2pZ9almrmNzxYfhOZGXjg="
else
{
x86_64-linux = "sha256-XxVcy3s3gOnh6uhv9r0yJFwBMCxhrnT/swaUY4t1CpY=";
aarch64-linux = "sha256-3DKVyooYi6aSBzP4DSnIchGyHKbCANjX0TPspKf5dXU=";
x86_64-linux = "sha256-pOPL8HoAAFNDq6L3SC/OygDtqqYVvfkWwVA6qv1xZPs=";
aarch64-linux = "sha256-rclLjAiG8aLsVinghpPZJiPU4Iq5jQ6s2H0+du+a9Ts=";
}
.${stdenv.hostPlatform.system};
};
@@ -126,13 +126,13 @@
"vendorHash": null
},
"aws": {
"hash": "sha256-52tdACEZF1AOg1pN25bo0T2pLObjho4fRrMSBhjP1xM=",
"hash": "sha256-5W12hwonBaEto5PTnvcBm9qeeIY37ALsyXs0r9pfVak=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v6.8.0",
"rev": "v6.11.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-rTQzbI04C92J+IXVX8dHtcbMvOif5jLW8ejm20qfrSA="
"vendorHash": "sha256-i3NwpixAXi9PzciiwTtHB8yrzLWv67gHiDY4HshAbBo="
},
"awscc": {
"hash": "sha256-RMOLAJyoIVIlg4GgU6rCSASgcZlvFMmLjFPqc5Lrdp8=",
+2 -2
View File
@@ -5,14 +5,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "BeatPrints";
version = "1.1.4";
version = "1.1.5";
pyproject = true;
src = fetchFromGitHub {
owner = "TrueMyst";
repo = "BeatPrints";
rev = "v${version}";
hash = "sha256-HtYPEnHbJarSC3P337l3IGagk62FgEohSAVyv6PBnIs=";
hash = "sha256-7h2MbU6wPqcRhWijdMyd7sTf3UVNCX+5JUNytKr5/EM=";
};
build-system = with python3Packages; [
+9 -8
View File
@@ -11,14 +11,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "genxword";
version = "2.1.0";
format = "pyproject";
version = "2.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "riverrun";
repo = "genxword";
rev = "v${version}";
sha256 = "17h8saja45bv612yk0pra9ncbp2mjnx5n10q25nqhl765ks4bmb5";
tag = "v${version}";
hash = "sha256-vzzkXfMnkeTFQmTNAfCIKqVVNm1I6GSfRV1lwGmLj6Y=";
};
nativeBuildInputs = [
@@ -50,10 +50,11 @@ python3.pkgs.buildPythonApplication rec {
# there are no tests
doCheck = false;
meta = with lib; {
inherit (src.meta) homepage;
meta = {
homepage = "https://github.com/riverrun/genxword";
description = "Crossword generator";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];
license = lib.licenses.gpl3Plus;
mainProgram = "genxword";
maintainers = with lib.maintainers; [ dotlambda ];
};
}
+3 -3
View File
@@ -8,15 +8,15 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "jsonschema-cli";
version = "0.32.1";
version = "0.33.0";
src = fetchCrate {
pname = "jsonschema-cli";
inherit (finalAttrs) version;
hash = "sha256-XZbVYYZU32WZ/h3offg5C/YIhb+3FlGu+VLKYrTDGDs=";
hash = "sha256-09u50o4dg7keJgFC4xlRJ0LtkR7ZxmxnqLdEVKpE77E=";
};
cargoHash = "sha256-gI5acxWIHD0MtVAFBuTGpK6h7ZM84rYglKXXMGa37/U=";
cargoHash = "sha256-zY4PtuQuUMvuR7gr42iytR2CW7bQBfbB0L6JE8cSQh8=";
nativeInstallCheckInputs = [
versionCheckHook
+4 -4
View File
@@ -8,23 +8,23 @@
let
finalAttrs = {
pname = "ncps";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "kalbasit";
repo = "ncps";
tag = "v${finalAttrs.version}";
hash = "sha256-CjiPn5godd8lT3eE9e7MnZ0/2hOEq+CG0bpgRtLtwHo=";
hash = "sha256-mBiasGQgwP8dRQqtn7z+tLKECDd1p0JE2nvCYLru0Ts=";
};
ldflags = [
"-X github.com/kalbasit/ncps/cmd.Version=v${finalAttrs.version}"
];
subPackages = [ "." ];
vendorHash = "sha256-5QpzU+cy14cdR5Oi2vwA+BbMSTPMXlhyq9RpzbMsRZQ=";
vendorHash = "sha256-El3yvYYnase4ztG3u7xxcKE5ARy5Lvp/FVosBwOXzbU=";
doCheck = true;
checkFlags = [ "-race" ];
nativeBuildInputs = [
dbmate # used for testing
+7 -8
View File
@@ -2,10 +2,10 @@
lib,
stdenv,
fetchFromGitHub,
makeWrapper,
makeBinaryWrapper,
curl,
recode,
spidermonkey_115,
spidermonkey_140,
}:
stdenv.mkDerivation rec {
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
owner = "mcrapet";
repo = "plowshare";
rev = "v${version}";
sha256 = "1p8s60dlzaldp006yj710s371aan915asyjhd99188vrj4jj1x79";
hash = "sha256-6fQgJZF5IxRSalB6rUpIVqlwhgbhSG8AuI2qTxswGt0=";
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeBinaryWrapper ];
dontBuild = true;
@@ -32,16 +32,15 @@ stdenv.mkDerivation rec {
lib.makeBinPath [
curl
recode
spidermonkey_115
spidermonkey_140
]
}"
done
'';
meta = {
description = ''
A command-line download/upload tool for popular file sharing websites
'';
description = "Command-line download/upload tool for popular file sharing websites";
homepage = "https://github.com/mcrapet/plowshare";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ aforemny ];
platforms = lib.platforms.linux;
+3 -4
View File
@@ -4,14 +4,13 @@
fetchurl,
unzip,
}:
stdenv.mkDerivation rec {
pname = "shortcat";
version = "0.11.4";
version = "0.12.2";
src = fetchurl {
url = "https://files.shortcat.app/releases/v${version}/Shortcat.zip";
sha256 = "sha256-0uhAGU5y98oOLAlM7Uu4dWyK85RfNR5c8z3U7LHi8g8=";
sha256 = "sha256-jmp9mBMYID0Zcu/o6ICYPS8QGHhSwcLz072jG3zR2mM=";
};
sourceRoot = "Shortcat.app";
@@ -28,7 +27,7 @@ stdenv.mkDerivation rec {
homepage = "https://shortcat.app/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = platforms.darwin;
maintainers = [ ];
maintainers = with lib.maintainers; [ t-monaghan ];
license = licenses.unfreeRedistributable;
};
}
@@ -32,14 +32,14 @@
buildPythonPackage rec {
pname = "paddleocr";
version = "3.1.1";
version = "3.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "PaddlePaddle";
repo = "PaddleOCR";
tag = "v${version}";
hash = "sha256-Ehi9xJZcIG9hzgrikLkLnPspC3xvdyPfDCaoA+uYzpQ=";
hash = "sha256-lrFwrbDzOYFzZEz+P0roTtQMxeWBCDZuEVviyUzM3M4=";
};
patches = [
@@ -1,26 +1,26 @@
{
lib,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
setuptools,
wheel,
requests,
sphinx,
}:
buildPythonPackage rec {
pname = "sphinxcontrib-images";
version = "0.9.4";
version = "1.0.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-9sI30EMHk+ZdkdvdsTsfsmos+DgECp3utSESlp+8Sks=";
src = fetchFromGitHub {
owner = "sphinx-contrib";
repo = "images";
tag = version;
hash = "sha256-olkczYxvdUgLZXmvA0SUXL2q+NL4tvUfRWBG7S05dQU=";
};
build-system = [
setuptools
wheel
];
dependencies = [
@@ -13,13 +13,13 @@
buildHomeAssistantComponent rec {
owner = "mampfes";
domain = "waste_collection_schedule";
version = "2.9.0";
version = "2.10.0";
src = fetchFromGitHub {
inherit owner;
repo = "hacs_waste_collection_schedule";
tag = version;
hash = "sha256-qH880z04TKNwO+PoH4INcOjwLrts1lzg9NMwKoum2zg=";
hash = "sha256-qFeo2VE0sgBq4dwOUm26Vkgi+rv/0PsOyQhlVEJ45aE=";
};
dependencies = [
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "apexcharts-card";
version = "2.2.0";
version = "2.2.3";
src = fetchFromGitHub {
owner = "RomRider";
repo = "apexcharts-card";
rev = "v${version}";
hash = "sha256-wHQmbNX96X4YT0xvLp13scD0c7MAADP4Ax47fwYRgbM=";
hash = "sha256-r8PjZLUWnC25XsA4CI1qCX5Np2HY6kp1sWSqfXfJrPk=";
};
npmDepsHash = "sha256-5hCd/ksFSIOsNZfVr5aoun7qrtkIlAGvwQN1xr6AbMI=";
npmDepsHash = "sha256-w/TR+8Oo6dbSnlHKhKKVSpeDops4WoGdle6VTCyR7T4=";
installPhase = ''
runHook preInstall