diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 9a68a6ef8d67..dec473965460 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -4,12 +4,10 @@ stdenv.mkDerivation rec { pname = "netatalk"; - release = "3.1.13"; - patch = "3"; - version = "${release}_${patch}"; + version = "3.1.13"; src = fetchurl { - url = "mirror://sourceforge/netatalk/netatalk/netatalk-${release}.tar.bz2"; + url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2"; sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9"; }; @@ -18,8 +16,7 @@ stdenv.mkDerivation rec { ./omitLocalstatedirCreation.patch (fetchpatch { name = "make-afpstats-python3-compatible.patch"; - url = - "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch"; + url = "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch"; sha256 = "sha256-DAABpYjQPJLsQBhmtP30gA357w0Qn+AsnFgAeyDC/Rg="; }) ]; @@ -28,26 +25,22 @@ stdenv.mkDerivation rec { # https://bugs.freebsd.org/263123 (fetchpatch { name = "patch-etc_afpd_directory.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_directory.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_directory.c"; sha256 = "sha256-07YAJs+EtqGcFXbYHDLbILved1Ebtd8ukQepvzy6et0="; }) (fetchpatch { name = "patch-etc_afpd_file.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_file.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_file.c"; sha256 = "sha256-T1WTNa2G6wxKtvMa/MCX3Vx6XZBHtU6w3enkdGuIWus="; }) (fetchpatch { name = "patch-etc_afpd_volume.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_volume.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_volume.c"; sha256 = "sha256-NOZNZGzA0hxrNkoLTvN64h40yApPbMH4qIfBTpQoI0s="; }) (fetchpatch { name = "patch-etc_cnid__dbd_cmd__dbd__scanvol.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_cnid__dbd_cmd__dbd__scanvol.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_cnid__dbd_cmd__dbd__scanvol.c"; sha256 = "sha256-5QV+tQDo8/XeKwH/e5+Ne+kEOl2uvRDbHMaWysIB6YU="; }) (fetchpatch { @@ -58,33 +51,28 @@ stdenv.mkDerivation rec { }) (fetchpatch { name = "patch-libatalk_adouble_ad__conv.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__conv.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__conv.c"; sha256 = "sha256-T27WlKVXosv4bX5Gek2bR2cVDYEee5qrH4mnL9ghbP8="; }) (fetchpatch { name = "patch-libatalk_adouble_ad__date.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__date.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__date.c"; sha256 = "sha256-fkW5A+7R5fT3bukRfZaOwFo7AsyPaYajc1hIlDMZMnc="; }) (fetchpatch { name = "patch-libatalk_adouble_ad__flush.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__flush.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__flush.c"; sha256 = "sha256-k2zTx35tAlsFHym83bZGoWXRomwFV9xT3r2fzr3Zvbk="; }) (fetchpatch { name = "patch-libatalk_adouble_ad__open.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__open.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__open.c"; sha256 = "sha256-uV4wwft2IH54+4k5YR+Gz/BpRZBanxX/Ukp8BkohInU="; }) # https://bugs.freebsd.org/251203 (fetchpatch { name = "patch-libatalk_vfs_extattr.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_vfs_extattr.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_vfs_extattr.c"; sha256 = "sha256-lFWF0Qo8PJv7QKvnMn0Fc9Ruzb+FTEWgOMpxc789jWs="; }) ]; @@ -96,8 +84,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = - [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ]; + nativeBuildInputs = [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ]; buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ];