From b45fe742d31451e8b6bb5de52e93a62af3558e72 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 6 Nov 2024 07:39:08 +0100
Subject: [PATCH 1/4] ncmpc: 0.49 -> 0.51

---
 pkgs/by-name/nc/ncmpc/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nc/ncmpc/package.nix b/pkgs/by-name/nc/ncmpc/package.nix
index db76f3777224d..c1ef9858edc42 100644
--- a/pkgs/by-name/nc/ncmpc/package.nix
+++ b/pkgs/by-name/nc/ncmpc/package.nix
@@ -9,6 +9,7 @@
 , libmpdclient
 , gettext
 , boost
+, fmt
 , pcreSupport ? false, pcre ? null
 }:
 
@@ -16,16 +17,16 @@ assert pcreSupport -> pcre != null;
 
 stdenv.mkDerivation rec {
   pname = "ncmpc";
-  version = "0.49";
+  version = "0.51";
 
   src = fetchFromGitHub {
     owner  = "MusicPlayerDaemon";
     repo   = "ncmpc";
     rev    = "v${version}";
-    sha256 = "sha256-rqIlQQ9RhFrhPwUd9dZmMZiqwFinNoV46VaJ3pbyUI8=";
+    sha256 = "sha256-mFZ8szJT7eTPHQHxjpP5pThCcY0YERGkGR8528Xu9MA=";
   };
 
-  buildInputs = [ glib ncurses libmpdclient boost ]
+  buildInputs = [ glib ncurses libmpdclient boost fmt ]
     ++ lib.optional pcreSupport pcre;
   nativeBuildInputs = [ meson ninja pkg-config gettext ];
 

From d73bbaaebdda8b4948ed3d8fa4e6c00899698144 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 6 Nov 2024 07:45:24 +0100
Subject: [PATCH 2/4] ncmpc: reformat with nixfmt-rfc-style

---
 pkgs/by-name/nc/ncmpc/package.nix | 57 +++++++++++++++++++------------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/nc/ncmpc/package.nix b/pkgs/by-name/nc/ncmpc/package.nix
index c1ef9858edc42..bc4cc32de26b6 100644
--- a/pkgs/by-name/nc/ncmpc/package.nix
+++ b/pkgs/by-name/nc/ncmpc/package.nix
@@ -1,16 +1,18 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
-, glib
-, ncurses
-, libmpdclient
-, gettext
-, boost
-, fmt
-, pcreSupport ? false, pcre ? null
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  glib,
+  ncurses,
+  libmpdclient,
+  gettext,
+  boost,
+  fmt,
+  pcreSupport ? false,
+  pcre ? null,
 }:
 
 assert pcreSupport -> pcre != null;
@@ -20,15 +22,26 @@ stdenv.mkDerivation rec {
   version = "0.51";
 
   src = fetchFromGitHub {
-    owner  = "MusicPlayerDaemon";
-    repo   = "ncmpc";
-    rev    = "v${version}";
+    owner = "MusicPlayerDaemon";
+    repo = "ncmpc";
+    rev = "v${version}";
     sha256 = "sha256-mFZ8szJT7eTPHQHxjpP5pThCcY0YERGkGR8528Xu9MA=";
   };
 
-  buildInputs = [ glib ncurses libmpdclient boost fmt ]
-    ++ lib.optional pcreSupport pcre;
-  nativeBuildInputs = [ meson ninja pkg-config gettext ];
+  buildInputs = [
+    glib
+    ncurses
+    libmpdclient
+    boost
+    fmt
+  ] ++ lib.optional pcreSupport pcre;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+  ];
 
   mesonFlags = [
     "-Dlirc=disabled"
@@ -37,9 +50,9 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Curses-based interface for MPD (music player daemon)";
-    homepage    = "https://www.musicpd.org/clients/ncmpc/";
-    license     = licenses.gpl2Plus;
-    platforms   = platforms.all;
+    homepage = "https://www.musicpd.org/clients/ncmpc/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
     maintainers = with maintainers; [ fpletz ];
     mainProgram = "ncmpc";
   };

From e999a6f576ed0af4cb57302b8f15c4548cf71e93 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 6 Nov 2024 07:46:35 +0100
Subject: [PATCH 3/4] ncmpc: build manpage and enable regex

---
 pkgs/by-name/nc/ncmpc/package.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/nc/ncmpc/package.nix b/pkgs/by-name/nc/ncmpc/package.nix
index bc4cc32de26b6..97589e6b3ba1d 100644
--- a/pkgs/by-name/nc/ncmpc/package.nix
+++ b/pkgs/by-name/nc/ncmpc/package.nix
@@ -5,18 +5,16 @@
   meson,
   ninja,
   pkg-config,
+  sphinx,
   glib,
   ncurses,
   libmpdclient,
   gettext,
   boost,
   fmt,
-  pcreSupport ? false,
-  pcre ? null,
+  pcre2,
 }:
 
-assert pcreSupport -> pcre != null;
-
 stdenv.mkDerivation rec {
   pname = "ncmpc";
   version = "0.51";
@@ -34,19 +32,25 @@ stdenv.mkDerivation rec {
     libmpdclient
     boost
     fmt
-  ] ++ lib.optional pcreSupport pcre;
+    pcre2
+  ];
 
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
     gettext
+    sphinx
   ];
 
   mesonFlags = [
-    "-Dlirc=disabled"
-    "-Ddocumentation=disabled"
-  ] ++ lib.optional (!pcreSupport) "-Dregex=disabled";
+    (lib.mesonEnable "lirc" false)
+  ];
+
+  outputs = [
+    "out"
+    "doc"
+  ];
 
   meta = with lib; {
     description = "Curses-based interface for MPD (music player daemon)";

From 8a8bce8b04a5ba76c7666e0da334366492165523 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 24 Nov 2024 21:54:09 +0100
Subject: [PATCH 4/4] ncmpc: fails on darwin

---
 pkgs/by-name/nc/ncmpc/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/nc/ncmpc/package.nix b/pkgs/by-name/nc/ncmpc/package.nix
index 97589e6b3ba1d..caddc5019736f 100644
--- a/pkgs/by-name/nc/ncmpc/package.nix
+++ b/pkgs/by-name/nc/ncmpc/package.nix
@@ -56,7 +56,8 @@ stdenv.mkDerivation rec {
     description = "Curses-based interface for MPD (music player daemon)";
     homepage = "https://www.musicpd.org/clients/ncmpc/";
     license = licenses.gpl2Plus;
-    platforms = platforms.all;
+    platforms = platforms.unix;
+    badPlatforms = platforms.darwin;
     maintainers = with maintainers; [ fpletz ];
     mainProgram = "ncmpc";
   };