From dae90a0d29343bbb9ffc5d3f7bcfb816fca3e639 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:05:32 +0800 Subject: [PATCH] gmpc: remove --- pkgs/applications/audio/gmpc/default.nix | 67 ------------------- .../gmpc/libmpd-11.8.17-remove-strndup.patch | 15 ----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 pkgs/applications/audio/gmpc/default.nix delete mode 100644 pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix deleted file mode 100644 index e3f5f4580d6f..000000000000 --- a/pkgs/applications/audio/gmpc/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libtool -, intltool -, pkg-config -, glib -, gtk2 -, curl -, libmpdclient -, libsoup -, gob2 -, vala -, libunique -, libSM -, libICE -, sqlite -, hicolor-icon-theme -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "gmpc"; - version = "11.8.16"; - - libmpd = stdenv.mkDerivation { - pname = "libmpd"; - version = "11.8.17"; - src = fetchurl { - url = "https://download.sarine.nl/Programs/gmpc/${lib.versions.majorMinor version}/libmpd-${version}.tar.gz"; - sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; - }; - patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ]; - }; - - src = fetchurl { - url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz"; - sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; - }; - - nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook3 ]; - buildInputs = [ - glib - gtk2 - curl - libmpdclient - libsoup - libunique - libmpd - libSM - libICE - sqlite - hicolor-icon-theme - ]; - - meta = with lib; { - homepage = "https://gmpclient.org"; - description = "GTK2 frontend for Music Player Daemon"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} -# TODO: what is this libmpd derivation embedded above? diff --git a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch b/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch deleted file mode 100644 index ad4fdc02ef3e..000000000000 --- a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/libmpd-internal.h b/src/libmpd-internal.h -index c84c3a4..51be441 100644 ---- a/src/libmpd-internal.h -+++ b/src/libmpd-internal.h -@@ -206,10 +206,6 @@ int mpd_unlock_conn(MpdObj *mi); - MpdData * mpd_misc_sort_tag_list(MpdData *data); - - --#ifndef HAVE_STRNDUP --char * strndup (const char *s, size_t n); --#endif -- - int mpd_server_get_allowed_commands(MpdObj *mi); - typedef enum _MpdSearchType { - MPD_SEARCH_TYPE_NONE, diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9caad6509e41..bb96a8f8455d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -520,6 +520,7 @@ mapAliases ({ gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 + gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14 gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b0110bd8bfe..a4014bbb166b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30353,8 +30353,6 @@ with pkgs; gqview = callPackage ../applications/graphics/gqview { }; - gmpc = callPackage ../applications/audio/gmpc { }; - gnomecast = callPackage ../applications/video/gnomecast { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { };