From 24431bd0f67bb3497161f4048c6ab7e50ebe764e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Jan 2012 17:43:48 +0000 Subject: [PATCH] * Update various Xfce packages. svn path=/nixpkgs/trunk/; revision=31607 --- pkgs/desktops/xfce-4.8/applications/ristretto.nix | 12 +++++------- pkgs/desktops/xfce-4.8/core/garcon.nix | 8 ++++---- pkgs/desktops/xfce-4.8/core/libxfce4ui.nix | 4 ++-- pkgs/desktops/xfce-4.8/core/libxfce4util.nix | 4 ++-- pkgs/desktops/xfce-4.8/core/thunar.nix | 7 ++++--- pkgs/desktops/xfce-4.8/core/xfce-utils.nix | 4 ++-- pkgs/desktops/xfce-4.8/core/xfce4-panel.nix | 4 ++-- pkgs/desktops/xfce-4.8/core/xfce4-session.nix | 4 ++-- pkgs/desktops/xfce-4.8/core/xfce4-settings.nix | 4 ++-- pkgs/desktops/xfce-4.8/core/xfconf.nix | 4 ++-- pkgs/desktops/xfce-4.8/core/xfdesktop.nix | 4 ++-- pkgs/desktops/xfce-4.8/core/xfwm4.nix | 4 ++-- pkgs/desktops/xfce-4.8/default.nix | 1 + 13 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/desktops/xfce-4.8/applications/ristretto.nix b/pkgs/desktops/xfce-4.8/applications/ristretto.nix index cbb22e12ea7..ce90891bb0b 100644 --- a/pkgs/desktops/xfce-4.8/applications/ristretto.nix +++ b/pkgs/desktops/xfce-4.8/applications/ristretto.nix @@ -2,20 +2,18 @@ , exo, dbus_glib, libxfce4util, libxfce4ui, xfconf }: stdenv.mkDerivation rec { - name = "ristretto-0.0.93"; + name = "ristretto-0.2.3"; src = fetchurl { - url = "http://archive.xfce.org/src/apps/ristretto/0.0/${name}.tar.bz2"; - sha1 = "c71acaad169633faffe26609f9cc671b04ff52d3"; + url = "http://archive.xfce.org/src/apps/ristretto/0.2/${name}.tar.bz2"; + sha1 = "5a34b865cb9013b67467b0e8d51970f0a1e977d1"; }; buildInputs = - [ pkgconfig intltool libexif gtk thunar exo dbus_glib - libxfce4util libxfce4ui xfconf + [ pkgconfig intltool libexif gtk dbus_glib libxfce4util + libxfce4ui xfconf ]; - NIX_LDFLAGS = "-lX11"; - meta = { homepage = http://goodies.xfce.org/projects/applications/ristretto; description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; diff --git a/pkgs/desktops/xfce-4.8/core/garcon.nix b/pkgs/desktops/xfce-4.8/core/garcon.nix index 40b40541bf1..7f5f18173b2 100644 --- a/pkgs/desktops/xfce-4.8/core/garcon.nix +++ b/pkgs/desktops/xfce-4.8/core/garcon.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util }: stdenv.mkDerivation rec { - name = "garcon-0.1.8"; + name = "garcon-0.1.9"; src = fetchurl { url = "http://archive.xfce.org/src/xfce/garcon/0.1/${name}.tar.bz2"; - sha1 = "e5eac6a13208c81ccad0941656c01e7a69530f03"; + sha1 = "2eeab19bc10747a40b44afd4598a2f555eb69952"; }; - buildInputs = [ pkgconfig intltool glib ]; + buildInputs = [ pkgconfig intltool glib libxfce4util ]; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix b/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix index c3551d565e1..76c285ae599 100644 --- a/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix @@ -2,11 +2,11 @@ , libstartup_notification }: stdenv.mkDerivation rec { - name = "libxfce4ui-4.8.0"; + name = "libxfce4ui-4.8.1"; src = fetchurl { url = "http://archive.xfce.org/src/xfce/libxfce4ui/4.8/${name}.tar.bz2"; - sha1 = "107f9d8e3e583f3cf5330074e89ea72eb2a82888"; + sha1 = "408645581e589135aa03d2e9b84f4eede68596b2"; }; buildInputs = diff --git a/pkgs/desktops/xfce-4.8/core/libxfce4util.nix b/pkgs/desktops/xfce-4.8/core/libxfce4util.nix index 1a2b64bc8fa..7a567d62935 100644 --- a/pkgs/desktops/xfce-4.8/core/libxfce4util.nix +++ b/pkgs/desktops/xfce-4.8/core/libxfce4util.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, intltool }: stdenv.mkDerivation rec { - name = "libxfce4util-4.8.1"; + name = "libxfce4util-4.8.2"; src = fetchurl { url = "http://archive.xfce.org/src/xfce/libxfce4util/4.8/${name}.tar.bz2"; - sha1 = "4d26aea58413603e2c163ff0374a6e32fc47bc4c"; + sha1 = "e7498c2e5fca2c89dfef89e0788f10eebbd020c3"; }; buildInputs = [ pkgconfig glib intltool ]; diff --git a/pkgs/desktops/xfce-4.8/core/thunar.nix b/pkgs/desktops/xfce-4.8/core/thunar.nix index 0e8f72e22d6..07fd734a1f2 100644 --- a/pkgs/desktops/xfce-4.8/core/thunar.nix +++ b/pkgs/desktops/xfce-4.8/core/thunar.nix @@ -2,11 +2,12 @@ , dbus_glib, libstartup_notification, xfconf, xfce4panel, udev, libnotify }: stdenv.mkDerivation rec { - name = "thunar-1.2.2"; + version = "1.2.3"; + name = "thunar-${version}"; src = fetchurl { - url = "http://archive.xfce.org/src/xfce/thunar/1.2/Thunar-1.2.2.tar.bz2"; - sha1 = "314e3d53ec7be1ea578da4d842ecc8dc5958b1bd"; + url = "http://archive.xfce.org/src/xfce/thunar/1.2/Thunar-${version}.tar.bz2"; + sha1 = "a05d0e14515d70c5ad94cca881822a707d366863"; }; buildInputs = diff --git a/pkgs/desktops/xfce-4.8/core/xfce-utils.nix b/pkgs/desktops/xfce-4.8/core/xfce-utils.nix index eb998c2759f..fde8a2c3953 100644 --- a/pkgs/desktops/xfce-4.8/core/xfce-utils.nix +++ b/pkgs/desktops/xfce-4.8/core/xfce-utils.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui }: stdenv.mkDerivation rec { - name = "xfce-utils-4.8.2"; + name = "xfce-utils-4.8.3"; src = fetchurl { url = "http://archive.xfce.org/src/xfce/xfce-utils/4.8/${name}.tar.bz2"; - sha1 = "c9358f47f57b961fc51008cf6752d2761b4c4f25"; + sha1 = "159d445b689ebbf73462a4b4baf5cce4e04afaab"; }; configureFlags = "--with-xsession-prefix=$(out)/share/xsessions --with-vendor-info=NixOS.org"; diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix b/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix index fc297df9cbf..bb263712962 100644 --- a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix @@ -2,11 +2,11 @@ , libxfce4ui, xfconf, libwnck, exo }: stdenv.mkDerivation rec { - name = "xfce4-panel-4.8.5"; + name = "xfce4-panel-4.8.6"; src = fetchurl { url = "http://archive.xfce.org/src/xfce/xfce4-panel/4.8/${name}.tar.bz2"; - sha1 = "67b9d5bc422663f60f5a05e7cfd7ca67b4542813"; + sha1 = "332fc968332e6271e1bb65d6de8de2524b0440ec"; }; buildInputs = diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-session.nix b/pkgs/desktops/xfce-4.8/core/xfce4-session.nix index 7aeaedb1e2a..0e0f1a86939 100644 --- a/pkgs/desktops/xfce-4.8/core/xfce4-session.nix +++ b/pkgs/desktops/xfce-4.8/core/xfce4-session.nix @@ -2,11 +2,11 @@ , libwnck, dbus_glib, xfconf, xorg, xfce4panel }: stdenv.mkDerivation rec { - name = "xfce4-session-4.8.1"; + name = "xfce4-session-4.8.2"; src = fetchurl { url = "http://archive.xfce.org/src/xfce/xfce4-session/4.8/${name}.tar.bz2"; - sha1 = "a33534e53fa36a38a1f9bd164469a9fb62c765a7"; + sha1 = "636c2983552861a959225e554898675152a4d812"; }; buildInputs = diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix b/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix index 03d2ac67a39..dc6e8e555b2 100644 --- a/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix @@ -2,11 +2,11 @@ , xfconf, xorg, libnotify, libxklavier }: stdenv.mkDerivation rec { - name = "xfce4-settings-4.8.2"; + name = "xfce4-settings-4.8.3"; src = fetchurl { url = "http://archive.xfce.org/src/xfce/xfce4-settings/4.8/${name}.tar.bz2"; - sha1 = "402afe308944a315c385d2b1ed567f997d016b61"; + sha1 = "98431633ba3ec2a4a10182bc7266904d9256949b"; }; buildInputs = diff --git a/pkgs/desktops/xfce-4.8/core/xfconf.nix b/pkgs/desktops/xfce-4.8/core/xfconf.nix index bb351c68d28..e0c61d3a1f5 100644 --- a/pkgs/desktops/xfce-4.8/core/xfconf.nix +++ b/pkgs/desktops/xfce-4.8/core/xfconf.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }: stdenv.mkDerivation rec { - name = "xfconf-4.8.0"; + name = "xfconf-4.8.1"; src = fetchurl { url = "http://archive.xfce.org/src/xfce/xfconf/4.8/${name}.tar.bz2"; - sha1 = "3f560b11d618171805bfb9e6a8290185c7ee5dcd"; + sha1 = "aeab124f7c548e387b37a5476e594ef559515533"; }; buildInputs = [ pkgconfig intltool glib libxfce4util ]; diff --git a/pkgs/desktops/xfce-4.8/core/xfdesktop.nix b/pkgs/desktops/xfce-4.8/core/xfdesktop.nix index 5f64fff3b4d..45c82f1ec02 100644 --- a/pkgs/desktops/xfce-4.8/core/xfdesktop.nix +++ b/pkgs/desktops/xfce-4.8/core/xfdesktop.nix @@ -2,11 +2,11 @@ , libxfce4ui, libwnck, xfconf, garcon, libnotify, exo }: stdenv.mkDerivation rec { - name = "xfdesktop-4.8.2"; + name = "xfdesktop-4.8.3"; src = fetchurl { url = "http://archive.xfce.org/src/xfce/xfdesktop/4.8/${name}.tar.bz2"; - sha1 = "fe7d71bb502197b0353b952947826a5a50ab13bc"; + sha1 = "b3af72a69627f860f22b37d021efd81e4e37eb55"; }; buildInputs = diff --git a/pkgs/desktops/xfce-4.8/core/xfwm4.nix b/pkgs/desktops/xfce-4.8/core/xfwm4.nix index aefae75a3c3..c0f89784bfb 100644 --- a/pkgs/desktops/xfce-4.8/core/xfwm4.nix +++ b/pkgs/desktops/xfce-4.8/core/xfwm4.nix @@ -2,11 +2,11 @@ , libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }: stdenv.mkDerivation rec { - name = "xfwm4-4.8.1"; + name = "xfwm4-4.8.3"; src = fetchurl { url = "http://archive.xfce.org/src/xfce/xfwm4/4.8/${name}.tar.bz2"; - sha1 = "4075a689f572ae157ed80ab3ce5be85f09dac766"; + sha1 = "6d27deca383e0c2fba0cede0bbe0e9aee18e9257"; }; buildInputs = diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix index 056bc4368c6..4b82ff04307 100644 --- a/pkgs/desktops/xfce-4.8/default.nix +++ b/pkgs/desktops/xfce-4.8/default.nix @@ -5,6 +5,7 @@ rec { #### SUPPORT + # The useful bits from ‘gnome-disk-utility’. libgdu = callPackage ./support/libgdu.nix { }; # Gvfs is required by Thunar for the trash feature and for volume