public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into stdenv-updates

Browse Source 
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
2014-01-20 19:39:28 +01:00
parent 177667eea9 8088837dc8
commit ac6761c908
121 changed files with 1468 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/release-python.nix
-1
View File
@@ -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; };