talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot] 2025-06-16 12:07:13 +00:00 committed by GitHub
commit 73e4d026a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 55 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/applications/virtualization/docker/default.nix
View File

@ -360,45 +360,17 @@ rec {
# Get revisions from
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
docker_25 = callPackage dockerGen rec {
version = "25.0.8";
version = "25.0.10";
# Upstream forgot to tag release
# https://github.com/docker/cli/issues/5789
cliRev = "43987fca488a535d810c429f75743d8c7b63bf4f";
cliHash = "sha256-OwufdfuUPbPtgqfPeiKrQVkOOacU2g4ommHb770gV40=";
mobyRev = "v${version}";
mobyHash = "sha256-n7GdjQEceqyC7E2sPXQWyxpRThtH35eM/J20yLa5NSs=";
runcRev = "v1.2.4";
runcHash = "sha256-LdYCMxdqDP7rKo6Ek/B1DE6QvUFrltbSJVggkVkXQZo=";
containerdRev = "v1.7.25";
containerdHash = "sha256-T0F5bwxSCqa4Czs/W01NaAlJJFvgrzkBC1y/r+muivA=";
tiniRev = "v0.19.0";
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
};
docker_26 = callPackage dockerGen rec {
version = "26.1.5";
cliRev = "v${version}";
cliHash = "sha256-UlN+Uc0YHhLyu14h5oDBXP4K9y2tYKPOIPTGZCe4PVY=";
mobyRev = "v${version}";
mobyHash = "sha256-6Hx7GnA7P6HqDlnGoc+HpPHSl69XezwAEGbvWYUVQlE=";
runcRev = "v1.1.12";
runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0=";
containerdRev = "v1.7.18";
containerdHash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ=";
tiniRev = "v0.19.0";
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
};
docker_27 = callPackage dockerGen rec {
version = "27.5.1";
cliRev = "v${version}";
cliHash = "sha256-7laxRfssh2aGfJeZI0PsJ/MCiy2npigSmCa1SUlWY4s=";
mobyRev = "v${version}";
mobyHash = "sha256-q+VCJZ93jvPJQE0xn89prH/6spsarVY3VUEmgwyMxU4=";
runcRev = "v1.2.4";
runcHash = "sha256-LdYCMxdqDP7rKo6Ek/B1DE6QvUFrltbSJVggkVkXQZo=";
containerdRev = "v1.7.25";
containerdHash = "sha256-T0F5bwxSCqa4Czs/W01NaAlJJFvgrzkBC1y/r+muivA=";
mobyHash = "sha256-57iXL+QYtbEz099yOTR4k/2Z7CT08OAkQ3kVJSmsa/U=";
runcRev = "v1.2.5";
runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4=";
containerdRev = "v1.7.27";
containerdHash = "sha256-H94EHnfW2Z59KcHcbfJn+BipyZiNUvHe50G5EXbrIps=";
tiniRev = "v0.19.0";
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
};

6
pkgs/by-name/ed/edl/package.nix
View File

@ -8,14 +8,14 @@
python3Packages.buildPythonPackage {
pname = "edl";
version = "3.52.1-unstable-2025-05-05";
version = "3.52.1-unstable-2025-06-08";
src = fetchFromGitHub {
owner = "bkerler";
repo = "edl";
rev = "407f1a98572cd41bfb9fbda3c15db854d42a54f6";
rev = "bc1534496c83571b199b30b64774abc495744418";
fetchSubmodules = true;
hash = "sha256-KISUWlQxblNMaBoL+cckgEBAIJUgBXBNr1w1Z2kVIIc=";
hash = "sha256-aWNYTWbCHFhPBVH2tEfEdW3n35OKoQ2DPxnUDcSghWM=";
};
propagatedBuildInputs = with python3Packages; [

3
pkgs/by-name/ey/eyed3/package.nix Normal file
View File

@ -0,0 +1,3 @@
{ python3Packages }:
python3Packages.toPythonApplication python3Packages.eyed3

16
pkgs/by-name/go/goose-cli/package.nix
View File

@ -7,6 +7,7 @@
dbus,
xorg,
pkg-config,
protobuf,
writableTmpDirAsHomeHook,
nix-update-script,
llvmPackages,
@ -26,19 +27,22 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "goose-cli";
version = "1.0.24";
version = "1.0.27";
src = fetchFromGitHub {
owner = "block";
repo = "goose";
tag = "v${finalAttrs.version}";
hash = "sha256-pkqZZwA25IszAnaW0G5adUI2NIEqqQnTQRqlqHWgJRg=";
hash = "sha256-+HNAOw/BJVNHiDHeEBKoAAs66IXCdYhm1VzVFIzk4m8=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-Wct5XnBueG58+A4zZpcKy0vA2Kjwmtk505JZKNPFTDQ=";
cargoHash = "sha256-v+UQFbFpkwX+7oNFvKf2v2u3OSkPdgOWntXLW6XJibE=";
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
pkg-config
protobuf
];
buildInputs = [ dbus ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libxcb ];
@ -70,6 +74,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
"--skip=logging::tests::test_log_file_name::with_session_name_without_error_capture"
"--skip=logging::tests::test_log_file_name::without_session_name"
"--skip=developer::tests::test_text_editor_str_replace"
# need API keys
"--skip=providers::factory::tests::test_create_lead_worker_provider"
"--skip=providers::factory::tests::test_create_regular_provider_without_lead_config"
"--skip=providers::factory::tests::test_lead_model_env_vars_with_defaults"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"--skip=providers::gcpauth::tests::test_load_from_metadata_server"

4
pkgs/by-name/ha/halo/package.nix
View File

@ -8,10 +8,10 @@
}:
stdenv.mkDerivation rec {
pname = "halo";
version = "2.20.21";
version = "2.21.0";
src = fetchurl {
url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar";
hash = "sha256-hUR5zG6jr8u8pFaGcZJs8MFv+WBMm1oDo6zGaS4Y7BI=";
hash = "sha256-taEaHhPy/jR2ThY9Qk+cded3+LyZSNnrytWh8G5zqVE=";
};
nativeBuildInputs = [

4
pkgs/by-name/kc/kcc/package.nix
View File

@ -11,13 +11,13 @@
}:
python3.pkgs.buildPythonApplication rec {
pname = "kcc";
version = "7.3.3";
version = "7.4.1";
src = fetchFromGitHub {
owner = "ciromattia";
repo = "kcc";
tag = "v${version}";
hash = "sha256-6zHUV4s1bOdARsTwNRxFM+s0p+6FLJhqJ9qG5BaBgas=";
hash = "sha256-9XYc749dSFNYK61BfuNxH/CJrT/P7YsXNroBsHcsZNA=";
};
nativeBuildInputs = [ qt6.wrapQtAppsHook ];

4
pkgs/by-name/mk/mkbrr/package.nix
View File

@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "mkbrr";
version = "1.12.1";
version = "1.13.0";
src = fetchFromGitHub {
owner = "autobrr";
repo = "mkbrr";
tag = "v${finalAttrs.version}";
hash = "sha256-gUIX271eaG15329pLnZ8QnZD7BrdCk+cWs43uUzKxOE=";
hash = "sha256-E5UiV7JoMzmnj8/LzVDqOuPNSockgmExmc0B9+KjGII=";
};
vendorHash = "sha256-G8WM5x99UZfAZUkE5W37Ogx/OKk8JypPzGBrIuBOFNo=";

4
pkgs/by-name/qu/quill-log/package.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "quill-log";
version = "9.0.3";
version = "10.0.0";
src = fetchFromGitHub {
owner = "odygrd";
repo = "quill";
rev = "v${version}";
hash = "sha256-G7DUxN32g32744kfGVth4G7GJz8xguIfvX/ojkgh/Ao=";
hash = "sha256-za0ech+rkhhtFumrkMMJXccd14PKXoiBQPXSYcK8Y7A=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/by-name/s7/s7/package.nix
View File

@ -19,14 +19,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "s7";
version = "11.5-unstable-2025-06-14";
version = "11.5-unstable-2025-06-15";
src = fetchFromGitLab {
domain = "cm-gitlab.stanford.edu";
owner = "bil";
repo = "s7";
rev = "02ac5499a1273553c344b1cba3363cef9fd18f41";
hash = "sha256-VqkQT5N/ggIRVL98puikMJEBwenhMGx+Fwfx99prYc4=";
rev = "9ab3baa97bd90b1fb3d8d7cef1e0adc31f89c6e2";
hash = "sha256-ZhhaRdk6hf+tu2THGFnnpTB/0VE8h87RxLDT46MuiLc=";
};
buildInputs = [

4
pkgs/by-name/sh/shellhub-agent/package.nix
View File

@ -12,13 +12,13 @@
buildGoModule rec {
pname = "shellhub-agent";
version = "0.19.0";
version = "0.19.1";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
hash = "sha256-xoGOiaUIjlR2l+l+oM1s3J7YBW9af2dfd+hXwq8zZU8=";
hash = "sha256-xFCUq1x9C+W1xxo6UIpW7ej7ltquvEqNUUvvF86rA9o=";
};
modRoot = "./agent";

6
pkgs/by-name/tw/twiggy/package.nix
View File

@ -6,15 +6,15 @@
rustPlatform.buildRustPackage rec {
pname = "twiggy";
version = "0.7.0";
version = "0.8.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-NbtS7A5Zl8634Q3xyjVzNraNszjt1uIXqmctArfnqkk=";
hash = "sha256-FguDuah3MlC0wgz8VnXV5xepIVhTwYmQzijgX0sbdNY=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-thGehtb8cF4b/G76nbkuBqQyNodaCbAiDBsrUKQ3zbQ=";
cargoHash = "sha256-FaoEqCdMb3h93zGvc+EZ8LfYgMPY3dT/fScpRgGVeAo=";
meta = with lib; {
homepage = "https://rustwasm.github.io/twiggy/";

6
pkgs/by-name/tw/twitch-hls-client/package.nix
View File

@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "twitch-hls-client";
version = "1.4.1";
version = "1.4.3";
src = fetchFromGitHub {
owner = "2bc4";
repo = "twitch-hls-client";
rev = version;
hash = "sha256-m6ci7jKmWGsvJZt9CxfU0OCk5GA7I87c5HHdPP+4O94=";
hash = "sha256-UOXz1Gbo1alBnnwOWKlP5ZtaaTYr+Bqxe/+Y5A5B4Eg=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-4/a94VFlOvw3TR+LYkq3qghhUudt0S9HF85fy4mYbQM=";
cargoHash = "sha256-0bcnObIBsjgzmIrKaypb/iXnloHCRXpJtVXXl2Agk94=";
meta = with lib; {
description = "Minimal CLI client for watching/recording Twitch streams";

4
pkgs/by-name/xg/xgboost/package.nix
View File

@ -48,14 +48,14 @@ effectiveStdenv.mkDerivation rec {
# in \
# rWrapper.override{ packages = [ xgb ]; }"
pname = lib.optionalString rLibrary "r-" + pnameBase;
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "dmlc";
repo = pnameBase;
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-sa8Ea/3ypHqnjn0Rl5dgqGejh6921T6JVHXo8y5gp90=";
hash = "sha256-8mj8uw7bbwhRaL0JZf9L9//a+Re2AwbL0e7Oiw/BqIA=";
};
nativeBuildInputs =

4
pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix
View File

@ -12,7 +12,7 @@
}:
buildPythonPackage rec {
pname = "mozjpeg_lossless_optimization";
version = "1.1.3";
version = "1.3.0";
pyproject = true;
src = fetchFromGitHub {
@ -20,7 +20,7 @@ buildPythonPackage rec {
repo = "mozjpeg-lossless-optimization";
# https://github.com/NixOS/nixpkgs/issues/26302
rev = "refs/tags/v${version}";
hash = "sha256-OKNt9XtfZ6hhRJN1Asn1T2dVjyXKQAsnFvXKYnrRZ98=";
hash = "sha256-g2+QpV3F7wtu37qRJlA4a5r1J9yuJZcC99fDDy03JqU=";
fetchSubmodules = true;
};

7
pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
View File

@ -43,7 +43,12 @@ stdenv.mkDerivation rec {
rimeDataDrv = symlinkJoin {
name = "fcitx5-rime-data";
paths = rimeDataPkgs;
postBuild = "mkdir -p $out/share/rime-data";
postBuild = ''
mkdir -p $out/share/rime-data
# Ensure default.yaml exists
[ -e "$out/share/rime-data/default.yaml" ] || touch "$out/share/rime-data/default.yaml"
'';
};
postInstall = ''

2
pkgs/top-level/aliases.nix
View File

@ -553,6 +553,8 @@ mapAliases {
dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14
docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02
docker_24 = throw "'docker_24' has been removed because it has been unmaintained since June 2024. Use docker_25 or newer instead."; # Added 2024-12-21
docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21
docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15
docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29
docker-distribution = distribution; # Added 2023-12-26
dolphin-emu-beta = dolphin-emu; # Added 2023-02-11

2
pkgs/top-level/all-packages.nix
View File

@ -12131,8 +12131,6 @@ with pkgs;
inherit (callPackage ../applications/virtualization/docker { })
docker_25
docker_26
docker_27
docker_28
;