diff --git a/nixos/release.nix b/nixos/release.nix index 8409191200c..f632f36d3fe 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 9a6414f81c3..1053b777a61 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 982c6d659ee..a6e95ca5187 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 79e5e2dfec3..5f9c423ce44 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;