From 9bf7d5104710b9d6dfc967c476ded449d56b1e57 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 9 Feb 2020 22:32:43 +0100 Subject: [PATCH] conkeror: remove package Conkeror doesn't work with any secure firefox release. Please move to some of the alternatives suggested at http://conkeror.org/Alternatives. --- .../networking/browsers/conkeror/default.nix | 39 ------------------- pkgs/top-level/aliases.nix | 5 +++ pkgs/top-level/all-packages.nix | 3 -- 3 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/conkeror/default.nix diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix deleted file mode 100644 index ffc6bde79a1..00000000000 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchgit, unzip, firefox-esr-52, makeWrapper }: - -stdenv.mkDerivation rec { - pkgname = "conkeror"; - version = "1.0.4"; - name = "${pkgname}-${version}"; - - src = fetchgit { - url = git://repo.or.cz/conkeror.git; - rev = "refs/tags/${version}"; - sha256 = "10c57wqybp9kcjpkb01wxq0h3vafcdb1g5kb4k8sb2zajg59afv8"; - }; - - buildInputs = [ unzip makeWrapper ]; - - installPhase = '' - mkdir -p $out/libexec/conkeror - cp -r * $out/libexec/conkeror - - makeWrapper ${firefox-esr-52}/bin/firefox $out/bin/conkeror \ - --add-flags "-app $out/libexec/conkeror/application.ini" - ''; - - meta = with stdenv.lib; { - description = "A keyboard-oriented, customizable, extensible web browser"; - longDescription = '' - Conkeror is a keyboard-oriented, highly-customizable, highly-extensible - web browser based on Mozilla XULRunner, written mainly in JavaScript, - and inspired by exceptional software such as Emacs and vi. Conkeror - features a sophisticated keyboard system, allowing users to run commands - and interact with content in powerful and novel ways. It is - self-documenting, featuring a powerful interactive help system. - ''; - homepage = http://conkeror.org/; - license = with licenses; [ mpl11 gpl2 lgpl21 ]; - maintainers = with maintainers; [ astsmtl ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f5ee54de214..bd30b69bfcc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -123,6 +123,11 @@ mapAliases ({ firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; # 2020-02, remove after 20.03 branchoff icecat = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff icecat-unwrapped = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff + conkeror-unwrapped = conkeror; # 2020-02, remove after 20.03 branchoff + conkeror = throw '' + Conkeror doesn't work with any secure firefox release. + Please move to some of the alternatives at http://conkeror.org/Alternatives + ''; # 2020-02, remove after 20.03 branchoff firestr = throw "firestr has been removed."; # added 2019-12-08 flameGraph = flamegraph; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 817f80a7dfd..0b8eccb15c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18503,9 +18503,6 @@ in comical = callPackage ../applications/graphics/comical { }; - conkeror-unwrapped = callPackage ../applications/networking/browsers/conkeror { }; - conkeror = wrapFirefox conkeror-unwrapped { }; - containerd = callPackage ../applications/virtualization/containerd { }; convchain = callPackage ../tools/graphics/convchain {};