pyrox.dev / nixpkgs
lol
fork atom

netatalk: 4.2.0 -> 4.2.3 (#398742)

authored by

Matthew Croughan and committed by
GitHub be076e8e 98c6384a

+9 -58
unified split
-29
pkgs/by-name/ne/netatalk/0000-no-install-under-usr-cupsd.patch
··· 1 - diff --git a/config/meson.build b/config/meson.build 2 - index 4d750dba..f6bd6e6e 100644 3 - --- a/config/meson.build 4 - +++ b/config/meson.build 5 - @@ -55,15 +55,15 @@ elif host_os in ['linux'] 6 - cups_libdir = '/usr/lib' 7 - endif 8 - 9 - -if have_appletalk and have_cups and cups_libdir != '' 10 - - configure_file( 11 - - input: 'pap.in', 12 - - output: 'pap', 13 - - configuration: cdata, 14 - - install: true, 15 - - install_dir: cups_libdir / 'cups/backend', 16 - - ) 17 - -endif 18 - +#if have_appletalk and have_cups and cups_libdir != '' 19 - +# configure_file( 20 - +# input: 'pap.in', 21 - +# output: 'pap', 22 - +# configuration: cdata, 23 - +# install: true, 24 - +# install_dir: cups_libdir / 'cups/backend', 25 - +# ) 26 - +#endif 27 - 28 - foreach file : static_conf_files 29 - if (
-13
pkgs/by-name/ne/netatalk/0001-no-install-under-var-CNID.patch
··· 1 - diff --git a/config/meson.build b/config/meson.build 2 - index 4d750dba..111389e7 100644 3 - --- a/config/meson.build 4 - +++ b/config/meson.build 5 - @@ -89,7 +89,7 @@ if ( 6 - ) 7 - endif 8 - 9 - -install_data('README', install_dir: localstatedir / 'netatalk/CNID') 10 - +# install_data('README', install_dir: localstatedir / 'netatalk/CNID') 11 - 12 - if have_pam 13 - subdir('pam')
+9 -16
pkgs/by-name/ne/netatalk/package.nix
··· 22 22 openldap, 23 23 glib, 24 24 dbus, 25 - docbook-xsl-nons, 26 - cmark-gfm, 27 25 iniparser, 26 + pandoc, 28 27 }: 29 28 30 29 stdenv.mkDerivation (finalAttrs: { 31 30 pname = "netatalk"; 32 - version = "4.2.0"; 31 + version = "4.2.3"; 33 32 34 33 src = fetchurl { 35 34 url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz"; 36 - hash = "sha256-doqRAU4pjcHRTvKOvjMN2tSZKOPDTzBzU7i90xf1ClI="; 35 + hash = "sha256-EKPDpMEazsZX35wzxppiaeMZ26dZxeHfpB7lo/G4DEM="; 37 36 }; 38 - 39 - patches = [ 40 - ./0000-no-install-under-usr-cupsd.patch 41 - ./0001-no-install-under-var-CNID.patch 42 - ]; 43 37 44 38 nativeBuildInputs = [ 45 39 pkg-config ··· 64 58 glib 65 59 perl 66 60 dbus 67 - docbook-xsl-nons 68 - cmark-gfm 69 61 iniparser 62 + pandoc 70 63 ]; 71 64 72 65 mesonFlags = [ ··· 79 72 "-Dwith-lockfile-path=/run/lock/" 80 73 "-Dwith-cracklib=true" 81 74 "-Dwith-cracklib-path=${cracklib.out}" 82 - "-Dwith-docbook-path=${docbook-xsl-nons.out}/share/xml/docbook-xsl-nons/" 75 + "-Dwith-statedir-creation=false" 83 76 ]; 84 77 85 78 enableParallelBuilding = true; 86 79 87 - meta = with lib; { 80 + meta = { 88 81 description = "Apple Filing Protocol Server"; 89 82 homepage = "https://netatalk.io/"; 90 - license = licenses.gpl2Plus; 91 - platforms = platforms.linux; 92 - maintainers = with maintainers; [ jcumming ]; 83 + license = lib.licenses.gpl2Plus; 84 + platforms = lib.platforms.linux; 85 + maintainers = with lib.maintainers; [ jcumming ]; 93 86 }; 94 87 })