Skip to content

Commit 0d0b968

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
Merge master into staging-nixos
2 parents 5fd7268 + c4a64f7 commit 0d0b968

24 files changed

Lines changed: 102 additions & 91 deletions

File tree

‎pkgs/applications/editors/android-studio/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ let
2020
sha256Hash = "sha256-pvnUDYeFbxOnw2dP9BeKFushnTHmpDrBwmnNWDx8pbQ=";
2121
};
2222
betaVersion = {
23-
version = "2025.2.2.6"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 RC 2"
24-
sha256Hash = "sha256-ciu+To5Kcus8FPDz1D43AD+qOqfPHaW4JsEBr9fx2PE=";
23+
version = "2025.2.3.6"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 RC 1"
24+
sha256Hash = "sha256-UysTlKH2h+8FElFgYYTiP4LCPYCssMRSrSA4lwsk6ek=";
2525
};
2626
latestVersion = {
2727
version = "2025.3.1.1"; # "Android Studio Panda 1 | 2025.3.1 Canary 1"

‎pkgs/applications/emulators/libretro/cores/mame2003-plus.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
}:
66
mkLibretroCore {
77
core = "mame2003-plus";
8-
version = "0-unstable-2025-12-13";
8+
version = "0-unstable-2025-12-18";
99

1010
src = fetchFromGitHub {
1111
owner = "libretro";
1212
repo = "mame2003-plus-libretro";
13-
rev = "b235c48df0698bca32d941ecc0d046cfe6eb7eef";
14-
hash = "sha256-/QFg5Ns6csHfGIHMm50x8j0Twq44/VETFavJd5WVKZU=";
13+
rev = "bcf5a632307ecad1a3e6b2c0377a3c8f22b461c7";
14+
hash = "sha256-+l5Zgn69qEnYm5m9SEQQbqqq4wNN6eRWA4M4RNuye3U=";
1515
};
1616

1717
makefile = "Makefile";

‎pkgs/applications/networking/cluster/terraform-providers/providers.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"vendorHash": "sha256-n01cHzyG9FvxCb92sFccKY1h7Pa0zmi+CUxSYHM5Elc="
1010
},
1111
"a10networks_thunder": {
12-
"hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=",
12+
"hash": "sha256-RX3mP5btzyvuBjoMNiUL6ZeFLEo5SqmwwSK/eE0gWEw=",
1313
"homepage": "https://registry.terraform.io/providers/a10networks/thunder",
1414
"owner": "a10networks",
1515
"repo": "terraform-provider-thunder",
16-
"rev": "v1.4.2",
16+
"rev": "v1.5.0",
1717
"spdx": "BSD-2-Clause",
1818
"vendorHash": null
1919
},
@@ -73,13 +73,13 @@
7373
"vendorHash": "sha256-mzOhvrX7BxU00HfbE17xswPg4oRVbVvDb3etwUbq7EE="
7474
},
7575
"auth0_auth0": {
76-
"hash": "sha256-J2fMZBWbLL4hEPTqN7aKrqSOPQPA11NGZ/yILZQot1Q=",
76+
"hash": "sha256-NB8MRaj3O7Fb2xBYzYEEQ6+ZcibF4JHUQQz51ynUzlc=",
7777
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
7878
"owner": "auth0",
7979
"repo": "terraform-provider-auth0",
80-
"rev": "v1.36.0",
80+
"rev": "v1.37.0",
8181
"spdx": "MPL-2.0",
82-
"vendorHash": "sha256-2UfA1QHpVgRKi6PtZ5cHHuO4m5cN6KWlLt3hmPca6HY="
82+
"vendorHash": "sha256-6GejDtQg8CJqyDPsB2dS8dtBZha/5TNH3XNECuCgJAw="
8383
},
8484
"aviatrixsystems_aviatrix": {
8585
"hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=",
@@ -508,13 +508,13 @@
508508
"vendorHash": "sha256-d90pR0WCyYIaXOyZWNw+2++sgt+subhkPCgFOEsX8JQ="
509509
},
510510
"hashicorp_awscc": {
511-
"hash": "sha256-+qcv9cCr5MraBa91x+iziMBK1Wdaq4lg0xbDBf3cmFE=",
511+
"hash": "sha256-rqZULnv3FaewbLNe1PT+OmDpBRPxloAcn8Yvzj17hIc=",
512512
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
513513
"owner": "hashicorp",
514514
"repo": "terraform-provider-awscc",
515-
"rev": "v1.66.0",
515+
"rev": "v1.67.0",
516516
"spdx": "MPL-2.0",
517-
"vendorHash": "sha256-J5BFrprtg424YG3kYoTagb36CkaYVWIqfoyrUBqNHFg="
517+
"vendorHash": "sha256-jRDBWDEjD07SerwcScIpWDqv8bEotVwRaqwSuXHKy7w="
518518
},
519519
"hashicorp_azuread": {
520520
"hash": "sha256-ATYOrBmZP9LximrS5KpfktU/kfW08XWShxE4z+x6Sts=",

‎pkgs/by-name/ac/acli/sources.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
2-
"version": "1.3.8-stable",
2+
"version": "1.3.9-stable",
33
"sources": {
44
"aarch64-darwin": {
5-
"url": "https://acli.atlassian.com/darwin/1.3.8-stable/acli_1.3.8-stable_darwin_arm64.tar.gz",
6-
"sha256": "6cca92743b2414217ba2e5654fec2c8fcfb1a529ae9bbabb5174417af5b76cff"
5+
"url": "https://acli.atlassian.com/darwin/1.3.9-stable/acli_1.3.9-stable_darwin_arm64.tar.gz",
6+
"sha256": "4cc82582a74e75ef290af17d1ec157ed69f5120d58cbde188b85273bdf8c66ef"
77
},
88
"aarch64-linux": {
9-
"url": "https://acli.atlassian.com/linux/1.3.8-stable/acli_1.3.8-stable_linux_arm64.tar.gz",
10-
"sha256": "2b69c2828152d05481cc03f282355d3ce79cd5650f4bb3f94489776cfc12e75b"
9+
"url": "https://acli.atlassian.com/linux/1.3.9-stable/acli_1.3.9-stable_linux_arm64.tar.gz",
10+
"sha256": "9fb2841ad16034f5086f04387a6209c70f2edc26153a44aef91691e5cdc78164"
1111
},
1212
"x86_64-darwin": {
13-
"url": "https://acli.atlassian.com/darwin/1.3.8-stable/acli_1.3.8-stable_darwin_amd64.tar.gz",
14-
"sha256": "27f095a96a2622414a67ac2933c765685586d056558d4401beee7aee9fa1444d"
13+
"url": "https://acli.atlassian.com/darwin/1.3.9-stable/acli_1.3.9-stable_darwin_amd64.tar.gz",
14+
"sha256": "2a0703c5940db30587f63c8fffa0de143fee92d4618f9356badcb62bdb088efe"
1515
},
1616
"x86_64-linux": {
17-
"url": "https://acli.atlassian.com/linux/1.3.8-stable/acli_1.3.8-stable_linux_amd64.tar.gz",
18-
"sha256": "ebaeeee8d925be3de85cf05bc2f9b1b0deb6f3b43a0505c5c9b32f0105b90f1c"
17+
"url": "https://acli.atlassian.com/linux/1.3.9-stable/acli_1.3.9-stable_linux_amd64.tar.gz",
18+
"sha256": "3cfc9fa3bbcb1ebf9c2a14574874a9f3f9dec8d2db561415f914c9bd70656de7"
1919
}
2020
}
2121
}

‎pkgs/by-name/aw/aws-iam-authenticator/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
buildGoModule rec {
88
pname = "aws-iam-authenticator";
9-
version = "0.7.9";
9+
version = "0.7.10";
1010

1111
src = fetchFromGitHub {
1212
owner = "kubernetes-sigs";
1313
repo = "aws-iam-authenticator";
1414
tag = "v${version}";
15-
hash = "sha256-+c9LjWXNK2XtvhpQK3hzuVQVHQxSEDgh994Iys69x9U=";
15+
hash = "sha256-usnLBLdgEpfpjItMwlRUnuiYQDcq+3FhOpL0WPxdYyY=";
1616
};
1717

18-
vendorHash = "sha256-gTNrHvilSYqKAO164VgbIzwVdZt2nS7Xmh6DOU7QEZc=";
18+
vendorHash = "sha256-cEWsTYwWVo7UKcAjXf+dUQ8pboIUnT+0D8yFhD6WSSk=";
1919

2020
ldflags =
2121
let

‎pkgs/by-name/bc/bcachefs-tools/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
2828

2929
stdenv.mkDerivation (finalAttrs: {
3030
pname = "bcachefs-tools";
31-
version = "1.33.2";
31+
version = "1.33.3";
3232

3333
src = fetchFromGitHub {
3434
owner = "koverstreet";
3535
repo = "bcachefs-tools";
3636
tag = "v${finalAttrs.version}";
37-
hash = "sha256-L7Ir5oOKMxgHWxdRBhM9VVGWMu/ePmezkUy4pHoMB2M=";
37+
hash = "sha256-g08z/0Qrj0d5K+X7foSiUI4pQ+h6um8LV9Nc6EjnelU=";
3838
};
3939

4040
cargoDeps = rustPlatform.fetchCargoVendor {
4141
inherit (finalAttrs) src;
42-
hash = "sha256-GFnta7jm30zvU9jW7YKUB2ZhCa04eq3clHS8uaqVIew=";
42+
hash = "sha256-ipm7OVLGZDYaU8NNxNCe5hRXEGiZef+2zqpwCyColjA=";
4343
};
4444

4545
postPatch = ''

‎pkgs/by-name/cl/clickhouse-backup/package.nix‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
clickhouse-backup,
44
fetchFromGitHub,
55
lib,
6+
ps,
7+
stdenv,
68
testers,
79
}:
810

@@ -13,8 +15,8 @@ buildGoModule rec {
1315
src = fetchFromGitHub {
1416
owner = "Altinity";
1517
repo = "clickhouse-backup";
16-
rev = "v${version}";
17-
hash = "sha256-o7twdOyd53rP95Pi+l5MIo+U/lDqB0cynqONokfy8do=";
18+
tag = "v${version}";
19+
hash = "sha256-LBwmdGcQuDu0tr9c67bboBzv6ypxzYRU36Z76lL94yo=";
1820
};
1921

2022
vendorHash = "sha256-UxbQ/Q4HsTBkbIMBdeKns6t8tZnfdBRaHDMOA2RYDLI=";
@@ -27,6 +29,12 @@ buildGoModule rec {
2729
export CGO_ENABLED=0
2830
'';
2931

32+
preCheck = ''
33+
export PATH=${ps}/bin:$PATH
34+
'';
35+
36+
checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-skip=TestParseCallback" ];
37+
3038
passthru.tests.version = testers.testVersion {
3139
package = clickhouse-backup;
3240
};

‎pkgs/by-name/ec/ecspresso/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77

88
buildGoModule rec {
99
pname = "ecspresso";
10-
version = "2.6.5";
10+
version = "2.7.0";
1111

1212
src = fetchFromGitHub {
1313
owner = "kayac";
1414
repo = "ecspresso";
1515
tag = "v${version}";
16-
hash = "sha256-a0MWTymTGJM3iH2ZIheNXO/YvRfh/bVUgsvCnVJWvF0=";
16+
hash = "sha256-GaxMpc6VUnPPlpFxptWFEpAec5VuSR0EOBOuZufrxvM=";
1717
};
1818

1919
subPackages = [
2020
"cmd/ecspresso"
2121
];
2222

23-
vendorHash = "sha256-iRSc9iH/4Pveoq8Nyh2cfFYQ/8lUFWx9sL+766WEQVY=";
23+
vendorHash = "sha256-NFuWMfw31BfolRd8yxleVdwFi/XcnHcSTOlqkm/stko=";
2424

2525
ldflags = [
2626
"-s"

‎pkgs/by-name/fi/firebase-tools/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010

1111
buildNpmPackage rec {
1212
pname = "firebase-tools";
13-
version = "15.0.0";
13+
version = "15.1.0";
1414

1515
src = fetchFromGitHub {
1616
owner = "firebase";
1717
repo = "firebase-tools";
1818
tag = "v${version}";
19-
hash = "sha256-5bxcocw20zzjEh5kGLEUMW/xuAaAvX1goYP5JesFfm0=";
19+
hash = "sha256-b9dXWCrP70htLbZX0xcoFv8CEgxPjJthhneuuxnO9hQ=";
2020
};
2121

22-
npmDepsHash = "sha256-a46vqu39pVKpu1kpP7+EiYUg2DK/fHTWTX+qZ1j+744=";
22+
npmDepsHash = "sha256-v2Dcfx5hcYvi43g8ihNIKNKBS5duiLSaonb/y0QJBy8=";
2323

2424
# No more package-lock.json in upstream src
2525
postPatch = ''

‎pkgs/by-name/hl/hl-log-viewer/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
}:
1010
rustPlatform.buildRustPackage (finalAttrs: {
1111
pname = "hl-log-viewer";
12-
version = "0.32.3";
12+
version = "0.33.1";
1313

1414
src = fetchFromGitHub {
1515
owner = "pamburus";
1616
repo = "hl";
1717
tag = "v${finalAttrs.version}";
18-
hash = "sha256-BYSVzLh/GGC5BK0Q2xyZ54AA6UUxmWNFj9mH8gGvLXQ=";
18+
hash = "sha256-xsBJIId5F1AUJ+Si1ymCUr27Qb4XRc8fObjT5kcumhM=";
1919
};
2020

21-
cargoHash = "sha256-F9C6OeU0lxVdollldL1PV/wTo5+3j+MGZg9lkJVVvFI=";
21+
cargoHash = "sha256-eHpFXq8ez8xIMhkQ2m/sR8OFU9edid3/hnBNYP1HmL8=";
2222

2323
nativeBuildInputs = [ installShellFiles ];
2424

0 commit comments

Comments
 (0)