0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

Merge release-24.11 into staging-next-24.11

This commit is contained in:
nixpkgs-ci[bot] 2025-06-13 00:20:10 +00:00 committed by GitHub
commit bcc458d04f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 14 deletions

View file

@ -63,4 +63,4 @@ git -C "$tmp/merged" merge -q --no-edit "$baseSha"
trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m"
trace "Running nixpkgs-vet.."
nix-build ci -A nixpkgs-vet --argstr base "$tmp/base" --argstr head "$tmp/merged"
nix-build ci -A nixpkgs-vet --arg base "$tmp/base" --arg head "$tmp/merged"

View file

@ -12459,6 +12459,12 @@
githubId = 567634;
name = "Daniel Kuehn";
};
leleuvilela = {
email = "viniciusvilela19@gmail.com";
github = "leleuvilela";
githubId = 19839085;
name = "Vinicius Vilela";
};
lelgenio = {
email = "lelgenio@lelgenio.com";
github = "lelgenio";
@ -13389,6 +13395,13 @@
name = "Mæve";
keys = [ { fingerprint = "96C9 D086 CC9D 7BD7 EF24 80E2 9168 796A 1CC3 AEA2"; } ];
};
maeve-oake = {
email = "maeve@oa.ke";
matrix = "@maeve:oa.ke";
github = "maeve-oake";
githubId = 38541651;
name = "maeve";
};
mafo = {
email = "Marc.Fontaine@gmx.de";
github = "MarcFontaine";

View file

@ -797,7 +797,7 @@
}
},
"ungoogled-chromium": {
"version": "137.0.7151.68",
"version": "137.0.7151.103",
"deps": {
"depot_tools": {
"rev": "1fcc527019d786502b02f71b8b764ee674a40953",
@ -808,16 +808,16 @@
"hash": "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI="
},
"ungoogled-patches": {
"rev": "137.0.7151.68-1",
"hash": "sha256-oPYNvnBuBKBb1SRNQkQeApmPVDoV+bFVjCh9HKa4A8o="
"rev": "137.0.7151.103-1",
"hash": "sha256-KMzO25yruwrT7rpqbQ56FMGxkVZOwDSsvFqCZbUUM5Y="
},
"npmHash": "sha256-I6MsfAhrLRmgiRJ13LSejfy2N63C3Oug5tOOXA622j4="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "2989ffee9373ea8b8623bd98b3cb350a8e95cadc",
"hash": "sha256-lPmmXVCNUa9of8d52hUejImPSEfOz7v7PlovZS4cfIE=",
"rev": "3dcc738117a3439068c9773ccd31f9858923fc4a",
"hash": "sha256-MIEjHLpfKIBiTFh+bO+NUf6iDpizTP9yfXQqbHfiDwo=",
"recompress": true
},
"src/third_party/clang-format/script": {
@ -1037,8 +1037,8 @@
},
"src/third_party/devtools-frontend/src": {
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
"rev": "fdc8ca697612f90e7ddf2621dffbc43733d2d238",
"hash": "sha256-jKYldgZJwJeTQavmcM9enTdGN8+zt/EG7K1E9wQYIBA="
"rev": "e423961606946be24c8c1ec0d1ec91511efbabc5",
"hash": "sha256-MhooXuF6aw+ixPzvVCBl+6T+79cTReCYx86qqXAZ6bg="
},
"src/third_party/dom_distiller_js/dist": {
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@ -1587,8 +1587,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "e398f9bf6d5c8a768ab736f46146d7349cf31547",
"hash": "sha256-cJx8IgUB3UA3jEPvb5aDvHLYmAnHydK1qR11q6Y5PnA="
"rev": "41f53aba7095888c959932bd8f2ee8b4e16af223",
"hash": "sha256-ICrdvHA6fe2CUphRgPdlofazr0L+NFypWDNOI5e5QIM="
}
}
}

View file

@ -174,11 +174,11 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "microsoft-edge";
version = "136.0.3240.76";
version = "137.0.3296.68";
src = fetchurl {
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-biNM1exJ/xUcmhZjH7ZcFF9cYVqsPavbbtsJnRVlyFo=";
hash = "sha256-dgmQF6zpd8dAYKoTSiidk8VU6dZ/ZWEDlYD91IPaDEE=";
};
# With strictDeps on, some shebangs were not being patched correctly
@ -284,8 +284,10 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.unfree;
mainProgram = "microsoft-edge";
maintainers = with lib.maintainers; [
kuwii
rhysmdnz
cholli
ulrikstrid
maeve-oake
leleuvilela
];
platforms = [ "x86_64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];