diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-09 17:52:37 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-09 17:55:37 +0100 |
| commit | 86639d9bb934c22dc6661c7e40930df1b6eb4dc4 (patch) | |
| tree | 767b1df74a2afeb2d7f3d48116b4040cd0419266 /pkgs/top-level/release-python.nix | |
| parent | c3203cfc3b1423942743906271794cb9ebc87441 (diff) | |
| parent | f0c683faec406c2d8da30bf2ef6ef33413c00f5b (diff) | |
| download | nixpkgs-86639d9bb934c22dc6661c7e40930df1b6eb4dc4.tar nixpkgs-86639d9bb934c22dc6661c7e40930df1b6eb4dc4.tar.gz nixpkgs-86639d9bb934c22dc6661c7e40930df1b6eb4dc4.tar.bz2 nixpkgs-86639d9bb934c22dc6661c7e40930df1b6eb4dc4.tar.lz nixpkgs-86639d9bb934c22dc6661c7e40930df1b6eb4dc4.tar.xz nixpkgs-86639d9bb934c22dc6661c7e40930df1b6eb4dc4.tar.zst nixpkgs-86639d9bb934c22dc6661c7e40930df1b6eb4dc4.zip | |
Merge branch 'master' into x-updates
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
Diffstat (limited to 'pkgs/top-level/release-python.nix')
| -rw-r--r-- | pkgs/top-level/release-python.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index ce6d40c4246..ce712fc0402 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -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; }; |