Skip to content

Commit 386128c

Browse files
Merge release-25.11 into staging-next-25.11
2 parents ec01da1 + b857e36 commit 386128c

17 files changed

Lines changed: 341 additions & 325 deletions

File tree

ci/eval/outpaths.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ let
3333
allowVariants = !attrNamesOnly;
3434
checkMeta = true;
3535

36+
# Silence the `x86_64-darwin` deprecation warning.
37+
allowDeprecatedx86_64Darwin = true;
38+
3639
handleEvalIssue =
3740
reason: errormsg:
3841
let

pkgs/applications/networking/browsers/chromium/info.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"chromium": {
3-
"version": "145.0.7632.109",
3+
"version": "145.0.7632.116",
44
"chromedriver": {
55
"version": "145.0.7632.110",
66
"hash_darwin": "sha256-wa8s3PwS5G1TopGYheyLD7wlxxTZWPYwU90TLFpBMZw=",
@@ -21,8 +21,8 @@
2121
"DEPS": {
2222
"src": {
2323
"url": "https://chromium.googlesource.com/chromium/src.git",
24-
"rev": "61eff07de4f37ac1c6969c91034a447ef6cd394d",
25-
"hash": "sha256-b498JyyvsN/+0Gqjdrq+eT1HW54/ayEENRHa1Sw69Xw=",
24+
"rev": "7d28075c6a9ba147e6df449209001258bb82a122",
25+
"hash": "sha256-ljqK297kBByDGHKwH+yz6XcLO7l0+GDIrR0Hznh6X8c=",
2626
"recompress": true
2727
},
2828
"src/third_party/clang-format/script": {
@@ -132,8 +132,8 @@
132132
},
133133
"src/third_party/dawn": {
134134
"url": "https://dawn.googlesource.com/dawn.git",
135-
"rev": "d9f5a980bb5a4baeb7d9c1fef89a39789a6cd9fb",
136-
"hash": "sha256-DaNsRQm9bR2lfbiP6vWr2R7KD8mYWOaJ72VJyrUkJvI="
135+
"rev": "3df397b5b33f950da92787d9a6ac655e0601bca2",
136+
"hash": "sha256-UAKnxnEScteAj+14i56K6VA34JM+J4KCpG4HbY2bT4s="
137137
},
138138
"src/third_party/dawn/third_party/glfw": {
139139
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -817,13 +817,13 @@
817817
},
818818
"src/v8": {
819819
"url": "https://chromium.googlesource.com/v8/v8.git",
820-
"rev": "a8b42c8fae7c7f1ce4e32b08ee61c22775185c01",
821-
"hash": "sha256-HZ4JbSoMNVqUrCWoxk0/AxzlcpMgKhe/HJ7DGeTeE9M="
820+
"rev": "ce21eb288e9b86bf6a294968a5113a2646d7b8dd",
821+
"hash": "sha256-ayAzZOrJYOLqGunDs9t/x6HBUy32y+0ISjaGkEUK+hk="
822822
}
823823
}
824824
},
825825
"ungoogled-chromium": {
826-
"version": "145.0.7632.109",
826+
"version": "145.0.7632.116",
827827
"deps": {
828828
"depot_tools": {
829829
"rev": "fb0b652edba70f5c4ac867f3beca9e535f905b4c",
@@ -835,16 +835,16 @@
835835
"hash": "sha256-SoXVnpCuNee80N4YdsTEHQd3jZNoHOwKVP6O8a67Ym0="
836836
},
837837
"ungoogled-patches": {
838-
"rev": "145.0.7632.109-1",
839-
"hash": "sha256-IKt/88bzppdwewWJpim8JL7u6N42o6W2VygvWd+XdVo="
838+
"rev": "145.0.7632.116-1",
839+
"hash": "sha256-5rixK6Hp5Czz0I+UISyhi2hPgPhgt+f4JFqd8ERvCV0="
840840
},
841841
"npmHash": "sha256-13sgV/5BD7QvDLBAEmoLN5vongw+S5v5znvZcctxhWc="
842842
},
843843
"DEPS": {
844844
"src": {
845845
"url": "https://chromium.googlesource.com/chromium/src.git",
846-
"rev": "61eff07de4f37ac1c6969c91034a447ef6cd394d",
847-
"hash": "sha256-b498JyyvsN/+0Gqjdrq+eT1HW54/ayEENRHa1Sw69Xw=",
846+
"rev": "7d28075c6a9ba147e6df449209001258bb82a122",
847+
"hash": "sha256-ljqK297kBByDGHKwH+yz6XcLO7l0+GDIrR0Hznh6X8c=",
848848
"recompress": true
849849
},
850850
"src/third_party/clang-format/script": {
@@ -954,8 +954,8 @@
954954
},
955955
"src/third_party/dawn": {
956956
"url": "https://dawn.googlesource.com/dawn.git",
957-
"rev": "d9f5a980bb5a4baeb7d9c1fef89a39789a6cd9fb",
958-
"hash": "sha256-DaNsRQm9bR2lfbiP6vWr2R7KD8mYWOaJ72VJyrUkJvI="
957+
"rev": "3df397b5b33f950da92787d9a6ac655e0601bca2",
958+
"hash": "sha256-UAKnxnEScteAj+14i56K6VA34JM+J4KCpG4HbY2bT4s="
959959
},
960960
"src/third_party/dawn/third_party/glfw": {
961961
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -1639,8 +1639,8 @@
16391639
},
16401640
"src/v8": {
16411641
"url": "https://chromium.googlesource.com/v8/v8.git",
1642-
"rev": "a8b42c8fae7c7f1ce4e32b08ee61c22775185c01",
1643-
"hash": "sha256-HZ4JbSoMNVqUrCWoxk0/AxzlcpMgKhe/HJ7DGeTeE9M="
1642+
"rev": "ce21eb288e9b86bf6a294968a5113a2646d7b8dd",
1643+
"hash": "sha256-ayAzZOrJYOLqGunDs9t/x6HBUy32y+0ISjaGkEUK+hk="
16441644
}
16451645
}
16461646
}

pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix

Lines changed: 265 additions & 265 deletions
Large diffs are not rendered by default.

pkgs/by-name/bb/bbedit/package.nix

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

88
stdenvNoCC.mkDerivation (finalAttrs: {
99
pname = "bbedit";
10-
version = "15.5.4";
10+
version = "15.5.5";
1111

1212
src = fetchurl {
1313
url = "https://s3.amazonaws.com/BBSW-download/BBEdit_${finalAttrs.version}.dmg";
14-
hash = "sha256-GMPgnT14L7bTQ8XlUlV8syrspW1mzUs8yyqr148NLq8=";
14+
hash = "sha256-DsrGj2id9XUf3n55s0OHoJnX4AQY5AqiP9skaXysghk=";
1515
};
1616

1717
sourceRoot = ".";

pkgs/by-name/br/brave/package.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33

44
let
55
pname = "brave";
6-
version = "1.87.188";
6+
version = "1.87.190";
77

88
allArchives = {
99
aarch64-linux = {
1010
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
11-
hash = "sha256-v4q5kXwpdYXzXFzkJDvuBdlvuHYt9Zyj5R3R4Ajivxo=";
11+
hash = "sha256-ktHcMh5sPgpj6lNtW1PAcJJoFSMZKoOawdKkAH27/OI=";
1212
};
1313
x86_64-linux = {
1414
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
15-
hash = "sha256-fQx9UQ7G57q08rIR5rWh6qBGmprcVlv8OTzoK8u/SeI=";
15+
hash = "sha256-gQ1LSSKSVV7YOFTFHENDIQF73CyMr/nYNcxYOb/qw+w=";
1616
};
1717
aarch64-darwin = {
1818
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
19-
hash = "sha256-UbH4M9jeT+vfzd/V5y0UQNM6ye4/ejp/4drzsUOvpIA=";
19+
hash = "sha256-QCswcz18onnqn+xfM91hIk7ZCx9WZVR8gAu+3TnfPS4=";
2020
};
2121
x86_64-darwin = {
2222
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
23-
hash = "sha256-qjYfN835bKxc4kPFvNBW30AnhkuGzV4Wm+PeWJlpGe8=";
23+
hash = "sha256-zeLuQYY/ZNnxMLQKp73CB1j8FhTI0GqsarUPLz+5J0o=";
2424
};
2525
};
2626

pkgs/by-name/ca/cargo-shear/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
3838
};
3939

4040
meta = {
41-
description = "Detect and remove unused dependencies from Cargo.toml";
41+
description = "Detect and fix unused/misplaced dependencies from Cargo.toml";
4242
mainProgram = "cargo-shear";
4343
homepage = "https://github.com/Boshen/cargo-shear";
4444
changelog = "https://github.com/Boshen/cargo-shear/blob/v${finalAttrs.version}/CHANGELOG.md";

pkgs/by-name/go/gogdl/package.nix

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,19 @@
44
fetchFromGitHub,
55
}:
66

7-
python3Packages.buildPythonApplication {
7+
python3Packages.buildPythonApplication rec {
88
pname = "gogdl";
9-
version = "1.2.0";
10-
format = "pyproject";
9+
version = "1.2.1";
10+
pyproject = true;
1111

1212
src = fetchFromGitHub {
1313
owner = "Heroic-Games-Launcher";
1414
repo = "heroic-gogdl";
15-
# two commits after the v1.2.0 tag, because the release messed up submodule fetching
16-
rev = "9759dfb1f50e0c68854f938e9568d84cab59652c";
15+
tag = "v${version}";
1716
fetchSubmodules = true;
18-
hash = "sha256-yjiPHEiZjs9TnBRaKzm1TpLcPK0tfIrzM30DX66m+1Y=";
17+
hash = "sha256-qYarDcwrVrTpLHQYdWQvXL5+V1wMyL06+n5t6LXKBHI=";
1918
};
2019

21-
disabled = python3Packages.pythonOlder "3.8";
22-
2320
build-system = with python3Packages; [
2421
setuptools
2522
];

pkgs/by-name/he/heroic-unwrapped/legendary.nix

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,17 @@
44
fetchFromGitHub,
55
python3Packages,
66
}:
7-
let
8-
version = "0.20.39";
9-
in
10-
python3Packages.buildPythonApplication {
11-
inherit version;
7+
8+
python3Packages.buildPythonApplication rec {
129
pname = "legendary-heroic";
13-
format = "pyproject";
10+
version = "0.20.41";
11+
pyproject = true;
1412

1513
src = fetchFromGitHub {
16-
inherit version;
1714
owner = "Heroic-Games-Launcher";
1815
repo = "legendary";
1916
tag = version;
20-
hash = "sha256-2+9MRbwugBlBdZQQo6BUcLmwCqVdTAv9CZ+sPu5VAxY=";
17+
hash = "sha256-zX5Lyj8IDHETFyEpUaFnGaYZVs1hDy9rtwab1+rNlrw=";
2118
};
2219

2320
build-system = with python3Packages; [

pkgs/by-name/he/heroic-unwrapped/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ let
3030
in
3131
stdenv.mkDerivation (finalAttrs: {
3232
pname = "heroic-unwrapped";
33-
version = "2.19.1";
33+
version = "2.20.0";
3434

3535
src = fetchFromGitHub {
3636
owner = "Heroic-Games-Launcher";
3737
repo = "HeroicGamesLauncher";
3838
tag = "v${finalAttrs.version}";
39-
hash = "sha256-e+/FRvG9u6ZQsMGD5hqY+yLPjsbLSrjC9Wp0xdxVk6w=";
39+
hash = "sha256-gjQPQ/PwpDlBUfNF1JAlWUDGJa+7hwoQtouihdSCDqI=";
4040
};
4141

4242
pnpmDeps = fetchPnpmDeps {
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
4848
;
4949
inherit pnpm;
5050
fetcherVersion = 3;
51-
hash = "sha256-uwJYOm+2wGNRHAiIw1UjCBLBW6kjtj6AFLWihCqtL28=";
51+
hash = "sha256-JLUiPNxcOpwkYaabl2kP73fgr+WFyXQW8y6qDIb5gt4=";
5252
};
5353

5454
nativeBuildInputs = [

pkgs/by-name/hm/hmcl/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
}:
4040
stdenv.mkDerivation (finalAttrs: {
4141
pname = "hmcl";
42-
version = "3.10.3";
42+
version = "3.11.1";
4343

4444
src = fetchurl {
4545
# HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key.
4646
# See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28
4747
url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar";
48-
hash = "sha256-+xxDACa2ECbWaCUzK0b/rcRS49Hex4GZDcNNK/aEURs=";
48+
hash = "sha256-nthmv/xvgQ4JFmtcwn4XkCHcdzC23hJ5McoAIl2g8A4=";
4949
};
5050

5151
# - HMCL prompts users to download prebuilt Terracotta binary for

0 commit comments

Comments
 (0)