diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix deleted file mode 100644 index e0437fb7cea1..000000000000 --- a/pkgs/development/libraries/neon/0.29.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, libxml2, pkg-config, perl -, compressionSupport ? true, zlib ? null -, sslSupport ? true, openssl ? null -, static ? false -, shared ? true -}: - -assert compressionSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert static || shared; - -let - inherit (lib) optionals; -in - -stdenv.mkDerivation rec { - version = "0.29.6"; - pname = "neon"; - - src = fetchurl { - url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; - sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; - }; - - patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [libxml2 openssl] - ++ lib.optional compressionSupport zlib; - - configureFlags = [ - (lib.enableFeature shared "shared") - (lib.enableFeature static "static") - (lib.withFeature compressionSupport "zlib") - (lib.withFeature sslSupport "ssl") - ]; - - passthru = {inherit compressionSupport sslSupport;}; - - checkInputs = [ perl ]; - doCheck = false; # fails, needs the net - - meta = with lib; { - description = "An HTTP and WebDAV client library"; - homepage = "http://www.webdav.org/neon/"; - platforms = platforms.unix; - license = licenses.lgpl2; - }; -} diff --git a/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch b/pkgs/development/libraries/neon/darwin-fix-configure.patch similarity index 100% rename from pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch rename to pkgs/development/libraries/neon/darwin-fix-configure.patch diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 739c5e07d206..a39ece28aae9 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0y46dbhiblcvg8k41bdydr3fivghwk73z040ki5825d24ynf67ng"; }; - patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; + patches = optionals stdenv.isDarwin [ ./darwin-fix-configure.patch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be057d0b4bd7..0e0d93b13e14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19200,10 +19200,6 @@ with pkgs; neon = callPackage ../development/libraries/neon { }; - neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { - openssl = openssl_1_0_2; - }; - nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; newman = callPackage ../development/web/newman {};