diff --git a/pkgs/development/libraries/gettext/0.17.nix b/pkgs/development/libraries/gettext/0.17.nix deleted file mode 100644 index 3ea70bea80be..000000000000 --- a/pkgs/development/libraries/gettext/0.17.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl, libiconv }: - -stdenv.mkDerivation rec { - name = "gettext-0.17"; - - src = fetchurl { - url = "mirror://gnu/gettext/${name}.tar.gz"; - sha256 = "1fipjpaxxwifdw6cbr7mkxp1yvy643i38nhlh7124bqnisxki5i0"; - }; - - configureFlags = "--disable-csharp"; - - # On cross building, gettext supposes that the wchar.h from libc - # does not fulfill gettext needs, so it tries to work with its - # own wchar.h file, which does not cope well with the system's - # wchar.h and stddef.h (gcc-4.3 - glibc-2.9) - preConfigure = '' - if test -n "$crossConfig"; then - echo gl_cv_func_wcwidth_works=yes > cachefile - configureFlags="$configureFlags --cache-file=`pwd`/cachefile" - fi - ''; - - buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - - meta = { - description = "GNU gettext, a well integrated set of translation tools and documentation"; - - longDescription = '' - Usually, programs are written and documented in English, and use - English at execution time for interacting with users. Using a common - language is quite handy for communication between developers, - maintainers and users from all countries. On the other hand, most - people are less comfortable with English than with their own native - language, and would rather be using their mother tongue for day to - day's work, as far as possible. Many would simply love seeing their - computer screen showing a lot less of English, and far more of their - own language. - - GNU `gettext' is an important step for the GNU Translation Project, as - it is an asset on which we may build many other steps. This package - offers to programmers, translators, and even users, a well integrated - set of tools and documentation. Specifically, the GNU `gettext' - utilities are a set of tools that provides a framework to help other - GNU packages produce multi-lingual messages. - ''; - - homepage = http://www.gnu.org/software/gettext/; - - maintainers = [ ]; - branch = "0.17"; - }; -} \ No newline at end of file diff --git a/pkgs/development/libraries/gettext/0.18.nix b/pkgs/development/libraries/gettext/0.18.nix deleted file mode 100644 index bb1a0519e7bb..000000000000 --- a/pkgs/development/libraries/gettext/0.18.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, fetchurl, gettext }: - -stdenv.lib.overrideDerivation gettext (attrs: rec { - name = "gettext-0.18.2"; - - src = fetchurl { - url = "mirror://gnu/gettext/${name}.tar.gz"; - sha256 = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c"; - }; - -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8f37de62402..97dfe27bb7da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6253,15 +6253,9 @@ let getdata = callPackage ../development/libraries/getdata { }; - gettext = gettext_0_19; + gettext = callPackage ../development/libraries/gettext { }; - gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { }; - gettext_0_18 = callPackage ../development/libraries/gettext/0.18.nix { }; - gettext_0_19 = callPackage ../development/libraries/gettext { }; - - gettextWithExpat = gettext: callPackage ../development/libraries/gettext/expat.nix { - inherit gettext; - }; + gettextWithExpat = callPackage ../development/libraries/gettext/expat.nix { }; gd = callPackage ../development/libraries/gd { }; @@ -6482,7 +6476,7 @@ let }; gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { - gettext = gettextWithExpat gettext_0_19; + gettext = gettextWithExpat; }; gtk = pkgs.gtk2;