From d64b2cc1e9c8f160cfa3c10ed3e9aa8b740173e7 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 26 Apr 2022 10:49:55 -0500 Subject: [PATCH] twister: remove --- .../networking/p2p/twister/default.nix | 70 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/twister/default.nix diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix deleted file mode 100644 index 979ac955caf3..000000000000 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2 -, boost, db, openssl, geoip, libiconv, miniupnpc, srcOnly -}: - -let - twisterHTML = srcOnly { - name = "twister-html"; - src = fetchFromGitHub { - owner = "miguelfreitas"; - repo = "twister-html"; - rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b"; - sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk="; - }; - }; - - boostPython = boost.override { - enablePython = true; - python = python2; - }; - -in stdenv.mkDerivation rec { - pname = "twister"; - version = "2019-08-19"; - - src = fetchFromGitHub { - owner = "miguelfreitas"; - repo = "twister-core"; - rev = "31faf3f63e461ea0a9b23081567a4a552cf06873"; - sha256 = "0xh1lgnl9nd86jr0mp7m8bkd7r5j4d6chd0y73h2xv4aq5sld0sp"; - }; - - configureFlags = [ - "--with-libgeoip" - "--with-libiconv" - "--disable-deprecated-functions" - "--enable-tests" - "--enable-python-binding" - "--with-boost-libdir=${boostPython.out}/lib" - ]; - - nativeBuildInputs = [ pkg-config automake autoconf ]; - buildInputs = [ - libtool python2 - boostPython db openssl geoip miniupnpc libiconv - ]; - - postPatch = '' - sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \ - src/init.cpp - sed -i -e '/GetDataDir.*html/s|path *= *[^;]*|path = "${twisterHTML}"|' \ - src/util.cpp - ''; - - preConfigure = '' - sh autotool.sh - ''; - - installPhase = '' - install -vD twisterd "$out/bin/twisterd" - ''; - - enableParallelBuilding = true; - - meta = { - homepage = "http://www.twister.net.co/"; - description = "Peer-to-peer microblogging"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fcfce41aac13..1f4fa4765181 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1301,6 +1301,7 @@ mapAliases ({ tshark = throw "'tshark' has been renamed to/replaced by 'wireshark-cli'"; # Converted to throw 2022-02-22 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 + twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11 ### U ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d57f89d88814..2bcfd1d27abf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29969,10 +29969,6 @@ with pkgs; swt = swt_jdk8; }; - twister = callPackage ../applications/networking/p2p/twister { - boost = boost16x; - }; - twmn = libsForQt5.callPackage ../applications/misc/twmn { }; testssl = callPackage ../applications/networking/testssl { };