diff --git a/gnu/local.mk b/gnu/local.mk index e2cac7ffed..7a19387695 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -109,7 +109,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/commencement.scm \ %D%/packages/compression.scm \ %D%/packages/compton.scm \ - %D%/packages/conkeror.scm \ %D%/packages/conky.scm \ %D%/packages/connman.scm \ %D%/packages/cook.scm \ diff --git a/gnu/packages/conkeror.scm b/gnu/packages/conkeror.scm deleted file mode 100644 index 6145dbf445..0000000000 --- a/gnu/packages/conkeror.scm +++ /dev/null @@ -1,83 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Cyrill Schenkel -;;; Copyright © 2014, 2015 Eric Bavier -;;; Copyright © 2016 John J. Foerch -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages conkeror) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (gnu packages) - #:use-module (gnu packages gnuzilla)) - -(define-public conkeror - (package - (name "conkeror") - (version "1.1.0") - (source (origin - (method url-fetch) - (uri - (string-append "http://repo.or.cz/conkeror.git/snapshot/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0jz216mjwis7f03j98s4wkcrrq2j3f41fb2y47a5qszc340zhdzv")))) - (build-system gnu-build-system) - (inputs `(("icecat" ,icecat))) - (arguments - `(#:tests? #f ;no tests - #:make-flags `("CC=gcc" - ,(string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after - 'install 'install-app-launcher - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; This overwrites the installed launcher, which execs xulrunner, - ;; with one that execs 'icecat --app' - (let* ((out (assoc-ref outputs "out")) - (datadir (string-append out "/share/conkeror")) - (launcher (string-append out "/bin/conkeror"))) - (call-with-output-file launcher - (lambda (p) - (format p "#!~a/bin/bash -exec ~a/bin/icecat --app ~a \"$@\"~%" - (assoc-ref inputs "bash") ;implicit input - (assoc-ref inputs "icecat") - (string-append datadir - "/application.ini")))) - (chmod launcher #o555))))))) - (synopsis "Keyboard focused web browser with Emacs look and feel") - (description "Conkeror is a highly-programmable web browser based on -Mozilla XULRunner which is the base of all Mozilla products including Firefox. -Conkeror has a sophisticated keyboard system for running commands and -interacting with web page content, modelled after Emacs and Lynx. It is -self-documenting and extensible with JavaScript. - -It comes with builtin support for several Web 2.0 sites like several Google -services (Search, Gmail, Maps, Reader, etc.), Del.icio.us, Reddit, Last.fm and -YouTube. For easier editing of form fields, it can spawn external editors.") - (home-page "http://conkeror.org") - ;; Conkeror is triple licensed. - (license (list - ;; MPL 1.1 -- this license is not GPL compatible - license:gpl2 - license:lgpl2.1)))) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 74845ef239..bb7fda24e6 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -903,3 +903,8 @@ features built-in privacy-protecting features.") `((ftp-directory . "/gnu/gnuzilla") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) + +(define-public conkeror + ;; The Conkeror web browser relied on XULRunner, which IceCat > 50 no longer + ;; provides. See for the original web page. + (deprecated-package "conkeror" icecat))