diff options
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2311.section.md | 4 | ||||
-rwxr-xr-x | pkgs/applications/networking/browsers/chromium/update.py | 8 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.nix | 26 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
5 files changed, 12 insertions, 38 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 06b17194a3133..1a3d094076277 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -162,6 +162,10 @@ - The `users.users.<name>.passwordFile` has been renamed to `users.users.<name>.hashedPasswordFile` to avoid possible confusions. The option is in fact the file-based version of `hashedPassword`, not `password`, and expects a file containing the {manpage}`crypt(3)` hash of the user password. +- `chromiumBeta` and `chromiumDev` have been removed due to the lack of maintenance in nixpkgs. Consider using `chromium` instead. + +- `google-chrome-beta` and `google-chrome-dev` have been removed due to the lack of maintenance in nixpkgs. Consider using `google-chrome` instead. + - The `services.ananicy.extraRules` option now has the type of `listOf attrs` instead of `string`. - `buildVimPluginFrom2Nix` has been renamed to `buildVimPlugin`, which now diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 60267331cc275..a241ee0dd7cff 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -151,10 +151,6 @@ def channel_name_to_attr_name(channel_name): """Maps a channel name to the corresponding main Nixpkgs attribute name.""" if channel_name == 'stable': return 'chromium' - if channel_name == 'beta': - return 'chromiumBeta' - if channel_name == 'dev': - return 'chromiumDev' if channel_name == 'ungoogled-chromium': return 'ungoogled-chromium' print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) @@ -206,6 +202,10 @@ with urlopen(RELEASES_URL) as resp: if channel_name in channels: continue + # We only look for channels that are listed in our version pin file. + if channel_name not in last_channels: + continue + # If we're back at the last release we used, we don't need to # keep going -- there's no new version available, and we can # just reuse the info from last time. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 32fb0ecb48338..e6a7e3f6c7adf 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,30 +1,4 @@ { - beta = { - deps = { - gn = { - rev = "811d332bd90551342c5cbd39e133aa276022d7f8"; - hash = "sha256-WCq+PNkWxWpssUOQyQbAZ5l6k+hg+qGMsoaMG0Ybj0o="; - url = "https://gn.googlesource.com/gn"; - version = "2023-08-01"; - }; - }; - hash = "sha256-spzY2u5Wk52BrKCk9aQOEp/gbppaGVLCQxXa+3JuajA="; - hash_deb_amd64 = "sha256-eTeEeNa4JuCW81+SUAyrKi3S0/TJNTAoTktWQ0JsgYc="; - version = "117.0.5938.22"; - }; - dev = { - deps = { - gn = { - rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; - hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M="; - url = "https://gn.googlesource.com/gn"; - version = "2023-08-10"; - }; - }; - hash = "sha256-W0fZuvv9jz03ibQqB6MG45aw2zPklfxoFzZzr+kRuJk="; - hash_deb_amd64 = "sha256-XWxRFLFxBqnvKcoB5HErwVbtHCGYRteLeTv44zVMwIc="; - version = "118.0.5966.0"; - }; stable = { chromedriver = { hash_darwin = "sha256-ugsxRhIPtDD7Y4/PsIc8Apqrtyo4uiVKoLmtRvQaJ3k="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5dc11a345a6dd..0153a1c93f035 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -134,6 +134,8 @@ mapAliases ({ chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22 chocolateDoom = chocolate-doom; # Added 2023-05-01 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 + chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 + chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 citra = citra-nightly; # added 2022-05-17 clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 @@ -317,6 +319,8 @@ mapAliases ({ godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 + google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 + google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 go-thumbnailer = thud; # Added 2023-09-21 gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92da00a960772..1d5fa7c2537f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30866,10 +30866,6 @@ with pkgs; chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); - chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); - - chromiumDev = lowPrio (chromium.override { channel = "dev"; }); - chuck = callPackage ../applications/audio/chuck { inherit (darwin) DarwinTools; inherit (darwin.apple_sdk.frameworks) AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport; @@ -32270,10 +32266,6 @@ with pkgs; google-chrome = callPackage ../applications/networking/browsers/google-chrome { }; - google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; - - google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; - go-graft = callPackage ../applications/networking/go-graft { }; gostatic = callPackage ../applications/misc/gostatic { }; |