netatalk: 4.2.0 -> 4.2.3 (#398742)

pkgs/by-name/ne/netatalk/0000-no-install-under-usr-cupsd.patch

@@ -1,29 +0,0 @@
-diff --git a/config/meson.build b/config/meson.build
-index 4d750dba..f6bd6e6e 100644
---- a/config/meson.build
-+++ b/config/meson.build
-@@ -55,15 +55,15 @@ elif host_os in ['linux']
-     cups_libdir = '/usr/lib'
- endif
- 
--if have_appletalk and have_cups and cups_libdir != ''
--    configure_file(
--        input: 'pap.in',
--        output: 'pap',
--        configuration: cdata,
--        install: true,
--        install_dir: cups_libdir / 'cups/backend',
--    )
--endif
-+#if have_appletalk and have_cups and cups_libdir != ''
-+#    configure_file(
-+#        input: 'pap.in',
-+#        output: 'pap',
-+#        configuration: cdata,
-+#        install: true,
-+#        install_dir: cups_libdir / 'cups/backend',
-+#    )
-+#endif
- 
- foreach file : static_conf_files
-     if (

pkgs/by-name/ne/netatalk/0001-no-install-under-var-CNID.patch

@@ -1,13 +0,0 @@
-diff --git a/config/meson.build b/config/meson.build
-index 4d750dba..111389e7 100644
---- a/config/meson.build
-+++ b/config/meson.build
-@@ -89,7 +89,7 @@ if (
-     )
- endif
- 
--install_data('README', install_dir: localstatedir / 'netatalk/CNID')
-+# install_data('README', install_dir: localstatedir / 'netatalk/CNID')
- 
- if have_pam
-     subdir('pam')

pkgs/by-name/ne/netatalk/package.nix

@@ -22,25 +22,19 @@
   openldap,
   glib,
   dbus,
-  docbook-xsl-nons,
-  cmark-gfm,
   iniparser,
+  pandoc,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "netatalk";
-  version = "4.2.0";
+  version = "4.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-doqRAU4pjcHRTvKOvjMN2tSZKOPDTzBzU7i90xf1ClI=";
+    hash = "sha256-EKPDpMEazsZX35wzxppiaeMZ26dZxeHfpB7lo/G4DEM=";
   };
 
-  patches = [
-    ./0000-no-install-under-usr-cupsd.patch
-    ./0001-no-install-under-var-CNID.patch
-  ];
-
   nativeBuildInputs = [
     pkg-config
     meson
@@ -64,9 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     perl
     dbus
-    docbook-xsl-nons
-    cmark-gfm
     iniparser
+    pandoc
   ];
 
   mesonFlags = [
@@ -79,16 +72,16 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dwith-lockfile-path=/run/lock/"
     "-Dwith-cracklib=true"
     "-Dwith-cracklib-path=${cracklib.out}"
-    "-Dwith-docbook-path=${docbook-xsl-nons.out}/share/xml/docbook-xsl-nons/"
+    "-Dwith-statedir-creation=false"
   ];
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Apple Filing Protocol Server";
     homepage = "https://netatalk.io/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ jcumming ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ jcumming ];
   };
 })