diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 06:29:09 +0000 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 06:29:09 +0000 |
commit | bde20f3e881049c9d019eb34c07d6194b20b0042 (patch) | |
tree | f24782e55ca68a214d0fe7585097d97a6aa687dd /pkgs/top-level/release-python.nix | |
parent | 6a29a56c1277d80aa65e063f34a179c847e6d8b4 (diff) | |
parent | 50d66b945ee5aceae2bbf2eb791487e18ac9d374 (diff) |
Merge branch 'master' into x-updates
Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.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 ce712fc040236..c57f1271ff134 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1804,7 +1804,6 @@ in gigolo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gtk_xfce_engine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gvfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgdu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libxfce4ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libxfce4util = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libxfcegui4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; |