Unverified Commit f3e9221b authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge release-24.11 into staging-next-24.11

parents eb517115 39a79978

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -6038,6 +6038,12 @@ 
    githubId = 2025623;

    name = "Luc Chabassier";

  };

  dwrege = {

    email = "email@dwrege.de";

    github = "dominicwrege";

    githubId = 7389000;

    name = "Dominic Wrege";

  };

  dxf = {

    email = "dingxiangfei2009@gmail.com";

    github = "dingxiangfei2009";

pkgs/applications/networking/browsers/chromium/common.nix

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ let 
    postPatch =  lib.optionalString (!isElectron) ''

      ln -s ${./files/gclient_args.gni} build/config/gclient_args.gni



      echo 'LASTCHANGE=${upstream-info.DEPS."src".rev}-refs/heads/master@{#0}' > build/util/LASTCHANGE

      echo 'LASTCHANGE=${upstream-info.DEPS."src".rev}-refs/tags/${version}@{#0}' > build/util/LASTCHANGE

      echo "$SOURCE_DATE_EPOCH" > build/util/LASTCHANGE.committime



      cat << EOF > gpu/config/gpu_lists_version.h

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

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    "DEPS": {

      "src": {

        "url": "https://chromium.googlesource.com/chromium/src.git",

        "rev": "131.0.6778.85",

        "rev": "3d81e41b6f3ac8bcae63b32e8145c9eb0cd60a2d",

        "hash": "sha256-fREToEHVbTD0IVGx/sn7csSju4BYajWZ+LDCiKWV4cI=",

        "recompress": true

      },
@@ -785,7 +785,7 @@ 
    "DEPS": {

      "src": {

        "url": "https://chromium.googlesource.com/chromium/src.git",

        "rev": "131.0.6778.85",

        "rev": "3d81e41b6f3ac8bcae63b32e8145c9eb0cd60a2d",

        "hash": "sha256-fREToEHVbTD0IVGx/sn7csSju4BYajWZ+LDCiKWV4cI=",

        "recompress": true

      },

pkgs/applications/networking/browsers/chromium/update.mjs

+13 −3
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ for (const attr_path of Object.keys(lockfile)) { 
    // unconditionally remove ungoogled-chromium's epoch/sub-version (e.g. 130.0.6723.116-1 -> 130.0.6723.116)

    const version_chromium = version_upstream.split('-')[0]



    const chromium_rev = await chromium_resolve_tag_to_rev(version_chromium)



    lockfile[attr_path] = {

      version: version_chromium,

      chromedriver: !ungoogled ? await fetch_chromedriver_binaries(version_chromium) : undefined,
@@ -62,20 +64,20 @@ for (const attr_path of Object.keys(lockfile)) { 
      DEPS: {},

    }



    const depot_tools = await fetch_depot_tools(version_chromium, lockfile_initial[attr_path].deps.depot_tools)

    const depot_tools = await fetch_depot_tools(chromium_rev, lockfile_initial[attr_path].deps.depot_tools)

    lockfile[attr_path].deps.depot_tools = {

      rev: depot_tools.rev,

      hash: depot_tools.hash,

    }



    const gn = await fetch_gn(version_chromium, lockfile_initial[attr_path].deps.gn)

    const gn = await fetch_gn(chromium_rev, lockfile_initial[attr_path].deps.gn)

    lockfile[attr_path].deps.gn = {

      rev: gn.rev,

      hash: gn.hash,

    }



    // DEPS update loop

    lockfile[attr_path].DEPS = await resolve_DEPS(depot_tools.out, version_chromium)

    lockfile[attr_path].DEPS = await resolve_DEPS(depot_tools.out, chromium_rev)

    for (const [path, value] of Object.entries(lockfile[attr_path].DEPS)) {

      delete value.fetcher

      delete value.postFetch
@@ -147,6 +149,14 @@ async function fetch_chromedriver_binaries(chromium_version) { 
}





async function chromium_resolve_tag_to_rev(tag) {

  const url = `https://chromium.googlesource.com/chromium/src/+/refs/tags/${tag}?format=json`

  const response = await (await fetch(url)).text()

  const json = JSON.parse(response.replace(`)]}'\n`, ''))

  return json.commit

}





async function resolve_DEPS(depot_tools_checkout, chromium_rev) {

  const { stdout } = await $`./depot_tools.py ${depot_tools_checkout} ${chromium_rev}`

  const deps = JSON.parse(stdout)

pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 


buildMozillaMach rec {

  pname = "firefox-beta";

  version = "133.0b1";

  version = "133.0b9";

  applicationName = "Mozilla Firefox Beta";

  src = fetchurl {

    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

    sha512 = "c4a85a72b2891c5b6c6e200cd7ef13abe0f5ad090f8ef1d8243a489791f3542b2cd390c141118c4745c4ca677d1e9bf1e564e4a45e066d27ed53e6bd92844727";

    sha512 = "2c950f04730666387a84b25cfe3afbd93b53988608345a062c8b538619e895c274049fe557a604e86f7ea5744ae2a50dc9c448a20664f0d7308949422a453ae9";

  };



  meta = {