diff --git a/pkgs/by-name/bs/bstring/package.nix b/pkgs/by-name/bs/bstring/package.nix new file mode 100644 index 000000000000..2aa06c3b7fe1 --- /dev/null +++ b/pkgs/by-name/bs/bstring/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bstring"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "msteinert"; + repo = "bstring"; + tag = "v${finalAttrs.version}"; + hash = "sha256-efXMSRcPgo+WlOdbS1kY2PYQqSVwcsVSyU1JfsU8OOo="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + meta = { + description = "Better String Library for C"; + homepage = "https://github.com/msteinert/bstring"; + changelog = "https://github.com/msteinert/bstring/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ nulleric ]; + }; +}) diff --git a/pkgs/by-name/ne/netatalk/package.nix b/pkgs/by-name/ne/netatalk/package.nix index 900bfe70bef7..c6111d502cc3 100644 --- a/pkgs/by-name/ne/netatalk/package.nix +++ b/pkgs/by-name/ne/netatalk/package.nix @@ -5,6 +5,7 @@ acl, autoreconfHook, avahi, + bstring, db, libevent, libgcrypt, @@ -28,11 +29,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netatalk"; - version = "4.2.4"; + version = "4.3.2"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz"; - hash = "sha256-Twe74RipUd10DT9RqHtcr7oklr0LIucEQ49CGqZnD5k="; + hash = "sha256-KXe0/RExgvDMGDM3uiPVcB+yvk4N/Ox+5XW01zpzjTo="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ acl avahi + bstring db libevent libgcrypt @@ -69,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dwith-bdb-include-path=${db.dev}/include" "-Dwith-install-hooks=false" "-Dwith-init-hooks=false" - "-Dwith-lockfile-path=/run/lock/" + "-Dwith-lockfile-path=/run/lock" "-Dwith-cracklib=true" "-Dwith-cracklib-path=${cracklib.out}" "-Dwith-statedir-creation=false" @@ -82,6 +84,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://netatalk.io/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jcumming ]; + maintainers = with lib.maintainers; [ + jcumming + nulleric + ]; }; })