diff --git a/pkgs/tools/filesystems/netatalk/no-suid.patch b/pkgs/tools/filesystems/netatalk/000-no-suid.patch similarity index 100% rename from pkgs/tools/filesystems/netatalk/no-suid.patch rename to pkgs/tools/filesystems/netatalk/000-no-suid.patch diff --git a/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch b/pkgs/tools/filesystems/netatalk/001-omit-localstatedir-creation.patch similarity index 100% rename from pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch rename to pkgs/tools/filesystems/netatalk/001-omit-localstatedir-creation.patch diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index dec473965460..07bab154f09a 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,19 +1,35 @@ -{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python3, db -, libgcrypt, avahi, libiconv, pam, openssl, acl, ed, libtirpc, libevent -, fetchpatch }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, acl +, autoreconfHook +, avahi +, db +, ed +, libevent +, libgcrypt +, libiconv +, libtirpc +, openssl +, pam +, perl +, pkg-config +, python3 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netatalk"; version = "3.1.13"; src = fetchurl { - url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2"; - sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9"; + url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.bz2"; + hash = "sha256-ia2mvP4bOa2U9YwjZlTR2UTyZFw+femLM3TgvTfV4F0="; }; patches = [ - ./no-suid.patch - ./omitLocalstatedirCreation.patch + ./000-no-suid.patch + ./001-omit-localstatedir-creation.patch (fetchpatch { name = "make-afpstats-python3-compatible.patch"; url = "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch"; @@ -84,9 +100,24 @@ 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 ]; + buildInputs = [ + acl + avahi + db + libevent + libgcrypt + libiconv + openssl + pam + ]; configureFlags = [ "--with-bdb=${db.dev}" @@ -119,11 +150,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Apple Filing Protocol Server"; homepage = "http://netatalk.sourceforge.net/"; - license = lib.licenses.gpl3; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jcumming ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ jcumming ]; }; -} +})