diff --git a/pkgs/servers/news/leafnode/1.nix b/pkgs/servers/news/leafnode/1.nix new file mode 100644 index 000000000000..377fbe2a7a2f --- /dev/null +++ b/pkgs/servers/news/leafnode/1.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, pcre2 }: + +stdenv.mkDerivation (finalAttrs: { + pname = "leafnode"; + version = "1.12.0"; + + src = fetchurl { + url = "https://downloads.sourceforge.net/project/leafnode/leafnode/${version}/leafnode-${version}.tar.gz"; + sha256 = "sha256-tGfOcyH2F6IeglfY00u199eKusnn6HeqD7or3Oz3ed4="; + }; + + configureFlags = [ + "--with-ipv6" + ]; + + buildInputs = [ pcre2 ]; + + meta = { + homepage = "https://leafnode.sourceforge.io/index.shtml"; + description = "Implementation of a store & forward NNTP proxy, stable release"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.ne9z ]; + }; +}) diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 32c59aea2bd3..0961bfdcdf6c 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pcre, libxcrypt }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "leafnode"; - version = "2.0.0.alpha20121101a.12"; + version = "2.0.0.alpha20140727b"; src = fetchurl { - url = "http://home.pages.de/~mandree/leafnode/beta/leafnode-2.0.0.alpha20121101a.tar.bz2"; - sha256 = "096w4gxj08m3vwmyv4sxpmbl8dn6mzqfmrhc32jgyca6qzlrdin8"; + url = "http://krusty.dt.e-technik.tu-dortmund.de/~ma/leafnode/beta/leafnode-${version}.tar.bz2"; + sha256 = "sha256-NOuiy7uHG3JMjV3UAtHDWK6yG6QmvrVljhVe0NdGEHU="; }; configureFlags = [ "--enable-runas-user=nobody" ]; @@ -15,24 +15,25 @@ stdenv.mkDerivation { substituteInPlace Makefile.in --replace 02770 0770 ''; + # configure uses id to check environment; we don't want this check preConfigure = '' - # configure uses id to check environment; we don't want this check sed -re 's/^ID[=].*/ID="echo whatever"/' -i configure ''; + # The is_validfqdn is far too restrictive, and only allows + # Internet-facing servers to run. In order to run leafnode via + # localhost only, we need to disable this check. postConfigure = '' - # The is_validfqdn is far too restrictive, and only allows - # Internet-facing servers to run. In order to run leafnode via - # localhost only, we need to disable this check. - sed -i validatefqdn.c -e 's/int is_validfqdn(const char \*f) {/int is_validfqdn(const char *f) { return 1;/;' + sed -i validatefqdn.c -e 's/int is_validfqdn(const char \*f) {/int is_validfqdn(const char *f) { return 1;/;' ''; buildInputs = [ pcre libxcrypt ]; meta = { - homepage = "http://leafnode.sourceforge.net/"; - description = "Implementation of a store & forward NNTP proxy"; + homepage = "https://leafnode.sourceforge.io/index.shtml"; + description = "Implementation of a store & forward NNTP proxy, under development"; license = lib.licenses.mit; platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.ne9z ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 128ce981e339..8aed8f81e818 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26444,6 +26444,8 @@ with pkgs; leafnode = callPackage ../servers/news/leafnode { }; + leafnode1 = callPackage ../servers/news/leafnode/1.nix { }; + lemmy-server = callPackage ../servers/web-apps/lemmy/server.nix { inherit (darwin.apple_sdk.frameworks) Security; };