Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-12-25 06:06:49 +00:00
committed by GitHub
24 changed files with 102 additions and 91 deletions
@@ -20,8 +20,8 @@ let
sha256Hash = "sha256-pvnUDYeFbxOnw2dP9BeKFushnTHmpDrBwmnNWDx8pbQ=";
};
betaVersion = {
version = "2025.2.2.6"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 RC 2"
sha256Hash = "sha256-ciu+To5Kcus8FPDz1D43AD+qOqfPHaW4JsEBr9fx2PE=";
version = "2025.2.3.6"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 RC 1"
sha256Hash = "sha256-UysTlKH2h+8FElFgYYTiP4LCPYCssMRSrSA4lwsk6ek=";
};
latestVersion = {
version = "2025.3.1.1"; # "Android Studio Panda 1 | 2025.3.1 Canary 1"
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mame2003-plus";
version = "0-unstable-2025-12-13";
version = "0-unstable-2025-12-18";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame2003-plus-libretro";
rev = "b235c48df0698bca32d941ecc0d046cfe6eb7eef";
hash = "sha256-/QFg5Ns6csHfGIHMm50x8j0Twq44/VETFavJd5WVKZU=";
rev = "bcf5a632307ecad1a3e6b2c0377a3c8f22b461c7";
hash = "sha256-+l5Zgn69qEnYm5m9SEQQbqqq4wNN6eRWA4M4RNuye3U=";
};
makefile = "Makefile";
@@ -9,11 +9,11 @@
"vendorHash": "sha256-n01cHzyG9FvxCb92sFccKY1h7Pa0zmi+CUxSYHM5Elc="
},
"a10networks_thunder": {
"hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=",
"hash": "sha256-RX3mP5btzyvuBjoMNiUL6ZeFLEo5SqmwwSK/eE0gWEw=",
"homepage": "https://registry.terraform.io/providers/a10networks/thunder",
"owner": "a10networks",
"repo": "terraform-provider-thunder",
"rev": "v1.4.2",
"rev": "v1.5.0",
"spdx": "BSD-2-Clause",
"vendorHash": null
},
@@ -73,13 +73,13 @@
"vendorHash": "sha256-mzOhvrX7BxU00HfbE17xswPg4oRVbVvDb3etwUbq7EE="
},
"auth0_auth0": {
"hash": "sha256-J2fMZBWbLL4hEPTqN7aKrqSOPQPA11NGZ/yILZQot1Q=",
"hash": "sha256-NB8MRaj3O7Fb2xBYzYEEQ6+ZcibF4JHUQQz51ynUzlc=",
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
"owner": "auth0",
"repo": "terraform-provider-auth0",
"rev": "v1.36.0",
"rev": "v1.37.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-2UfA1QHpVgRKi6PtZ5cHHuO4m5cN6KWlLt3hmPca6HY="
"vendorHash": "sha256-6GejDtQg8CJqyDPsB2dS8dtBZha/5TNH3XNECuCgJAw="
},
"aviatrixsystems_aviatrix": {
"hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=",
@@ -508,13 +508,13 @@
"vendorHash": "sha256-d90pR0WCyYIaXOyZWNw+2++sgt+subhkPCgFOEsX8JQ="
},
"hashicorp_awscc": {
"hash": "sha256-+qcv9cCr5MraBa91x+iziMBK1Wdaq4lg0xbDBf3cmFE=",
"hash": "sha256-rqZULnv3FaewbLNe1PT+OmDpBRPxloAcn8Yvzj17hIc=",
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
"owner": "hashicorp",
"repo": "terraform-provider-awscc",
"rev": "v1.66.0",
"rev": "v1.67.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-J5BFrprtg424YG3kYoTagb36CkaYVWIqfoyrUBqNHFg="
"vendorHash": "sha256-jRDBWDEjD07SerwcScIpWDqv8bEotVwRaqwSuXHKy7w="
},
"hashicorp_azuread": {
"hash": "sha256-ATYOrBmZP9LximrS5KpfktU/kfW08XWShxE4z+x6Sts=",
+9 -9
View File
@@ -1,21 +1,21 @@
{
"version": "1.3.8-stable",
"version": "1.3.9-stable",
"sources": {
"aarch64-darwin": {
"url": "https://acli.atlassian.com/darwin/1.3.8-stable/acli_1.3.8-stable_darwin_arm64.tar.gz",
"sha256": "6cca92743b2414217ba2e5654fec2c8fcfb1a529ae9bbabb5174417af5b76cff"
"url": "https://acli.atlassian.com/darwin/1.3.9-stable/acli_1.3.9-stable_darwin_arm64.tar.gz",
"sha256": "4cc82582a74e75ef290af17d1ec157ed69f5120d58cbde188b85273bdf8c66ef"
},
"aarch64-linux": {
"url": "https://acli.atlassian.com/linux/1.3.8-stable/acli_1.3.8-stable_linux_arm64.tar.gz",
"sha256": "2b69c2828152d05481cc03f282355d3ce79cd5650f4bb3f94489776cfc12e75b"
"url": "https://acli.atlassian.com/linux/1.3.9-stable/acli_1.3.9-stable_linux_arm64.tar.gz",
"sha256": "9fb2841ad16034f5086f04387a6209c70f2edc26153a44aef91691e5cdc78164"
},
"x86_64-darwin": {
"url": "https://acli.atlassian.com/darwin/1.3.8-stable/acli_1.3.8-stable_darwin_amd64.tar.gz",
"sha256": "27f095a96a2622414a67ac2933c765685586d056558d4401beee7aee9fa1444d"
"url": "https://acli.atlassian.com/darwin/1.3.9-stable/acli_1.3.9-stable_darwin_amd64.tar.gz",
"sha256": "2a0703c5940db30587f63c8fffa0de143fee92d4618f9356badcb62bdb088efe"
},
"x86_64-linux": {
"url": "https://acli.atlassian.com/linux/1.3.8-stable/acli_1.3.8-stable_linux_amd64.tar.gz",
"sha256": "ebaeeee8d925be3de85cf05bc2f9b1b0deb6f3b43a0505c5c9b32f0105b90f1c"
"url": "https://acli.atlassian.com/linux/1.3.9-stable/acli_1.3.9-stable_linux_amd64.tar.gz",
"sha256": "3cfc9fa3bbcb1ebf9c2a14574874a9f3f9dec8d2db561415f914c9bd70656de7"
}
}
}
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "aws-iam-authenticator";
version = "0.7.9";
version = "0.7.10";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "aws-iam-authenticator";
tag = "v${version}";
hash = "sha256-+c9LjWXNK2XtvhpQK3hzuVQVHQxSEDgh994Iys69x9U=";
hash = "sha256-usnLBLdgEpfpjItMwlRUnuiYQDcq+3FhOpL0WPxdYyY=";
};
vendorHash = "sha256-gTNrHvilSYqKAO164VgbIzwVdZt2nS7Xmh6DOU7QEZc=";
vendorHash = "sha256-cEWsTYwWVo7UKcAjXf+dUQ8pboIUnT+0D8yFhD6WSSk=";
ldflags =
let
+3 -3
View File
@@ -28,18 +28,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bcachefs-tools";
version = "1.33.2";
version = "1.33.3";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
tag = "v${finalAttrs.version}";
hash = "sha256-L7Ir5oOKMxgHWxdRBhM9VVGWMu/ePmezkUy4pHoMB2M=";
hash = "sha256-g08z/0Qrj0d5K+X7foSiUI4pQ+h6um8LV9Nc6EjnelU=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-GFnta7jm30zvU9jW7YKUB2ZhCa04eq3clHS8uaqVIew=";
hash = "sha256-ipm7OVLGZDYaU8NNxNCe5hRXEGiZef+2zqpwCyColjA=";
};
postPatch = ''
+10 -2
View File
@@ -3,6 +3,8 @@
clickhouse-backup,
fetchFromGitHub,
lib,
ps,
stdenv,
testers,
}:
@@ -13,8 +15,8 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "Altinity";
repo = "clickhouse-backup";
rev = "v${version}";
hash = "sha256-o7twdOyd53rP95Pi+l5MIo+U/lDqB0cynqONokfy8do=";
tag = "v${version}";
hash = "sha256-LBwmdGcQuDu0tr9c67bboBzv6ypxzYRU36Z76lL94yo=";
};
vendorHash = "sha256-UxbQ/Q4HsTBkbIMBdeKns6t8tZnfdBRaHDMOA2RYDLI=";
@@ -27,6 +29,12 @@ buildGoModule rec {
export CGO_ENABLED=0
'';
preCheck = ''
export PATH=${ps}/bin:$PATH
'';
checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-skip=TestParseCallback" ];
passthru.tests.version = testers.testVersion {
package = clickhouse-backup;
};
+3 -3
View File
@@ -7,20 +7,20 @@
buildGoModule rec {
pname = "ecspresso";
version = "2.6.5";
version = "2.7.0";
src = fetchFromGitHub {
owner = "kayac";
repo = "ecspresso";
tag = "v${version}";
hash = "sha256-a0MWTymTGJM3iH2ZIheNXO/YvRfh/bVUgsvCnVJWvF0=";
hash = "sha256-GaxMpc6VUnPPlpFxptWFEpAec5VuSR0EOBOuZufrxvM=";
};
subPackages = [
"cmd/ecspresso"
];
vendorHash = "sha256-iRSc9iH/4Pveoq8Nyh2cfFYQ/8lUFWx9sL+766WEQVY=";
vendorHash = "sha256-NFuWMfw31BfolRd8yxleVdwFi/XcnHcSTOlqkm/stko=";
ldflags = [
"-s"
+3 -3
View File
@@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "firebase-tools";
version = "15.0.0";
version = "15.1.0";
src = fetchFromGitHub {
owner = "firebase";
repo = "firebase-tools";
tag = "v${version}";
hash = "sha256-5bxcocw20zzjEh5kGLEUMW/xuAaAvX1goYP5JesFfm0=";
hash = "sha256-b9dXWCrP70htLbZX0xcoFv8CEgxPjJthhneuuxnO9hQ=";
};
npmDepsHash = "sha256-a46vqu39pVKpu1kpP7+EiYUg2DK/fHTWTX+qZ1j+744=";
npmDepsHash = "sha256-v2Dcfx5hcYvi43g8ihNIKNKBS5duiLSaonb/y0QJBy8=";
# No more package-lock.json in upstream src
postPatch = ''
+3 -3
View File
@@ -9,16 +9,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hl-log-viewer";
version = "0.32.3";
version = "0.33.1";
src = fetchFromGitHub {
owner = "pamburus";
repo = "hl";
tag = "v${finalAttrs.version}";
hash = "sha256-BYSVzLh/GGC5BK0Q2xyZ54AA6UUxmWNFj9mH8gGvLXQ=";
hash = "sha256-xsBJIId5F1AUJ+Si1ymCUr27Qb4XRc8fObjT5kcumhM=";
};
cargoHash = "sha256-F9C6OeU0lxVdollldL1PV/wTo5+3j+MGZg9lkJVVvFI=";
cargoHash = "sha256-eHpFXq8ez8xIMhkQ2m/sR8OFU9edid3/hnBNYP1HmL8=";
nativeBuildInputs = [ installShellFiles ];
@@ -1,37 +1,38 @@
{
lib,
stdenv,
asciidoc,
fetchFromGitHub,
mkDerivation,
qtbase,
cmake,
extra-cmake-modules,
icecream,
libcap_ng,
lzo,
qt6,
zstd,
libarchive,
wrapQtAppsHook,
}:
mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "icemon";
version = "3.3";
version = "3.3-unstable-2025-05-15";
src = fetchFromGitHub {
owner = "icecc";
repo = "icemon";
rev = "v${version}";
sha256 = "09jnipr67dhawbxfn69yh7mmjrkylgiqmd0gmc2limd3z15d7pgc";
rev = "d0969453c7d4467e22dcff0f218b31e81136afbe";
hash = "sha256-jN374J8PytnZgVEUSZ6DakmPmi411ABJffzuZ5CodJ8=";
};
nativeBuildInputs = [
asciidoc
cmake
extra-cmake-modules
wrapQtAppsHook
qt6.wrapQtAppsHook
];
buildInputs = [
icecream
qtbase
qt6.qtbase
libcap_ng
lzo
zstd
@@ -40,10 +41,10 @@ mkDerivation rec {
meta = {
description = "Icecream GUI Monitor";
inherit (src.meta) homepage;
homepage = "https://github.com/icecc/icemon";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ emantor ];
platforms = with lib.platforms; linux ++ darwin;
mainProgram = "icemon";
};
}
})
+3 -3
View File
@@ -7,15 +7,15 @@
buildGoModule rec {
pname = "istioctl";
version = "1.28.1";
version = "1.28.2";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
hash = "sha256-Klew+aFwF4KmOud6GLqZ+H7HyydFGFa7oX79r7/ylGs=";
hash = "sha256-T3bhFAIsdnobcTYc80jY7mtIKRjBK6OcqGR59ko6q3s=";
};
vendorHash = "sha256-Cv7wG8ws/wuMOT1JQFNemfNYxcJrcN0H+srQC2xNbMA=";
vendorHash = "sha256-QcPtQV3sO+B2NtxJvOi5x5hlAI1ace4LqWO84fAovGw=";
nativeBuildInputs = [ installShellFiles ];
+5 -2
View File
@@ -15,7 +15,7 @@ in
inherit useVSCodeRipgrep;
commandLineArgs = extraCommandLineArgs;
version = "0.6.0";
version = "0.7.21";
pname = "kiro";
# You can find the current VSCode version in the About dialog:
@@ -43,7 +43,10 @@ in
homepage = "https://kiro.dev";
license = lib.licenses.amazonsl;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with lib.maintainers; [ vuks ];
maintainers = with lib.maintainers; [
vuks
jamesward
];
platforms = [
"x86_64-linux"
"x86_64-darwin"
+6 -6
View File
@@ -1,14 +1,14 @@
{
"x86_64-linux": {
"url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.6.0/tar/kiro-ide-0.6.0-stable-linux-x64.tar.gz",
"hash": "sha256-FOMfF/rJIzBnAqR5dxUlcDaMV2I/7dWMqU2UtMvJZIo="
"url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.7.21/tar/kiro-ide-0.7.21-stable-linux-x64.tar.gz",
"hash": "sha256-mCNcuGutI7i8oENKjpYTHXndFH6g9bWI5ZgrgEHqK44="
},
"x86_64-darwin": {
"url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.6.0/kiro-ide-0.6.0-stable-darwin-x64.dmg",
"hash": "sha256-3Bf5a+9yw4WyCy1ADn64YomkjH4Qr7wGPO0kMVd8ZzM="
"url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.7.21/kiro-ide-0.7.21-stable-darwin-x64.dmg",
"hash": "sha256-uqO4MU5lzyNRPkFZxk2NeTrs9eyTWi2b8qpcf4/ZFds="
},
"aarch64-darwin": {
"url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.6.0/kiro-ide-0.6.0-stable-darwin-arm64.dmg",
"hash": "sha256-H5AEQgvG1JtBUVUaQp2cYLkpxOgaZdblVUWLCo0HweU="
"url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.7.21/kiro-ide-0.7.21-stable-darwin-arm64.dmg",
"hash": "sha256-3OhxVIBlgrS6y0xq4yU5VFCCgJXOT6is8gq+0D7dTME="
}
}
Regular → Executable
View File
+2 -2
View File
@@ -25,14 +25,14 @@ in
py.pkgs.buildPythonApplication rec {
pname = "oci-cli";
version = "3.71.1";
version = "3.71.4";
pyproject = true;
src = fetchFromGitHub {
owner = "oracle";
repo = "oci-cli";
tag = "v${version}";
hash = "sha256-vV67ZCvRlykrBJLa77GJ/tjq4YlWmA8Rq4DBlpLZZEE=";
hash = "sha256-Dkbp5tXn0X5cuuSv1xFmuwAnZysuNPeEZKGYbMqRwFA=";
};
nativeBuildInputs = [ installShellFiles ];
+16 -15
View File
@@ -5,19 +5,20 @@
gpgme,
installShellFiles,
pkg-config,
testers,
openshift,
versionCheckHook,
nix-update-script,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "openshift";
version = "4.16.0";
gitCommit = "fa84651";
version = "4.19.0-202505210330";
gitCommit = "8f1c8b5";
src = fetchFromGitHub {
owner = "openshift";
repo = "oc";
rev = "fa846511dbeb7e08cf77265056397283c6c896f9";
hash = "sha256-mGItCpZQqQOKoNm2amwpHrEIcZdVNirQFa7DGvmnR9s=";
tag = "openshift-clients-${finalAttrs.version}";
hash = "sha256-EIsK73zSozqBOFZalURNcamk5FRDusUEhXtup60c2zQ=";
};
vendorHash = null;
@@ -32,8 +33,8 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X github.com/openshift/oc/pkg/version.commitFromGit=${gitCommit}"
"-X github.com/openshift/oc/pkg/version.versionFromGit=v${version}"
"-X github.com/openshift/oc/pkg/version.commitFromGit=${finalAttrs.gitCommit}"
"-X github.com/openshift/oc/pkg/version.versionFromGit=v${finalAttrs.version}"
];
doCheck = false;
@@ -54,11 +55,11 @@ buildGoModule rec {
--zsh <($out/bin/oc completion zsh)
'';
passthru.tests.version = testers.testVersion {
package = openshift;
command = "oc version";
version = "v${version}";
};
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "version";
passthru.updateScript = nix-update-script { };
meta = {
description = "Build, deploy, and manage your applications with Docker and Kubernetes";
@@ -71,4 +72,4 @@ buildGoModule rec {
];
mainProgram = "oc";
};
}
})
+2 -2
View File
@@ -12,11 +12,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "parallel";
version = "20251122";
version = "20251222";
src = fetchurl {
url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2";
hash = "sha256-No0Zgs/Z2+u4zQ5ETeYZlVnflKwt0e35X3Q1Dwrx6E0=";
hash = "sha256-tWtTiNoPLK3/b3DG6eafivlRbrJmWtok00ctWWWSwnU=";
};
outputs = [
+2 -2
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pv";
version = "1.10.2";
version = "1.10.3";
src = fetchurl {
url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";
hash = "sha256-P3tH8Or2b5wqSH/F28QJzQC/5ezYqbGY128e0595Lck=";
hash = "sha256-qhYwx5r2lgqJIv+mTSw+f4dIbaIfy1fid4JClP0mZ0I=";
};
meta = {
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rasm";
version = "3.0.1";
version = "3.0.3";
src = fetchFromGitHub {
owner = "EdouardBERGE";
repo = "rasm";
tag = "v${finalAttrs.version}";
hash = "sha256-Kw5cm2czmQNU1VDZP4c1ToVbdtdQiWoJeHthxM6N3qs=";
hash = "sha256-URCig2+Fxf0/skHsLb83Tv8JEjfIK5NNB1ZTrM9GqEI=";
};
# by default the EXEC variable contains `rasm.exe`
+2 -2
View File
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "rime-wanxiang";
version = "13.8.5";
version = "13.9.3";
src = fetchFromGitHub {
owner = "amzxyz";
repo = "rime_wanxiang";
tag = "v" + finalAttrs.version;
hash = "sha256-ZAdfs3RfSIdjEqoir0tTp44ddCQcMtInnaIcUSDDf84=";
hash = "sha256-MxbReUD9PaU4CIPCHx7QA5n1wRSBgjW6NROLK0Ko0Q8=";
};
installPhase = ''
@@ -24,7 +24,7 @@
let
pname = "ansible";
version = "13.0.0";
version = "13.1.0";
in
buildPythonPackage {
inherit pname version;
@@ -32,7 +32,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
hash = "sha256-/Q9KKcPndhcBG5jYDkV5wx4dWPQJKNPo/V5DRpZnZ5c=";
hash = "sha256-5Se5URvhOC4x6O92UOIzinsPCdY/xd7Tzpv4I0RE13E=";
};
# we make ansible-core depend on ansible, not the other way around,
@@ -63,7 +63,7 @@ buildPythonPackage rec {
meta = {
description = "Fast Python library to work with IPLD: DAG-CBOR, CID, CAR, multibase";
homepage = "https://github.com/MarshalX/python-libipld";
changelog = "https://github.com/MarshalX/python-libipld/blob/v${version}/CHANGES.md";
changelog = "https://github.com/MarshalX/python-libipld/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ vji ];
};
-2
View File
@@ -2890,8 +2890,6 @@ with pkgs;
hyphenDicts = recurseIntoAttrs (callPackages ../development/libraries/hyphen/dictionaries.nix { });
icemon = libsForQt5.callPackage ../applications/networking/icemon { };
icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak;
ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {