diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 5b77afaaf3eb..d4259c2895ad 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -1,5 +1,5 @@ { lib, mkChromiumDerivation -, channel, chromiumVersionAtLeast +, chromiumVersionAtLeast , enableWideVine, ungoogled }: @@ -90,7 +90,7 @@ mkChromiumDerivation (base: rec { license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3; platforms = lib.platforms.linux; mainProgram = "chromium"; - hydraPlatforms = lib.optionals (channel == "stable" || channel == "ungoogled-chromium") ["aarch64-linux" "x86_64-linux"]; + hydraPlatforms = ["aarch64-linux" "x86_64-linux"]; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 86b09ef7d10f..469c6fda5ad2 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -3,7 +3,7 @@ , buildPackages , pkgsBuildBuild # Channel data: -, channel, upstream-info +, upstream-info # Helper functions: , chromiumVersionAtLeast, versionRange diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 767e244a6cd1..0fa5c35cdf8b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -10,8 +10,7 @@ # package customization # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) -, channel ? "stable" -, upstream-info ? (import ./upstream-info.nix).${channel} +, upstream-info ? (import ./upstream-info.nix).${if !ungoogled then "stable" else "ungoogled-chromium"} , proprietaryCodecs ? true , enableWideVine ? false , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -46,7 +45,7 @@ let inherit stdenv upstream-info; mkChromiumDerivation = callPackage ./common.nix ({ - inherit channel chromiumVersionAtLeast versionRange; + inherit chromiumVersionAtLeast versionRange; inherit proprietaryCodecs cupsSupport pulseSupport ungoogled; gnChromium = buildPackages.gn.overrideAttrs (oldAttrs: { @@ -69,7 +68,7 @@ let }); browser = callPackage ./browser.nix { - inherit channel chromiumVersionAtLeast enableWideVine ungoogled; + inherit chromiumVersionAtLeast enableWideVine ungoogled; }; # ungoogled-chromium is, contrary to its name, not a build of @@ -80,8 +79,6 @@ let ungoogled-chromium = pkgsBuildBuild.callPackage ./ungoogled.nix {}; }; - suffix = lib.optionalString (channel != "stable" && channel != "ungoogled-chromium") ("-" + channel); - sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; # We want users to be able to enableWideVine without rebuilding all of @@ -99,7 +96,7 @@ let in stdenv.mkDerivation { pname = lib.optionalString ungoogled "ungoogled-" - + "chromium${suffix}"; + + "chromium"; inherit (chromium.browser) version; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15d61c44a95e..fb165d546883 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16246,7 +16246,6 @@ with pkgs; ungoogled-chromium = callPackage ../applications/networking/browsers/chromium ((config.chromium or {}) // { ungoogled = true; - channel = "ungoogled-chromium"; }); unigine-tropics = pkgsi686Linux.callPackage ../applications/graphics/unigine-tropics { };