From d7349c6cfaaa12fa9b64b821eedd68dbdcceecc9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 17 Nov 2022 12:35:47 +0200 Subject: [PATCH] tlspool: remove because its dependency gnutls-kdh has been removed 71276302bb3bd33972f1282ab1daff03dcf0584d > gnutls-kdh: remove after being marked broken for over two years (cherry picked from commit 07f075b57edd3a9f4652aa1167b1ee7ff940a9d5) --- pkgs/tools/networking/tlspool/default.nix | 52 ----------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 54 deletions(-) delete mode 100644 pkgs/tools/networking/tlspool/default.nix diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix deleted file mode 100644 index 01eced9a5664..000000000000 --- a/pkgs/tools/networking/tlspool/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config, arpa2cm -, openldap, p11-kit, unbound, libtasn1, db, openssl, quickder, libkrb5, ldns, gnutls-kdh -, softhsm -}: - -let - pname = "tlspool"; - version = "20180227"; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "arpa2"; - repo = "tlspool"; - rev = "b4459637d71c7602e94d455e23c74f3973b9cf30"; - sha256 = "0x78f2bdsiglwicwn3injm5ysfjlfa0yzdpnc0r3iw4z0n89rj2r"; - }; - - nativeBuildInputs = [ - cmake pkg-config arpa2cm - ]; - - buildInputs = [ - openldap p11-kit unbound libtasn1 db openssl quickder libkrb5 ldns gnutls-kdh - ]; - - postPatch = '' - # CMake is probably confused because the current version isn't 1.2.6, but 1.2-6 - substituteInPlace CMakeLists.txt \ - --replace "Quick-DER 1.2.4" "Quick-DER 1.2" - substituteInPlace etc/tlspool.conf \ - --replace "dnssec_rootkey ../etc/root.key" "dnssec_rootkey $out/etc/root.key" \ - --replace "pkcs11_path /usr/local/lib/softhsm/libsofthsm2.so" "pkcs11_path ${softhsm}/lib/softhsm/libsofthsm2.so" - ''; - - postInstall = '' - mkdir -p $out/include/${pname}/pulleyback $out/etc/tlspool - cp -R $src/etc/* $out/etc/tlspool/ - cp $src/include/tlspool/*.h $out/include/${pname} - cp $src/pulleyback/*.h $out/include/${pname}/pulleyback/ - cp $src/src/*.h $out/include/${pname} - ''; - - meta = with lib; { - description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment"; - license = licenses.gpl3; - homepage = "http://www.tlspool.org"; - maintainers = with maintainers; [ leenaars qknight ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec50d3d7e9f7..91ffc881a40c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12067,8 +12067,6 @@ with pkgs; tldr-hs = haskellPackages.tldr; - tlspool = callPackage ../tools/networking/tlspool { }; - tlsx = callPackage ../tools/security/tlsx { }; tmate = callPackage ../tools/misc/tmate { };