diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-18 23:21:29 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-18 23:21:29 +0100 |
| commit | 4c5a71f777769b1f2516096532424cd42531aa1f (patch) | |
| tree | a5eb1c36a9363911ce264c7ed573b2f3cc6a7798 /pkgs/desktops/gnome-2 | |
| parent | e8394e3f8c7d464bc27a344a982648c20a08a6d7 (diff) | |
| parent | 43498628e8a3eb7d6acbabe2b1918e21bd1a30f1 (diff) | |
| download | nixpkgs-4c5a71f777769b1f2516096532424cd42531aa1f.tar nixpkgs-4c5a71f777769b1f2516096532424cd42531aa1f.tar.gz nixpkgs-4c5a71f777769b1f2516096532424cd42531aa1f.tar.bz2 nixpkgs-4c5a71f777769b1f2516096532424cd42531aa1f.tar.lz nixpkgs-4c5a71f777769b1f2516096532424cd42531aa1f.tar.xz nixpkgs-4c5a71f777769b1f2516096532424cd42531aa1f.tar.zst nixpkgs-4c5a71f777769b1f2516096532424cd42531aa1f.zip | |
Merge master into x-updates
Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix
Diffstat (limited to 'pkgs/desktops/gnome-2')
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index da7673de419..a19b20e86b5 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}: stdenv.mkDerivation { - name = "libgnomeprintui-2.18.4"; + name = "libgnomeprintui-2.18.6"; src = fetchurl { - url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2; - sha256 = "19d2aa95c9cb85f1ddd13464500217a76e2abce59281ec5d210e139c14dd7490"; + url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2; + sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme]; |