From 175a86d3b654afcfb6d98598c3abca5f436f35fb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 9 Mar 2023 21:59:29 +0100 Subject: [PATCH] ungoogled-chromium: 110.0.5481.177 -> 111.0.5563.65 --- .../networking/browsers/chromium/default.nix | 6 +----- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 0152a7ed0926..202b0cab0e31 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,4 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_14 , llvmPackages_15 , ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit @@ -19,7 +18,7 @@ }: let - llvmPackages = llvmPackages_14; + llvmPackages = llvmPackages_15; stdenv = llvmPackages.stdenv; upstream-info = (lib.importJSON ./upstream-info.json).${channel}; @@ -54,9 +53,6 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (chromiumVersionAtLeast "111") rec { - llvmPackages = llvmPackages_15; - stdenv = llvmPackages_15.stdenv; }); browser = callPackage ./browser.nix { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 56bafcd6385d..3b3858d352fc 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "110.0.5481.177", - "sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv", - "sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2", + "version": "111.0.5563.65", + "sha256": "1wg84pd50zi5268snkiahnp5191c66bqkbvdz2z8azivm95lwqwp", + "sha256bin64": null, "deps": { "gn": { "version": "2022-12-12", @@ -56,8 +56,8 @@ "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" }, "ungoogled-patches": { - "rev": "110.0.5481.177-1", - "sha256": "0rsvkbsrnfkdp3iw4s54kddw8r771h14hf1ivgahmn42yjafkk3n" + "rev": "111.0.5563.65-1", + "sha256": "06mfm2gaz1nbwqhn2jp34pm52rw1q99i9fq7wh19m0qasdpidis9" } } }