diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-05-04 17:37:34 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-05-04 18:16:27 +0200 |
commit | f2d24b98408b48c2179b131fa4c3700dc41f5b52 (patch) | |
tree | 7e29cffe41f2a7d06647f6043d143acc6fd92caa | |
parent | 942db2e9acab06d3199463aa36be1a9c7e615d93 (diff) | |
download | nixlib-f2d24b98408b48c2179b131fa4c3700dc41f5b52.tar nixlib-f2d24b98408b48c2179b131fa4c3700dc41f5b52.tar.gz nixlib-f2d24b98408b48c2179b131fa4c3700dc41f5b52.tar.bz2 nixlib-f2d24b98408b48c2179b131fa4c3700dc41f5b52.tar.lz nixlib-f2d24b98408b48c2179b131fa4c3700dc41f5b52.tar.xz nixlib-f2d24b98408b48c2179b131fa4c3700dc41f5b52.tar.zst nixlib-f2d24b98408b48c2179b131fa4c3700dc41f5b52.zip |
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.
-rw-r--r-- | nixos/release.nix | 2 | ||||
-rw-r--r-- | nixos/tests/chromium.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/browser.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 8409191200c8..f632f36d3fed 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -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 {}; diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 9a6414f81c39..1053b777a61b 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -2,8 +2,6 @@ , pkgs ? import ../.. { inherit system; } , channelMap ? { stable = pkgs.chromium; - beta = pkgs.chromiumBeta; - dev = pkgs.chromiumDev; } }: diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 982c6d659ee6..a6e95ca51878 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -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 []; }; }) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 79e5e2dfec34..5f9c423ce447 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -29,7 +29,7 @@ let hiDPISupport; }; - browser = callPackage ./browser.nix { }; + browser = callPackage ./browser.nix { inherit channel; }; plugins = callPackage ./plugins.nix { inherit enablePepperFlash enableWideVine; |