diff --git a/pkgs/tools/networking/cadaver/configure.patch b/pkgs/tools/networking/cadaver/configure.patch deleted file mode 100644 index b618099b371a..000000000000 --- a/pkgs/tools/networking/cadaver/configure.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.orig -+++ b/configure -@@ -9595,7 +9595,7 @@ fi - $as_echo "$ne_cv_lib_neon" >&6; } - if test "$ne_cv_lib_neon" = "yes"; then - ne_cv_lib_neonver=no -- for v in 27 28 29; do -+ for v in 27 28 29 30 31; do - case $ne_libver in - 0.$v.*) ne_cv_lib_neonver=yes ;; - esac -@@ -10328,7 +10328,7 @@ fi - $as_echo "$ne_cv_lib_neon" >&6; } - if test "$ne_cv_lib_neon" = "yes"; then - ne_cv_lib_neonver=no -- for v in 27 28 29; do -+ for v in 27 28 29 30 31; do - case $ne_libver in - 0.$v.*) ne_cv_lib_neonver=yes ;; - esac diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index e8c57e529cf3..d94c89371b1b 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -1,35 +1,41 @@ -{ lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib, openssl }: +{ lib +, stdenv +, fetchurl +, neon +, pkg-config +, zlib +, openssl +}: stdenv.mkDerivation rec { pname = "cadaver"; - version = "0.23.3"; + version = "0.24"; src = fetchurl { - url = "http://www.webdav.org/cadaver/cadaver-${version}.tar.gz"; - sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x"; + url = "https://notroj.github.io/cadaver/cadaver-${version}.tar.gz"; + hash = "sha256-Rs/y8+vTLNMoNoEspHvMdTU/wr51fwk9qIwN2PEP1fY="; }; - patches = [ - (fetchpatch { - url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/disable-sslv2.patch?h=packages/cadaver"; - name = "disable-sslv2.patch"; - sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr"; - }) - # Cadaver also works with newer versions of neon than stated - # in the configure script - ./configure.patch + configureFlags = [ + "--with-ssl" ]; - configureFlags = [ "--with-ssl" "--with-readline" ]; + nativeBuildInputs = [ + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ neon readline zlib openssl ]; + buildInputs = [ + neon + openssl + zlib + ]; meta = with lib; { description = "A command-line WebDAV client"; - homepage = "http://www.webdav.org/cadaver"; + homepage = "https://notroj.github.io/cadaver/"; + changelog = "https://github.com/notroj/cadaver/blob/${version}/NEWS"; maintainers = with maintainers; [ ianwookim ]; - license = licenses.gpl2; - platforms = with platforms; linux ++ freebsd ++ openbsd; + license = licenses.gpl2Plus; + platforms = with platforms; linux ++ freebsd ++ openbsd; }; }