dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chromium: Disable Hydra builds of -dev and -beta

Browse Source 
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:
Eelco Dolstra 2016-05-04 17:37:34 +02:00
parent 942db2e9ac
commit f2d24b9840
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/release.nix
View File

@ -210,7 +210,7 @@ in rec {
tests.blivet = callTest tests/blivet.nix {}; tests.blivet = callTest tests/blivet.nix {};
tests.boot = callSubTests tests/boot.nix {}; tests.boot = callSubTests tests/boot.nix {};
tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); 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.cjdns = callTest tests/cjdns.nix {};
tests.containers-ipv4 = callTest tests/containers-ipv4.nix {}; tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
tests.containers-ipv6 = callTest tests/containers-ipv6.nix {}; tests.containers-ipv6 = callTest tests/containers-ipv6.nix {};

2
nixos/tests/chromium.nix
View File

@ -2,8 +2,6 @@
, pkgs ? import ../.. { inherit system; } , pkgs ? import ../.. { inherit system; }
, channelMap ? { , channelMap ? {
stable = pkgs.chromium; stable = pkgs.chromium;
beta = pkgs.chromiumBeta;
dev = pkgs.chromiumDev;
} }
}: }:

3
pkgs/applications/networking/browsers/chromium/browser.nix
View File

@ -1,4 +1,4 @@
{ stdenv, mkChromiumDerivation }: { stdenv, mkChromiumDerivation, channel }:
with stdenv.lib; with stdenv.lib;
@ -35,5 +35,6 @@ mkChromiumDerivation (base: rec {
maintainers = with maintainers; [ chaoflow ]; maintainers = with maintainers; [ chaoflow ];
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.linux; platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else [];
}; };
}) })

2
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -29,7 +29,7 @@ let
hiDPISupport; hiDPISupport;
}; };
browser = callPackage ./browser.nix { }; browser = callPackage ./browser.nix { inherit channel; };
plugins = callPackage ./plugins.nix { plugins = callPackage ./plugins.nix {
inherit enablePepperFlash enableWideVine; inherit enablePepperFlash enableWideVine;