Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2026-04-14 06:38:55 +00:00
committed by GitHub
18 changed files with 199 additions and 77 deletions
+4 -1
View File
@@ -159,7 +159,10 @@ in
environment.etc = {
"greetd/regreet.css" =
if lib.isPath cfg.extraCss then { source = cfg.extraCss; } else { text = cfg.extraCss; };
if lib.isPath cfg.extraCss || lib.isStorePath cfg.extraCss then
{ source = cfg.extraCss; }
else
{ text = cfg.extraCss; };
"greetd/regreet.toml".source =
if lib.isPath cfg.settings then
@@ -21,9 +21,9 @@ let
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.3.6/android-studio-panda3-linux.tar.gz";
};
betaVersion = {
version = "2025.3.3.5"; # "Android Studio Panda 3 | 2025.3.3 RC 1"
sha256Hash = "sha256-lKpFKw2Oq7OlDrPjFJhMH3aQsJO7TeOKy7HGUCE0B1U=";
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.3.5/android-studio-panda3-rc1-linux.tar.gz";
version = "2025.3.4.5"; # "Android Studio Panda 4 | 2025.3.4 RC 1"
sha256Hash = "sha256-NiNq1j+rzPU4KsLKYymfi5/Vx2Bn3hK8I3OVIUFloX0=";
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.5/android-studio-panda4-rc1-linux.tar.gz";
};
latestVersion = {
version = "2025.3.4.4"; # "Android Studio Panda 4 | 2025.3.4 Canary 4"
@@ -73,13 +73,13 @@
"vendorHash": "sha256-FHBpTYSmVivoqz+Eaa/r5y1f/saIx4l6mjOtZhxZVRw="
},
"auth0_auth0": {
"hash": "sha256-1gtBZPyzYk3UqLrRKHeyLt/2KPPP6QlJYo042XNDWkY=",
"hash": "sha256-Ha+2Z0gVNJ7oOozSWmW9XVpwlZo2LpvET03pAvh/3Mo=",
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
"owner": "auth0",
"repo": "terraform-provider-auth0",
"rev": "v1.42.0",
"rev": "v1.43.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-g1xtMHyQ1zD5dzfB2+MtVUo42RG95TX9uni3Hf8FiRQ="
"vendorHash": "sha256-E6NOuhalQ9bXwRp6UTS5t35K3lOmFr9krGdRWtdtjGI="
},
"aviatrixsystems_aviatrix": {
"hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=",
+9 -9
View File
@@ -9,26 +9,26 @@ let
inherit (stdenv) hostPlatform;
sources = {
x86_64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2026.03.30-a5d3e17/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-4NS2EdsRHS2+dkdDhicb/z4duyzG3fUn+dXVgBss4qA=";
url = "https://downloads.cursor.com/lab/2026.04.08-a41fba1/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-zHNiy5I61cN6BpfRv1TozdRk+2R/RNxIanCPkwqdfZE=";
};
aarch64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2026.03.30-a5d3e17/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-dRBud1TlTcCoZ2naQ94D/FzUpEuS5lxvpowYbHtXgSU=";
url = "https://downloads.cursor.com/lab/2026.04.08-a41fba1/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-xcbIoTunBlL79SgE8h5PeT4HwguHY0UUQTiYdtppv7c=";
};
x86_64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2026.03.30-a5d3e17/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-9z4nTSikG/WTksC0KvgK1m1gZqUjtNQ3sXOAJzikWEg=";
url = "https://downloads.cursor.com/lab/2026.04.08-a41fba1/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-O9OoPaBBHAAazYnEvHSB8okyDHdEqMu1A0CbUwsw93I=";
};
aarch64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2026.03.30-a5d3e17/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-+l5f/W38rJlbOzrmsBdad+PX6MuzHaQxvhIwdgEDKrQ=";
url = "https://downloads.cursor.com/lab/2026.04.08-a41fba1/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-TGyQxZbn5yGTjqqfrbKRGXCp9MhuEHSV6oNZOIEoZDA=";
};
};
in
stdenv.mkDerivation {
pname = "cursor-cli";
version = "0-unstable-2026-03-30";
version = "0-unstable-2026-04-08";
src = sources.${hostPlatform.system};
+2 -2
View File
@@ -7,11 +7,11 @@
}:
appimageTools.wrapType2 rec {
pname = "dopamine";
version = "3.0.3";
version = "3.0.4";
src = fetchurl {
url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage";
hash = "sha256-jSES9FJKrA2z6+f376Vc9NtHbRBG215Fc2335Vp/h1A=";
hash = "sha256-sm8/ZzSqa1CsQJ7XfQ67yAKX5rR9E8J/Z6v1rLVhNwI=";
};
nativeBuildInputs = [ makeWrapper ];
+3 -3
View File
@@ -15,18 +15,18 @@
buildNpmPackage (finalAttrs: {
pname = "gemini-cli";
version = "0.37.0";
version = "0.37.2";
src = fetchFromGitHub {
owner = "google-gemini";
repo = "gemini-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-8UiHsBggmiJCs9sWGQoq0W2FNToAKFakGdAKvFl4ceo=";
hash = "sha256-jmVYARto5NoqX1DbT+jYQOTzMkeSi0Z7A5oKDN5fCnY=";
};
nodejs = nodejs_22;
npmDepsHash = "sha256-lLywxLYmfO7EIYewPwISV5izAcOpy1350oJGwdsV6L8=";
npmDepsHash = "sha256-Hxxi2eKDLXucZLhUswcQ3kVEKoRNbs81m6IFr+CYxzs=";
dontPatchElf = stdenv.isDarwin;
+4 -4
View File
@@ -23,25 +23,25 @@
# runs without an external linter, which leaves `jsPlugins` configs inert.
stdenv.mkDerivation (finalAttrs: {
pname = "oxlint";
version = "1.58.0";
version = "1.59.0";
src = fetchFromGitHub {
owner = "oxc-project";
repo = "oxc";
tag = "oxlint_v${finalAttrs.version}";
hash = "sha256-FqKqLO31ej9NgBdcCjzVkgjlfMHV6RZMcHbdBVVwhHs=";
hash = "sha256-o4vacOuKNUdLdkd6v94jQcevA8dCXG32fYmO2ZEj330=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-OpMGS5+pTPZvfY2EMxQMTWrCHhnxUQb9kQC/pLvrZSY=";
hash = "sha256-lppnmePEmbguoDDGyIM3gWbEX0ShgymoCjvrx1tK2Lw=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
fetcherVersion = 3;
hash = "sha256-cYlY8UHd9yWWJkktycfhbvg/7N2rY9h/jYA+QQ20rK0=";
hash = "sha256-5T3lrAjMH03Rngc7u7oCLzp9E1sz7jOvG2XmPhouAz0=";
};
dontUseCmakeConfigure = true;
+2 -2
View File
@@ -13,14 +13,14 @@
}:
let
version = "1.0.1351";
version = "1.0.1365";
src = fetchFromGitHub {
owner = "lollipopkit";
repo = "flutter_server_box";
tag = "v${version}";
fetchSubmodules = true;
hash = "sha256-zCe45ESYbtMZaOZEppOKjSDs0l6+UtEQ7fs9r3yzDP4=";
hash = "sha256-rZTQ3ZDWfVWHKLg/+uEDWE5KzLK01S/JCj1KhOGzZsA=";
};
in
flutter341.buildFlutterApplication {
+22 -2
View File
@@ -971,6 +971,26 @@
"source": "hosted",
"version": "4.1.5+1"
},
"jni": {
"dependency": "transitive",
"description": {
"name": "jni",
"sha256": "c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.0"
},
"jni_flutter": {
"dependency": "transitive",
"description": {
"name": "jni_flutter",
"sha256": "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
},
"js": {
"dependency": "transitive",
"description": {
@@ -1285,11 +1305,11 @@
"dependency": "transitive",
"description": {
"name": "path_provider_android",
"sha256": "149441ca6e4f38193b2e004c0ca6376a3d11f51fa5a77552d8bd4d2b0c0912ba",
"sha256": "914a07484c4380e572998d30486e77e0d9cd2faec72fee268086d07bf7f302c9",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.23"
"version": "2.3.0"
},
"path_provider_foundation": {
"dependency": "transitive",
+3 -3
View File
@@ -8,7 +8,7 @@
}:
buildGoModule (finalAttrs: {
pname = "sesh";
version = "2.24.2";
version = "2.25.0";
nativeBuildInputs = [
go-mockery
@@ -19,7 +19,7 @@ buildGoModule (finalAttrs: {
owner = "joshmedeski";
repo = "sesh";
tag = "v${finalAttrs.version}";
hash = "sha256-iisAIn4km/uFw2DohA2mjoYmKgDQ3lYUH284Le3xQD0=";
hash = "sha256-azs1tf9eR4MVSdjMdd3U/xdPAANn1Kyamf0TwFrBSTU=";
};
# NOTE: prevent crash when getting vendor deps/hash
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
mockery
'';
vendorHash = "sha256-WHMQ7O5EZ43biR7HxjO9gUq8skFPCZVOx47NIPp5iSE=";
vendorHash = "sha256-9IiDp/HaxXQAyNzuVBLiO+oIijBbdKBjssCmj8WV9V4=";
ldflags = [
"-s"
+3 -4
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "taskwarrior-tui";
version = "0.26.6";
version = "0.27.0";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "taskwarrior-tui";
rev = "v${finalAttrs.version}";
sha256 = "sha256-3RUTNQe0D9EquqWowsXI3Ho9mKdckC0XilDcNLmtfCk=";
sha256 = "sha256-8Gpf8D7XocdcHuJKLqfT1QeqkIa7cQHEAoTkKIl/RrU=";
};
cargoHash = "sha256-dXdbvsQ1RJWORZMWsxF///8y1wsar6FiCblHyZD7t8o=";
cargoHash = "sha256-u0W1qVj0SRYVtnoWMqxeuBC9QvibogL4quiQLxzM8LM=";
nativeBuildInputs = [ installShellFiles ];
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
doCheck = false;
postInstall = ''
installManPage docs/taskwarrior-tui.1
installShellCompletion completions/taskwarrior-tui.{bash,fish} --zsh completions/_taskwarrior-tui
'';
+4 -4
View File
@@ -6,20 +6,20 @@
buildNpmPackage rec {
pname = "valdi";
version = "1.0.8";
version = "1.0.11";
src = fetchFromGitHub {
owner = "Snapchat";
repo = "Valdi";
rev = "e5bec35276f9aa5727384252fdeefff98dd53d6c";
hash = "sha256-cXLSZK7duxdgkAnDDJRDgEVdiz6dt08A7KvrmBfX37c=";
rev = "e4f8ab9fa885ac044121ae61186164e36824f18a";
hash = "sha256-VWcV7Jg4B50gtMm/6vDZqIo7PG8rqVSA4e9fn3Jw5eI=";
};
passthru.updateScript = ./update.sh;
sourceRoot = "${src.name}/npm_modules/cli";
npmDepsHash = "sha256-h1DuH8HE5T7mEBQKlegbqkvRQSx3yEFJhcNVHh5Uo6Y=";
npmDepsHash = "sha256-UFdWHEdi6VQYLBQ7gmwxcLNRfoHLKwx4l0ANe5lZnZc=";
meta = {
description = "Cross-platform UI framework CLI by Snapchat";
+57
View File
@@ -0,0 +1,57 @@
{
lib,
rustPlatform,
fetchFromGitHub,
installShellFiles,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "xfr";
version = "0.9.6";
src = fetchFromGitHub {
owner = "lance0";
repo = "xfr";
tag = "v${finalAttrs.version}";
hash = "sha256-wYhwDSL9C4rtWgkhaXimk3u03c9UHj2O9eEe8pRlj6c=";
};
cargoHash = "sha256-f8m5vFNk62iXyK1Sh3Dda0pV6rUNErymS6QxiCuZ8DA=";
nativeBuildInputs = [
installShellFiles
versionCheckHook
];
doInstallCheck = true;
postInstall = ''
installShellCompletion --cmd xfr \
--bash <($out/bin/xfr --completions bash) \
--fish <($out/bin/xfr --completions fish) \
--zsh <($out/bin/xfr --completions zsh)
'';
passthru = {
updateScript = nix-update-script { };
};
__structuredAttrs = true;
meta = {
description = "Modern iperf3 alternative with a live TUI, multi-client server, and QUIC support.";
mainProgram = "xfr";
homepage = "https://github.com/lance0/xfs";
changelog = "https://github.com/lance0/xfr/releases/tag/v${finalAttrs.version}";
maintainers = with lib.maintainers; [
_0x4A6F
herbetom
];
license = with lib.licenses; [
asl20
mit
];
platforms = lib.platforms.linux;
};
})
+58
View File
@@ -0,0 +1,58 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
pnpm_10,
pnpm ? pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
nix-update-script,
}:
buildNpmPackage (finalAttrs: {
pname = "zashboard";
version = "3.4.0";
src = fetchFromGitHub {
owner = "Zephyruso";
repo = "zashboard";
tag = "v${finalAttrs.version}";
hash = "sha256-S5NrXjD34UwbsYQrHWMAgLc10/R1U2ZZ1gW0zkUXg6w=";
};
npmDeps = null;
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
inherit pnpm;
fetcherVersion = 3;
hash = "sha256-DMR9vNgsWdBK0BbSGzxEZUBZpa4szF2NIFO/GePwIUw=";
};
nativeBuildInputs = [ pnpm ];
npmConfigHook = pnpmConfigHook;
postPatch = ''
substituteInPlace vite.config.ts \
--replace-fail "getGitCommitId()" '""'
'';
__darwinAllowLocalNetworking = true;
installPhase = ''
runHook preInstall
cp -r dist $out
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Dashboard Using Clash API";
homepage = "https://github.com/Zephyruso/zashboard";
changelog = "https://github.com/Zephyruso/zashboard/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ chillcicada ];
};
})
+9 -8
View File
@@ -34,20 +34,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# Source files
mkdir -p $out/share/zinit
install -m0644 zinit{,-side,-install,-autoload,-additional}.zsh _zinit $out/share/zinit
install -m0755 share/git-process-output.zsh $out/share/zinit
install -m0644 share/rpm2cpio.zsh $out/share/zinit
install -m0444 zinit{,-side,-install,-autoload,-additional}.zsh _zinit $out/share/zinit
install -m0555 share/git-process-output.zsh $out/share/zinit
install -m0444 share/rpm2cpio.zsh $out/share/zinit
# Autocompletion
installShellCompletion --zsh _zinit
# Manpage
mkdir -p ${placeholder "man"}/share/man/man{1..9}
# otherwsise zinit tries to create them in the nix store
mkdir -p $man/share/man/man{1..9}
installManPage doc/zinit.1
mkdir -p $doc/share/doc/zinit
install -m0644 doc/zsdoc/*.adoc $doc/share/doc/zinit
install -m0644 doc/HACKING.md $doc/share/doc/zinit
install -m0444 doc/zsdoc/*.adoc $doc/share/doc/zinit
install -m0444 doc/HACKING.md $doc/share/doc/zinit
runHook postInstall
'';
@@ -55,8 +56,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
postFixup = ''
substituteInPlace $out/share/zinit/zinit.zsh \
--replace-fail zinit.1 zinit.1.gz \
--replace-fail "\''${ZINIT[BIN_DIR]}/doc" ${placeholder "man"}/share/man/man1 \
--replace-fail "ZINIT[MAN_DIR]:=\''${ZPFX}/man" "ZINIT[MAN_DIR]:=${placeholder "man"}/share/man"
--replace-fail "\''${ZINIT[BIN_DIR]}/doc" $man/share/man/man1 \
--replace-fail "ZINIT[MAN_DIR]:=\''${ZPFX}/man" "ZINIT[MAN_DIR]:=$man/share/man"
'';
passthru = {
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "hueble";
version = "2.2.0";
version = "2.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "flip-dots";
repo = "HueBLE";
tag = "v${version}";
hash = "sha256-BokZeQMgOseIlxs4u5BpYmGLKCM5IwSCvV8ic0ZVIeI=";
hash = "sha256-JbihHDG44PeS6rxUOXSRF9NlH/smUGz3/JrCmXqTT5s=";
};
build-system = [ setuptools ];
+11 -26
View File
@@ -651,6 +651,14 @@ let
f:
let
installedExtensions = f postgresql.pkgs;
recurse = postgresqlWithPackages {
inherit
buildEnv
lib
makeBinaryWrapper
postgresql
;
};
finalPackage = buildEnv {
pname = "${postgresql.pname}-and-plugins";
inherit (postgresql) version;
@@ -692,33 +700,10 @@ let
};
};
withJIT = postgresqlWithPackages {
inherit
buildEnv
lib
makeBinaryWrapper
postgresql
;
} (_: installedExtensions ++ [ postgresql.jit ]);
withoutJIT = postgresqlWithPackages {
inherit
buildEnv
lib
makeBinaryWrapper
postgresql
;
} (_: lib.remove postgresql.jit installedExtensions);
withJIT = recurse (_: installedExtensions ++ [ postgresql.jit ]);
withoutJIT = recurse (_: lib.remove postgresql.jit installedExtensions);
withPackages =
f':
postgresqlWithPackages {
inherit
buildEnv
lib
makeBinaryWrapper
postgresql
;
} (ps: installedExtensions ++ f' ps);
withPackages = f': recurse (ps: installedExtensions ++ f' ps);
};
};
in
-1
View File
@@ -2494,7 +2494,6 @@ mapAliases {
zabbix72 = throw "'zabbix72' was removed as it has reached its end of life"; # Added 2026-02-11
zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
zandronum-alpha-server = throw "'zandronum-alpha-server' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
zashboard = throw "'zashboard' has been removed because upstream repository source code has been deleted"; # Added 2025-12-29
zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
zdoom = throw "'zdoom' has been removed as it was broken and unmaintained upstream. Consider using UZDoom instead."; # Added 2026-04-04
zeal-qt5 = warnAlias "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31