netatalk: refactor

+46 -15
+46 -15
pkgs/tools/filesystems/netatalk/default.nix
··· 1 - { fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python3, db 2 - , libgcrypt, avahi, libiconv, pam, openssl, acl, ed, libtirpc, libevent 3 - , fetchpatch }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , fetchpatch 5 + , acl 6 + , autoreconfHook 7 + , avahi 8 + , db 9 + , ed 10 + , libevent 11 + , libgcrypt 12 + , libiconv 13 + , libtirpc 14 + , openssl 15 + , pam 16 + , perl 17 + , pkg-config 18 + , python3 19 + }: 4 20 5 - stdenv.mkDerivation rec { 21 + stdenv.mkDerivation (finalAttrs: { 6 22 pname = "netatalk"; 7 23 version = "3.1.13"; 8 24 9 25 src = fetchurl { 10 - url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2"; 11 - sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9"; 26 + url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.bz2"; 27 + hash = "sha256-ia2mvP4bOa2U9YwjZlTR2UTyZFw+femLM3TgvTfV4F0="; 12 28 }; 13 29 14 30 patches = [ 15 - ./no-suid.patch 16 - ./omitLocalstatedirCreation.patch 31 + ./000-no-suid.patch 32 + ./001-omit-localstatedir-creation.patch 17 33 (fetchpatch { 18 34 name = "make-afpstats-python3-compatible.patch"; 19 35 url = "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch"; ··· 84 100 done 85 101 ''; 86 102 87 - nativeBuildInputs = [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ]; 103 + nativeBuildInputs = [ 104 + autoreconfHook 105 + pkg-config 106 + perl 107 + python3 108 + python3.pkgs.wrapPython 109 + ]; 88 110 89 - buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ]; 111 + buildInputs = [ 112 + acl 113 + avahi 114 + db 115 + libevent 116 + libgcrypt 117 + libiconv 118 + openssl 119 + pam 120 + ]; 90 121 91 122 configureFlags = [ 92 123 "--with-bdb=${db.dev}" ··· 119 150 120 151 enableParallelBuilding = true; 121 152 122 - meta = { 153 + meta = with lib; { 123 154 description = "Apple Filing Protocol Server"; 124 155 homepage = "http://netatalk.sourceforge.net/"; 125 - license = lib.licenses.gpl3; 126 - platforms = lib.platforms.linux; 127 - maintainers = with lib.maintainers; [ jcumming ]; 156 + license = licenses.gpl2Plus; 157 + platforms = platforms.linux; 158 + maintainers = with maintainers; [ jcumming ]; 128 159 }; 129 - } 160 + })
pkgs/tools/filesystems/netatalk/no-suid.patch pkgs/tools/filesystems/netatalk/000-no-suid.patch
pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch pkgs/tools/filesystems/netatalk/001-omit-localstatedir-creation.patch