diff options
author | Florian Klink <flokli@flokli.de> | 2020-02-02 22:29:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-02 22:29:35 +0100 |
commit | a1bcf2c90e93a19e8bcd56faca4722a0d15428f3 (patch) | |
tree | 4b2c4f46c1214db70db51856359d531ed6c24a22 /pkgs | |
parent | 75a9868dbe66bff430d3e1c01b5067a1c48053c3 (diff) | |
parent | c99e248f3c1ce6a114c5a93a0a7542574e5694cc (diff) | |
download | nixlib-a1bcf2c90e93a19e8bcd56faca4722a0d15428f3.tar nixlib-a1bcf2c90e93a19e8bcd56faca4722a0d15428f3.tar.gz nixlib-a1bcf2c90e93a19e8bcd56faca4722a0d15428f3.tar.bz2 nixlib-a1bcf2c90e93a19e8bcd56faca4722a0d15428f3.tar.lz nixlib-a1bcf2c90e93a19e8bcd56faca4722a0d15428f3.tar.xz nixlib-a1bcf2c90e93a19e8bcd56faca4722a0d15428f3.tar.zst nixlib-a1bcf2c90e93a19e8bcd56faca4722a0d15428f3.zip |
Merge pull request #77426 from lheckemann/remove-otter
otter-browser: remove
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/browsers/otter/default.nix | 27 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 1 insertions, 29 deletions
diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix deleted file mode 100644 index d41f84404201..000000000000 --- 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 c75efae1abba..2bcfb2b0047c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5790a0330588..98e878a8d79e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |