Skip to content

Commit 5d57d37

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
Merge release-25.11 into staging-next-25.11
2 parents d5dd84c + 763c156 commit 5d57d37

56 files changed

Lines changed: 3941 additions & 1583 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎maintainers/maintainer-list.nix‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8509,6 +8509,11 @@
85098509
github = "felixdorn";
85108510
githubId = 55788595;
85118511
};
8512+
FelixLusseau = {
8513+
name = "Félix Lusseau";
8514+
github = "FelixLusseau";
8515+
githubId = 94113911;
8516+
};
85128517
felixscheinost = {
85138518
name = "Felix Scheinost";
85148519
email = "felix.scheinost@posteo.de";

‎nixos/modules/services/security/kanidm.nix‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ let
3737
subtractLists
3838
types
3939
unique
40+
versionAtLeast
4041
;
4142

4243
cfg = config.services.kanidm;
@@ -139,12 +140,14 @@ let
139140
builtins.toJSON { inherit (cfg.provision) groups persons systems; }
140141
);
141142

143+
scriptingArg = optionalString (versionAtLeast cfg.package.version "1.9") "scripting";
144+
142145
# Only recover the admin account if a password should explicitly be provisioned
143146
# for the account. Otherwise it is not needed for provisioning.
144147
maybeRecoverAdmin = optionalString (cfg.provision.adminPasswordFile != null) ''
145148
KANIDM_ADMIN_PASSWORD=$(< ${cfg.provision.adminPasswordFile})
146149
# We always reset the admin account password if a desired password was specified.
147-
if ! KANIDM_RECOVER_ACCOUNT_PASSWORD=$KANIDM_ADMIN_PASSWORD ${cfg.package}/bin/kanidmd recover-account -c ${serverConfigFile} admin --from-environment >/dev/null; then
150+
if ! KANIDM_RECOVER_ACCOUNT_PASSWORD=$KANIDM_ADMIN_PASSWORD ${cfg.package}/bin/kanidmd ${scriptingArg} recover-account -c ${serverConfigFile} admin --from-environment >/dev/null; then
148151
echo "Failed to recover admin account" >&2
149152
exit 1
150153
fi
@@ -158,19 +161,35 @@ let
158161
''
159162
KANIDM_IDM_ADMIN_PASSWORD=$(< ${cfg.provision.idmAdminPasswordFile})
160163
# We always reset the idm_admin account password if a desired password was specified.
161-
if ! KANIDM_RECOVER_ACCOUNT_PASSWORD=$KANIDM_IDM_ADMIN_PASSWORD ${cfg.package}/bin/kanidmd recover-account -c ${serverConfigFile} idm_admin --from-environment >/dev/null; then
164+
if ! KANIDM_RECOVER_ACCOUNT_PASSWORD=$KANIDM_IDM_ADMIN_PASSWORD ${cfg.package}/bin/kanidmd ${scriptingArg} recover-account -c ${serverConfigFile} idm_admin --from-environment >/dev/null; then
162165
echo "Failed to recover idm_admin account" >&2
163166
exit 1
164167
fi
165168
''
169+
else if versionAtLeast cfg.package.version "1.9" then
170+
''
171+
# Recover idm_admin account
172+
if ! recover_out=$(${cfg.package}/bin/kanidmd scripting recover-account -c ${serverConfigFile} idm_admin); then
173+
echo "$recover_out" >&2
174+
echo "kanidm provision: Failed to recover idm_admin account" >&2
175+
exit 1
176+
fi
177+
178+
if ! KANIDM_IDM_ADMIN_PASSWORD=$(${getExe pkgs.jq} -r .output <<< "$recover_out"); then
179+
echo "$recover_out" >&2
180+
echo "kanidm provision: Failed to parse password for idm_admin account" >&2
181+
exit 1
182+
fi
183+
''
166184
else
167185
''
168186
# Recover idm_admin account
169187
if ! recover_out=$(${cfg.package}/bin/kanidmd recover-account -c ${serverConfigFile} idm_admin -o json); then
170188
echo "$recover_out" >&2
171-
echo "kanidm provision: Failed to recover admin account" >&2
189+
echo "kanidm provision: Failed to recover idm_admin account" >&2
172190
exit 1
173191
fi
192+
174193
if ! KANIDM_IDM_ADMIN_PASSWORD=$(grep '{"password' <<< "$recover_out" | ${getExe pkgs.jq} -r .password); then
175194
echo "$recover_out" >&2
176195
echo "kanidm provision: Failed to parse password for idm_admin account" >&2

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"chromium": {
3-
"version": "145.0.7632.75",
3+
"version": "145.0.7632.109",
44
"chromedriver": {
5-
"version": "145.0.7632.76",
6-
"hash_darwin": "sha256-7bZgvz6yD8qO1G82KTlAuPxLPelZ5TfIlLvyugDJUjM=",
7-
"hash_darwin_aarch64": "sha256-fwtLzGyT810JoTKI52jXPGBu2EnrD+ROG1L2kGMfFfk="
5+
"version": "145.0.7632.110",
6+
"hash_darwin": "sha256-wa8s3PwS5G1TopGYheyLD7wlxxTZWPYwU90TLFpBMZw=",
7+
"hash_darwin_aarch64": "sha256-/J4A4DrERlHdlI0Pv9hHCnBGoeUIB6G43fS0Y8taLFs="
88
},
99
"deps": {
1010
"depot_tools": {
@@ -21,8 +21,8 @@
2121
"DEPS": {
2222
"src": {
2323
"url": "https://chromium.googlesource.com/chromium/src.git",
24-
"rev": "ab0b95409566de9da1ed76e690022f774aec7793",
25-
"hash": "sha256-VvHDqNTXOFeV+QY3K2O9fTFxDzrkz6qKl9hP8nVDMAw=",
24+
"rev": "61eff07de4f37ac1c6969c91034a447ef6cd394d",
25+
"hash": "sha256-b498JyyvsN/+0Gqjdrq+eT1HW54/ayEENRHa1Sw69Xw=",
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": "0cf07977de12e7056ab3cbcbf584411e88a1f734",
136-
"hash": "sha256-2OgNRRkpUlkyXAQDSOL4279JAi1C0QbH4MEfNW7WieQ="
135+
"rev": "d9f5a980bb5a4baeb7d9c1fef89a39789a6cd9fb",
136+
"hash": "sha256-DaNsRQm9bR2lfbiP6vWr2R7KD8mYWOaJ72VJyrUkJvI="
137137
},
138138
"src/third_party/dawn/third_party/glfw": {
139139
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -257,8 +257,8 @@
257257
},
258258
"src/third_party/devtools-frontend/src": {
259259
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
260-
"rev": "cc75f545bcb65238f74fd291833112305ce6915a",
261-
"hash": "sha256-tOE96dcLmUaAVvOo4oGoUrEFpGSH2yxIBtvXSAVzbK0="
260+
"rev": "8eb35b80efbc72ffb3aff36c3c1106fe9269df88",
261+
"hash": "sha256-fzcXSU0kaIZVTQx1L5A0Xmn3HEzUE35mzfsU0YEaxw0="
262262
},
263263
"src/third_party/dom_distiller_js/dist": {
264264
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -602,8 +602,8 @@
602602
},
603603
"src/third_party/pdfium": {
604604
"url": "https://pdfium.googlesource.com/pdfium.git",
605-
"rev": "3c679253a9e17c10be696d345c63636b18b7f925",
606-
"hash": "sha256-OW39m1TVJnSdbeVeTCgSxePTqFTOwWqZIrU/5SEioCc="
605+
"rev": "004b47619573a582c076679764e07725ace3e497",
606+
"hash": "sha256-PHu3v/ZeEa11/CTGJh8aJjV/lTIVSJ6W7uH2njsHj1w="
607607
},
608608
"src/third_party/perfetto": {
609609
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
@@ -817,13 +817,13 @@
817817
},
818818
"src/v8": {
819819
"url": "https://chromium.googlesource.com/v8/v8.git",
820-
"rev": "fffd2bdc35a900b4312833885d9d30803580670e",
821-
"hash": "sha256-WqSGzOCvLw6k3t1oNgZV17KY8TVl6j4lJr0NZSVbm4o="
820+
"rev": "a8b42c8fae7c7f1ce4e32b08ee61c22775185c01",
821+
"hash": "sha256-HZ4JbSoMNVqUrCWoxk0/AxzlcpMgKhe/HJ7DGeTeE9M="
822822
}
823823
}
824824
},
825825
"ungoogled-chromium": {
826-
"version": "145.0.7632.75",
826+
"version": "145.0.7632.109",
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.75-1",
839-
"hash": "sha256-DlHNbochbPLRdD3wn1lW9S7x4OLzI+1cAMqjeTYNlA4="
838+
"rev": "145.0.7632.109-1",
839+
"hash": "sha256-IKt/88bzppdwewWJpim8JL7u6N42o6W2VygvWd+XdVo="
840840
},
841841
"npmHash": "sha256-13sgV/5BD7QvDLBAEmoLN5vongw+S5v5znvZcctxhWc="
842842
},
843843
"DEPS": {
844844
"src": {
845845
"url": "https://chromium.googlesource.com/chromium/src.git",
846-
"rev": "ab0b95409566de9da1ed76e690022f774aec7793",
847-
"hash": "sha256-VvHDqNTXOFeV+QY3K2O9fTFxDzrkz6qKl9hP8nVDMAw=",
846+
"rev": "61eff07de4f37ac1c6969c91034a447ef6cd394d",
847+
"hash": "sha256-b498JyyvsN/+0Gqjdrq+eT1HW54/ayEENRHa1Sw69Xw=",
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": "0cf07977de12e7056ab3cbcbf584411e88a1f734",
958-
"hash": "sha256-2OgNRRkpUlkyXAQDSOL4279JAi1C0QbH4MEfNW7WieQ="
957+
"rev": "d9f5a980bb5a4baeb7d9c1fef89a39789a6cd9fb",
958+
"hash": "sha256-DaNsRQm9bR2lfbiP6vWr2R7KD8mYWOaJ72VJyrUkJvI="
959959
},
960960
"src/third_party/dawn/third_party/glfw": {
961961
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -1079,8 +1079,8 @@
10791079
},
10801080
"src/third_party/devtools-frontend/src": {
10811081
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
1082-
"rev": "cc75f545bcb65238f74fd291833112305ce6915a",
1083-
"hash": "sha256-tOE96dcLmUaAVvOo4oGoUrEFpGSH2yxIBtvXSAVzbK0="
1082+
"rev": "8eb35b80efbc72ffb3aff36c3c1106fe9269df88",
1083+
"hash": "sha256-fzcXSU0kaIZVTQx1L5A0Xmn3HEzUE35mzfsU0YEaxw0="
10841084
},
10851085
"src/third_party/dom_distiller_js/dist": {
10861086
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1424,8 +1424,8 @@
14241424
},
14251425
"src/third_party/pdfium": {
14261426
"url": "https://pdfium.googlesource.com/pdfium.git",
1427-
"rev": "3c679253a9e17c10be696d345c63636b18b7f925",
1428-
"hash": "sha256-OW39m1TVJnSdbeVeTCgSxePTqFTOwWqZIrU/5SEioCc="
1427+
"rev": "004b47619573a582c076679764e07725ace3e497",
1428+
"hash": "sha256-PHu3v/ZeEa11/CTGJh8aJjV/lTIVSJ6W7uH2njsHj1w="
14291429
},
14301430
"src/third_party/perfetto": {
14311431
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
@@ -1639,8 +1639,8 @@
16391639
},
16401640
"src/v8": {
16411641
"url": "https://chromium.googlesource.com/v8/v8.git",
1642-
"rev": "fffd2bdc35a900b4312833885d9d30803580670e",
1643-
"hash": "sha256-WqSGzOCvLw6k3t1oNgZV17KY8TVl6j4lJr0NZSVbm4o="
1642+
"rev": "a8b42c8fae7c7f1ce4e32b08ee61c22775185c01",
1643+
"hash": "sha256-HZ4JbSoMNVqUrCWoxk0/AxzlcpMgKhe/HJ7DGeTeE9M="
16441644
}
16451645
}
16461646
}

