Skip to content

Commit

Permalink
Remove scheduling priorities
Browse files Browse the repository at this point in the history
This was only used for stdenv and is pretty obsolete now.
  • Loading branch information
edolstra committed Jan 6, 2015
1 parent c8d5a73 commit ab10131
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 17 deletions.
20 changes: 4 additions & 16 deletions pkgs/top-level/release-lib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,8 @@ rec {
crossMaintainers = with pkgs.lib.maintainers; [ viric ];


/* Set the Hydra scheduling priority for a job. The default
priority (10) should be used for most jobs. A different priority
should only be used for a few particularly interesting jobs (in
terms of giving feedback to developers), such as stdenv. */
prio = level: job: toJob job // { schedulingPriority = level; };


toJob = x: if builtins.isAttrs x then x else
{ type = "job"; systems = x; schedulingPriority = 10; };
{ type = "job"; systems = x; };


/* Build a package on the given set of platforms. The function `f'
Expand Down Expand Up @@ -73,9 +66,7 @@ rec {
(path: value:
let
job = toJob value;
getPkg = pkgs:
pkgs.lib.addMetaAttrs { schedulingPriority = toString job.schedulingPriority; }
(pkgs.lib.getAttrFromPath path pkgs);
getPkg = pkgs: pkgs.lib.getAttrFromPath path pkgs;
in testOn job.systems getPkg);


Expand All @@ -87,11 +78,8 @@ rec {
(path: value:
let
job = toJob value;
getPkg = pkgs: (pkgs.lib.addMetaAttrs {
schedulingPriority = toString job.schedulingPriority;
maintainers = crossMaintainers;
}
(pkgs.lib.getAttrFromPath path pkgs));
getPkg = pkgs: pkgs.lib.addMetaAttrs { maintainers = crossMaintainers; }
(pkgs.lib.getAttrFromPath path pkgs);
in testOnCross crossSystem job.systems getPkg);


Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/release.nix
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ let
spidermonkey = linux;
squid = linux;
ssmtp = linux;
stdenv = prio 175 all;
stdenv = all;
stlport = linux;
su = linux;
sudo = linux;
Expand Down

0 comments on commit ab10131

Please sign in to comment.