From 33df2ffa0a5e666f9fd9a2a836b2ff4f96224e6d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Jan 2022 01:47:13 +0100 Subject: [PATCH] blink: drop The package was not updated since 2019 and requires python2 only dependencies. --- .../instant-messengers/blink/default.nix | 68 ------------------- .../instant-messengers/blink/pythonpath.patch | 49 ------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/blink/default.nix delete mode 100644 pkgs/applications/networking/instant-messengers/blink/pythonpath.patch diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix deleted file mode 100644 index ead46366cbf4..000000000000 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, fetchdarcs, python2Packages, libvncserver, zlib -, gnutls, libvpx, makeDesktopItem, mkDerivationWith }: - -mkDerivationWith python2Packages.buildPythonApplication rec { - - pname = "blink"; - version = "3.2.0"; - - src = fetchdarcs { - url = "http://devel.ag-projects.com/repositories/blink-qt"; - rev = "release-${version}"; - sha256 = "19rcwr5scw48qnj79q1pysw95fz9h98nyc3161qy2kph5g7dwkc3"; - }; - - patches = [ ./pythonpath.patch ]; - postPatch = '' - sed -i 's|@out@|'"''${out}"'|g' blink/resources.py - ''; - - propagatedBuildInputs = with python2Packages; [ - pyqt5_with_qtwebkit - cjson - sipsimple - twisted - google-api-python-client - ]; - - buildInputs = [ - python2Packages.cython - zlib - libvncserver - libvpx - ]; - - desktopItem = makeDesktopItem { - name = "Blink"; - exec = "blink"; - comment = meta.description; - desktopName = "Blink"; - icon = "blink"; - genericName = "Instant Messaging"; - categories = "Internet;"; - }; - - dontWrapQtApps = true; - - postInstall = '' - mkdir -p "$out/share/applications" - mkdir -p "$out/share/pixmaps" - cp "$desktopItem"/share/applications/* "$out/share/applications" - cp "$out"/share/blink/icons/blink.* "$out/share/pixmaps" - ''; - - preFixup = '' - makeWrapperArgs+=( - --prefix "LD_LIBRARY_PATH" ":" "${gnutls.out}/lib" - "''${qtWrapperArgs[@]}" - ) - ''; - - meta = with lib; { - homepage = "https://icanblink.com/"; - description = "A state of the art, easy to use SIP client for Voice, Video and IM"; - platforms = platforms.linux; - license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch b/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch deleted file mode 100644 index 0df8bc84ff30..000000000000 --- a/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- blink-2.0.0/blink/resources.py 2016-03-09 14:39:07.000000000 +0100 -+++ blink-2.0.0/blink/resources-patched.py 2016-03-12 21:34:14.965476623 +0100 -@@ -1,7 +1,10 @@ -+# Copyright (C) 2010-2013 AG Projects. See LICENSE for details. -+# - - """Provide access to Blink's resources""" - --import __main__ -+__all__ = ['ApplicationData', 'Resources', 'IconManager'] -+ - import imghdr - import os - import platform -@@ -19,14 +22,10 @@ - from blink.util import run_in_gui_thread - - --__all__ = ['ApplicationData', 'Resources', 'IconManager'] -- -- - class DirectoryContextManager(unicode): - def __enter__(self): - self.directory = os.getcwdu() - os.chdir(self) -- - def __exit__(self, type, value, traceback): - os.chdir(self.directory) - -@@ -61,18 +60,7 @@ - @classproperty - def directory(cls): - if cls._cached_directory is None: -- try: -- binary_directory = os.path.dirname(os.path.realpath(__main__.__file__)) -- except AttributeError: -- if hasattr(sys, 'frozen'): -- application_directory = os.path.dirname(os.path.realpath(sys.executable)) -- else: -- application_directory = os.path.realpath('') # executed in interactive interpreter -- else: -- if os.path.basename(binary_directory) == 'bin': -- application_directory = os.path.dirname(binary_directory) -- else: -- application_directory = binary_directory -+ application_directory = '@out@' - if os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')): - cls._cached_directory = os.path.join(application_directory, 'resources').decode(sys.getfilesystemencoding()) - else: diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 19f58cd8a0dd..ff376e6eba1d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -100,6 +100,7 @@ mapAliases ({ bitwarden_rs-postgresql = vaultwarden-postgresql; bitwarden_rs-vault = vaultwarden-vault; + blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal."; # added 2022-01-12 bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02 bsod = throw "bsod has been removed: deleted by upstream"; # added 2022-01-07 btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index caa5e5937150..a67682d8ed05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2197,8 +2197,6 @@ with pkgs; bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { }; - blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { }; - blitz = callPackage ../development/libraries/blitz { }; blockbook = callPackage ../servers/blockbook { };