chromium: Disable Hydra builds of -dev and -beta
It's not the job of Nixpkgs to distribute beta versions of upstream packages. More importantly, building these delays channel updates by several hours, which is bad for our security fix turnaround time.
This commit is contained in:
@@ -210,7 +210,7 @@ in rec {
|
||||
tests.blivet = callTest tests/blivet.nix {};
|
||||
tests.boot = callSubTests tests/boot.nix {};
|
||||
tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
|
||||
tests.chromium = callSubTests tests/chromium.nix {};
|
||||
tests.chromium = callSubTests tests/chromium.nix { system = "x86_64-linux"; };
|
||||
tests.cjdns = callTest tests/cjdns.nix {};
|
||||
tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
|
||||
tests.containers-ipv6 = callTest tests/containers-ipv6.nix {};
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
, pkgs ? import ../.. { inherit system; }
|
||||
, channelMap ? {
|
||||
stable = pkgs.chromium;
|
||||
beta = pkgs.chromiumBeta;
|
||||
dev = pkgs.chromiumDev;
|
||||
}
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, mkChromiumDerivation }:
|
||||
{ stdenv, mkChromiumDerivation, channel }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
@@ -35,5 +35,6 @@ mkChromiumDerivation (base: rec {
|
||||
maintainers = with maintainers; [ chaoflow ];
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else [];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -29,7 +29,7 @@ let
|
||||
hiDPISupport;
|
||||
};
|
||||
|
||||
browser = callPackage ./browser.nix { };
|
||||
browser = callPackage ./browser.nix { inherit channel; };
|
||||
|
||||
plugins = callPackage ./plugins.nix {
|
||||
inherit enablePepperFlash enableWideVine;
|
||||
|
||||
Reference in New Issue
Block a user