ed7482f · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

on master help sign in

Merge pull request #170440 from armeenm/remove-twister

ed7482fArtturi5 years ago

pkgs/applications/networking/p2p/twister/default.nixdeleted−70

compare with master

unifiedsplit

@@ -1,70 +0,0 @@

1−{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2

2−, boost, db, openssl, geoip, libiconv, miniupnpc, srcOnly

3−}:

4−

5−let

6− twisterHTML = srcOnly {

7− name = "twister-html";

8− src = fetchFromGitHub {

9− owner = "miguelfreitas";

10− repo = "twister-html";

11− rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b";

12− sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk=";

13− };

14− };

15−

16− boostPython = boost.override {

17− enablePython = true;

18− python = python2;

19− };

20−

21−in stdenv.mkDerivation rec {

22− pname = "twister";

23− version = "2019-08-19";

24−

25− src = fetchFromGitHub {

26− owner = "miguelfreitas";

27− repo = "twister-core";

28− rev = "31faf3f63e461ea0a9b23081567a4a552cf06873";

29− sha256 = "0xh1lgnl9nd86jr0mp7m8bkd7r5j4d6chd0y73h2xv4aq5sld0sp";

30− };

31−

32− configureFlags = [

33− "--with-libgeoip"

34− "--with-libiconv"

35− "--disable-deprecated-functions"

36− "--enable-tests"

37− "--enable-python-binding"

38− "--with-boost-libdir=${boostPython.out}/lib"

39− ];

40−

41− nativeBuildInputs = [ pkg-config automake autoconf ];

42− buildInputs = [

43− libtool python2

44− boostPython db openssl geoip miniupnpc libiconv

45− ];

46−

47− postPatch = ''

48− sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \

49− src/init.cpp

50− sed -i -e '/GetDataDir.*html/s|path *= *[^;]*|path = "${twisterHTML}"|' \

51− src/util.cpp

52− '';

53−

54− preConfigure = ''

55− sh autotool.sh

56− '';

57−

58− installPhase = ''

59− install -vD twisterd "$out/bin/twisterd"

60− '';

61−

62− enableParallelBuilding = true;

63−

64− meta = {

65− homepage = "http://www.twister.net.co/";

66− description = "Peer-to-peer microblogging";

67− license = lib.licenses.mit;

68− platforms = lib.platforms.linux;

69− };

70−}

pkgs/top-level/aliases.nix+1

@@ -1308,6 +1308,7 @@ mapAliases ({

1308 tshark = throw "'tshark' has been renamed to/replaced by 'wireshark-cli'"; # Converted to throw 2022-02-22

1309 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07

1310 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08

1311+ twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26

1311 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11

1312 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11

1312

1313

1313 ### U ###

1314 ### U ###

pkgs/top-level/all-packages.nix−4

@@ -30069,10 +30069,6 @@ with pkgs;

30069 swt = swt_jdk8;

30070 };

30071

30072− twister = callPackage ../applications/networking/p2p/twister {

30073− boost = boost16x;

30074− };

30075−

30076 twmn = libsForQt5.callPackage ../applications/misc/twmn { };

30072 twmn = libsForQt5.callPackage ../applications/misc/twmn { };

30077

30073

30078 testssl = callPackage ../applications/networking/testssl { };

30074 testssl = callPackage ../applications/networking/testssl { };