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

Merge master into stdenv-updates

Browse Source 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
2014-01-18 14:46:20 +01:00
parent 2848336491 9c1d3bfa9f
commit 0a58b512cb
231 changed files with 2911 additions and 1982 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/release-python.nix
-8
View File
@@ -59,8 +59,6 @@ let
antlr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
antlr3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
apacheAntGcj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
apacheAntOpenJDK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
apacheAntOracleJDK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
apparmor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
aqbanking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
arb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -162,8 +160,6 @@ let
clisp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
clisp_2_44_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
clojure = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
clojure_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
clooj_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
clucene_core_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
clutter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
clutter_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -675,7 +671,6 @@ let
icecat3Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
icecat3Xul = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
icecatXulrunner3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
icedtea = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
icewm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
idutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
ikiwiki = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -724,7 +719,6 @@ let
julia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
jwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
k3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
kaffe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
kde3 = {
arts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
kdelibs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1759,7 +1753,6 @@ let
x11vnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
x2vnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
x2x = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
xalanJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
xaos = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
xapianBindings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
xapianBindings10 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -1778,7 +1771,6 @@ let
xdaliclock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
xdotool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
xen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
xercesJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
xf86_input_mtrack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
xf86_input_multitouch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
xf86_input_wacom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };