Unverified Commit 59719f78 authored by emilylange's avatar emilylange
Browse files

chromium{Beta,Dev},google-chrome-{beta,dev}: drop 

This is mainly due to the lack of maintenance in nixpkgs.
`google-chrome-{beta,dev}` depend on `chromium{Beta,Dev}`'s version
info.

`chromium{Beta,Dev}` are rarely updated and explicitly blocklisted by
`hydra.nixos.org`, meaning they are almost always outdated and not
cached in `cache.nixos.org`.

`chromium{Beta,Dev}` were intended to fix the build derivation of each
new major release (if something broke) *before* stable reached that
new major release.
Allowing for fast bumps in nixpkgs, especially if the stable bump
contains very important critical security fixes.

Something that can easily be replicated by using an early-stable release
or by manually entering a dev/beta version string in stable's
`upstream-info.nix`.

This resolves exposing end-users to outdated and vulnerable
`google-chrome-{beta,dev}` and `chromium{Beta,Dev}` versions.
parent aacbfcde

nixos/doc/manual/release-notes/rl-2311.section.md

+4 −0
Original line number Diff line number Diff line
@@ -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

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

+4 −4
Original line number Diff line number Diff line
@@ -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.

pkgs/applications/networking/browsers/chromium/upstream-info.nix

+0 −26
Original line number Diff line number Diff line 
{

  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=";

pkgs/top-level/aliases.nix

+4 −0
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+0 −8
Original line number Diff line number Diff line
@@ -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 { };