From ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 9 May 2013 13:58:08 +0200 Subject: Revert Merge x-updates into master due to mesa bloat See #490 discussion. This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto) --- pkgs/data/misc/poppler-data/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/data/misc/poppler-data') diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 9e2679c04380..14a41cf84fc9 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, cmake }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.6"; + name = "poppler-data-0.4.5"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "1yhaz74b50hjkz3ii077kmq3qg3p3kdyxm33cv6r1njvz8fr01pk"; + sha256 = "1zbh1zd083wfwrcw7vxc2bn32h42y6iyh24syxcb3r5ggd2vr41i"; }; buildInputs = [ cmake ]; @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { homepage = http://poppler.freedesktop.org/; description = "Encoding files for Poppler, a PDF rendering library"; platforms = stdenv.lib.platforms.all; - license = "free"; # more free licenses combined maintainers = [ stdenv.lib.maintainers.urkud ]; }; } -- cgit 1.4.1