diff options
author | Ryan Burns <52847440+r-burns@users.noreply.github.com> | 2021-09-26 14:01:59 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-26 14:01:59 -0700 |
commit | 47fd3efed88ffd072e01af76367afcbe3ea54a86 (patch) | |
tree | da33bd7bddb4c3097b42f397e17350c72a8a9503 | |
parent | 76a4a78d099ce19221a1564fbb3b96315157c21d (diff) | |
parent | b20e68e6230cb137b0fc23b38423465fbd4ba82a (diff) | |
download | nixpkgs-47fd3efed88ffd072e01af76367afcbe3ea54a86.tar nixpkgs-47fd3efed88ffd072e01af76367afcbe3ea54a86.tar.gz nixpkgs-47fd3efed88ffd072e01af76367afcbe3ea54a86.tar.bz2 nixpkgs-47fd3efed88ffd072e01af76367afcbe3ea54a86.tar.lz nixpkgs-47fd3efed88ffd072e01af76367afcbe3ea54a86.tar.xz nixpkgs-47fd3efed88ffd072e01af76367afcbe3ea54a86.tar.zst nixpkgs-47fd3efed88ffd072e01af76367afcbe3ea54a86.zip |
Merge pull request #139391 from woffs/trebleshot-remove
trebleshot: remove
-rw-r--r-- | pkgs/applications/networking/trebleshot/default.nix | 29 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 1 insertions, 31 deletions
diff --git a/pkgs/applications/networking/trebleshot/default.nix b/pkgs/applications/networking/trebleshot/default.nix deleted file mode 100644 index 82f91ddef8b..00000000000 --- 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 ad615a67b8c..60957b53324 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 c53485f5dea..4a7e1eb4c6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9787,8 +9787,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; }; |