From ab757c51f506569117009610c6e283d19d9007ec Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 7 Apr 2023 09:41:31 +0200 Subject: [PATCH] ungoogled-chromium: update repo links to ungoogled-software organisation The main repository has moved from the Eloston user to the ungoogled-software organisation. --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- .../applications/networking/browsers/chromium/ungoogled.nix | 2 +- pkgs/applications/networking/browsers/chromium/update.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 1eea3e8962f8..63465f370caa 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -82,7 +82,7 @@ mkChromiumDerivation (base: rec { of source code for Google Chrome (which has some additional features). ''; homepage = if ungoogled - then "https://github.com/Eloston/ungoogled-chromium" + then "https://github.com/ungoogled-software/ungoogled-chromium" else "https://www.chromium.org/"; maintainers = with lib.maintainers; if ungoogled then [ squalus primeos michaeladler ] diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled.nix b/pkgs/applications/networking/browsers/chromium/ungoogled.nix index a8e84dae196d..549d2853776f 100644 --- a/pkgs/applications/networking/browsers/chromium/ungoogled.nix +++ b/pkgs/applications/networking/browsers/chromium/ungoogled.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = rev; src = fetchFromGitHub { - owner = "Eloston"; + owner = "ungoogled-software"; repo = "ungoogled-chromium"; inherit rev sha256; }; diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 1a38ab72e464..31a65391dc88 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -92,7 +92,7 @@ def get_channel_dependencies(version): def get_latest_ungoogled_chromium_tag(): """Returns the latest ungoogled-chromium tag using the GitHub API.""" - api_tag_url = 'https://api.github.com/repos/Eloston/ungoogled-chromium/tags?per_page=1' + api_tag_url = 'https://api.github.com/repos/ungoogled-software/ungoogled-chromium/tags' with urlopen(api_tag_url) as http_response: tag_data = json.load(http_response) return tag_data[0]['name'] @@ -111,7 +111,7 @@ def get_latest_ungoogled_chromium_build(): def get_ungoogled_chromium_gn_flags(revision): """Returns ungoogled-chromium's GN build flags for the given revision.""" - gn_flags_url = f'https://raw.githubusercontent.com/Eloston/ungoogled-chromium/{revision}/flags.gn' + gn_flags_url = f'https://raw.githubusercontent.com/ungoogled-software/ungoogled-chromium/{revision}/flags.gn' return urlopen(gn_flags_url).read().decode() @@ -209,7 +209,7 @@ with urlopen(RELEASES_URL) as resp: if channel_name == 'stable': channel['chromedriver'] = get_matching_chromedriver(channel['version']) elif channel_name == 'ungoogled-chromium': - ungoogled_repo_url = 'https://github.com/Eloston/ungoogled-chromium.git' + ungoogled_repo_url = 'https://github.com/ungoogled-software/ungoogled-chromium.git' channel['deps']['ungoogled-patches'] = { 'rev': release['ungoogled_tag'], 'sha256': nix_prefetch_git(ungoogled_repo_url, release['ungoogled_tag'])['sha256']