Merge pull request #77426 from lheckemann/remove-otter

otter-browser: remove
This commit is contained in:
Florian Klink 2020-02-02 22:29:35 +01:00 committed by GitHub
commit a1bcf2c90e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 29 deletions

View file

@ -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 ];
};
}

View file

@ -288,6 +288,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

View file

@ -6680,8 +6680,6 @@ in
Sylk = callPackage ../applications/networking/Sylk {};
otter-browser = qt5.callPackage ../applications/networking/browsers/otter {};
privoxy = callPackage ../tools/networking/privoxy {
w3m = w3m-batch;
};