From 71e2b303c179e97af108b8b3a38369113fd09f9a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Jan 2022 03:59:12 +0100 Subject: [PATCH] pybitmessage: remove > "Programming Language :: Python :: 2.7 :: Only", --- .../pybitmessage/default.nix | 40 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/pybitmessage/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix deleted file mode 100644 index 279eea2f2d7b..000000000000 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, fetchFromGitHub, python2Packages, openssl }: - -python2Packages.buildPythonApplication rec { - pname = "pybitmessage"; - - version = "0.6.3.2"; - - src = fetchFromGitHub { - owner = "bitmessage"; - repo = "PyBitmessage"; - rev = version; - sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35"; - }; - - propagatedBuildInputs = with python2Packages; [ msgpack pyqt4 numpy pyopencl setuptools ] ++ [ openssl ]; - - preConfigure = '' - # Remove interaction and misleading output - substituteInPlace setup.py \ - --replace "nothing = raw_input()" pass \ - --replace 'print "It looks like building the package failed.\n" \' pass \ - --replace ' "You may be missing a C++ compiler and the OpenSSL headers."' pass \ - --replace 'msgpack-python' 'msgpack' - - substituteInPlace src/pyelliptic/openssl.py \ - --replace "libdir.append(find_library('ssl'))" "libdir.append('${openssl.out}/lib/libssl.so')" - - substituteInPlace src/depends.py \ - --replace "ctypes.util.find_library('ssl')" "'${openssl.out}/lib/libssl.so'" - - ''; - - meta = with lib; { - homepage = "https://bitmessage.org/"; - description = "The official Bitmessage client"; - license = licenses.mit; - maintainers = with maintainers; [ jgillich ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index de0b28e2c414..81d41311161d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -776,6 +776,7 @@ mapAliases ({ phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # added 2021-05-14 + pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2."; # added 2022-01-01 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01 python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 897dd9df4f27..c90db222930b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28038,8 +28038,6 @@ with pkgs; pwdsafety = callPackage ../tools/security/pwdsafety { }; - pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { }; - qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; qbittorrent-nox = qbittorrent.override { guiSupport = false;