diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-05-29 23:24:20 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-05-29 23:25:02 +0200 |
| commit | b7703655749df57dd5cbc84b89cc3be4bc7358bc (patch) | |
| tree | a3a84870d2fff43f9cce6abfc6f0961f0a5a156d /pkgs/data/misc | |
| parent | 971337a119d708d78a152f4d918694e7b5a2b7e8 (diff) | |
| download | nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.gz nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.bz2 nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.lz nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.xz nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.zst nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.zip | |
ReRevert Merge x-updates into master
This reverts commit ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde. Conflicts (taken x-updates): pkgs/development/libraries/libgcrypt/default.nix pkgs/development/libraries/libgpg-error/default.nix pkgs/development/libraries/poppler/default.nix
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/gsettings-desktop-schemas/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/data/misc/poppler-data/default.nix | 5 |
2 files changed, 3 insertions, 19 deletions
diff --git a/pkgs/data/misc/gsettings-desktop-schemas/default.nix b/pkgs/data/misc/gsettings-desktop-schemas/default.nix deleted file mode 100644 index c934863d75d7..000000000000 --- a/pkgs/data/misc/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, intltool }: - -stdenv.mkDerivation { - name = "gsettings-desktop-schemas-3.2.0"; - - src = fetchurl { - url = mirror://gnome/sources/gsettings-desktop-schemas/3.2/gsettings-desktop-schemas-3.2.0.tar.xz; - sha256 = "0772axkd1nlf3j1lcg0zi5x5jh4zmr25k98dhn7pzppahljaj3hi"; - }; - - buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = { - inherit (glib.meta) maintainers platforms; - }; -} diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 14a41cf84fc9..9e2679c04380 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.5"; + name = "poppler-data-0.4.6"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "1zbh1zd083wfwrcw7vxc2bn32h42y6iyh24syxcb3r5ggd2vr41i"; + sha256 = "1yhaz74b50hjkz3ii077kmq3qg3p3kdyxm33cv6r1njvz8fr01pk"; }; buildInputs = [ cmake ]; @@ -23,6 +23,7 @@ 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 ]; }; } |