From b20e68e6230cb137b0fc23b38423465fbd4ba82a Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sat, 25 Sep 2021 09:22:10 +0200 Subject: [PATCH] trebleshot: remove upstream is archived and not compatible with recent versions for Android anymore --- .../networking/trebleshot/default.nix | 29 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/applications/networking/trebleshot/default.nix diff --git a/pkgs/applications/networking/trebleshot/default.nix b/pkgs/applications/networking/trebleshot/default.nix deleted file mode 100644 index 82f91ddef8b4..000000000000 --- a/pkgs/applications/networking/trebleshot/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ mkDerivation, lib, fetchFromGitHub -, cmake, qtbase, kdnssd -}: - -mkDerivation rec { - pname = "trebleshot"; - version = "0.1.0-alpha2-15-ga7ac23c"; - # name="${pname}-${version}"; - - src = fetchFromGitHub { - owner = "genonbeta"; - repo = "TrebleShot-Desktop"; - rev = version; - sha256 = "1k8wagw6arsi1lqkhn1nl6j11mb122vi1qs0q2np6nznwfy7pn1k"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qtbase kdnssd ]; - - meta = with lib; { - description = "Android file transferring tool for desktop"; - homepage = "https://github.com/genonbeta/TrebleShot-Desktop"; - license = licenses.gpl2; - - platforms = platforms.linux; - maintainers = with maintainers; [ woffs ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ad615a67b8c7..60957b53324b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -944,6 +944,7 @@ mapAliases ({ transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # added 2020-10-14 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; + trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned."; trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29 truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9933bfc4af47..17715424bcf7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9782,8 +9782,6 @@ with pkgs; trash-cli = callPackage ../tools/misc/trash-cli { }; - trebleshot = libsForQt5.callPackage ../applications/networking/trebleshot { }; - trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { inherit (xorg) libXxf86vm; };