cadaver: 0.23.3 -> 0.24

Changelog: https://github.com/notroj/cadaver/blob/0.24/NEWS

1 files changed, 25 insertions, 19 deletions

diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix
index e8c57e529cf..d94c89371b1 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;
   };
 }