From 762861670c91c0688c1ebdc65cfb4d3d04053f37 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 26 Mar 2015 12:01:42 -0700
Subject: [PATCH] gettext: Make 0.19 the default

---
 pkgs/development/libraries/gettext/{0.19.nix => 0.18.nix} | 5 +++--
 pkgs/development/libraries/gettext/default.nix            | 4 ++--
 pkgs/top-level/all-packages.nix                           | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename pkgs/development/libraries/gettext/{0.19.nix => 0.18.nix} (59%)

diff --git a/pkgs/development/libraries/gettext/0.19.nix b/pkgs/development/libraries/gettext/0.18.nix
similarity index 59%
rename from pkgs/development/libraries/gettext/0.19.nix
rename to pkgs/development/libraries/gettext/0.18.nix
index 27a8bd252c8a..bb1a0519e7bb 100644
--- a/pkgs/development/libraries/gettext/0.19.nix
+++ b/pkgs/development/libraries/gettext/0.18.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.lib.overrideDerivation gettext (attrs: rec {
-  name = "gettext-0.19.4";
+  name = "gettext-0.18.2";
 
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "0gvz86m4cs8bdf3mwmwsyx6lrq4ydfxgadrgd9jlx32z3bnz3jca";
+    sha256 = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c";
   };
+
 })
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 81918b7c5e34..8f6277ca2e94 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libiconv, xz }:
 
 stdenv.mkDerivation (rec {
-  name = "gettext-0.18.2";
+  name = "gettext-0.19.4";
 
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c";
+    sha256 = "0gvz86m4cs8bdf3mwmwsyx6lrq4ydfxgadrgd9jlx32z3bnz3jca";
   };
 
   LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fee3f0ff993f..2dee67a59fff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5702,11 +5702,11 @@ let
 
   getdata = callPackage ../development/libraries/getdata { };
 
-  gettext = gettext_0_18;
+  gettext = gettext_0_19;
 
   gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { };
-  gettext_0_18 = callPackage ../development/libraries/gettext { };
-  gettext_0_19 = callPackage ../development/libraries/gettext/0.19.nix { };
+  gettext_0_18 = callPackage ../development/libraries/gettext/0.18.nix { };
+  gettext_0_19 = callPackage ../development/libraries/gettext { };
 
   gd = callPackage ../development/libraries/gd { };