nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: links: Update to 2.12. 

* gnu/packages/links.scm (links): Update to 2.12.
  Various whitespace and line length fixes.
This commit is contained in:
Efraim Flashner 2015-11-02 10:46:56 +02:00
parent 32efa254a8
commit cb7fed9285
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/links.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -31,21 +32,21 @@
(define-public links (define-public links
(package (package
(name "links") (name "links")
(version "2.8") (version "2.12")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://links.twibright.com/download/" (uri (string-append "http://links.twibright.com/download/"
name "-" version ".tar.bz2")) name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 "15h07498z52jfdahzgvkphg1f7qvxnpbyfn2xmsls0d2dwwdll3r")))) (base32 "0knq15yrp60s4jh92aacw8yfc2pcv3bqsw7dba7h5s6ivq8ihhcq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (alist-replace `(#:phases (alist-replace
'configure 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; The tarball uses a very old version of autconf. It doesn't understand ;; The tarball uses a very old version of autconf. It doesn't
;; extra flags like `--enable-fast-install', so we need to ;; understand extra flags like `--enable-fast-install', so
;; invoke it with just what it understand. ;; we need to invoke it with just what it understands.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
;; 'configure' doesn't understand '--host'. ;; 'configure' doesn't understand '--host'.
,@(if (%current-target-system) ,@(if (%current-target-system)
@ -55,8 +56,7 @@
(zero? (zero?
(system* "./configure" (system* "./configure"
(string-append "--prefix=" out) (string-append "--prefix=" out)
"--enable-graphics" "--enable-graphics"))))
))))
%standard-phases))) %standard-phases)))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("zlib" ,zlib) (inputs `(("zlib" ,zlib)
@ -73,10 +73,7 @@ features including, tables, builtin image display, bookmarks, SSL and more.")
;; However, the copyright notices simply say: ;; However, the copyright notices simply say:
;; "This file is a part of the Links program, released under GPL." ;; "This file is a part of the Links program, released under GPL."
;; Therefore, under the provisions of Section 9, we can choose ;; Therefore, under the provisions of Section 9, we can choose
;; any version ever published by the FSF ;; any version ever published by the FSF.
;; One file (https.c) contains an exception permitting ;; One file (https.c) contains an exception permitting
;; linking of the program with openssl ;; linking of the program with openssl.
(license license:gpl1+))) (license license:gpl1+)))