From 7a5f25594e48d366c588eab8d252ac223b2e8f54 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 31 Mar 2022 22:04:30 +0200 Subject: [PATCH] myserver: remove after being marked broken for over two years It was marked in commit 8a7f3c36185ddb801372b3461ff65109978ab46b by Eelco Dolstra on 2014-08-08 (commited on 2014-08-08) --- pkgs/servers/http/myserver/default.nix | 53 ------------------- .../disable-dns-lookup-in-chroot.patch | 12 ----- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 67 deletions(-) delete mode 100644 pkgs/servers/http/myserver/default.nix delete mode 100644 pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix deleted file mode 100644 index be659114d470..000000000000 --- a/pkgs/servers/http/myserver/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls -, libxml2, zlib, guile, texinfo, cppunit, killall }: - -let version = "0.11"; in - -stdenv.mkDerivation rec { - pname = "myserver"; - inherit version; - - src = fetchurl { - url = "mirror://gnu/myserver/${version}/${pname}-${version}.tar.xz"; - sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax"; - }; - - patches = - [ ./disable-dns-lookup-in-chroot.patch ]; - - buildInputs = [ - libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo - ]; - - checkInputs = [ cppunit ]; - - makeFlags = [ "V=1" ]; - - doCheck = true; - - enableParallelBuilding = true; - - # On GNU/Linux the `test_suite' process sometimes stays around, so - # forcefully terminate it. - postCheck = "${killall}/bin/killall test_suite || true"; - - meta = { - description = "GNU MyServer, a powerful and easy to configure web server"; - - longDescription = '' - GNU MyServer is a powerful and easy to configure web server. Its - multi-threaded architecture makes it extremely scalable and usable in - large scale sites as well as in small networks, it has a lot of - built-in features. Share your files in minutes! - ''; - - homepage = "https://www.gnu.org/software/myserver/"; - - license = lib.licenses.gpl3Plus; - - # libevent fails to build on Cygwin and Guile has troubles on Darwin. - platforms = lib.platforms.gnu ++ lib.platforms.linux; - - broken = true; # needs patch for gets() - }; -} diff --git a/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch b/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch deleted file mode 100644 index 31b24915c4da..000000000000 --- a/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch +++ /dev/null @@ -1,12 +0,0 @@ -Disable this test because it attempts to do a DNS lookup, which fails -in a chroot. - ---- myserver-0.10/tests/test_socket.cpp 2010-10-19 00:12:59.000000000 +0200 -+++ myserver-0.10/tests/test_socket.cpp 2010-10-19 00:13:07.000000000 +0200 -@@ -56,7 +56,6 @@ class TestSocket : public CppUnit::TestF - - CPPUNIT_TEST (testGethostname); - CPPUNIT_TEST (testRecv); -- CPPUNIT_TEST (testGetLocalIPsList); - - CPPUNIT_TEST_SUITE_END (); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 485e9384ea43..ba3000f148c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21629,8 +21629,6 @@ with pkgs; buildGoModule = buildGo116Module; }; - myserver = callPackage ../servers/http/myserver { }; - napalm = with python3Packages; toPythonApplication ( napalm.overridePythonAttrs (attrs: { # add community frontends that depend on the napalm python package