From d04d1c65bb04e2bd292a4b5db430d0886a3832ac Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 8 Dec 2019 22:56:14 +0100 Subject: [PATCH] mbedtls_1_3: remove EoL version --- pkgs/development/libraries/mbedtls/1.3.nix | 34 ---------------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 pkgs/development/libraries/mbedtls/1.3.nix diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix deleted file mode 100644 index 8b8d8cd0be8..00000000000 --- a/pkgs/development/libraries/mbedtls/1.3.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, perl }: - -stdenv.mkDerivation rec { - name = "mbedtls-1.3.22"; - - src = fetchurl { - url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "0ms4s41z88mz7b6gsnp7jslms4v0115k7gw51i6kx6ng9am43l6y"; - }; - - nativeBuildInputs = [ perl ]; - - postPatch = '' - patchShebangs . - ''; - - makeFlags = [ - "SHARED=1" - ]; - - installFlags = [ - "DESTDIR=\${out}" - ]; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = https://tls.mbed.org/; - description = "Portable cryptographic and SSL/TLS library, aka polarssl"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ fpletz ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3cfbb68c9cf..d0ef93371c9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -219,6 +219,7 @@ mapAliases ({ man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 + mbedtls_1_3 = throw "End of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 @@ -285,6 +286,7 @@ mapAliases ({ pltScheme = racket; # just to be sure plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 pmtools = acpica-tools; # added 2018-11-01 + polarssl = mbedtls; # added 2018-04-25 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 postgresql95 = postgresql_9_5; postgresql96 = postgresql_9_6; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e68465838e7..8aa0fdbf77c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13126,8 +13126,6 @@ in matio = callPackage ../development/libraries/matio { }; mbedtls = callPackage ../development/libraries/mbedtls { }; - mbedtls_1_3 = callPackage ../development/libraries/mbedtls/1.3.nix { }; - polarssl = mbedtls; # TODO: add to aliases.nix mdds = callPackage ../development/libraries/mdds { };