libmusicbrainz2: remove deprecated version

builds no longer against gcc6 and is not used anywhere

pkgs/applications/kde/k3b.nix

@@ -5,7 +5,7 @@
 , flac, lame, libmad, libmpcdec, libvorbis
 , libsamplerate, libsndfile, taglib
 , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
-, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info, kinit
+, ffmpeg, libmusicbrainz3, normalize, sox, transcode, shared_mime_info, kinit
 }:
 
 mkDerivation {
@@ -28,7 +28,7 @@ mkDerivation {
     # cd/dvd
     cdparanoia libdvdcss libdvdread
     # others
-    ffmpeg libmusicbrainz2 shared_mime_info
+    ffmpeg libmusicbrainz3 shared_mime_info
   ];
   propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
   postFixup =

pkgs/development/libraries/libmusicbrainz/2.x.nix

@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, expat }:
-
-stdenv.mkDerivation rec {
-  name = "libmusicbrainz-2.1.5";
-
-  configureFlags = "--enable-cpp-headers";
-
-  buildInputs = [ expat ];
-
-  patches = [ ./gcc-4.x.patch ];
-
-  src = fetchurl {
-    url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz";
-    sha256 = "183i4c109r5qx3mk4r986sx5xw4n5mdhdz4yz3rrv3s2xm5rqqn6";
-  };
-
-  meta = {
-    homepage = http://musicbrainz.org/doc/libmusicbrainz;
-    description = "MusicBrainz Client Library (deprecated 2.x version)";
-    longDescription = ''
-      The libmusicbrainz (also known as mb_client or MusicBrainz Client
-      Library) is a development library geared towards developers who wish to
-      add MusicBrainz lookup capabilities to their applications.'';
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/development/libraries/libmusicbrainz/gcc-4.x.patch

@@ -1,60 +0,0 @@
-diff --git a/lib/c_wrapper.cpp b/lib/c_wrapper.cpp
-index deae11d..ebc7854 100644
---- a/lib/c_wrapper.cpp
-+++ b/lib/c_wrapper.cpp
-@@ -24,6 +24,7 @@
- #include "musicbrainz.h"
- #include "trm.h"
- #include "mb_c.h"
-+#include <string.h>
- 
- extern "C"
- {
-diff --git a/lib/comhttpsocket.cpp b/lib/comhttpsocket.cpp
-index 067313b..4371772 100644
---- a/lib/comhttpsocket.cpp
-+++ b/lib/comhttpsocket.cpp
-@@ -20,6 +20,7 @@
- #endif
- #include <stdlib.h>
- #include <assert.h>
-+#include <string.h>
- 
- const char* g_strCOMVer = "libmusicbrainz/"VERSION;
- 
-diff --git a/lib/comsocket.cpp b/lib/comsocket.cpp
-index 01a94be..7bfc4dd 100644
---- a/lib/comsocket.cpp
-+++ b/lib/comsocket.cpp
-@@ -44,6 +44,7 @@ ____________________________________________________________________________*/
- #include <net/if.h>
- #include <sys/ioctl.h>
- #endif
-+#include <string.h>
- 
- #define mb_socklen_t ACCEPT_ARG3
- 
-diff --git a/lib/http.cpp b/lib/http.cpp
-index 85390a3..e63713c 100644
---- a/lib/http.cpp
-+++ b/lib/http.cpp
-@@ -67,6 +67,7 @@
- #ifdef __QNX__
- #include <strings.h>
- #endif
-+#include <string.h>
- 
- using namespace std;
- 
-diff --git a/lib/sigclient.cpp b/lib/sigclient.cpp
-index 9f76008..4bbbaae 100644
---- a/lib/sigclient.cpp
-+++ b/lib/sigclient.cpp
-@@ -32,6 +32,7 @@ email                : ijr@relatable.com
- #ifdef WIN32
- #pragma warning(disable:4786)
- #endif
-+#include <string.h>
- 
- #include "sigclient.h"
- #include "comhttpsocket.h"

pkgs/top-level/all-packages.nix

@@ -9094,8 +9094,6 @@ with pkgs;
 
   libmspack = callPackage ../development/libraries/libmspack { };
 
-  libmusicbrainz2 = callPackage ../development/libraries/libmusicbrainz/2.x.nix { };
-
   libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { };
 
   libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
@@ -11106,7 +11104,7 @@ with pkgs;
   dex-oidc = callPackage ../servers/dex { };
 
   dgraph = callPackage ../servers/dgraph { };
-    
+
   dico = callPackage ../servers/dico { };
 
   dict = callPackage ../servers/dict {
@@ -18699,7 +18697,7 @@ with pkgs;
   hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { };
 
   hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; };
-  
+
   epkowa = callPackage ../misc/drivers/epkowa { };
 
   illum = callPackage ../tools/system/illum { };