diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-20 19:39:28 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-20 19:39:28 +0100 |
| commit | ac6761c9081134baaa7dae18f06cbfaca38270d5 (patch) | |
| tree | a1ff0e93e8907624d65aff367496513d3dc47374 /pkgs/top-level/release-python.nix | |
| parent | 177667eea987898097e854a54962ff90bbf4fa35 (diff) | |
| parent | 8088837dc8f35ef7853787f88bb1db7248900cc4 (diff) | |
| download | nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.gz nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.bz2 nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.lz nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.xz nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.zst nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.zip | |
Merge master into stdenv-updates
Conflicts: pkgs/applications/version-management/gource/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/top-level/release-python.nix')
| -rw-r--r-- | pkgs/top-level/release-python.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 82af1f439ff1..8eb08d259834 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -153,7 +153,6 @@ let cinepaint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ciopfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clangUnwrapped = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clanlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; classpath = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clearsilver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; |