From 37d2e2e917b6880814a388e126867994cabf044d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Jan 2012 10:20:50 +0000
Subject: [PATCH 1/3] gmp: renamed nix files to conform with coding guidelines

svn path=/nixpkgs/trunk/; revision=31903
---
 pkgs/development/libraries/gmp/{4.nix => 4.3.2.nix}       | 0
 pkgs/development/libraries/gmp/{default.nix => 5.0.1.nix} | 0
 pkgs/top-level/all-packages.nix                           | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/libraries/gmp/{4.nix => 4.3.2.nix} (100%)
 rename pkgs/development/libraries/gmp/{default.nix => 5.0.1.nix} (100%)

diff --git a/pkgs/development/libraries/gmp/4.nix b/pkgs/development/libraries/gmp/4.3.2.nix
similarity index 100%
rename from pkgs/development/libraries/gmp/4.nix
rename to pkgs/development/libraries/gmp/4.3.2.nix
diff --git a/pkgs/development/libraries/gmp/default.nix b/pkgs/development/libraries/gmp/5.0.1.nix
similarity index 100%
rename from pkgs/development/libraries/gmp/default.nix
rename to pkgs/development/libraries/gmp/5.0.1.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bd8f938244..ed2587061ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3629,7 +3629,7 @@ let
     else
       # We temporarily leave gmp 4 here, waiting for a new ppl/cloog-ppl that
       # would build well with gmp 5.
-      makeOverridable (import ../development/libraries/gmp/4.nix) {
+      makeOverridable (import ../development/libraries/gmp/4.3.2.nix) {
         inherit stdenv fetchurl m4;
         cxx = false;
       };

From 7d9442e2c37dd0a10d743b887bd82fc5f09e1c47 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Jan 2012 10:20:57 +0000
Subject: [PATCH 2/3] Removed obsolete comment.

svn path=/nixpkgs/trunk/; revision=31904
---
 pkgs/top-level/all-packages.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed2587061ba..fe0ac245c3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2220,10 +2220,8 @@ let
     haskellPackagesFun ../development/compilers/ghc/7.0.3.nix
       ghc6101Binary (x : x.ghc703Prefs) false false lowPrio;
 
-  # Current default version: 7.0.4
-  # Note that the platform isn't officially released for ghc-7.0.4, but
-  # it works without problems.
-
+  # Current default version: 7.0.4.
+  #
   # The following items are a bit convoluted, but they serve the
   # following purpose:
   #   - for the default version of GHC, both profiling and

From 4b36b6132ff2de7a758b51eeae2c529a2edff0f9 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 28 Jan 2012 12:44:42 +0000
Subject: [PATCH 3/3] Introduce libiconvOrNull and libiconvOrGlibc

One can use these attrs instead of custom 'if ... then libiconv else null'.
This way we can maintain the correct 'if ... then' check in one place.

NB: I don't know what is the correct condition, so I use stdenv.isLinux. Feel
free to fix this.

svn path=/nixpkgs/trunk/; revision=31906
---
 pkgs/top-level/all-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe0ac245c3d..8c1733925c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4054,6 +4054,10 @@ let
 
   libiconv = callPackage ../development/libraries/libiconv { };
 
+  libiconvOrNull = if gcc ? libc then null else libiconv;
+
+  libiconvOrLibc = if gcc ? libc then gcc.libc else libiconv;
+
   libid3tag = callPackage ../development/libraries/libid3tag { };
 
   libidn = callPackage ../development/libraries/libidn { };