From c99e248f3c1ce6a114c5a93a0a7542574e5694cc Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 10 Jan 2020 11:30:45 +0100 Subject: [PATCH] otter-browser: remove I have no interest in maintaining this anymore and it has no other maintainers. --- .../networking/browsers/otter/default.nix | 27 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/otter/default.nix diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix deleted file mode 100644 index d41f8440420..00000000000 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, cmake, fetchFromGitHub -, qtbase, qtmultimedia, qtwebengine, qtxmlpatterns -, version ? "1.0.01" -, sourceSha ? "1jw8bj3lcqngr0mqwvz1gf47qjxbwiyda7x4sm96a6ckga7pcwyb" -}: -stdenv.mkDerivation { - pname = "otter-browser"; - inherit version; - - src = fetchFromGitHub { - owner = "OtterBrowser"; - repo = "otter-browser"; - rev = "v${version}"; - sha256 = sourceSha; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qtbase qtmultimedia qtwebengine qtxmlpatterns ]; - - meta = with stdenv.lib; { - homepage = https://otter-browser.org; - license = licenses.gpl3Plus; - description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5"; - maintainers = with maintainers; [ lheckemann ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7191dba0e4..a6f4a5c494a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -290,6 +290,7 @@ mapAliases ({ opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 osquery = throw "osquery has been removed."; # added 2019-11-24 + otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 parquet-cpp = arrow-cpp; # added 2018-09-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7e7be15700..392f393218d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6622,8 +6622,6 @@ in Sylk = callPackage ../applications/networking/Sylk {}; - otter-browser = qt5.callPackage ../applications/networking/browsers/otter {}; - privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; };