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

Merge master into stdenv-updates

Browse Source 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
This commit is contained in:
Vladimír Čunát
2013-12-28 23:28:30 +01:00
parent cb639302df 9f735bdf57
commit e740b565cf
395 changed files with 5580 additions and 3281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/top-level/release-python.nix
View File

@@ -334,7 +334,6 @@ let
ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
ffmpeg_0_6_90 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
ffmpeg_1_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
fileschanged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
fio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
firefox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };