Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-04-30 06:55:00 +00:00
committed by GitHub
23 changed files with 338 additions and 349 deletions
@@ -26,9 +26,9 @@ let
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.5/android-studio-panda4-rc1-linux.tar.gz";
};
latestVersion = {
version = "2026.1.1.1"; # "Android Studio Quail 1 | 2026.1.1 Canary 1"
sha256Hash = "sha256-Nr7V6B4sEZrcwkMdKoevLEkyIHawxUx/ejN0nBL4KW0=";
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.1/android-studio-quail1-canary1-linux.tar.gz";
version = "2026.1.1.2"; # "Android Studio Quail 1 | 2026.1.1 Canary 2"
sha256Hash = "sha256-jdbxyK7V4EJI5sCk31oo77lH6uXTM0QjljUgWn5Bl3M=";
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.2/android-studio-quail1-canary2-linux.tar.gz";
};
in
{
@@ -1481,13 +1481,13 @@
"vendorHash": "sha256-rUYHapEVqRupLOPVbcAH8YP0cuXclMmYTQUkqeOwCN0="
},
"vultr_vultr": {
"hash": "sha256-/lKhEoRNBsiQ2fTNaDFApSXgQp+jjtp8gLYRsKqzPv8=",
"hash": "sha256-gw4Eo4wrBDAycQyN7xGHe/w1VazTSgtIcAlBBrePrgs=",
"homepage": "https://registry.terraform.io/providers/vultr/vultr",
"owner": "vultr",
"repo": "terraform-provider-vultr",
"rev": "v2.30.1",
"rev": "v2.31.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-JIv3xfK3Pda/Y1IvTHR/Ypi9b51SOA9n3xVtxOkDMMo="
"vendorHash": "sha256-bKf0QittBRoEbuz0JvmcyCyus1wPP3pacuYmq2RLV08="
},
"wgebis_mailgun": {
"hash": "sha256-Li4eyqZ6huO5Q+XTcQ+HQCg8IOjhxGU9Z4Uw3TbMdAc=",
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -6,7 +6,7 @@
ocamlPackages.buildDunePackage rec {
pname = "anders";
version = "1.1.1";
version = "5.0.0";
duneVersion = "3";
@@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec {
owner = "groupoid";
repo = "anders";
tag = version;
sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4=";
sha256 = "sha256-8T/+faVsmgghjxC4SkXQ5B6KDuhVO9NdwMvu7UDlk/0=";
};
strictDeps = true;
@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "astro-language-server";
version = "2.16.6";
version = "2.16.7";
src = fetchFromGitHub {
owner = "withastro";
repo = "astro";
tag = "@astrojs/language-server@${finalAttrs.version}";
hash = "sha256-xuAkfTVF+do7Tmk6LUOFkS7yunhVRkl+ZGpsOC7Ob4M=";
hash = "sha256-0UkbHGOvMJxY4RXVLx9T8oh2cnuwziEuwUfFrls4Wc0=";
};
# https://pnpm.io/filtering#--filter-package_name-1
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
;
pnpm = pnpm_10;
fetcherVersion = 2;
hash = "sha256-+5S/VuZjP6LoWUPKF1NMhw317AFAJUgaY7/Tq0ZKouw=";
hash = "sha256-DFoIq5+cKqnmWLJ6CHhfdQEAGjvpu72qb1CSWaExODI=";
};
nativeBuildInputs = [
+1 -2
View File
@@ -3,7 +3,6 @@
fetchpatch,
fetchFromGitHub,
ocamlPackages,
opam,
makeBinaryWrapper,
writableTmpDirAsHomeHook,
unstableGitUpdater,
@@ -91,7 +90,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
runHook postInstall
'';
doInstallCheck = true;
doInstallCheck = false;
installCheckPhase = ''
runHook preInstallCheck
+7 -5
View File
@@ -6,6 +6,7 @@
git,
testers,
d2,
libdrm,
libgbm,
makeWrapper,
playwright-driver,
@@ -37,7 +38,7 @@ buildGoModule (finalAttrs: {
makeWrapper
];
buildInputs = [
buildInputs = lib.optionals libdrm.meta.available [
libgbm
playwright-driver.browsers
];
@@ -46,10 +47,11 @@ buildGoModule (finalAttrs: {
postInstall = ''
installManPage ci/release/template/man/d2.1
# Wrap the d2 executable to set LD_LIBRARY_PATH for Playwright
wrapProgram $out/bin/d2 \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}
''
# Wrap the d2 executable to set LD_LIBRARY_PATH for Playwright
+ lib.optionalString (finalAttrs.buildInputs != [ ]) ''
wrapProgram $out/bin/d2 \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}
'';
preCheck = ''
+2 -2
View File
@@ -28,13 +28,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "edhm-ui";
version = "3.0.63";
version = "3.0.64";
strictDeps = true;
src = fetchzip {
url = "https://github.com/BlueMystical/EDHM_UI/releases/download/v${finalAttrs.version}/edhm-ui-v3-linux-x64.zip";
hash = "sha256-f+nVupCywLlZYLKB8O1tGJKOKq3zT8PQM5mjLcp2MOY=";
hash = "sha256-kBCaQKGO8ySpquEWh91GyqHfHCem5q1gyVdYuWdaMB8=";
};
nativeBuildInputs = [
+4 -5
View File
@@ -37,10 +37,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
};
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd fh \
--bash <($out/bin/fh completion bash) \
--fish <($out/bin/fh completion fish) \
--zsh <($out/bin/fh completion zsh)
for shell in bash fish zsh; do
installShellCompletion --cmd fh --"$shell" <("$out/bin/fh" completion "$shell")
done
'';
__darwinAllowLocalNetworking = true;
@@ -48,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
meta = {
description = "Official FlakeHub CLI";
homepage = "https://github.com/DeterminateSystems/fh";
changelog = "https://github.com/DeterminateSystems/fh/releases/tag/${finalAttrs.version}";
changelog = "https://github.com/DeterminateSystems/fh/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ iamanaws ];
mainProgram = "fh";
+3 -3
View File
@@ -12,16 +12,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "fresh";
version = "0.2.25";
version = "0.3.2";
src = fetchFromGitHub {
owner = "sinelaw";
repo = "fresh";
tag = "v${finalAttrs.version}";
hash = "sha256-47m2aIc2QphYLB8yMgd/ZkIfDNymW4kE0Gtgmb0K7gk=";
hash = "sha256-1i87gZgAicFKEIfI3aqek8pHT+iDI7Y4awyBGzLcggo=";
};
cargoHash = "sha256-lirATYtgg6RxJSR3fLb7Welkra1zabffGLqtg5bR4NM=";
cargoHash = "sha256-l88eXpCoMQV63iZ1tLwjeM+TVH/Juibr5MHX3sL6jLA=";
nativeBuildInputs = [
gzip
+2 -2
View File
@@ -37,13 +37,13 @@
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "hyprpaper";
version = "0.8.3";
version = "0.8.4";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprpaper";
tag = "v${finalAttrs.version}";
hash = "sha256-6N1JeQx9/M3XCcxErk24FLMxTgn8GH40fpckP8X3ons=";
hash = "sha256-/4eWbt5XtOHzw3C9U0XPtoy8io03GxrEBd9znWMacbY=";
};
prePatch = ''
+3 -3
View File
@@ -16,13 +16,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencode";
version = "1.14.25";
version = "1.14.30";
src = fetchFromGitHub {
owner = "anomalyco";
repo = "opencode";
tag = "v${finalAttrs.version}";
hash = "sha256-v1aaq4HWAJ5wZm9bUeaRkyKr0iYjdOhigr/I31wwhEk=";
hash = "sha256-pRMPa0ba71wLo4ZumbV18+y80GbcoU7NN6+P3e8LUTM=";
};
node_modules = stdenvNoCC.mkDerivation {
@@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# NOTE: Required else we get errors that our fixed-output derivation references store paths
dontFixup = true;
outputHash = "sha256-r0UCWhxIB4q4Te+LpXNcfexjfmI4Th2swfWOL3cUp3g=";
outputHash = "sha256-0dBgIXkGplKmq/sbXwhLoKUGwTIZU+TeC74YkByNOYk=";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};
+9 -21
View File
@@ -2,33 +2,22 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
ninja,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pioasm";
version = "2.1.1";
version = "2.2.0";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "pico-sdk";
rev = finalAttrs.version;
hash = "sha256-epO7yw6/21/ess3vMCkXvXEqAn6/4613zmH/hbaBbUw=";
tag = finalAttrs.version;
hash = "sha256-hQdEZD84/cnLSzP5Xr9vbOGROQz4BjeVOnvbyhe6rfM=";
};
patches = [
# Pull upstream fix for gcc-15:
# https://github.com/raspberrypi/pico-sdk/pull/2468
(fetchpatch {
name = "gcc-15.patch";
url = "https://github.com/raspberrypi/pico-sdk/commit/66540fe88e86a9f324422b7451a3b5dff4c0449f.patch";
hash = "sha256-KwTED7/IWorgRTw1XMU2ILJhf6DAioGuVIunlC1QdNE=";
stripLen = 2;
})
];
sourceRoot = "${finalAttrs.src.name}/tools/pioasm";
nativeBuildInputs = [
@@ -36,17 +25,16 @@ stdenv.mkDerivation (finalAttrs: {
ninja
];
installPhase = ''
runHook preInstall
cmakeFlags = [
(lib.cmakeFeature "PIOASM_VERSION_STRING" finalAttrs.version)
];
install -D pioasm $out/bin/pioasm
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Assemble PIO programs for Raspberry Pi Pico";
homepage = "https://github.com/raspberrypi/pico-sdk";
changelog = "https://github.com/raspberrypi/pico-sdk/releases/tag/${finalAttrs.version}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ emilytrau ];
platforms = lib.platforms.unix;
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule {
pname = "pkgsite";
version = "0-unstable-2026-04-17";
version = "0-unstable-2026-04-29";
src = fetchFromGitHub {
owner = "golang";
repo = "pkgsite";
rev = "2aebd320af3eaaf0dfd54f655a8e40e033de83f5";
hash = "sha256-pLplSDXn/TYaj0cA4IvUMOt93H89kQ7Of75ThL+kc1M=";
rev = "6c973a1b2cc4702635ceccabe0c4b9e87d564a24";
hash = "sha256-OquWb+1a5Bo1T6q9URiTXMvvZagkhL5dCelPlcyRbjw=";
};
vendorHash = "sha256-BbCCOgx6Tis2e07nSftdIi7cv8cHIXlsZl5Qk4fsWh8=";
+2 -2
View File
@@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "26.4.17";
version = "26.4.25";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-lXl9lKdj17XREv07DiIzg3S2jtYrezWtHaBCHVFQdzI=";
hash = "sha256-wge2r4R++ao8z4mBwwM93gJhGcp1ZIcXOqj3pzQr8LI=";
};
nativeBuildInputs = [
+5 -5
View File
@@ -7,7 +7,7 @@
makeWrapper,
}:
let
version = "4.2.3";
version = "4.2.4";
inherit (stdenv.hostPlatform) system;
throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
@@ -22,10 +22,10 @@ let
hash =
{
aarch64-darwin = "sha256-NPuPa7rYe8BOE9BSN0Tl4fLc/ezvO/RO9+d575QjXJU=";
aarch64-linux = "sha256-p+eWD9a64t6k+W7nTL1Qmd+W0E1kIpAqexRSnaN780U=";
x86_64-darwin = "sha256-q3CAQUIFQczepFKTFFyXFsuFYTdjlvFI0PsECOjtTZE=";
x86_64-linux = "sha256-rdyFwhwruoyVCCs7k2+f6jZZKYhwf4bhtN9aq5td9Ck=";
aarch64-darwin = "sha256-ky9wRSBSg/Syb5pMPwJ5WFJr9bzIV3p+LxgALh61FF4=";
aarch64-linux = "sha256-MPpa2NJuj1qut+UA2mAVVDxbu/t9fXdbg/vD+5zV73w=";
x86_64-darwin = "sha256-T8u/TmgORiNlpB/qr0QU+Swl9bzAp3KaYkMsBegXNzM=";
x86_64-linux = "sha256-yr7vBJzeq2Gl+mtl6iij6OU7ioXliIOUeGjHMPxIvew=";
}
.${system} or throwSystem;
in
+1 -1
View File
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
doCheck = false;
postFixup = ''
wrapProgram $out/bin/termshark --prefix PATH : ${lib.makeBinPath [ wireshark-cli ]}
wrapProgram $out/bin/termshark --suffix PATH : ${lib.makeBinPath [ wireshark-cli ]}
'';
ldflags = [
+2 -2
View File
@@ -6,11 +6,11 @@
appimageTools.wrapType2 rec {
pname = "xlights";
version = "2026.06";
version = "2026.07";
src = fetchurl {
url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
hash = "sha256-qRMICQVQEUOWMXrhbCHQSwKSur0WMZDLN4gz1fBhNQM=";
hash = "sha256-+uWNRYV1tSfb27iXY2rcGEyIUpZco4gp58n5Bj762Gs=";
};
meta = {
@@ -6,11 +6,11 @@
buildDunePackage (finalAttrs: {
pname = "atdgen-codec-runtime";
version = "4.1.0";
version = "4.2.0";
src = fetchurl {
url = "https://github.com/ahrefs/atd/releases/download/${finalAttrs.version}/atd-${finalAttrs.version}.tbz";
hash = "sha256-c7J+xg77vqYPMRy8oJwQS1U3vocz9HcnqfXth41uBGw=";
hash = "sha256-QOVMjs3EV5QVUiH0KZwqnUkXD07EFCToyInSNaUtOlU=";
};
meta = {
@@ -29,8 +29,6 @@
buildDunePackage {
pname = "dns-cli";
minimalOCamlVersion = "4.08";
inherit (dns) version src;
# no need to propagate as this is primarily
@@ -18,13 +18,13 @@
buildDunePackage (finalAttrs: {
pname = "dns";
version = "10.2.4";
version = "10.2.5";
minimalOCamlVersion = "4.13";
src = fetchurl {
url = "https://github.com/mirage/ocaml-dns/releases/download/v${finalAttrs.version}/dns-${finalAttrs.version}.tbz";
hash = "sha256-2FLRXKL1jbVzZ5vxhoh0VgC5Epbi5USGYJhp1mbz0S8=";
hash = "sha256-I68JGm5MEzIrf5CUV35tct/NXiPE7AD6NSDttP+fX+8=";
};
propagatedBuildInputs = [
@@ -9,28 +9,32 @@ let
source =
{
"aarch64-darwin" = {
url = "https://web.archive.org/web/20250614103627/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_dar_arm64.tar.gz";
sha256 = "sha256-Dji4PIX5GqU6mOC7ZrSEu3dAZtsiVVuvKQ9Z5aGiuQ4=";
url = "https://web.archive.org/web/20260428124658/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_mac_arm64.tar.gz";
sha256 = "sha256-KzBF5ufljAjjP2V1lUJgW9Z+7G1evafV7pvfADFMkMM=";
};
"aarch64-linux" = {
url = "https://web.archive.org/web/20250614103715/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_aarch64.tar.gz";
sha256 = "sha256-zushkH7g3L62bDdjgTZamWcxOp35xQisOjSG6e2EEHg=";
url = "https://web.archive.org/web/20260428121019/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_aarch64.tar.gz";
sha256 = "sha256-TNw9y8dapjNdNKdW0FpY6pHBrq7oqSK1Ao5oqhy3dvs=";
};
"x86_64-linux" = {
url = "https://web.archive.org/web/20250614103238/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz";
sha256 = "sha256-W8AXulfQx2nkT9nznCCx2lrayKA3R+n2TyhU1ScNjMg=";
url = "https://web.archive.org/web/20260313061550/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz";
sha256 = "sha256-uCBEHux1R4FdC7aQa9oJJYgmwTTl3w5JQi+0KBDLZMc=";
};
}
.${stdenv.hostPlatform.system};
phpVersion = lib.versions.majorMinor php.version;
systemPrefix = lib.substring 0 3 stdenv.hostPlatform.parsed.kernel.name; # lin, dar, fre
systemPrefix =
if stdenv.hostPlatform.isDarwin then
"mac"
else
lib.substring 0 3 stdenv.hostPlatform.parsed.kernel.name; # lin, fre
filename = "ioncube_loader_${systemPrefix}_${phpVersion}${lib.optionalString php.ztsSupport "_ts"}.so";
in
stdenv.mkDerivation {
pname = "ioncube-loader";
version = "14.4.1";
version = "15.5.0";
extensionName = "ioncube-loader";
@@ -49,7 +53,6 @@ stdenv.mkDerivation {
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ neverbehave ];
broken = lib.versionAtLeast php.version "8.5";
platforms = [
"x86_64-linux"
"aarch64-linux"
@@ -13,14 +13,14 @@
buildPythonPackage (finalAttrs: {
pname = "pyworxcloud";
version = "6.3.5";
version = "6.3.6";
pyproject = true;
src = fetchFromGitHub {
owner = "MTrab";
repo = "pyworxcloud";
tag = "v${finalAttrs.version}";
hash = "sha256-bfm+S5Yvto8UjvEfqFTKKqAIvgLJiLqxd7OeKkElZQY=";
hash = "sha256-9UBtzSo+CKbY8KXERdN+Cxu+D03qf33oTrXp288Qgik=";
};
pythonRelaxDeps = [ "awsiotsdk" ];