diff options
author | ajs124 <git@ajs124.de> | 2022-03-31 22:04:10 +0200 |
---|---|---|
committer | ajs124 <git@ajs124.de> | 2022-04-03 16:14:14 +0100 |
commit | 71276302bb3bd33972f1282ab1daff03dcf0584d (patch) | |
tree | d59920c88b5553d7442ea82814d565629a659ddd | |
parent | 42d49fd75debe7e640a279fdc2b9d29af59083e3 (diff) | |
download | nixpkgs-71276302bb3bd33972f1282ab1daff03dcf0584d.tar nixpkgs-71276302bb3bd33972f1282ab1daff03dcf0584d.tar.gz nixpkgs-71276302bb3bd33972f1282ab1daff03dcf0584d.tar.bz2 nixpkgs-71276302bb3bd33972f1282ab1daff03dcf0584d.tar.lz nixpkgs-71276302bb3bd33972f1282ab1daff03dcf0584d.tar.xz nixpkgs-71276302bb3bd33972f1282ab1daff03dcf0584d.tar.zst nixpkgs-71276302bb3bd33972f1282ab1daff03dcf0584d.zip |
gnutls-kdh: remove after being marked broken for over two years
It was marked in commit 36fe55487a05c0f5aec84f9308d744780c0218bd by Peter Simons on 2019-10-30 (commited on 2019-10-30)
-rw-r--r-- | pkgs/development/libraries/gnutls-kdh/3.5.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/gnutls-kdh/generic.nix | 95 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 0 insertions, 111 deletions
diff --git a/pkgs/development/libraries/gnutls-kdh/3.5.nix b/pkgs/development/libraries/gnutls-kdh/3.5.nix deleted file mode 100644 index 015163b3293..00000000000 --- a/pkgs/development/libraries/gnutls-kdh/3.5.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage, fetchFromGitHub, autoreconfHook, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.0"; - - src = fetchFromGitHub { - owner = "arpa2"; - repo = "gnutls-kdh"; - rev = "ff3bb36f70a746f28554641d466e124098dfcb25"; - sha256 = "1rr3p4r145lnprxn8hqyyzh3qkj3idsbqp08g07ndrhqnxq0k0sw"; - }; -}) diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix deleted file mode 100644 index 7b3b4561efb..00000000000 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkg-config, lzip -, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv -, guileBindings ? config.gnutls.guile or false, guile -, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake -, bison, texinfo - -# Version dependent args -, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] -, ...}: - -assert guileBindings -> guile != null; -let - # XXX: Gnulib's `test-select' fails on FreeBSD: - # https://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; -in -stdenv.mkDerivation { - pname = "gnutls-kdh"; - inherit version; - - inherit src patches; - - outputs = [ "bin" "dev" "out" ]; - - patchPhase = '' - # rm -fR ./po - # substituteInPlace configure "po/Makefile.in" " " - substituteInPlace doc/manpages/Makefile.in --replace "gnutls_cipher_list.3" " " - substituteInPlace doc/manpages/Makefile.in --replace "gnutls_cipher_self_test.3" " " - substituteInPlace doc/manpages/Makefile.in --replace "gnutls_digest_self_test.3" " " - substituteInPlace doc/manpages/Makefile.in --replace "gnutls_mac_self_test.3" " " - substituteInPlace doc/manpages/Makefile.in --replace "gnutls_pk_self_test.3" " " - printf "all: ;\n\ninstall: ;" > "po/Makefile.in" - printf "all: ;\n\ninstall: ;" > "po/Makefile.in.in" - ''; - - postPatch = lib.optionalString (lib.versionAtLeast version "3.4") '' - sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \ - -i tests/cert-tests/name-constraints - '' + postPatch; - - preConfigure = "patchShebangs ."; - configureFlags = - lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" - ++ [ - "--disable-dependency-tracking" - "--enable-fast-install" - ] ++ lib.optional guileBindings - [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; - - # Build of the Guile bindings is not parallel-safe. See - # <https://github.com/arpa2/gnutls-kdh/commit/330995a920037b6030ec0282b51dde3f8b493cad> - # for the actual fix. Also an apparent race in the generation of - # systemkey-args.h. - enableParallelBuilding = false; - - buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp - autogen gperftools gperf gettext automake bison texinfo ] - ++ lib.optional doCheck nettools - ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv - ++ lib.optional (tpmSupport && stdenv.isLinux) trousers - ++ [ unbound ] - ++ lib.optional guileBindings guile; - - nativeBuildInputs = [ perl pkg-config ] ++ nativeBuildInputs; - - #inherit doCheck; - doCheck = false; - - # Fixup broken libtool and pkg-config files - preFixup = lib.optionalString (!stdenv.isDarwin) '' - sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \ - -e 's,-lz,-L${zlib.out}/lib -lz,' \ - -e 's,-L${gmp.dev}/lib,-L${gmp.out}/lib,' \ - -e 's,-lgmp,-L${gmp.out}/lib -lgmp,' \ - -i $out/lib/*.la "$dev/lib/pkgconfig/gnutls.pc" - ''; - - meta = with lib; { - description = "GnuTLS with additional TLS-KDH ciphers: Kerberos + Diffie-Hellman"; - - longDescription = '' - The ARPA2 project aims to add security. This is an enhanced - version of GnuTLS, a project that aims to develop a library which - provides a secure layer, over a reliable transport - layer. It adds TLS-KDH ciphers: Kerberos + Diffie-Hellman. - ''; - - homepage = "https://github.com/arpa2/gnutls-kdh"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ leenaars ]; - platforms = platforms.all; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd3e9edf235..13aa6f34776 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17272,10 +17272,6 @@ with pkgs; autoconf = buildPackages.autoconf269; }; - gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { - gperf = gperf_3_0; - }; - gpac = callPackage ../applications/video/gpac { }; gpgme = callPackage ../development/libraries/gpgme { }; |