From 4196905d20a47a8cbe31473a2bc40a72a36be9b2 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 03:14:38 +0100 Subject: [PATCH 1/6] libmusicbrainz: libmusicbrainz_3 -> libmusicbrainz_5 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e60748213ea..f042d1bac250 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8187,7 +8187,7 @@ with pkgs; libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { }; - libmusicbrainz = libmusicbrainz3; + libmusicbrainz = libmusicbrainz5; libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { }; From 7ae890f16ea7f3b3b8e709da921d003b25a7379c Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 03:15:29 +0100 Subject: [PATCH 2/6] libmusicbrainz3: drop --- .../libraries/libmusicbrainz/default.nix | 40 ------------------- .../libraries/libmusicbrainz/v3-darwin.patch | 22 ---------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 pkgs/development/libraries/libmusicbrainz/default.nix delete mode 100644 pkgs/development/libraries/libmusicbrainz/v3-darwin.patch diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix deleted file mode 100644 index d5df1f113222..000000000000 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - neon, - libdiscid, -}: - -stdenv.mkDerivation rec { - pname = "libmusicbrainz"; - version = "3.0.3"; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - neon - libdiscid - ]; - - src = fetchurl { - url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${pname}-${version}.tar.gz"; - sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; - }; - - patches = [ - # Fix spacing around string literal for modern clang - ./v3-darwin.patch - ]; - - meta = with lib; { - homepage = "http://musicbrainz.org/doc/libmusicbrainz"; - description = "MusicBrainz Client Library (3.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.''; - platforms = platforms.all; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch b/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch deleted file mode 100644 index af97eaff1ed3..000000000000 --- a/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/webservice.cpp b/src/webservice.cpp -index 3a36167..df14812 100644 ---- a/src/webservice.cpp -+++ b/src/webservice.cpp -@@ -184,7 +184,7 @@ WebService::get(const std::string &entity, - if (!sess) - throw WebServiceError("ne_session_create() failed."); - ne_set_server_auth(sess, httpAuth, this); -- ne_set_useragent(sess, PACKAGE"/"VERSION); -+ ne_set_useragent(sess, PACKAGE "/" VERSION); - - // Use proxy server - if (!d->proxyHost.empty()) { -@@ -269,7 +269,7 @@ WebService::post(const std::string &entity, - if (!sess) - throw WebServiceError("ne_session_create() failed."); - ne_set_server_auth(sess, httpAuth, this); -- ne_set_useragent(sess, PACKAGE"/"VERSION); -+ ne_set_useragent(sess, PACKAGE "/" VERSION); - - // Use proxy server - if (!d->proxyHost.empty()) { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5d903ac3ed8b..a4ccecbed5aa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1314,6 +1314,7 @@ mapAliases { libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17 liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 + libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16 libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 libosmo-sccp = libosmo-sigtran; # Added 2024-12-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f042d1bac250..03f04766c314 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8183,8 +8183,6 @@ with pkgs; libmicrohttpd = libmicrohttpd_1_0; - libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { }; - libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { }; libmusicbrainz = libmusicbrainz5; From bb35c2a6b7fccc90d3e02b24e76da2e3bbd7dd07 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 03:15:56 +0100 Subject: [PATCH 3/6] treewide: libmusicbrainz5 -> libmusicbrainz --- pkgs/by-name/ca/cantata/package.nix | 4 ++-- pkgs/by-name/cy/cyanrip/package.nix | 4 ++-- pkgs/by-name/ne/nemo-preview/package.nix | 4 ++-- pkgs/by-name/so/sound-juicer/package.nix | 4 ++-- pkgs/kde/gear/libkcddb/default.nix | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix index 8671ce1e690f..52305fa26472 100644 --- a/pkgs/by-name/ca/cantata/package.nix +++ b/pkgs/by-name/ca/cantata/package.nix @@ -16,7 +16,7 @@ withLame ? false, lame, withMusicbrainz ? false, - libmusicbrainz5, + libmusicbrainz, withTaglib ? true, taglib_1, @@ -129,7 +129,7 @@ let { names = [ "MUSICBRAINZ" ]; enable = withMusicbrainz; - pkgs = [ libmusicbrainz5 ]; + pkgs = [ libmusicbrainz ]; } { names = [ "ONLINE_SERVICES" ]; diff --git a/pkgs/by-name/cy/cyanrip/package.nix b/pkgs/by-name/cy/cyanrip/package.nix index 2af30984eecc..0547ed7d6bf6 100644 --- a/pkgs/by-name/cy/cyanrip/package.nix +++ b/pkgs/by-name/cy/cyanrip/package.nix @@ -8,7 +8,7 @@ ffmpeg-headless, libcdio, libcdio-paranoia, - libmusicbrainz5, + libmusicbrainz, curl, }: stdenv.mkDerivation (finalAttrs: { @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg-headless libcdio libcdio-paranoia - libmusicbrainz5 + libmusicbrainz curl ]; diff --git a/pkgs/by-name/ne/nemo-preview/package.nix b/pkgs/by-name/ne/nemo-preview/package.nix index 83d5742af99c..84223dcf99f9 100644 --- a/pkgs/by-name/ne/nemo-preview/package.nix +++ b/pkgs/by-name/ne/nemo-preview/package.nix @@ -10,7 +10,7 @@ cjs, gtksourceview4, gobject-introspection, - libmusicbrainz5, + libmusicbrainz, webkitgtk_4_1, clutter-gtk, clutter-gst, @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 cjs gtksourceview4 - libmusicbrainz5 + libmusicbrainz webkitgtk_4_1 clutter-gtk clutter-gst diff --git a/pkgs/by-name/so/sound-juicer/package.nix b/pkgs/by-name/so/sound-juicer/package.nix index 426ee4cfaa08..b949fdf00fa0 100644 --- a/pkgs/by-name/so/sound-juicer/package.nix +++ b/pkgs/by-name/so/sound-juicer/package.nix @@ -14,7 +14,7 @@ gnome, adwaita-icon-theme, gst_all_1, - libmusicbrainz5, + libmusicbrainz, libdiscid, isocodes, gsettings-desktop-schemas, @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libcanberra-gtk3 adwaita-icon-theme gsettings-desktop-schemas - libmusicbrainz5 + libmusicbrainz libdiscid isocodes gst_all_1.gstreamer diff --git a/pkgs/kde/gear/libkcddb/default.nix b/pkgs/kde/gear/libkcddb/default.nix index fea14f50c6e3..b0fb7d408b86 100644 --- a/pkgs/kde/gear/libkcddb/default.nix +++ b/pkgs/kde/gear/libkcddb/default.nix @@ -1,9 +1,9 @@ { mkKdeDerivation, - libmusicbrainz5, + libmusicbrainz, }: mkKdeDerivation { pname = "libkcddb"; - extraBuildInputs = [ libmusicbrainz5 ]; + extraBuildInputs = [ libmusicbrainz ]; } From e5d6c617cf5673b6f66da328c46cde954047c672 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 03:17:25 +0100 Subject: [PATCH 4/6] libmusicbrainz5: move to aliases --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a4ccecbed5aa..15adefb7b937 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1315,6 +1315,7 @@ mapAliases { liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16 + libmusicbrainz5 = libmusicbrainz; # Added 2025-09-16 libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 libosmo-sccp = libosmo-sigtran; # Added 2024-12-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03f04766c314..b4b71a3845d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8183,9 +8183,7 @@ with pkgs; libmicrohttpd = libmicrohttpd_1_0; - libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { }; - - libmusicbrainz = libmusicbrainz5; + libmusicbrainz = callPackage ../development/libraries/libmusicbrainz/5.x.nix { }; libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { }; From 443539a91c246cbbf76cca57fdbb9cbb20b78be6 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 03:18:10 +0100 Subject: [PATCH 5/6] libmusicbrainz: move to `by-name` --- .../5.x.nix => by-name/li/libmusicbrainz/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libmusicbrainz/5.x.nix => by-name/li/libmusicbrainz/package.nix} (100%) diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/by-name/li/libmusicbrainz/package.nix similarity index 100% rename from pkgs/development/libraries/libmusicbrainz/5.x.nix rename to pkgs/by-name/li/libmusicbrainz/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4b71a3845d3..857018200432 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8183,8 +8183,6 @@ with pkgs; libmicrohttpd = libmicrohttpd_1_0; - libmusicbrainz = callPackage ../development/libraries/libmusicbrainz/5.x.nix { }; - libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { }; libpeas = callPackage ../development/libraries/libpeas { }; From 8b2b6233df75ef979c82af5a9c8aaf238522ffda Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 03:22:09 +0100 Subject: [PATCH 6/6] libmusicbrainz: 5.1.0 -> 5.1.0-unstable-2025-07-12 Last stable release in 2014, trickle of mundane fix commits since then, including CMake 4 support. Try not to think about how long ago the 3.x version was released, by the way. Diff: https://github.com/metabrainz/libmusicbrainz/compare/release-5.1.0...4efbed3afae11ef68281816088d7cf3d0f704dfe --- pkgs/by-name/li/libmusicbrainz/package.nix | 44 ++++++++-------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/li/libmusicbrainz/package.nix b/pkgs/by-name/li/libmusicbrainz/package.nix index 8b6a622965c8..daf48ae5bd47 100644 --- a/pkgs/by-name/li/libmusicbrainz/package.nix +++ b/pkgs/by-name/li/libmusicbrainz/package.nix @@ -10,49 +10,37 @@ pkg-config, }: -stdenv.mkDerivation rec { - version = "5.1.0"; +stdenv.mkDerivation { pname = "libmusicbrainz"; + version = "5.1.0-unstable-2025-07-12"; + + src = fetchFromGitHub { + owner = "metabrainz"; + repo = "libmusicbrainz"; + rev = "4efbed3afae11ef68281816088d7cf3d0f704dfe"; + hash = "sha256-2nMm+vm/uOT7AzTQIvfpmBsNYApZF0mekDEgt7tC6fw="; + }; nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ neon libdiscid libxml2 ]; - src = fetchFromGitHub { - owner = "metabrainz"; - repo = "libmusicbrainz"; - sha256 = "0ah9kaf3g3iv1cps2vs1hs33nfbjfx1xscpjgxr1cg28p4ri6jhq"; - rev = "release-${version}"; - }; - - patches = [ - # Fix build with libxml2 2.12 - (fetchpatch { - url = "https://github.com/metabrainz/libmusicbrainz/commit/9ba00067a15479a52262a5126bcb6889da5884b7.patch"; - hash = "sha256-4VxTohLpjUNnNZGIoRpBjUz71mLP3blg4oFL7itnJnY="; - }) - (fetchpatch { - url = "https://github.com/metabrainz/libmusicbrainz/commit/558c9ba0e6d702d5c877f75be98176f57abf1b02.patch"; - hash = "sha256-hKYY4BJLh/Real3NugLwzc4gPBQ3NB/F63iI/aV8Wh8="; - }) - ]; - - dontUseCmakeBuildDir = true; - - meta = with lib; { + meta = { homepage = "http://musicbrainz.org/doc/libmusicbrainz"; - description = "MusicBrainz Client Library (5.x version)"; + description = "MusicBrainz Client Library"; 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.''; - platforms = platforms.all; - license = licenses.lgpl21; + add MusicBrainz lookup capabilities to their applications. + ''; + platforms = lib.platforms.all; + license = lib.licenses.lgpl21Plus; }; }