From 6d1b3bf55b8347b5edef46924a26eb19b94be250 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 31 Oct 2016 10:38:34 +0100 Subject: [PATCH 01/36] gnu: openocd: Correct license. * gnu/packages/embedded.scm (openocd)[license]: Change to gpl2+. --- gnu/packages/embedded.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 11df32a6f2..c4d05605a8 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -361,4 +361,4 @@ (define-public openocd (synopsis "On-Chip Debugger") (description "OpenOCD provides on-chip programming and debugging support with a layered architecture of JTAG interface and TAP support.") - (license license:gpl2)))) + (license license:gpl2+)))) From 58fdab1d135376b4d6426cdcbd0a88177f94aa06 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Oct 2016 16:00:31 +0100 Subject: [PATCH 02/36] gnu: Add ccid. * gnu/packages/security-token.scm (ccid): New variable. --- gnu/packages/security-token.scm | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 735b2fe0ec..8f58c589d9 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Ludovic Courtès ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Mike Gerwitz +;;; Copyright © 2016 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,11 +26,50 @@ (define-module (gnu packages security-token) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages curl) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages man) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config)) +(define-public ccid + (package + (name "ccid") + (version "1.4.25") + (source (origin + (method url-fetch) + (uri (string-append + "https://alioth.debian.org/frs/download.php/file/4187/" + "ccid-" version ".tar.bz2")) + (sha256 + (base32 + "029n4lpy5nvg278s4mybisyj4lm0bcjslvwfslw6hkghw162n1kb")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags (list (string-append "--enable-usbdropdir=" %output + "/pcsc/drivers")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-Makefile + (lambda _ + (substitute* "src/Makefile.in" + (("/bin/echo") (which "echo"))) + #t))))) + (native-inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("libusb" ,libusb) + ("pcsc-lite" ,pcsc-lite))) + (home-page "https://pcsclite.alioth.debian.org/ccid.html") + (synopsis "PC/SC driver for USB smart card devices") + (description + "This package provides a PC/SC IFD handler implementation for devices +compliant with the CCID and ICCD protocols. It supports a wide range of +readers and is needed to communicate with such devices through the +@command{pcscd} resource manager.") + (license license:lgpl2.1+))) + (define-public libyubikey (package (name "libyubikey") From c907beec92d02a430360a95dc392fd08a792116e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 31 Oct 2016 11:15:08 +0000 Subject: [PATCH 03/36] gnu: fio: Update to 2.15. * gnu/packages/benchmark.scm (fio): Update to 2.15. --- gnu/packages/benchmark.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 25813d1ab2..465c81b431 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -27,7 +27,7 @@ (define-module (gnu packages benchmark) (define-public fio (package (name "fio") - (version "2.13") + (version "2.15") (source (origin (method url-fetch) (uri (string-append @@ -35,7 +35,7 @@ (define-public fio "fio-" version ".tar.bz2")) (sha256 (base32 - "10bn9jzks8mam5vz6falhr9pmd9wx248kh53vqp1bazbfxs3qgz0")))) + "1ggma9c48717z2wz8j9f7jcgb3xqk8qawjl6c9hnabxxry94y130")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; No tests. From 8f50634ba44d29a401ab9f6fc636be0299c7f28b Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Thu, 20 Oct 2016 17:32:42 +0200 Subject: [PATCH 04/36] gnu: Add emacs-stream. * gnu/packages/emacs.scm (emacs-stream): New varaible. --- gnu/packages/emacs.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2c76b46e54..1f4035a61f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3320,3 +3320,21 @@ (define-public emacs-nginx-mode (description "This package provides an Emacs major mode for editing nginx config files.") (license license:gpl2+))) + +(define-public emacs-stream + (package + (name "emacs-stream") + (version "2.2.0") + (home-page "https://github.com/NicolasPetton/stream") + (source + (origin + (method url-fetch) + (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append home-page "/archive/"version ".tar.gz")) + (sha256 + (base32 "03ql4nqfz5pn55mjly6clhvc3g7x2d28kj7mrlqmigvjbql39xxc")))) + (build-system emacs-build-system) + (synopsis "Implementation of streams for Emacs") + (description "This library provides an implementation of streams for Emacs. +Streams are implemented as delayed evaluation of cons cells.") + (license license:gpl3+))) From 0fc06f3eba0acb67b2ba61b0810fb4bf34ab3daf Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Thu, 20 Oct 2016 17:50:56 +0200 Subject: [PATCH 05/36] gnu: Add emacs-el-search. * gnu/packages/emacs.scm (emacs-el-search): New variable. --- gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1f4035a61f..e5b420afff 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3338,3 +3338,27 @@ (define-public emacs-stream (description "This library provides an implementation of streams for Emacs. Streams are implemented as delayed evaluation of cons cells.") (license license:gpl3+))) + +(define-public emacs-el-search + (let ((commit "f26277bfbb3fc3fc74beea6592f294c439796bd4") + (revision "1")) + (package + (name "emacs-el-search") + ;; No ufficial release. + (version (string-append "0.0-" revision "." (string-take commit 7))) + (home-page "https://github.com/emacsmirror/el-search") + (source + (origin + (method git-fetch) + (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (commit commit) + (url (string-append home-page ".git")))) + (sha256 + (base32 "12xf40h9sb7xxg2r97gsia94q02543mgiiiw46fzh1ac7b7993g6")))) + (build-system emacs-build-system) + (inputs `(("emacs-stream" ,emacs-stream))) + (synopsis "Expression based interactive search for emacs-lisp-mode") + (description "This package provides expression based interactive search +procedures for emacs-lisp-mode.") + (license license:gpl3+)))) From 08fc0d68f0183cd8e23ffc16091ffd387feb6823 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Thu, 20 Oct 2016 20:23:11 +0200 Subject: [PATCH 06/36] gnu: haskell-mode: Update to 16.1. * gnu/packages/emacs.scm (haskell-mode): Update to 16.1. [inputs]: Add 'emacs-el-search' and 'emacs-stream'. [propagated-inputs]: Add 'emacs-dash'. [arguments]: Add modules. Adapt 'pre-build' and 'install' phases. --- gnu/packages/emacs.scm | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e5b420afff..5050f2e0dc 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -575,7 +575,7 @@ (define-public emacs-magit-popup (define-public haskell-mode (package (name "haskell-mode") - (version "13.14.2") + (version "16.1") (source (origin (method url-fetch) (file-name (string-append name "-" version ".tar.gz")) @@ -583,7 +583,12 @@ (define-public haskell-mode "https://github.com/haskell/haskell-mode/archive/v" version ".tar.gz")) (sha256 - (base32 "1kxc2yj8vb122dv91r68h7c5ladcryx963fr16plfhg71fv7f9av")))) + (base32 "0g6lcjw7lcgavv3yrd8xjcyqgfyjl787y32r1z14amw2f009m78h")))) + (inputs + `(("emacs-el-search" ,emacs-el-search) ; for tests + ("emacs-stream" ,emacs-stream))) ; for tests + (propagated-inputs + `(("emacs-dash" ,emacs-dash))) (native-inputs `(("emacs" ,emacs-minimal) ("texinfo" ,texinfo))) @@ -592,15 +597,38 @@ (define-public haskell-mode `(#:make-flags (list (string-append "EMACS=" (assoc-ref %build-inputs "emacs") "/bin/emacs")) + #:modules ((ice-9 match) + (srfi srfi-26) + ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases (delete 'configure) (add-before 'build 'pre-build (lambda* (#:key inputs #:allow-other-keys) + (define (el-dir store-dir) + (match (find-files store-dir) + ((f1 f2 ...) (dirname f1)) + (_ ""))) + (let ((sh (string-append (assoc-ref inputs "bash") "/bin/sh"))) + (define emacs-prefix? (cut string-prefix? "emacs-" <>)) + (setenv "SHELL" "sh") + (setenv "EMACSLOADPATH" + (string-concatenate + (map (match-lambda + (((? emacs-prefix? name) . dir) + (string-append (el-dir dir) ":")) + (_ "")) + inputs))) (substitute* (find-files "." "\\.el") (("/bin/sh") sh)) + (substitute* "tests/haskell-code-conventions.el" + ;; Function name recently changed in "emacs-el-search". + (("el-search--search-pattern") "el-search-forward") + ;; Don't contact home. + (("\\(when \\(>= emacs-major-version 25\\)") + "(require 'el-search) (when nil")) #t))) (replace 'install @@ -621,9 +649,9 @@ (define (copy-to-dir dir files) (install-file "haskell-mode.info" info)) (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md")) (copy-to-dir el-dir (find-files "." "\\.elc?")) - ;; these are now distributed with emacs + ;; These are part of other packages. (with-directory-excursion el-dir - (for-each delete-file '("cl-lib.el" "ert.el"))) + (for-each delete-file '("dash.el" "ert.el"))) #t)))))) (home-page "https://github.com/haskell/haskell-mode") (synopsis "Haskell mode for Emacs") From 53b9684e332dda113ec1d835a5597cbd336503d9 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Sat, 22 Oct 2016 10:55:36 +0200 Subject: [PATCH 07/36] gnu: Add chez-mit. * gnu/packages/chez.scm (chez-mit): New variable. --- gnu/packages/chez.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 0a74c3f87e..fc4bf69f0d 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -19,7 +19,7 @@ (define-module (gnu packages chez) #:use-module (gnu packages) #:use-module ((guix licenses) - #:select (gpl2+ lgpl2.0+ lgpl2.1+ asl2.0 bsd-3 expat + #:select (gpl2+ gpl3+ lgpl2.0+ lgpl2.1+ asl2.0 bsd-3 expat public-domain)) #:use-module (guix packages) #:use-module (guix download) @@ -470,3 +470,31 @@ (define-public chez-fmt without resorting to capturing and manipulating intermediate strings.") (license bsd-3))) + +(define-public chez-mit + (package + (name "chez-mit") + (version "0.1") + (home-page "https://github.com/fedeinthemix/chez-mit") + (source + (origin + (method url-fetch) + (uri (string-append home-page "/archive/v" version ".tar.gz")) + (sha256 + (base32 "1p11q061znwxzxrxg3vw4dbsnpv1dav12hjhnkrjnzyyjvvdm2kn")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (inputs + `(("chez-srfi" ,chez-srfi))) ; for tests + (native-inputs + `(("chez-scheme" ,chez-scheme))) + (arguments + `(#:make-flags ,(chez-make-flags name version) + #:test-target "test" + #:phases (modify-phases %standard-phases + (replace 'configure ,chez-configure)))) + (synopsis "MIT/GNU Scheme compatibility library for Chez Scheme") + (description "This package provides a set of MIT/GNU Scheme compatibility +libraries for Chez Scheme. The main goal was to provide the functionality +required to port the program 'Scmutils' to Chez Scheme.") + (license gpl3+))) From 149c6523780388c5374d7dc30b1b0f8eeafe3983 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Sat, 22 Oct 2016 10:58:32 +0200 Subject: [PATCH 08/36] gnu: Add chez-scmutils. * gnu/packages/chez.scm (chez-scmutils): New variable. --- gnu/packages/chez.scm | 66 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index fc4bf69f0d..7d77cc30fe 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -498,3 +498,69 @@ (define-public chez-mit libraries for Chez Scheme. The main goal was to provide the functionality required to port the program 'Scmutils' to Chez Scheme.") (license gpl3+))) + +(define-public chez-scmutils + (package + (name "chez-scmutils") + (version "0.1") + (home-page "https://github.com/fedeinthemix/chez-scmutils") + (source + (origin + (method url-fetch) + (uri (string-append home-page "/archive/v" version ".tar.gz")) + (sha256 + (base32 "1a5j61pggaiwl1gl6m038rcy5n8r2sj5nyjmz86jydx97mm5i8hj")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (inputs + `(("chez-srfi" ,chez-srfi))) ; for tests + (native-inputs + `(("chez-scheme" ,chez-scheme))) + (propagated-inputs + `(("chez-mit" ,chez-mit) + ("chez-srfi" ,chez-srfi))) + (arguments + `(#:make-flags ,(chez-make-flags name version) + #:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (replace 'configure ,chez-configure) + ;; Since the documentation is lacking, we install the source + ;; code. For things to work correctly we have to replace + ;; relative paths by absolute ones in 'include' forms. This + ;; in turn requires us to compile the files in the final + ;; destination. + (delete 'build) + (add-after 'install 'install-src + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (zero? (apply system* "make" "install-src" make-flags)))) + (add-after 'install-src 'absolute-path-in-scm-files + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (file) + (substitute* file + (("include +\"\\./scmutils") + (string-append "include \"" (dirname file))))) + (find-files out "\\.sls")) + (for-each (lambda (file) + (substitute* file + (("include +\"\\./scmutils/simplify") + (string-append "include \"" (dirname file))))) + (find-files out "fbe-syntax\\.scm")) + #t))) + (add-after 'absolute-path-in-scm-files 'build + (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (mk-file (car (find-files out "Makefile")))) + (with-directory-excursion (dirname mk-file) + (zero? (apply system* "make" "build" make-flags)))))) + (add-after 'build 'clean-up + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (for-each delete-file + (find-files out "Makefile|compile-all\\.ss")))))))) + (synopsis "Port of MIT/GNU Scheme Scmutils to Chez Scheme") + (description "This package provides a port of the MIT/GNU Scheme +Scmutils program to Chez Scheme. The port consists of a set of +libraries providing most of the functionality of the original.") + (license gpl3+))) From 6af886f492a7718a992226d1c2baac7cae04b407 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Mon, 24 Oct 2016 09:56:35 +0200 Subject: [PATCH 09/36] gnu: geiser-next: Re-introduce it. * gnu/packages/emacs.scm (geiser-next): Re-introduce it. --- gnu/packages/emacs.scm | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5050f2e0dc..1757a66ccf 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -298,8 +298,36 @@ (define-public geiser (license license:bsd-3))) (define-public geiser-next - ;; This has become "geiser". - (deprecated-package "geiser-next" geiser)) + ;; Geiser's upcoming version supports Chibi and Chez, while it was forgot to + ;; include some required files in 0.9. When the next Geiser release comes + ;; out, we can remove this. + (let ((commit "16035b9fa475496f7f89a57fa81455057af749a0") + (revision "1")) + (package + (inherit geiser) + (name "geiser-next") + (version (string-append "0.9-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "git://git.sv.gnu.org/geiser.git") + (commit commit))) + (sha256 + (base32 + "1rrafizrhjkai0msryjiz4c5dcdyihf0i2wmgiy8br74rwbxpyl5")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo) + ,@(package-native-inputs geiser))) + (arguments + (substitute-keyword-arguments (package-arguments geiser) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'autogen + (lambda _ + (zero? (system* "sh" "autogen.sh"))))))))))) (define-public paredit (package From 442c2c99a5d15c46551d2da6b2d23a4e39d9c4f4 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Sat, 29 Oct 2016 18:30:58 +0200 Subject: [PATCH 10/36] download: Add Hackage mirrors. * guix/download.scm [%mirrors]: Add Hackage mirrors. --- guix/download.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guix/download.scm b/guix/download.scm index 649e96b51b..4349719a9c 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -87,6 +87,8 @@ (define %mirrors "http://ftp.linux.org.uk/mirrors/ftp.gnome.org/" "http://ftp.gnome.org/pub/GNOME/" "http://mirror.yandex.ru/mirrors/ftp.gnome.org/") + (hackage + "https://hackage.haskell.org/") (savannah "http://download.savannah.gnu.org/releases/" "ftp://ftp.twaren.net/Unix/NonGNU/" From 505e0150dc079427eba2fa5148ab74de8784757e Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Mon, 24 Oct 2016 17:30:50 +0200 Subject: [PATCH 11/36] gnu: Add ghc-data-accessor. * gnu/packages/haskell.scm (ghc-data-accessor): New variable. --- gnu/packages/haskell.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a933162b8b..26979f4f00 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7902,4 +7902,24 @@ (define-public ghc-hashtables a set of wrappers to use the hash tables in the IO monad.") (license license:bsd-3))) +(define-public ghc-data-accessor + (package + (name "ghc-data-accessor") + (version "0.2.2.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://package/data-accessor/data-accessor-" + version ".tar.gz")) + (sha256 + (base32 "1vf2g1gac3rm32g97rl0fll51m88q7ry4m6khnl5j47qsmx24r9l")))) + (build-system haskell-build-system) + (home-page "http://www.haskell.org/haskellwiki/Record_access") + (synopsis + "Haskell utilities for accessing and manipulating fields of records") + (description "This package provides Haskell modules for accessing and +manipulating fields of records.") + (license license:bsd-3))) + ;;; haskell.scm ends here From 81a1191922e25a5ae3e7e2764845fd31c715e2f3 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Mon, 24 Oct 2016 17:35:27 +0200 Subject: [PATCH 12/36] gnu: Add ghc-data-access-transformers. * gnu/packages/haskell.scm (ghc-data-access-transformers): New variable. --- gnu/packages/haskell.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 26979f4f00..99f6144f09 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7922,4 +7922,24 @@ (define-public ghc-data-accessor manipulating fields of records.") (license license:bsd-3))) +(define-public ghc-data-accessor-transformers + (package + (name "ghc-data-accessor-transformers") + (version "0.2.1.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://package/data-accessor-transformers/data-accessor-transformers-" + version ".tar.gz")) + (sha256 + (base32 "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10")))) + (build-system haskell-build-system) + (inputs `(("ghc-data-accessor" ,ghc-data-accessor))) + (home-page "http://www.haskell.org/haskellwiki/Record_access") + (synopsis "Use Accessor to access state in transformers State monad") + (description "This package provides Haskell modules to allow use of +Accessor to access state in transformers State monad.") + (license license:bsd-3))) + ;;; haskell.scm ends here From a5cbef03bac9ff5f423b050b88c58c3b6cd74381 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Mon, 24 Oct 2016 17:43:17 +0200 Subject: [PATCH 13/36] gnu: Add ghc-utility-ht. * gnu/packages/haskell.scm (ghc-utility-ht): New variable. --- gnu/packages/haskell.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 99f6144f09..2c53fdf6b2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7942,4 +7942,22 @@ (define-public ghc-data-accessor-transformers Accessor to access state in transformers State monad.") (license license:bsd-3))) +(define-public ghc-utility-ht + (package + (name "ghc-utility-ht") + (version "0.0.12") + (home-page "https://hackage.haskell.org/package/utility-ht") + (source + (origin + (method url-fetch) + (uri (string-append home-page "/utility-ht-" version ".tar.gz")) + (sha256 + (base32 "1vq5bd51rl9l5lgfmaqxgiggddk38hzgngcj7qgrqnalcd1myi54")))) + (build-system haskell-build-system) + (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) + (synopsis "Haskell helper functions for Lists, Maybes, Tuples, Functions") + (description "This package includes Hakell modules providing various +helper functions for Lists, Maybes, Tuples, Functions.") + (license license:bsd-3))) + ;;; haskell.scm ends here From 1a86b671cef2a65f437758f35e73f48b0ed41fb7 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Mon, 24 Oct 2016 17:49:35 +0200 Subject: [PATCH 14/36] gnu: Add ghc-gnuplot. * gnu/packages/haskell.scm (ghc-gnuplot): New variable. --- gnu/packages/haskell.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 2c53fdf6b2..331057a521 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7960,4 +7960,38 @@ (define-public ghc-utility-ht helper functions for Lists, Maybes, Tuples, Functions.") (license license:bsd-3))) +(define-public ghc-gnuplot + (package + (name "ghc-gnuplot") + (version "0.5.4.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://package/gnuplot/gnuplot-" + version ".tar.gz")) + (sha256 + (base32 "1xz8prw9xjk0rsyrkp9bsmxykzrbhpv9qhhkdapy75mdbmgwjm7s")))) + (build-system haskell-build-system) + (inputs + `(("ghc-temporary" ,ghc-temporary) + ("ghc-utility-ht" ,ghc-utility-ht) + ("ghc-data-accessor-transformers" ,ghc-data-accessor-transformers) + ("ghc-data-accessor" ,ghc-data-accessor) + ("gnuplot" ,gnuplot))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-path-to-gnuplot + (lambda* (#:key inputs #:allow-other-keys) + (let ((gnuplot (assoc-ref inputs "gnuplot"))) + (substitute* "os/generic/Graphics/Gnuplot/Private/OS.hs" + (("(gnuplotName = ).*$" all cmd) + (string-append cmd "\"" gnuplot "/bin/gnuplot\""))))))))) + (home-page "http://www.haskell.org/haskellwiki/Gnuplot") + (synopsis "2D and 3D plots using gnuplot") + (description "This package provides a Haskell module for creating 2D and +3D plots using gnuplot.") + (license license:bsd-3))) + ;;; haskell.scm ends here From fdc45ab1b0e3bca9c4991f90614a0177f98c30d8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 31 Oct 2016 13:23:55 -0400 Subject: [PATCH 15/36] gnu: imagemagick: Update to 6.9.6-3. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.6-3. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 4c3c636b68..071d42a165 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -43,14 +43,14 @@ (define-module (gnu packages imagemagick) (define-public imagemagick (package (name "imagemagick") - (version "6.9.6-2") + (version "6.9.6-3") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "139h9lycxw3lszn052m34xm0rqyanin4nb529vxjcrkkzqilh91r")))) + "0min87mdhv6bni5hz99i3j1wkrjrqp88dx4ckjzmilg28p9ick63")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") From 6e9d5d5fba90db41ec2afda54033c2b055b86846 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 31 Oct 2016 23:09:45 +0100 Subject: [PATCH 16/36] gnu: librecad: Update to 2.1.3. * gnu/packages/engineering.scm (librecad): Update to 2.1.3. --- gnu/packages/engineering.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 829ceb0c55..c1ee6da668 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 David Thompson @@ -63,7 +63,7 @@ (define-module (gnu packages engineering) (define-public librecad (package (name "librecad") - (version "2.1.1") + (version "2.1.3") (source (origin (method url-fetch) (uri (string-append @@ -72,7 +72,7 @@ (define-public librecad (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "132vv9pzbx64zmbnikyg06d4j47yzlmwi4mywxnd9gkaik4yd2kb")))) + "01nvc1g3si05r5np1pzn62ah9w84p8nxa32wqrjh6gdi17jfvi3l")))) (build-system gnu-build-system) (arguments '(#:phases From 0905048ab3dc979c3bd790a57b3ddd08fb6d84de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Oct 2016 23:24:42 +0100 Subject: [PATCH 17/36] gnu: Add dotconf. * gnu/packages/textutils.scm (dotconf): New variable. --- gnu/packages/textutils.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 2259a16c91..db6e5a1894 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 ng0 +;;; Copyright © 2016 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -459,3 +460,35 @@ (define-public dbacl ;; GNU General Public License, (c) by the Free Software Foundation. ;; Guix excludes this file. (license (list license:gpl3+ license:public-domain)))) + +(define-public dotconf + (package + (name "dotconf") + (version "1.3") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/williamh/dotconf/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lsnh0yaw44psmx59hq94cj1932gscp5h8d3cnh05l0svr0cy7kz")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; FIXME maketest.sh does not work. + #:phases + (modify-phases %standard-phases + (add-before 'configure 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vif"))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (home-page "https://github.com/williamh/dotconf") + (synopsis "Configuration file parser library") + (description + "C library for creating and parsing configuration files.") + (license (list license:lgpl2.1 ; Main distribution. + license:asl1.1)))) ; src/readdir.{c,h} From b58691fa73623e989a9d54cc49db5946c3b272a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 31 Oct 2016 06:01:38 +0000 Subject: [PATCH 18/36] licenses: Export fdl1.2+. This is a follow-up to 59b2034787909cf7efa4e8d672a815b466d7d09d. * guix/licenses.scm (define-module): Export fdl1.2+. --- guix/licenses.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/licenses.scm b/guix/licenses.scm index ff214cf957..1e19300586 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -48,7 +48,7 @@ (define-module (guix licenses) giftware gpl1 gpl1+ gpl2 gpl2+ gpl3 gpl3+ gfl1.0 - fdl1.1+ fdl1.3+ + fdl1.1+ fdl1.2+ fdl1.3+ opl1.0+ isc ijg From b3df4d7e573933d20fa8529ca469afafa92e93b0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Oct 2016 23:26:25 +0100 Subject: [PATCH 19/36] gnu: Add speech-dispatcher. * gnu/packages/speech.scm (speech-dispatcher): New variable. --- gnu/packages/speech.scm | 45 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 95c7591480..39a940dfde 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Thompson +;;; Copyright © 2016 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +23,12 @@ (define-module (gnu packages speech) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages) - #:use-module (gnu packages gcc)) + #:use-module (gnu packages autotools) + #:use-module (gnu packages gcc) + #:use-module (gnu packages glib) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages textutils)) (define-public mitlm (package @@ -49,3 +55,40 @@ (define-public mitlm efficiency through the use of a compact vector representation of n-grams.") (home-page "https://github.com/mitlm/mitlm") (license license:expat))) + +(define-public speech-dispatcher + (package + (name "speech-dispatcher") + (version "0.8.5") + (source (origin + (method url-fetch) + (uri (string-append "https://devel.freebsoft.org/pub/" + "projects/speechd/speech-dispatcher-" + version ".tar.gz")) + (sha256 + (base32 + "18jlxnhlahyi6njc6l6576hfvmzivjjgfjyd2n7vvrvx9inphjrb")))) + (build-system gnu-build-system) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("dotconf" ,dotconf) + ("glib" ,glib) + ("libltdl" ,libltdl) + ("libsndfile" ,libsndfile))) + (synopsis "Common interface to speech synthesizers") + (description "The Speech Dispatcher project provides a high-level +device independent layer for access to speech synthesis through a simple, +stable and well documented interface.") + (home-page "https://devel.freebsoft.org/speechd") + ;; The software is distributed under GPL2+, but includes a number + ;; of files covered by other licenses. + (license (list license:gpl2+ + license:fdl1.2+ ; Most files in doc/ are dual gpl2+/fdl1.2+. + license:lgpl2.1+ + license:gpl2 + (license:non-copyleft + ;; festival_client.{c,h} carries an expat-style license. + "See src/modules/festival_client.c in the distribution.") + license:gpl3+)))) ; doc/texinfo.tex -- with TeX exception. From 4c13aad0bc45feb507b312ba257a6da600724c25 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Nov 2016 10:28:24 +0200 Subject: [PATCH 20/36] guix: Update hackage mirror. * guix/download.scm (%mirrors)[hackage]: Don't use https. --- guix/download.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/download.scm b/guix/download.scm index 4349719a9c..80507f952a 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -88,7 +88,7 @@ (define %mirrors "http://ftp.gnome.org/pub/GNOME/" "http://mirror.yandex.ru/mirrors/ftp.gnome.org/") (hackage - "https://hackage.haskell.org/") + "http://hackage.haskell.org/") (savannah "http://download.savannah.gnu.org/releases/" "ftp://ftp.twaren.net/Unix/NonGNU/" From 6846f08471c6106c832e2fd753522093becc078a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Nov 2016 10:31:24 +0200 Subject: [PATCH 21/36] gnu: Correct hackage mirror usage. * gnu/package/haskell.scm (ghc-data-accessor)[source]: Specify hackage mirror. (ghc-data-accessor-transformers)[source]: Same. (ghc-gnuplot)[source]: Same. --- gnu/packages/haskell.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 331057a521..7a7d6bab87 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7910,7 +7910,7 @@ (define-public ghc-data-accessor (origin (method url-fetch) (uri (string-append - "mirror://package/data-accessor/data-accessor-" + "mirror://hackage/package/data-accessor/data-accessor-" version ".tar.gz")) (sha256 (base32 "1vf2g1gac3rm32g97rl0fll51m88q7ry4m6khnl5j47qsmx24r9l")))) @@ -7930,8 +7930,8 @@ (define-public ghc-data-accessor-transformers (origin (method url-fetch) (uri (string-append - "mirror://package/data-accessor-transformers/data-accessor-transformers-" - version ".tar.gz")) + "mirror://hackage/package/data-accessor-transformers/" + "data-accessor-transformers-" version ".tar.gz")) (sha256 (base32 "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10")))) (build-system haskell-build-system) @@ -7968,7 +7968,7 @@ (define-public ghc-gnuplot (origin (method url-fetch) (uri (string-append - "mirror://package/gnuplot/gnuplot-" + "mirror://hackage/package/gnuplot/gnuplot-" version ".tar.gz")) (sha256 (base32 "1xz8prw9xjk0rsyrkp9bsmxykzrbhpv9qhhkdapy75mdbmgwjm7s")))) From b56d9ce304c16479e495bc2ef1b35f4280c867c1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 Nov 2016 10:37:19 +0000 Subject: [PATCH 22/36] gnu: xapian: Update to 1.4.1. * gnu/packages/search.scm (xapian): Update to 1.4.1. --- gnu/packages/search.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 5d7def5b2f..f0dbbc9b11 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -35,13 +35,13 @@ (define-module (gnu packages search) (define-public xapian (package (name "xapian") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append "https://oligarchy.co.uk/xapian/" version "/xapian-core-" version ".tar.xz")) (sha256 - (base32 "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h")))) + (base32 "1svhrs5zl7cyv9kqh70k02zc3cmpcpn6nvgdkv0pl1iwwx6m7wn5")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("util-linux" ,util-linux))) From bac3d6095d58b6b52b9fccc3cbc9fa8e748af67a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 Nov 2016 15:32:06 +0000 Subject: [PATCH 23/36] gnu: python-django: Update to 1.10.3 [fixes CVE-2016-{9013,9014}]. * gnu/packages/django.scm (python-django, python2-django): Update to 1.10.3. [source]: Remove patch. * gnu/packages/patches/python-django-fix-testcase.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/django.scm | 5 +-- .../patches/python-django-fix-testcase.patch | 42 ------------------- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 gnu/packages/patches/python-django-fix-testcase.patch diff --git a/gnu/local.mk b/gnu/local.mk index 24013a52be..5fe6be5190 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -804,7 +804,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-dendropy-exclude-failing-tests.patch \ %D%/packages/patches/python-disable-ssl-test.patch \ - %D%/packages/patches/python-django-fix-testcase.patch \ %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python-ipython-inputhook-ctype.patch \ %D%/packages/patches/python-rarfile-fix-tests.patch \ diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 8d4a7e4753..e7bd7f4994 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -29,14 +29,13 @@ (define-module (gnu packages django) (define-public python-django (package (name "python-django") - (version "1.10") + (version "1.10.3") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "01bh5yra6zyxcpqacahbwfbn0y4ivw07j2jsw3crvmjzivb6if26")) - (patches (search-patches "python-django-fix-testcase.patch")))) + "0c4c8zs7kzb0bdlpy4vlzv6va26dbazr32h91rldf6waxs6z14kg")))) (build-system python-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/python-django-fix-testcase.patch b/gnu/packages/patches/python-django-fix-testcase.patch deleted file mode 100644 index 4c1f9806d7..0000000000 --- a/gnu/packages/patches/python-django-fix-testcase.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 24123c31362b5f3783d84d133c160e9fe16805fe Mon Sep 17 00:00:00 2001 -From: Tim Graham -Date: Mon, 1 Aug 2016 15:40:46 -0400 -Subject: [PATCH] Fixed admin_utils test failures due to translation updates. - -https://github.com/django/django/commit/24123c31362b5f3783d84d133c160e9fe16805fe - ---- - tests/admin_utils/test_logentry.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/tests/admin_utils/test_logentry.py b/tests/admin_utils/test_logentry.py -index 7798373..8259bf0 100644 ---- a/tests/admin_utils/test_logentry.py -+++ b/tests/admin_utils/test_logentry.py -@@ -59,7 +59,7 @@ class LogEntryTests(TestCase): - logentry = LogEntry.objects.filter(content_type__model__iexact='article').latest('id') - self.assertEqual(logentry.get_change_message(), 'Changed title and hist.') - with translation.override('fr'): -- self.assertEqual(logentry.get_change_message(), 'Modification de title et hist.') -+ self.assertEqual(logentry.get_change_message(), 'Title et hist modifié(s).') - - add_url = reverse('admin:admin_utils_article_add') - post_data['title'] = 'New' -@@ -117,11 +117,12 @@ class LogEntryTests(TestCase): - 'Changed domain. Added article "Article object". ' - 'Changed title for article "Article object". Deleted article "Article object".' - ) -+ - with translation.override('fr'): - self.assertEqual( - logentry.get_change_message(), -- 'Modification de domain. Article « Article object » ajouté. ' -- 'Modification de title pour l\'objet article « Article object ». Article « Article object » supprimé.' -+ "Domain modifié(s). Article « Article object » ajouté. " -+ "Title modifié(s) pour l'objet article « Article object ». Article « Article object » supprimé." - ) - - def test_logentry_get_edited_object(self): --- -2.7.4 - From e3e3e488a1d64f81500a6471fd2d5c0ac3da17bc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 1 Nov 2016 16:15:24 -0400 Subject: [PATCH 24/36] gnu: diffoscope: Update to 62. * gnu/packages/package-management.scm (diffoscope): Update to 62. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9759fc71b9..f5e6d0039f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -478,13 +478,13 @@ (define-public rpm (define-public diffoscope (package (name "diffoscope") - (version "61") + (version "62") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "1qpk2l6p9z58s61jfx6adm96f5r21ns128db0876zd6b6h34411p")))) + "127b4gsw11hjbha5jpz5i42pc142h52pwzs1p792047y0j1yjg8z")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases From 3325803b0b98941d67de5098d1351df058933982 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 1 Nov 2016 17:00:23 -0400 Subject: [PATCH 25/36] gnu: bind: Update to 9.10.4-P4 [fixes CVE-2016-8864]. * gnu/packages/dns.scm (bind): Update to 9.10.4-P4. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index f60f1d1c54..b49a0b7392 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -73,7 +73,7 @@ (define-public dnsmasq (define-public bind (package (name "bind") - (version "9.10.4-P3") + (version "9.10.4-P4") (source (origin (method url-fetch) (uri (string-append @@ -81,7 +81,7 @@ (define-public bind version ".tar.gz")) (sha256 (base32 - "1vxs29w4hnl7jcd7sknga58xv1qk2rcpsxyich7cpp7xi77faxd0")))) + "11lxkb7d79c75scrs28q4xmr0ii2li69zj1c650al3qxir8yf754")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs From 21f828e02e087806a44aa22cc94635baf0c4f157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 1 Nov 2016 21:50:42 +0100 Subject: [PATCH 26/36] gnu: emacs-debbugs: Update to 0.12. * gnu/packages/emacs.scm (emacs-debbugs): Update to 0.12. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1757a66ccf..a065959d25 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1708,14 +1708,14 @@ (define-public emacs-ob-ipython (define-public emacs-debbugs (package (name "emacs-debbugs") - (version "0.11") + (version "0.12") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/debbugs-" version ".tar")) (sha256 (base32 - "10v9s7ayvfzd6j6hqfc9zihxgmsc2j0xhxrgy3ah30qkqn6z8w6n")))) + "1swi4d7fhahimid9j12cypmkz7dlqgffrnhfxy5ra44y3j2b35ph")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async))) From 4af2fafd9764b88fe51ca6529f0a7780d01ff984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 1 Nov 2016 22:09:36 +0100 Subject: [PATCH 27/36] doc: Fix typo. Fixes . Reported by saffronsnail@hushmail.com. * doc/guix.texi (Initial RAM Disk): Move parenthesis to after "of QEMU". --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index e9ff605711..1075a7e178 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10937,7 +10937,7 @@ volatile root file system. The initial RAM disk produced by @code{base-initrd} honors several options passed on the Linux kernel command line (that is, arguments passed @i{via} the @code{linux} command of GRUB, or the -@code{-append} option) of QEMU, notably: +@code{-append} option of QEMU), notably: @table @code @item --load=@var{boot} From 2c1d46b257fdbdfbb6fb8746abe426150fc3fbab Mon Sep 17 00:00:00 2001 From: David Thompson Date: Tue, 1 Nov 2016 21:02:09 -0400 Subject: [PATCH 28/36] gnu: love: Update to 0.10.2. * gnu/packages/game-development.scm (love): Update to 0.10.2. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index de0b842b48..693d728464 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -280,14 +280,14 @@ (define-public physfs (define-public love (package (name "love") - (version "0.10.1") + (version "0.10.2") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/rude/love/downloads/" "love-" version "-linux-src.tar.gz")) (sha256 (base32 - "1ys18m7c4994k5s7avqlf17sc2icx5zgvfplz504q1ka16hwkc52")))) + "11x346pw0gqad8nmkmywzx4xpcbfc3dslbrdw5x94n1i25mk0sxj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) From e777d07db90a64adc4cd7c22ae921aa03bb3fc49 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 1 Nov 2016 21:30:56 -0400 Subject: [PATCH 29/36] gnu: iproute2: Update to 4.8.0. * gnu/packages/linux.scm (iproute2): Update to 4.8.0. [arguments]: Set Bash completion directory in #:make-flags. --- gnu/packages/linux.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8f0a9ab0e4..dff36a3bdc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -900,7 +900,7 @@ (define-public iptables (define-public iproute (package (name "iproute2") - (version "4.4.0") + (version "4.8.0") (source (origin (method url-fetch) (uri (string-append @@ -908,12 +908,14 @@ (define-public iproute version ".tar.xz")) (sha256 (base32 - "05351m4m0whsivlblvs3m0nz5q9v6r06ik80z27gf6ca51kw74dw")))) + "12dk5hn1zlraqk2p0z8dv2xgsz0x9v8l3vcvf51fzj0v8b45j2d3")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite #:make-flags (let ((out (assoc-ref %outputs "out"))) (list "DESTDIR=" + (string-append "BASH_COMPDIR=" out + "/etc/bash_completion.d") (string-append "LIBDIR=" out "/lib") (string-append "SBINDIR=" out "/sbin") (string-append "CONFDIR=" out "/etc") From 86c61a6bd121fca158b4ceb9f0f35e26725461ab Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 1 Nov 2016 21:31:13 -0400 Subject: [PATCH 30/36] gnu: isc-dhcp: Update to 4.3.5 [fixes CVE-2016-8864]. * gnu/packages/admin.scm (isc-dhcp): Update to 4.3.5. Update bundled 'bind' to 9.9.9-P4. --- gnu/packages/admin.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d9b08efc4c..c9563a16ed 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -470,7 +470,7 @@ (define-public isc-dhcp (bind-minor-version "9") (bind-patch-version "9") (bind-release-type "-P") ; for patch release, use "-P" - (bind-release-version "3") ; for patch release, e.g. "4" + (bind-release-version "4") ; for patch release, e.g. "4" (bind-version (string-append bind-major-version "." bind-minor-version @@ -480,14 +480,14 @@ (define-public isc-dhcp bind-release-version))) (package (name "isc-dhcp") - (version "4.3.4") + (version "4.3.5") (source (origin (method url-fetch) (uri (string-append "http://ftp.isc.org/isc/dhcp/" version "/dhcp-" version ".tar.gz")) (sha256 (base32 - "0zk0imll6bfyp9p4ndn8h6s4ifijnw5bhixswifr5rnk7pp5l4gm")))) + "0m7rwxvpb7xrmfl9ynpckhl0hi0xgm9bq1fmbp2r68sxy5mr75gb")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f @@ -586,7 +586,7 @@ (define-public isc-dhcp "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "1qlii6syr491yjn6kpyqknlvbsrkwlsqa0grmmfbq1g3471fyfyn")))) + "1qpi23lrs6jfxqx8dakbqfyg3hvrzq5ldchg6my19xcvx8515mgx")))) ;; When cross-compiling, we need the cross Coreutils and sed. ;; Otherwise just use those from %FINAL-INPUTS. From 24dfc13bfadf53e85253445870fc18c2fc37b6bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 2 Nov 2016 04:41:52 +0000 Subject: [PATCH 31/36] gnu: re2: Update to 2016-11-01. * gnu/packages/regex.scm (re2): Update to 2016-11-01. --- gnu/packages/regex.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index e685a17d28..a2bd2390c6 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -27,7 +27,7 @@ (define-module (gnu packages regex) (define-public re2 (package (name "re2") - (version "2016-08-01") + (version "2016-11-01") (source (origin (method url-fetch) (uri @@ -37,7 +37,7 @@ (define-public re2 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "06pfm3xi5irrrij85m0c46rsn9jyg1rc2r431wi2knhjvbw9f0bx")))) + "0scn3rimfxz0kqxxasap04kv9cbzjsgi7krkqmyhbi710fgr9vh1")))) (build-system gnu-build-system) (arguments `(#:test-target "test" From d439aa36ce6274b0efbd93cf6ca3f27112df2b9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 2 Nov 2016 11:51:46 +0100 Subject: [PATCH 32/36] gnu: perl-test-simple: Update to 1.302062. * gnu/packages/perl.scm (perl-test-simple): Update to 1.302062. --- gnu/packages/perl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 5305a0d6d5..6b12b346bf 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015, 2016 Eric Bavier ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Mark H Weaver @@ -6053,14 +6053,14 @@ (define-public perl-test-sharedfork (define-public perl-test-simple (package (name "perl-test-simple") - (version "1.302026") + (version "1.302062") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/EX/EXODIST/" "Test-Simple-" version ".tar.gz")) (sha256 (base32 - "1mq1sykv48rgjamw4wxa290mnyjm0dw9w9lpzncnac9gfx18vm72")))) + "1sjny65iwnin35lvc203pb07gyx9wrp3gmn6lfrjsbmi986hcab7")))) (build-system perl-build-system) (synopsis "Basic utilities for writing tests") (description From b3097a71c5f69dcf327ab8a8db14b4927dfad621 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 2 Nov 2016 07:29:28 -0400 Subject: [PATCH 33/36] gnu: linux-libre@4.4: Update to 4.4.30. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.30. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dff36a3bdc..c868cf04d7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -332,8 +332,8 @@ (define-public linux-libre #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.28" - "1yn74vci0bygn5bi9mcgx1zz8xw9m3jb6j260wqsgkv1hbksa2yp" + (make-linux-libre "4.4.30" + "16jjcjfbf3s4mrifk6v7kmnm8l7yywispfap98wcv6gw6mv9sxdx" %intel-compatible-systems #:configuration-file kernel-config)) From ac1dc6d12fb5fac57df6a42584f134c873fbc38b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 2 Nov 2016 07:31:53 -0400 Subject: [PATCH 34/36] gnu: linux-libre: Update to 4.8.6. * gnu/packages/linux.scm (%linux-libre-version, %linux-libre-hash) (linux-libre): Update to 4.8.6. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c868cf04d7..3fdce5df7d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -326,8 +326,8 @@ (define* (make-linux-libre version hash supported-systems (define %intel-compatible-systems '("x86_64-linux" "i686-linux")) (define-public linux-libre - (make-linux-libre "4.8.5" - "124sf2jvckn0afy1zfyaqgr1679qsx3fnylw1wpl7p5298hwyf9m" + (make-linux-libre "4.8.6" + "07h618x13yyp3lnf77px4v60pdcz7il0fa7p466wa5gp3h0yhvmi" %intel-compatible-systems #:configuration-file kernel-config)) @@ -344,8 +344,8 @@ (define-public linux-libre-4.1 #:configuration-file kernel-config)) ;; Avoid rebuilding kernel variants when there is a minor version bump. -(define %linux-libre-version "4.8.5") -(define %linux-libre-hash "124sf2jvckn0afy1zfyaqgr1679qsx3fnylw1wpl7p5298hwyf9m") +(define %linux-libre-version "4.8.6") +(define %linux-libre-hash "07h618x13yyp3lnf77px4v60pdcz7il0fa7p466wa5gp3h0yhvmi") (define-public linux-libre-arm-generic (make-linux-libre %linux-libre-version From cbf5889fe542dafe71c6eedf9cc72673495fcc88 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 2 Nov 2016 09:01:36 +0000 Subject: [PATCH 35/36] gnu: curl: Update replacement to 7.51.0 [fixes CVE-2016-{8615..8625}]. * gnu/packages/curl.scm (curl)[replacement]: Update to 7.51.0. (curl-7.50.3): Replace with ... (curl-7.51.0): ... this. --- gnu/packages/curl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 5cd80868f7..5d92e0337c 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -40,7 +40,7 @@ (define-module (gnu packages curl) (define-public curl (package (name "curl") - (replacement curl-7.50.3) + (replacement curl-7.51.0) (version "7.47.0") (source (origin (method url-fetch) @@ -125,15 +125,15 @@ (define-public curl "See COPYING in the distribution.")) (home-page "http://curl.haxx.se/"))) -(define curl-7.50.3 +(define curl-7.51.0 (package (inherit curl) (source - (let ((version "7.50.3")) + (let ((version "7.51.0")) (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.lzma")) (sha256 (base32 - "1spmk0345hq0sgpwxs8d410268lmg3wf1x9v23hxff7wxki5fm4c"))))))) + "0605f28m2kxjcxrcfcv1ja353gv167lwyxjc3xizqbwppdmmzvwy"))))))) From e681e347c4ed071db88442c2c592241ea0f43857 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Wed, 2 Nov 2016 13:55:02 +0100 Subject: [PATCH 36/36] gnu: Add perl-getopt-long. * gnu/packages/perl.scm (perl-getopt-long): New variable. Signed-off-by: Marius Bakke --- gnu/packages/perl.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 6b12b346bf..6b3d0a7868 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2685,6 +2685,34 @@ (define-public perl-file-zglob For instance, it supports the @code{**/*.pm} form.") (license (package-license perl)))) +(define-public perl-getopt-long + (package + (name "perl-getopt-long") + (version "v2.49.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/J/JV/JV/" + "Getopt-Long-" (substring version 1) ".tar.gz")) + (sha256 + (base32 + "0bw8gbhj8s5gmkqvs3m7pk9arqhgqssrby4yimh29ah9alix9ylq")))) + (build-system perl-build-system) + (home-page "http://search.cpan.org/dist/Getopt-Long") + (synopsis "Module to handle parsing command line options") + (description "The @code{Getopt::Long} module implements an extended getopt +function called @code{GetOptions()}. It parses the command line from +@code{ARGV}, recognizing and removing specified options and their possible +values. + +This function adheres to the POSIX syntax for command line options, with GNU +extensions. In general, this means that options have long names instead of +single letters, and are introduced with a double dash \"--\". Support for +bundling of command line options, as was the case with the more traditional +single-letter approach, is provided but not enabled by default.") + ;; Can be used with either license. + (license (list (package-license perl) gpl2+)))) + (define-public perl-getopt-long-descriptive (package (name "perl-getopt-long-descriptive")