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

Merge branch 'master' into x-updates

Browse Source 
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
2013-03-09 17:55:37 +01:00
parent c3203cfc3b f0c683faec
commit 86639d9bb9
607 changed files with 8977 additions and 2289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/release-python.nix
+1 -2
View File
@@ -260,7 +260,6 @@ in
electricsheep = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
elinks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
emacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
emacs22 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
emacs23 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
emacs24Packages = {
autoComplete = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@@ -333,7 +332,7 @@ in
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_0 = { 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; };