‎pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
buildMozillaMach rec {
1111
pname = "firefox-devedition";
1212
binaryName = "firefox-devedition";
13-
version = "148.0b14";
13+
version = "148.0b15";
1414
applicationName = "Firefox Developer Edition";
1515
requireSigning = false;
1616
branding = "browser/branding/aurora";
1717
src = fetchurl {
1818
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
19-
sha512 = "10de6926c3c20fcbffe2f25f97213ac777e4ce3984cb303262ddaef15be24788a40c6064ce8cc138ab3a35ba621efdcd0f6e0a105b2e773f7f14a1d661c10693";
19+
sha512 = "32d7e4b9df739d5bdab2cd54250b1c7546d26b248a62e0bbc71e4b78b12d4e3d6d9451b631a0f18568f2540141786967a33b6543256a6ec6f4f245093d37a5d5";
2020
};
2121

2222
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

‎pkgs/by-name/ap/apko/package.nix‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
buildGoModule (finalAttrs: {
1313
pname = "apko";
14-
version = "0.30.22";
14+
version = "1.1.9";
1515

1616
src = fetchFromGitHub {
1717
owner = "chainguard-dev";
1818
repo = "apko";
1919
tag = "v${finalAttrs.version}";
20-
hash = "sha256-wHspbxGnTOFF6zKWlW0OjgxmYPdoG2LWUTq2lH7i5Fk=";
20+
hash = "sha256-gYLLKejvyQTbDEua51RxxQy1aSUsp8EJrg/7b5xrEBs=";
2121
# populate values that require us to use git. By doing this in postFetch we
2222
# can delete .git afterwards and maintain better reproducibility of the src.
2323
leaveDotGit = true;
@@ -29,7 +29,11 @@ buildGoModule (finalAttrs: {
2929
find "$out" -name .git -print0 | xargs -0 rm -rf
3030
'';
3131
};
32-
vendorHash = "sha256-6AP2cf5URe2vVKVYl9O00CbGPXD8Zg1OE8V8rF9+/MI=";
32+
vendorHash = "sha256-Iv9aRb4soepckHl0cQMb3TqHjiNn19QLFCprTunWiO8=";
33+
34+
excludedPackages = [
35+
"internal/gen-jsonschema"
36+
];
3337

3438
nativeBuildInputs = [ installShellFiles ];
3539

@@ -60,8 +64,8 @@ buildGoModule (finalAttrs: {
6064
'';
6165

6266
checkFlags = [
63-
# requires networking (apk.chainreg.biz)
64-
"-skip=TestInitDB_ChainguardDiscovery"
67+
# requires networking (apk.chainreg.biz and dl-cdn.alpinelinux.org)
68+
"-skip=TestInitDB_ChainguardDiscovery|TestFetchPackage|TestLock/apko-discover"
6569
];
6670

6771
postInstall =

‎pkgs/by-name/ca/caido/package.nix‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ let
1616
"cli"
1717
"desktop"
1818
];
19-
version = "0.53.1";
19+
version = "0.55.1";
2020

2121
system = stdenv.hostPlatform.system;
2222
isLinux = stdenv.isLinux;
@@ -26,39 +26,39 @@ let
2626
cliSources = {
2727
x86_64-linux = {
2828
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
29-
hash = "sha256-qSrgEg0iEx5Mpe+meHnkrOgM9zcQJBzoH5KlMy8FE5Q=";
29+
hash = "sha256-4xRkEN/ZA+JUFMB2qoEZT0Bzv2Qc7Y9kcj251MCAhKE=";
3030
};
3131
aarch64-linux = {
3232
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-aarch64.tar.gz";
33-
hash = "sha256-mgIjo+1y2jxC7lPUkLjuwIq4F8SagjQAyfeqaoeQX9w=";
33+
hash = "sha256-gMQkF0+mq2nRBy0oBenFvp69byWCkqmt8E4ZpKuNxKw=";
3434
};
3535
x86_64-darwin = {
3636
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-mac-x86_64.zip";
37-
hash = "sha256-iPDYQXWaxt32MxbAWL0496i7IO0FEt8di4E0msagfEo=";
37+
hash = "sha256-C+EfmSBJMyxYXLfzxCrY7ZVtg8nwtie8w0Lj1Dy7o/k=";
3838
};
3939
aarch64-darwin = {
4040
url = "https://caido.download/releases/v${version}/caido-cli-v${version}-mac-aarch64.zip";
41-
hash = "sha256-5b9TrR5ZqlN17OgIaQ9vPIccwOiELNcidjinF3rf6Zc=";
41+
hash = "sha256-b0cBS3RwsiLgJNqHWxi672MVZNfTYNOEJ2k0h2qNnP0=";
4242
};
4343
};
4444

4545
# Desktop sources
4646
desktopSources = {
4747
x86_64-linux = {
4848
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
49-
hash = "sha256-/puWhX5ooz994f1COw356HSfqcOmJaAweccTIWl9KCo=";
49+
hash = "sha256-zfts2h8QWTxe/dISwgKRQiSx2nD6vtE1atPfREyGX/U=";
5050
};
5151
aarch64-linux = {
5252
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-aarch64.AppImage";
53-
hash = "sha256-iYaWN6Nu0+zPSUzlhUS5EIuYO32BVkBLZrPA9h7DpfM=";
53+
hash = "sha256-fYqzukRptCB466LIPbVre2EwBFt4Bsq9amQ4kjQuV2Q=";
5454
};
5555
x86_64-darwin = {
5656
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-x86_64.dmg";
57-
hash = "sha256-iPDYQXWaxt32MxbAWL0496i7IO0FEt8di4E0msagfEo=";
57+
hash = "sha256-UsGT5n0MGVwWCXACo74Harb4J/qt/3TyD0+EFYNmPxw=";
5858
};
5959
aarch64-darwin = {
6060
url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-aarch64.dmg";
61-
hash = "sha256-5b9TrR5ZqlN17OgIaQ9vPIccwOiELNcidjinF3rf6Zc=";
61+
hash = "sha256-iZHZayj2VYjMY9+p+xrlX+vP/DcbCRPQizQEqtF39EU=";
6262
};
6363
};
6464

0 commit comments

Comments
 (0)