From a0bf07827bbf031d90ecb03f4e7345576208214a Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 17 Jan 2015 09:55:32 +0100
Subject: mpc: also rename the attribute to libmpc

Attrnames and package names should be as close as possible to avoid confusion.
I took care not to confuse the two mpc things during the mass-replace,
so hopefully I suceeded (tarball still builds).
---
 pkgs/applications/audio/cmus/default.nix           |  4 +--
 pkgs/applications/audio/moc/default.nix            |  4 +--
 pkgs/development/compilers/gcc/4.5/default.nix     |  6 ++--
 pkgs/development/compilers/gcc/4.6/default.nix     |  6 ++--
 pkgs/development/compilers/gcc/4.8/default.nix     |  6 ++--
 pkgs/development/compilers/gcc/4.9/default.nix     |  6 ++--
 pkgs/development/compilers/llvm/3.4/dragonegg.nix  |  4 +--
 pkgs/development/libraries/libmpc/default.nix      | 34 ++++++++++++++++++++++
 pkgs/development/libraries/mpc/default.nix         | 34 ----------------------
 .../misc/avr-gcc-with-avr-libc/default.nix         |  4 +--
 pkgs/stdenv/linux/default.nix                      |  2 +-
 pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix |  4 +--
 pkgs/stdenv/linux/make-bootstrap-tools.nix         |  2 +-
 pkgs/top-level/all-packages.nix                    |  4 +--
 14 files changed, 60 insertions(+), 60 deletions(-)
 create mode 100644 pkgs/development/libraries/libmpc/default.nix
 delete mode 100644 pkgs/development/libraries/mpc/default.nix

diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index 7cabc98ebaa9..fd252754d660 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, mpc, mp4v2, libcue, pulseaudio}:
+{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, pulseaudio}:
 
 stdenv.mkDerivation rec {
   name = "cmus-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = "./configure prefix=$out";
 
-  buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 libcue pulseaudio ];
+  buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue pulseaudio ];
 
   meta = {
     description = "Small, fast and powerful console music player for Linux and *BSD";
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index ec9b1dd47ae2..a87e74dc87c2 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg
-, libvorbis, mpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag
+, libvorbis, libmpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag
 , libtool
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis
-    mpc libsndfile jack2 db libmodplug timidity libid3tag libtool
+    libmpc libsndfile jack2 db libmodplug timidity libid3tag libtool
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index b438758e358d..931c5c413dee 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -8,7 +8,7 @@
 , enableShared ? true
 , texinfo ? null
 , perl ? null # optional, for texi2pod (then pod2man); required for Java
-, gmp, mpfr, mpc, gettext, which
+, gmp, mpfr, libmpc, gettext, which
 , libelf                      # optional, for link-time optimizations (LTO)
 , ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework
 , zlib ? null, boehmgc ? null
@@ -208,7 +208,7 @@ stdenv.mkDerivation ({
   nativeBuildInputs = [ texinfo which ]
     ++ optional (perl != null) perl;
     
-  buildInputs = [ gmp mpfr mpc libelf gettext ]
+  buildInputs = [ gmp mpfr libmpc libelf gettext ]
     ++ (optional (ppl != null) ppl)
     ++ (optional (cloogppl != null) cloogppl)
     ++ (optional (zlib != null) zlib)
@@ -236,7 +236,7 @@ stdenv.mkDerivation ({
     ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
     --with-gmp=${gmp}
     --with-mpfr=${mpfr}
-    --with-mpc=${mpc}
+    --with-mpc=${libmpc}
     ${if libelf != null then "--with-libelf=${libelf}" else ""}
     --disable-libstdcxx-pch
     --without-included-gettext
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index ef3e2c535c29..78666c8cdce3 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -9,7 +9,7 @@
 , enableShared ? true
 , texinfo ? null
 , perl ? null # optional, for texi2pod (then pod2man); required for Java
-, gmp, mpfr, mpc, gettext, which
+, gmp, mpfr, libmpc, gettext, which
 , libelf                      # optional, for link-time optimizations (LTO)
 , ppl ? null, cloog ? null # optional, for the Graphite optimization framework.
 , zlib ? null, boehmgc ? null
@@ -253,7 +253,7 @@ stdenv.mkDerivation ({
     ++ (optional (perl != null) perl)
     ++ (optional javaAwtGtk pkgconfig);
 
-  buildInputs = [ gmp mpfr mpc libelf ]
+  buildInputs = [ gmp mpfr libmpc libelf ]
     ++ (optional (ppl != null) ppl)
     ++ (optional (cloog != null) cloog)
     ++ (optional (zlib != null) zlib)
@@ -291,7 +291,7 @@ stdenv.mkDerivation ({
     ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
     --with-gmp=${gmp}
     --with-mpfr=${mpfr}
-    --with-mpc=${mpc}
+    --with-mpc=${libmpc}
     ${if libelf != null then "--with-libelf=${libelf}" else ""}
     --disable-libstdcxx-pch
     --without-included-gettext
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 0fff83fca31f..86d4aa30267f 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -11,7 +11,7 @@
 , enableShared ? true
 , texinfo ? null
 , perl ? null # optional, for texi2pod (then pod2man); required for Java
-, gmp, mpfr, mpc, gettext, which
+, gmp, mpfr, libmpc, gettext, which
 , libelf                      # optional, for link-time optimizations (LTO)
 , cloog ? null, isl ? null # optional, for the Graphite optimization framework.
 , zlib ? null, boehmgc ? null
@@ -275,7 +275,7 @@ stdenv.mkDerivation ({
     ++ (optional (perl != null) perl)
     ++ (optional javaAwtGtk pkgconfig);
 
-  buildInputs = [ gmp mpfr mpc libelf ]
+  buildInputs = [ gmp mpfr libmpc libelf ]
     ++ (optional (cloog != null) cloog)
     ++ (optional (isl != null) isl)
     ++ (optional (zlib != null) zlib)
@@ -333,7 +333,7 @@ stdenv.mkDerivation ({
     ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
     --with-gmp=${gmp}
     --with-mpfr=${mpfr}
-    --with-mpc=${mpc}
+    --with-mpc=${libmpc}
     ${if libelf != null then "--with-libelf=${libelf}" else ""}
     --disable-libstdcxx-pch
     --without-included-gettext
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index eca8120a2088..02747d90567b 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -9,7 +9,7 @@
 , enableShared ? true
 , texinfo ? null
 , perl ? null # optional, for texi2pod (then pod2man); required for Java
-, gmp, mpfr, mpc, gettext, which
+, gmp, mpfr, libmpc, gettext, which
 , libelf                      # optional, for link-time optimizations (LTO)
 , cloog ? null, isl ? null # optional, for the Graphite optimization framework.
 , zlib ? null, boehmgc ? null
@@ -271,7 +271,7 @@ stdenv.mkDerivation ({
     ++ (optional (perl != null) perl)
     ++ (optional javaAwtGtk pkgconfig);
 
-  buildInputs = [ gmp mpfr mpc libelf ]
+  buildInputs = [ gmp mpfr libmpc libelf ]
     ++ (optional (cloog != null) cloog)
     ++ (optional (isl != null) isl)
     ++ (optional (zlib != null) zlib)
@@ -323,7 +323,7 @@ stdenv.mkDerivation ({
     ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
     --with-gmp=${gmp}
     --with-mpfr=${mpfr}
-    --with-mpc=${mpc}
+    --with-mpc=${libmpc}
     ${if libelf != null then "--with-libelf=${libelf}" else ""}
     --disable-libstdcxx-pch
     --without-included-gettext
diff --git a/pkgs/development/compilers/llvm/3.4/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix
index a34fa965f066..8704d9964244 100644
--- a/pkgs/development/compilers/llvm/3.4/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.4/dragonegg.nix
@@ -1,4 +1,4 @@
-{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, mpc, ncurses, zlib, version}:
+{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}:
 
 stdenv.mkDerivation rec {
   name = "dragonegg-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   # The gcc the plugin will be built for (the same used building dragonegg)
   GCC = "gcc";
 
-  buildInputs = [ llvm gmp mpfr mpc ncurses zlib ];
+  buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ];
 
   installPhase = ''
     mkdir -p $out/lib $out/share/doc/${name}
diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix
new file mode 100644
index 000000000000..d5fd91712638
--- /dev/null
+++ b/pkgs/development/libraries/libmpc/default.nix
@@ -0,0 +1,34 @@
+{ fetchurl, stdenv, gmp, mpfr }:
+let
+  version = "1.0.1";
+in
+stdenv.mkDerivation rec {
+  name = "libmpc-${version}"; # to avoid clash with the MPD client
+
+  src = fetchurl {
+    url = "http://www.multiprecision.org/mpc/download/mpc-${version}.tar.gz";
+    sha1 = "vxg0rkyn4cs40wr2cp6bbcyr1nnijzlc";
+  };
+
+  buildInputs = [ gmp mpfr ];
+
+  CFLAGS = "-I${gmp}/include";
+
+  doCheck = true;
+
+  meta = {
+    description = "Library for multiprecision complex arithmetic with exact rounding";
+
+    longDescription =
+      '' GNU MPC is a C library for the arithmetic of complex numbers with
+         arbitrarily high precision and correct rounding of the result.  It is
+         built upon and follows the same principles as GNU MPFR.
+      '';
+
+    homepage = http://mpc.multiprecision.org/;
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix
deleted file mode 100644
index d5fd91712638..000000000000
--- a/pkgs/development/libraries/mpc/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ fetchurl, stdenv, gmp, mpfr }:
-let
-  version = "1.0.1";
-in
-stdenv.mkDerivation rec {
-  name = "libmpc-${version}"; # to avoid clash with the MPD client
-
-  src = fetchurl {
-    url = "http://www.multiprecision.org/mpc/download/mpc-${version}.tar.gz";
-    sha1 = "vxg0rkyn4cs40wr2cp6bbcyr1nnijzlc";
-  };
-
-  buildInputs = [ gmp mpfr ];
-
-  CFLAGS = "-I${gmp}/include";
-
-  doCheck = true;
-
-  meta = {
-    description = "Library for multiprecision complex arithmetic with exact rounding";
-
-    longDescription =
-      '' GNU MPC is a C library for the arithmetic of complex numbers with
-         arbitrarily high precision and correct rounding of the result.  It is
-         built upon and follows the same principles as GNU MPFR.
-      '';
-
-    homepage = http://mpc.multiprecision.org/;
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
index 8c0854ef3de4..4b1dca9855a1 100644
--- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
+++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, writeTextFile, coreutils, gnumake, gcc, gnutar, bzip2
   , gnugrep, gnused, gawk, diffutils, patch
-  , gmp, mpfr, mpc }:
+  , gmp, mpfr, libmpc }:
 
 stdenv.mkDerivation {
   name = "avr-gcc-libc";
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     mkdir -p "$out"
     export > env-vars
 
-    for i in "${gmp}" "${mpfr}" "${mpc}"; do
+    for i in "${gmp}" "${mpfr}" "${libmpc}"; do
       export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$i/include "
       export NIX_LDFLAGS="$NIX_LDFLAGS -L$i/lib "
     done
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index f1b5ae0dd1e0..e82338450688 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -207,7 +207,7 @@ rec {
       # reduces the size of the stdenv closure.
       gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
       mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
-      mpc = pkgs.mpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
+      libmpc = pkgs.libmpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
       isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
       cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
       gccPlain = pkgs.gcc.cc;
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
index 90f89cc0c784..1d2919919b1e 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
@@ -81,7 +81,7 @@ let
   cloog = pkgs.cloog.crossDrv;
   zlib = pkgs.zlib.crossDrv;
   isl = pkgs.isl.crossDrv;
-  mpc = pkgs.mpc.crossDrv;
+  libmpc = pkgs.libmpc.crossDrv;
   binutils = pkgs.binutils.crossDrv;
   klibc = pkgs.linuxPackages.klibc.crossDrv;
 
@@ -188,7 +188,7 @@ rec {
         cp -d ${cloog}/lib/libcloog*.so* $out/lib
         cp -d ${ppl}/lib/libppl*.so* $out/lib
         cp -d ${isl}/lib/libisl*.so* $out/lib
-        cp -d ${mpc}/lib/libmpc*.so* $out/lib
+        cp -d ${libmpc}/lib/libmpc*.so* $out/lib
         cp -d ${zlib}/lib/libz.so* $out/lib
         
         # Copy binutils.
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 16a1d513afe3..a836f6fdd378 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -113,7 +113,7 @@ rec {
 
         cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
         cp -d ${mpfr}/lib/libmpfr*.so* $out/lib
-        cp -d ${mpc}/lib/libmpc*.so* $out/lib
+        cp -d ${libmpc}/lib/libmpc*.so* $out/lib
         cp -d ${zlib}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3d787fbff44..db155f185aed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3185,7 +3185,7 @@ let
   }));
 
   gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 {
-    inherit fetchurl stdenv gmp mpfr mpc libelf zlib perl
+    inherit fetchurl stdenv gmp mpfr libmpc libelf zlib perl
       gettext which noSysDirs;
     texinfo = texinfo4;
 
@@ -6583,7 +6583,7 @@ let
 
   mp4v2 = callPackage ../development/libraries/mp4v2 { };
 
-  mpc = callPackage ../development/libraries/mpc { };
+  libmpc = callPackage ../development/libraries/libmpc { };
 
   mpich2 = callPackage ../development/libraries/mpich2 { };
 
-- 
cgit 1.4.1