From b7bc8611d00fd4dd590e885cf3d1d1e637afd666 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 13 Feb 2016 21:41:17 -0500 Subject: gnu: sqlite: Update to 3.10.2. * gnu/packages/databases.scm (sqlite): Update to 3.10.2. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b36f5d8c16..df7101b34f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -339,7 +339,7 @@ types are supported, as is encryption.") (define-public sqlite (package (name "sqlite") - (version "3.10.0") + (version "3.10.2") (source (origin (method url-fetch) ;; TODO: Download from sqlite.org once this bug : @@ -370,7 +370,7 @@ types are supported, as is encryption.") )) (sha256 (base32 - "0hhhv6si0pyf5i8bv7a71953m0b4gk6s3j2h09caf7vif0njkk23")))) + "0w99mq9y7jx69d270lsx1qpjydm46vzyvxsjh9n7vsli2ayv9cx2")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 7de5236a1d0bdc3bdf4fb8b04c23623b0c7a4f8f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 15 Feb 2016 00:46:17 -0500 Subject: gnu: gnutls: Update to 3.4.9. * gnu/packages/tls.scm (gnutls): Update to 3.4.9. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d70c92b71d..703cb299e1 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -107,7 +107,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.4.7") + (version "3.4.9") (source (origin (method url-fetch) (uri @@ -118,7 +118,7 @@ living in the same process.") "/gnutls-" version ".tar.xz")) (sha256 (base32 - "0nifi3mr5jhz608pidkp8cjs4vwfj1m2qczsjrgpnp99615rxgn1")))) + "0gvwyl0kdp1qpzbzp46wqfdzzrmwy9n54sgcjvvm1m1kpanlyna8")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From e7e7a1eb7c4484e2cb860e0edf7d8a5c1016ac54 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Feb 2016 15:35:26 +0200 Subject: gnu: python-2: Update to 2.7.11. * gnu/packages/python.scm (python-2): Update to 2.7.11. --- gnu/packages/python.scm | 56 ++++++++++++++----------------------------------- 1 file changed, 16 insertions(+), 40 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5b988c10af..ebaa88dabf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -88,7 +88,7 @@ (define-public python-2 (package (name "python") - (version "2.7.10") + (version "2.7.11") (source (origin (method url-fetch) @@ -96,7 +96,7 @@ version "/Python-" version ".tar.xz")) (sha256 (base32 - "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw")) + "0iiz844riiznsyhhyy962710pz228gmhv8qi3yk4w4jhmx2lqawn")) (patches (map search-patch '("python-2.7-search-paths.patch" "python-2-deterministic-build-info.patch" @@ -106,46 +106,22 @@ (build-system gnu-build-system) (arguments `(#:tests? #f - ;; 268 tests OK. - ;; 103 tests failed: - ;; test_distutils test_shutil test_signal test_site test_slice - ;; test_smtplib test_smtpnet test_socket test_socketserver - ;; test_softspace test_sort test_spwd test_sqlite test_ssl - ;; test_startfile test_stat test_str test_strftime test_string - ;; test_stringprep test_strop test_strptime test_strtod test_struct - ;; test_structmembers test_structseq test_subprocess test_sunau - ;; test_sunaudiodev test_sundry test_symtable test_syntax test_sys - ;; test_sys_setprofile test_sys_settrace test_sysconfig test_tarfile - ;; test_tcl test_telnetlib test_tempfile test_textwrap test_thread - ;; test_threaded_import test_threadedtempfile test_threading - ;; test_threading_local test_threadsignals test_time test_timeit - ;; test_timeout test_tk test_tokenize test_tools test_trace - ;; test_traceback test_transformer test_ttk_guionly test_ttk_textonly - ;; test_tuple test_typechecks test_ucn test_unary - ;; test_undocumented_details test_unicode test_unicode_file - ;; test_unicodedata test_univnewlines test_univnewlines2k test_unpack - ;; test_urllib test_urllib2 test_urllib2_localnet test_urllib2net - ;; test_urllibnet test_urlparse test_userdict test_userlist - ;; test_userstring test_uu test_uuid test_wait3 test_wait4 - ;; test_warnings test_wave test_weakref test_weakset test_whichdb - ;; test_winreg test_winsound test_with test_wsgiref test_xdrlib - ;; test_xml_etree test_xml_etree_c test_xmllib test_xmlrpc - ;; test_xpickle test_xrange test_zipfile test_zipfile64 - ;; test_zipimport test_zipimport_support test_zlib - ;; 30 tests skipped: + ;; 356 tests OK. + ;; 6 tests failed: + ;; test_compileall test_distutils test_import test_shutil test_socket + ;; test_subprocess + ;; 39 tests skipped: ;; test_aepack test_al test_applesingle test_bsddb test_bsddb185 ;; test_bsddb3 test_cd test_cl test_codecmaps_cn test_codecmaps_hk - ;; test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_crypt - ;; test_curses test_dl test_gdb test_gl test_idle test_imageop - ;; test_imgfile test_ioctl test_kqueue test_linuxaudiodev test_macos - ;; test_macostools test_msilib test_nis test_ossaudiodev - ;; test_scriptpackages - ;; 6 skips unexpected on linux2: - ;; test_bsddb test_bsddb3 test_crypt test_gdb test_idle test_ioctl - ;; One of the typical errors: - ;; test_unicode - ;; test test_unicode crashed -- : [Errno 2] No - ;; such file or directory + ;; test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_curses + ;; test_dl test_gdb test_gl test_imageop test_imgfile test_ioctl + ;; test_kqueue test_linuxaudiodev test_macos test_macostools + ;; test_msilib test_ossaudiodev test_scriptpackages test_smtpnet + ;; test_socketserver test_startfile test_sunaudiodev test_timeout + ;; test_tk test_ttk_guionly test_urllib2net test_urllibnet + ;; test_winreg test_winsound test_zipfile64 + ;; 4 skips unexpected on linux2: + ;; test_bsddb test_bsddb3 test_gdb test_ioctl #:test-target "test" #:configure-flags (list "--enable-shared" ;allow embedding -- cgit v1.2.3 From 10a42aa2e285097e3bd14e5a6a62d8dd3fe7a92f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Feb 2016 22:15:57 +0200 Subject: gnu: python-2: Enable tests. * gnu/packages/python.scm (python-2)[source]: Delete failing tests. [arguments]: Enable tests. --- gnu/packages/python.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ebaa88dabf..987e1238ff 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -100,13 +100,26 @@ (patches (map search-patch '("python-2.7-search-paths.patch" "python-2-deterministic-build-info.patch" - "python-2.7-source-date-epoch.patch"))))) + "python-2.7-source-date-epoch.patch"))) + (modules '((guix build utils))) + ;; suboptimal to delete failing tests here, but if we delete them in the + ;; arguments then we need to make sure to strip out that phase when it + ;; gets inherited by python and python-minimal. + (snippet + '(begin + (for-each delete-file + '("Lib/test/test_compileall.py" + "Lib/test/test_distutils.py" + "Lib/test/test_import.py" + "Lib/test/test_shutil.py" + "Lib/test/test_socket.py" + "Lib/test/test_subprocess.py")) + #t)))) (outputs '("out" "tk")) ;tkinter; adds 50 MiB to the closure (build-system gnu-build-system) (arguments - `(#:tests? #f - ;; 356 tests OK. + `(;; 356 tests OK. ;; 6 tests failed: ;; test_compileall test_distutils test_import test_shutil test_socket ;; test_subprocess -- cgit v1.2.3 From 5cd2c1e8c1dc3b0a18c2c6d4f2432b81e3a55f75 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Feb 2016 10:08:14 +0200 Subject: gnu: ed: Update to 1.13. * gnu/packages/ed.scm (ed): Update to 1.13. --- gnu/packages/ed.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ed.scm b/gnu/packages/ed.scm index 7cd1fcd71d..953f739d31 100644 --- a/gnu/packages/ed.scm +++ b/gnu/packages/ed.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2013, 2014 Ludovic Courtès +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,14 +28,14 @@ (define-public ed (package (name "ed") - (version "1.12") + (version "1.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ed/ed-" version ".tar.lz")) (sha256 (base32 - "0bw0187a311rci58vznvncsj6pfp8bhs5phrlrqn03sa2i1mfrfj")))) + "1ly7i1iw02vbcd0zrx084z577ngxnarffmkm45dg6vndad5carnd")))) (build-system gnu-build-system) (native-inputs `(("lzip" ,lzip))) (arguments -- cgit v1.2.3 From ff0c847687ce796d61c94ca07ffa6d646339d095 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Feb 2016 10:16:49 +0200 Subject: gnu: ed: Use 'modify-phases'. * gnu/packages/ed.scm (ed)[arguments]: Use 'modify-phases'. --- gnu/packages/ed.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ed.scm b/gnu/packages/ed.scm index 953f739d31..3668aac19a 100644 --- a/gnu/packages/ed.scm +++ b/gnu/packages/ed.scm @@ -40,11 +40,12 @@ (native-inputs `(("lzip" ,lzip))) (arguments '(#:configure-flags '("CC=gcc") - #:phases (alist-cons-before 'patch-source-shebangs 'patch-test-suite - (lambda _ - (substitute* "testsuite/check.sh" - (("/bin/sh") (which "sh")))) - %standard-phases))) + #:phases + (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'patch-test-suite + (lambda _ + (substitute* "testsuite/check.sh" + (("/bin/sh") (which "sh")))))))) (home-page "http://www.gnu.org/software/ed/") (synopsis "Line-oriented text editor") (description -- cgit v1.2.3 From 18caed4475334b282587a27d5e99e504a58a20a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Feb 2016 12:00:32 +0200 Subject: gnu: grep: Update to 2.23. * gnu/packages/base.scm (grep): Update to 2.23. --- gnu/packages/base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f8ea80b5e7..b7699b8f71 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -74,14 +74,14 @@ command-line arguments, multiple languages, and so on.") (define-public grep (package (name "grep") - (version "2.22") + (version "2.23") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/grep/grep-" version ".tar.xz")) (sha256 (base32 - "1srn321x7whlhs5ks36zlcrrmj4iahll8fxwsh1vbz3v04px54fa")) + "1kvflnraswy6mz3dbxs9m4aqgqf9603z63l2140ph5yfw674gz2l")) (patches (list (search-patch "grep-timing-sensitive-test.patch"))))) (build-system gnu-build-system) -- cgit v1.2.3 From 419016da81a1433017ea63846d2762d3f52b96fa Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 17 Feb 2016 12:15:37 -0500 Subject: gnu: linux-libre-headers: Update to 4.1.18. * gnu/packages/linux.scm (linux-libre-headers): Update to 4.1.18. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e7f7bcd9c2..9bfdc66f46 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -97,7 +97,7 @@ version "-gnu.tar.xz"))) (define-public linux-libre-headers - (let* ((version "3.14.37") + (let* ((version "4.1.18") (build-phase (lambda (arch) `(lambda _ @@ -135,7 +135,7 @@ (uri (linux-libre-urls version)) (sha256 (base32 - "1blxr2bsvfqi9khj4cpspv434bmx252zak2wsbi2mgl60zh77gza")))) + "1bddh2rg645lavhjkk9z75vflba5y0g73z2fjwgbfrj5jb44x9i7")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (arguments -- cgit v1.2.3 From 578a4c027377a4522026e4e051c8212b73b5256a Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 17 Feb 2016 20:18:33 -0500 Subject: gnu: libdrm: Update to 2.4.67. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.67. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5ca203e764..3ec3e69645 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -206,7 +206,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.65") + (version "2.4.67") (source (origin (method url-fetch) @@ -216,7 +216,7 @@ rasterisation.") ".tar.bz2")) (sha256 (base32 - "1i4n7mz49l0j4kr0dg9n1j3hlc786ncqgj0v5fci1mz7pp40m5ki")) + "1gnf206zs8dwszvkv4z2hbvh23045z0q29kms127bqrv27hp2nzf")) (patches (list (search-patch "libdrm-symbol-check.patch"))))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 5d9356f0fe67e679e35b92b5020a4a7b850af81c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2016 20:33:16 +0200 Subject: gnu: binutils: Update to 2.26. * gnu/packages/base.scm (binutils): Update to 2.26. --- gnu/packages/base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index b7699b8f71..b4bebaa527 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -355,14 +355,14 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package (name "binutils") - (version "2.25.1") + (version "2.26") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 (base32 - "08lzmhidzc16af1zbx34f8cy4z7mzrswpdbhrb8shy3xxpflmcdm")) + "1ngc2h3knhiw8s22l8y6afycfaxr5grviqy7mwvm4bsl14cf9b62")) (patches (list (search-patch "binutils-ld-new-dtags.patch") (search-patch "binutils-loongson-workaround.patch"))))) (build-system gnu-build-system) -- cgit v1.2.3 From 10baeb35dedbe2a7b8de09fce2f5966ed8f569a9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2016 23:28:16 +0200 Subject: gnu: coreutils: Update to 8.25. * gnu/packages/base.scm (coreutils): Update to 8.25. [source]: Remove patch. --- gnu/packages/base.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index b4bebaa527..0b07ea196d 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -245,23 +245,14 @@ used to apply commands with arbitrarily long arguments.") (define-public coreutils (package (name "coreutils") - (version "8.24") + (version "8.25") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/coreutils/coreutils-" version ".tar.xz")) (sha256 (base32 - "0w11jw3fb5sslf0f72kxy7llxgk1ia3a6bcw0c9kmvxrlj355mx2")) - (patches - (list (origin - (method url-fetch) - (uri "http://git.savannah.gnu.org/cgit/coreutils.git/\ -patch/?id=3ba68f9e64fa2eb8af22d510437a0c6441feb5e0") - (sha256 - (base32 - "1dnlszhc8lihhg801i9sz896mlrgfsjfcz62636prb27k5hmixqz")) - (file-name "coreutils-tail-inotify-race.patch")))))) + "11yfrnb94xzmvi4lhclkcmkqsbhww64wf234ya1aacjvg82prrii")))) (build-system gnu-build-system) (inputs `(("acl" ,acl) ; TODO: add SELinux ("gmp" ,gmp) ;bignums in 'expr', yay! -- cgit v1.2.3 From fe5f687284889eeff3c1b73edab0aa26e58c3bc5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 22 Feb 2016 02:28:20 -0500 Subject: gnu: giflib: Update to 5.1.2. * gnu/packages/image.scm (giflib): Update to 5.1.2. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index f287054e41..c98d4ea53a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -375,14 +375,14 @@ error-resilience, a Java-viewer for j2k-images, ...") (define-public giflib (package (name "giflib") - (version "5.1.1") + (version "5.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/giflib/giflib-" (first (string-split version #\.)) ".x/giflib-" version ".tar.bz2")) (sha256 - (base32 "1z1gzq16sdya8xnl5qjc07634kkwj5m0n3bvvj4v9j11xfn1841r")))) + (base32 "0z1adsza46q84chkxwr6x8ph11k117k8nywkzwar6bxhqf2a1h3n")))) (build-system gnu-build-system) (outputs '("bin" ; utility programs "out")) ; library -- cgit v1.2.3 From 5c19dab94591db68c5361bc2521321fc587dc704 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Feb 2016 08:53:05 -0500 Subject: gnu: wrap-python3: Remove extraneous commas from Scheme lists. * gnu/packages/python.scm (wrap-python3): Remove commas from Scheme lists. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2e485a9aff..2308ece4e0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -321,8 +321,8 @@ data types.") (lambda (old new) (symlink (string-append python old) (string-append bin "/" new))) - `("python3" ,"pydoc3" ,"idle3") - `("python" ,"pydoc" ,"idle")))))) + '("python3" "pydoc3" "idle3") + '("python" "pydoc" "idle")))))) (synopsis "Wrapper for the Python 3 commands") (description "This package provides wrappers for the commands of Python@tie{}3.x such -- cgit v1.2.3 From 52c0c82f52ff8dd8165b86fd53988fba39664d7e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 28 Feb 2016 15:17:38 +0100 Subject: gnu: bootstrap: Honor the origin's names. Reported by Mark H Weaver at . * gnu/packages/bootstrap.scm (bootstrap-origin)[boot]: Honor NAME. --- gnu/packages/bootstrap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index f5bf069c20..2cd8534ace 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -61,7 +61,7 @@ (define (boot fetch) (lambda* (url hash-algo hash #:optional name #:key system) - (fetch url hash-algo hash + (fetch url hash-algo hash name #:guile %bootstrap-guile #:system system))) -- cgit v1.2.3 From 3b698589d25a2d491ff6bc154d78af4566c85f84 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 4 Mar 2016 16:13:15 +0200 Subject: gnu: cmake: Update to 3.4.3. * gnu/packages/cmake.scm (cmake): Update to 3.4.3. --- gnu/packages/cmake.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index d75b9f62ef..35e3e1a415 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015 Sou Bunnbu +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,7 +37,7 @@ (define-public cmake (package (name "cmake") - (version "3.3.2") + (version "3.4.3") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -44,7 +45,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7")) + "1yl0z422gr7zfc638chifv343vx0ig5gasvrh7nzf7b15488qgxp")) (patches (list (search-patch "cmake-fix-tests.patch"))))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 2a8b3b4e221f2e5e9e2b8718ab776262ec8facce Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 6 Mar 2016 11:31:35 +0800 Subject: gnu: dbus: Merge with dbus/activation. * gnu/packages/glib.scm (dbus): Apply patch. (dbus/activation): Remove. * gnu/services/dbus.scm: Use 'dbus' instead of 'dbus/activation'. --- gnu/packages/glib.scm | 16 +++------------- gnu/services/dbus.scm | 6 +++--- 2 files changed, 6 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b925704aa0..0f06f7717c 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -61,14 +61,15 @@ (name "dbus") (version "1.10.0") (source (origin - ;; TODO: Apply patch from DBUS/ACTIVATION below. (method url-fetch) (uri (string-append "https://dbus.freedesktop.org/releases/dbus/dbus-" version ".tar.gz")) (sha256 (base32 - "0jwj7wlrhq5y0fwfh8k2d9rgdpfax06lj8698g6iqbwrzd2rgyqx")))) + "0jwj7wlrhq5y0fwfh8k2d9rgdpfax06lj8698g6iqbwrzd2rgyqx")) + (patches + (list (search-patch "dbus-helper-search-path.patch"))))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -126,17 +127,6 @@ or through unencrypted TCP/IP suitable for use behind a firewall with shared NFS home directories.") (license license:gpl2+))) ; or Academic Free License 2.1 -(define-public dbus/activation - ;; D-Bus with a patch to fix service activation. - ;; TODO: Merge with DBUS above. - (package - (inherit dbus) - (version (string-append (package-version dbus) ".a")) - (source (origin - (inherit (package-source dbus)) - (patches - (list (search-patch "dbus-helper-search-path.patch"))))))) - (define glib (package (name "glib") diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index 88a840a4b5..cd1b5f4b8a 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -21,7 +21,7 @@ #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu system shadow) - #:use-module ((gnu packages glib) #:select (dbus/activation)) + #:use-module ((gnu packages glib) #:select (dbus)) #:use-module (gnu packages admin) #:use-module (guix gexp) #:use-module (guix records) @@ -38,7 +38,7 @@ dbus-configuration make-dbus-configuration dbus-configuration? (dbus dbus-configuration-dbus ; - (default dbus/activation)) + (default dbus)) (services dbus-configuration-services ;list of (default '()))) @@ -198,7 +198,7 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in (append (dbus-configuration-services config) services))))))) -(define* (dbus-service #:key (dbus dbus/activation) (services '())) +(define* (dbus-service #:key (dbus dbus) (services '())) "Return a service that runs the \"system bus\", using @var{dbus}, with support for @var{services}. -- cgit v1.2.3 From 6e4e336ce14fc9bd64839154d743e3562114b2a7 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 7 Mar 2016 20:12:38 +0100 Subject: gnu: mpfr: Update to 3.1.4. * gnu/packages/multiprecision.scm (mpfr): Update to 3.1.4. --- gnu/packages/multiprecision.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index ad507706db..ba2211974b 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -81,13 +81,13 @@ cryptography and computational algebra.") (define-public mpfr (package (name "mpfr") - (version "3.1.3") + (version "3.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mpfr/mpfr-" version ".tar.xz")) (sha256 (base32 - "05jaa5z78lvrayld09nyr0v27c1m5dm9l7kr85v2bj4jv65s0db8")))) + "1x8pcnpn1vxfzfsr0js07rwhwyq27fmdzcfjpzi5773ldnqi653n")))) (build-system gnu-build-system) (outputs '("out" "debug")) (propagated-inputs `(("gmp" ,gmp))) ; refers to -- cgit v1.2.3 From f4d9339c0fcbf704ecda8c2a063f7abb6154343f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 10 Mar 2016 20:38:13 +0200 Subject: gnu: check: Update to 0.10.0. * gnu/packages/check.scm (check): Update to 0.10.0. [home-page]: Project has moved to github. --- gnu/packages/check.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 21ecd8413a..21f5949858 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -34,17 +34,17 @@ (define-public check (package (name "check") - (version "0.9.14") + (version "0.10.0") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/check/check/" - version "/check-" version ".tar.gz")) + (uri (string-append "https://github.com/libcheck/check/files/71408/" + "/check-" version ".tar.gz")) (sha256 (base32 - "02l4g79d81s07hzywcv1knwj5dyrwjiq2pgxaz7kidxi8m364wn2")))) + "0lhhywf5nxl3dd0hdakra3aasl590756c9kmvyifb3vgm9k0gxgm")))) (build-system gnu-build-system) - (home-page "http://check.sourceforge.net/") + (home-page "https://libcheck.github.io/check/") (synopsis "Unit test framework for C") (description "Check is a unit testing framework for C. It features a simple -- cgit v1.2.3 From 12c7eb10270566a2fdf1d6b9454b3c16b1f9c3ae Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Fri, 11 Mar 2016 11:32:45 +0300 Subject: gnu: font-dejavu: Update to 2.35. * gnu/packages/fonts.scm (font-dejavu): Update to 2.35. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 69e195dbf0..c45b01908c 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -118,7 +118,7 @@ TrueType (TTF) files.") (define-public font-dejavu (package (name "font-dejavu") - (version "2.34") + (version "2.35") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/dejavu/" @@ -126,7 +126,7 @@ TrueType (TTF) files.") version ".tar.bz2")) (sha256 (base32 - "0pgb0a3ngamidacmrvasg51ck3gp8gn93w6sf1s8snwzx4x2r9yh")))) + "122d35y93r820zhi6d7m9xhakdib10z51v63lnlg67qhhrardmzn")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 70e17ba368dc08e5708870c77c4ebf336ff02646 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 14 Mar 2016 21:06:38 +0200 Subject: gnu: grep: Update to 2.24. * gnu/packages/base.scm (grep): Update to 2.24. --- gnu/packages/base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3c6b189120..7bd2ba4121 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -74,14 +74,14 @@ command-line arguments, multiple languages, and so on.") (define-public grep (package (name "grep") - (version "2.23") + (version "2.24") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/grep/grep-" version ".tar.xz")) (sha256 (base32 - "1kvflnraswy6mz3dbxs9m4aqgqf9603z63l2140ph5yfw674gz2l")) + "057cir4p19h7yv4xir1wiaxfa1fp45d3pl7xsaaannlc16wvwj7j")) (patches (list (search-patch "grep-timing-sensitive-test.patch"))))) (build-system gnu-build-system) -- cgit v1.2.3 From 0eccd2980654065e67451572e0642721f94e64ee Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 17 Mar 2016 06:52:11 +0200 Subject: gnu: sqlite: Update to 3.11.1. * gnu/packages/databases.scm (sqlite): Update to 3.11.1. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 79254eafb9..7fdabea91c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -340,7 +340,7 @@ types are supported, as is encryption.") (define-public sqlite (package (name "sqlite") - (version "3.10.2") + (version "3.11.1") (source (origin (method url-fetch) ;; TODO: Download from sqlite.org once this bug : @@ -371,7 +371,7 @@ types are supported, as is encryption.") )) (sha256 (base32 - "0w99mq9y7jx69d270lsx1qpjydm46vzyvxsjh9n7vsli2ayv9cx2")))) + "0xs3gl3kbxqfx2ahrymgcf2n8c8sy37724jr05pncbhw4z8g2gsk")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 2a37ff2e67773ece6c44feedbc9e24f96918f6b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 17 Mar 2016 06:24:48 +0200 Subject: gnu: postgresql: Update to 9.5.1. * gnu/packages/databases.scm (postgresql): Update to 9.5.1. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7fdabea91c..7e4b2ff857 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -274,14 +274,14 @@ as a drop-in replacement of MySQL.") (define-public postgresql (package (name "postgresql") - (version "9.3.11") + (version "9.5.1") (source (origin (method url-fetch) (uri (string-append "http://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "08ba951nfiy516flaw352shj1zslxg4ryx3w5k0adls1r682l8ix")))) + "1ljvijaja5zy4i5b1450drbj8m3fcm3ly1zzaakp75x30s2rsc3b")))) (build-system gnu-build-system) (inputs `(("readline" ,readline) -- cgit v1.2.3 From 2dbed47f5c09347c9af42c5f5bacfccbc1ab4aff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 17 Mar 2016 08:45:55 +0200 Subject: gnu: cmake: Update to 3.5.0. * gnu/packages/cmake.scm (cmake): Update to 3.5.0. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 35e3e1a415..e8b292f862 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -37,7 +37,7 @@ (define-public cmake (package (name "cmake") - (version "3.4.3") + (version "3.5.0") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -45,7 +45,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1yl0z422gr7zfc638chifv343vx0ig5gasvrh7nzf7b15488qgxp")) + "1yly38mpk2s08b4rglp9xcw5pxalk0whp9hrcg7j8qpxlkc3mj4j")) (patches (list (search-patch "cmake-fix-tests.patch"))))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 8c9ec2038642f075b3741816bb89c8365edd230c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 29 Feb 2016 19:24:20 -0500 Subject: gnu: openssl: Enforce non-reference to perl. * gnu/packages/tls.scm (openssl)[arguments]: Add #:disallowed-references. --- gnu/packages/tls.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 74cb14c47c..8132ef2053 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -201,6 +201,10 @@ required structures.") `(#:parallel-build? #f #:parallel-tests? #f #:test-target "test" + + ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure, + ;; so we explicitly disallow it here. + #:disallowed-references ,(list (canonical-package perl)) #:phases (modify-phases %standard-phases (add-before -- cgit v1.2.3 From 2382cb4f52b98e6bf28d388194ab0100ef9f23c9 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sat, 19 Mar 2016 11:36:33 +0300 Subject: gnu: texinfo: Use version 6.1 by default. * gnu/packages/texinfo.scm (texinfo): Update to 6.1. (texinfo-6.1): Remove. * gnu/packages/emacs.scm (emacs)[arguments]: Remove 'remove-info.info' phase. --- gnu/packages/emacs.scm | 8 -------- gnu/packages/texinfo.scm | 16 ++-------------- 2 files changed, 2 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f53f73bb8a..215061a67a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -88,14 +88,6 @@ (substitute* (find-files "." "^Makefile\\.in$") (("/bin/pwd") "pwd")))) - (add-after 'install 'remove-info.info - (lambda* (#:key outputs #:allow-other-keys) - ;; Remove 'info.info', which is provided by Texinfo <= 6.0. - ;; TODO: Remove this phase when we switch to Texinfo 6.1. - (let ((out (assoc-ref outputs "out"))) - (delete-file - (string-append out "/share/info/info.info.gz")) - #t))) (add-after 'install 'install-site-start ;; Copy guix-emacs.el from Guix and add it to site-start.el. This ;; way, Emacs packages provided by Guix and installed in diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 5c1204ed2e..8b9ed00de7 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -32,14 +32,14 @@ (define-public texinfo (package (name "texinfo") - (version "6.0") + (version "6.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/texinfo/texinfo-" version ".tar.xz")) (sha256 (base32 - "1r3i6jyynn6ab45fxw5bms8mflk9ry4qpj6gqyry72vfd5c47fhi")))) + "1ll3d0l8izygdxqz96wfr2631kxahifwdknpgsx2090vw963js5c")))) (build-system gnu-build-system) (native-inputs `(("procps" ,procps))) ;one of the tests needs pgrep (inputs `(("ncurses" ,ncurses) @@ -62,18 +62,6 @@ their source and the command-line Info reader. The emphasis of the language is on expressing the content semantically, avoiding physical markup commands.") (license gpl3+))) -(define-public texinfo-6.1 - (package - (inherit texinfo) - (version "6.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/texinfo/texinfo-" - version ".tar.xz")) - (sha256 - (base32 - "1ll3d0l8izygdxqz96wfr2631kxahifwdknpgsx2090vw963js5c")))))) - (define-public texinfo-5 (package (inherit texinfo) (version "5.2") -- cgit v1.2.3 From 51514e69597365f8a5e03811e5d7ce5142602fbb Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 25 Mar 2016 21:38:16 -0400 Subject: gnu: expat: Update to 2.1.1. * gnu/packages/patches/expat-CVE-2015-1283.patch: Delete file. * gnu-system.am (dist_patch_DATA): Remove it. * gnu/packages/xml.scm (expat): Update to 2.1.1. [source]: Use bz2 tarball. Remove patch. --- gnu-system.am | 1 - gnu/packages/patches/expat-CVE-2015-1283.patch | 89 -------------------------- gnu/packages/xml.scm | 9 ++- 3 files changed, 4 insertions(+), 95 deletions(-) delete mode 100644 gnu/packages/patches/expat-CVE-2015-1283.patch (limited to 'gnu') diff --git a/gnu-system.am b/gnu-system.am index f13a55de12..805464f658 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -461,7 +461,6 @@ dist_patch_DATA = \ gnu/packages/patches/emacs-source-date-epoch.patch \ gnu/packages/patches/eudev-rules-directory.patch \ gnu/packages/patches/evilwm-lost-focus-bug.patch \ - gnu/packages/patches/expat-CVE-2015-1283.patch \ gnu/packages/patches/fastcap-mulGlobal.patch \ gnu/packages/patches/fastcap-mulSetup.patch \ gnu/packages/patches/fasthenry-spAllocate.patch \ diff --git a/gnu/packages/patches/expat-CVE-2015-1283.patch b/gnu/packages/patches/expat-CVE-2015-1283.patch deleted file mode 100644 index f9065bea16..0000000000 --- a/gnu/packages/patches/expat-CVE-2015-1283.patch +++ /dev/null @@ -1,89 +0,0 @@ -Copied from Debian. - -Description: fix multiple integer overflows in the XML_GetBuffer function - Multiple integer overflows in the XML_GetBuffer function in Expat through - 2.1.0, as used in Google Chrome before 44.0.2403.89 and other products, - allow remote attackers to cause a denial of service (heap-based buffer - overflow) or possibly have unspecified other impact via crafted XML data, - a related issue to CVE-2015-2716. -Origin: Mozilla, https://hg.mozilla.org/releases/mozilla-esr31/rev/2f3e78643f5c -Author: Eric Rahm -Forwarded: not-needed -Last-Update: 2015-07-24 - -diff --git a/lib/xmlparse.c b/lib/xmlparse.c ---- a/lib/xmlparse.c -+++ b/lib/xmlparse.c -@@ -1673,29 +1673,40 @@ XML_ParseBuffer(XML_Parser parser, int l - XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position); - positionPtr = bufferPtr; - return result; - } - - void * XMLCALL - XML_GetBuffer(XML_Parser parser, int len) - { -+/* BEGIN MOZILLA CHANGE (sanity check len) */ -+ if (len < 0) { -+ errorCode = XML_ERROR_NO_MEMORY; -+ return NULL; -+ } -+/* END MOZILLA CHANGE */ - switch (ps_parsing) { - case XML_SUSPENDED: - errorCode = XML_ERROR_SUSPENDED; - return NULL; - case XML_FINISHED: - errorCode = XML_ERROR_FINISHED; - return NULL; - default: ; - } - - if (len > bufferLim - bufferEnd) { -- /* FIXME avoid integer overflow */ - int neededSize = len + (int)(bufferEnd - bufferPtr); -+/* BEGIN MOZILLA CHANGE (sanity check neededSize) */ -+ if (neededSize < 0) { -+ errorCode = XML_ERROR_NO_MEMORY; -+ return NULL; -+ } -+/* END MOZILLA CHANGE */ - #ifdef XML_CONTEXT_BYTES - int keep = (int)(bufferPtr - buffer); - - if (keep > XML_CONTEXT_BYTES) - keep = XML_CONTEXT_BYTES; - neededSize += keep; - #endif /* defined XML_CONTEXT_BYTES */ - if (neededSize <= bufferLim - buffer) { -@@ -1714,17 +1725,25 @@ XML_GetBuffer(XML_Parser parser, int len - } - else { - char *newBuf; - int bufferSize = (int)(bufferLim - bufferPtr); - if (bufferSize == 0) - bufferSize = INIT_BUFFER_SIZE; - do { - bufferSize *= 2; -- } while (bufferSize < neededSize); -+/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */ -+ } while (bufferSize < neededSize && bufferSize > 0); -+/* END MOZILLA CHANGE */ -+/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */ -+ if (bufferSize <= 0) { -+ errorCode = XML_ERROR_NO_MEMORY; -+ return NULL; -+ } -+/* END MOZILLA CHANGE */ - newBuf = (char *)MALLOC(bufferSize); - if (newBuf == 0) { - errorCode = XML_ERROR_NO_MEMORY; - return NULL; - } - bufferLim = newBuf + bufferSize; - #ifdef XML_CONTEXT_BYTES - if (bufferPtr) { - - - - diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 7419c61d3a..f6a3f82063 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015 Ricardo Wurmus -;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Efraim Flashner ;;; Copyright © 2015 Raimon Grau ;;; @@ -44,15 +44,14 @@ (define-public expat (package (name "expat") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/expat/expat/" - version "/expat-" version ".tar.gz")) + version "/expat-" version ".tar.bz2")) (sha256 (base32 - "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2")) - (patches (list (search-patch "expat-CVE-2015-1283.patch"))))) + "0ryyjgvy7jq0qb7a9mhc1giy3bzn56aiwrs8dpydqngplbjq9xdg")))) (build-system gnu-build-system) (home-page "http://www.libexpat.org/") (synopsis "Stream-oriented XML parser library written in C") -- cgit v1.2.3 From ea5d388257664d703df23cf3eb0da7b6546d6c42 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 1 Apr 2016 17:42:28 +0300 Subject: gnu: gzip: Update to 1.7. * gnu/packages/compression.scm (gzip): Update to 1.7. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 938d4b8718..66eec1b5c5 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -129,14 +129,14 @@ adding and extracting files to/from a tar archive.") (define-public gzip (package (name "gzip") - (version "1.6") + (version "1.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gzip/gzip-" version ".tar.gz")) (sha256 (base32 - "0zlgdm4v3dndrbiz7b67mbbj25dpwqbmbzjiycssvrfrcfvq7swp")))) + "1as1ddq58spflzz5kxm0ni0xfpswrkkrncjpxyb3aw77gizcacgv")))) (build-system gnu-build-system) (synopsis "General file (de)compression (using lzw)") (arguments -- cgit v1.2.3 From f8835ff4b3dd59d59bf44838d05d3d60114d15d2 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sun, 3 Apr 2016 10:27:45 +0300 Subject: gnu: fontconfig: Find fonts in the system profile. Fixes . Reported by myglc2 . This also reverts commit e71ef7adaece7e132a5059139122b45083ea1b39. * gnu/packages/fontutils.scm (fontconfig)[arguments]: Add /run/current-system/profile/share/fonts to --with-add-fonts configure flag. * gnu/system/shadow.scm (default-skeletons): Do not create "fonts.conf" file. --- gnu/packages/fontutils.scm | 8 ++++---- gnu/system/shadow.scm | 23 ----------------------- 2 files changed, 4 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 7e3f293817..2912ce2366 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -95,10 +95,10 @@ anti-aliased glyph bitmap generation with 256 gray levels.") (assoc-ref %build-inputs "gs-fonts") "/share/fonts") - ;; register fonts from user profile - ;; TODO: Add /run/current-system/profile/share/fonts and remove - ;; the skeleton that works around it from 'default-skeletons'. - "--with-add-fonts=~/.guix-profile/share/fonts" + ;; Register fonts from user and system profiles. + (string-append "--with-add-fonts=" + "~/.guix-profile/share/fonts," + "/run/current-system/profile/share/fonts") ;; python is not actually needed "PYTHON=false") diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index a13ef1192c..6e62aeee57 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -131,12 +131,6 @@ (define (default-skeletons) "Return the default skeleton files for /etc/skel. These files are copied by 'useradd' in the home directory of newly created user accounts." - (define fonts.conf-content - ;; SXML for ~/.config/fontconfig/fonts.conf. This works around the fact - ;; that Fontconfig currently does not such this directory by default, - ;; thereby ignoring fonts installed system-wide (FIXME). - `(fontconfig (dir "/run/current-system/profile/share/fonts"))) - (define copy-guile-wm #~(begin (use-modules (guix build utils)) @@ -180,22 +174,6 @@ source /etc/profile\n")) (xdefaults (plain-file "Xdefaults" "\ XTerm*utf8: always XTerm*metaSendsEscape: true\n")) - (fonts.conf (computed-file - "fonts.conf" - #~(begin - (use-modules (guix build utils) - (sxml simple)) - - (define dir - (string-append #$output - "/fontconfig")) - - (mkdir-p dir) - (call-with-output-file (string-append dir - "/fonts.conf") - (lambda (port) - (sxml->xml '#$fonts.conf-content port)))) - #:modules '((guix build utils)))) (gdbinit (plain-file "gdbinit" "\ # Tell GDB where to look for separate debugging files. set debug-file-directory ~/.guix-profile/lib/debug\n"))) @@ -204,7 +182,6 @@ set debug-file-directory ~/.guix-profile/lib/debug\n"))) (".zlogin" ,zlogin) (".Xdefaults" ,xdefaults) (".guile-wm" ,guile-wm) - (".config" ,fonts.conf) (".gdbinit" ,gdbinit)))) (define (skeleton-directory skeletons) -- cgit v1.2.3 From 8f03b70b020c5a4e3dfc3d515cdefbb7723e7fc9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 14:20:09 +0200 Subject: gnu: info-reader: Adjust to 'texinfo-6.1' removal. * gnu/packages/texinfo.scm (info-reader): Change 'texinfo-6.1' to 'texinfo'. --- gnu/packages/texinfo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 51497030c2..18142adb1a 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -93,10 +93,10 @@ is on expressing the content semantically, avoiding physical markup commands.") ;; The idea of this package is to have the standalone Info reader without ;; the dependency on Perl that 'makeinfo' drags. (package - (inherit texinfo-6.1) + (inherit texinfo) (name "info-reader") (arguments - `(#:disallowed-references ,(assoc-ref (package-inputs texinfo-6.1) + `(#:disallowed-references ,(assoc-ref (package-inputs texinfo) "perl") #:modules ((ice-9 ftw) (srfi srfi-1) -- cgit v1.2.3 From 5d6c4d3794b8c77effcd9eeab22adc4e2c0d2c24 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 22:22:36 +0200 Subject: gnu: commencement: Disable Texinfo tests during bootstrap. * gnu/packages/commencement.scm (texinfo-boot0): Add #:tests? #f. --- gnu/packages/commencement.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 6dfe5c9cb7..59a7c7798e 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -306,7 +306,12 @@ ;; Also, use %BOOT0-INPUTS to avoid building Perl once more. (let ((texinfo (package (inherit texinfo) (native-inputs '()) - (inputs `(("perl" ,perl-boot0)))))) + (inputs `(("perl" ,perl-boot0))) + + ;; Some of Texinfo 6.1's tests would fail with "Couldn't + ;; set UTF-8 character type in locale" but we don't have a + ;; UTF-8 locale at this stage, so skip them. + (arguments '(#:tests? #f))))) (package-with-bootstrap-guile (package-with-explicit-inputs texinfo %boot0-inputs (current-source-location) -- cgit v1.2.3 From 2a5739b4c0856721181e4e7ab4b747541a64efca Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 14:20:50 +0200 Subject: ld-wrapper: Unset 'GUILE_LOAD_COMPILED_PATH'. * gnu/packages/ld-wrapper.in: Unset 'GUILE_LOAD_COMPILED_PATH'. --- gnu/packages/ld-wrapper.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ld-wrapper.in b/gnu/packages/ld-wrapper.in index c92ed1dcc7..ebfd8332c4 100644 --- a/gnu/packages/ld-wrapper.in +++ b/gnu/packages/ld-wrapper.in @@ -6,12 +6,16 @@ # the shebang line in Linux. # Use `load-compiled' because `load' (and `-l') doesn't otherwise load our # .go file (see ). +# Unset 'GUILE_LOAD_COMPILED_PATH' to make sure we do not stumble upon +# incompatible .go files. See +# . +unset GUILE_LOAD_COMPILED_PATH main="(@ (gnu build-support ld-wrapper) ld-wrapper)" exec @GUILE@ -c "(load-compiled \"@SELF@.go\") (apply $main (cdr (command-line)))" "$@" !# ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 81cea47d4a4c0054beb234004b990d6f514d0514 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 15:10:12 +0200 Subject: gnu: perl: Do not retain references to GCC & co. Fixes . Reported by David Thompson . * gnu/packages/perl.scm (perl)[arguments]: Add 'remove-extra-references' phase. Remove -Dlibpth and -Dplibpth from #:configure-flags. * gnu/packages/commencement.scm (perl-boot0): Add #:disallowed-references. --- gnu/packages/commencement.scm | 33 ++++++++++++++++++--------------- gnu/packages/perl.scm | 39 +++++++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 59a7c7798e..0d9133fb9c 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -270,21 +270,24 @@ (name "perl-boot0") (replacement #f) (arguments - (substitute-keyword-arguments (package-arguments perl) - ((#:phases phases) - `(modify-phases ,phases - ;; Pthread support is missing in the bootstrap compiler - ;; (broken spec file), so disable it. - (add-before 'configure 'disable-pthreads - (lambda _ - (substitute* "Configure" - (("^libswanted=(.*)pthread" _ before) - (string-append "libswanted=" before)))))))))))) - (package-with-bootstrap-guile - (package-with-explicit-inputs perl - %boot0-inputs - (current-source-location) - #:guile %bootstrap-guile)))) + ;; At the very least, this must not depend on GCC & co. + (let ((args `(#:disallowed-references + ,(list %bootstrap-binutils)))) + (substitute-keyword-arguments (package-arguments perl) + ((#:phases phases) + `(modify-phases ,phases + ;; Pthread support is missing in the bootstrap compiler + ;; (broken spec file), so disable it. + (add-before 'configure 'disable-pthreads + (lambda _ + (substitute* "Configure" + (("^libswanted=(.*)pthread" _ before) + (string-append "libswanted=" before))))))))))))) + (package-with-bootstrap-guile + (package-with-explicit-inputs perl + %boot0-inputs + (current-source-location) + #:guile %bootstrap-guile)))) (define (linux-libre-headers-boot0) "Return Linux-Libre header files for the bootstrap environment." diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 9bbcc8ffa4..41bcd7da84 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -86,15 +86,7 @@ "-Dinstallstyle=lib/perl5" "-Duseshrplib" (string-append "-Dlocincpth=" libc "/include") - (string-append "-Dloclibpth=" libc "/lib") - - ;; Force the library search path to contain only libc - ;; because it is recorded in Config.pm and - ;; Config_heavy.pl; we don't want to keep a reference - ;; to everything that's in $LIBRARY_PATH at build - ;; time (Binutils, bzip2, file, etc.) - (string-append "-Dlibpth=" libc "/lib") - (string-append "-Dplibpth=" libc "/lib")))))) + (string-append "-Dloclibpth=" libc "/lib")))))) (add-before 'strip 'make-shared-objects-writable @@ -105,7 +97,34 @@ (lib (string-append out "/lib"))) (for-each (lambda (dso) (chmod dso #o755)) - (find-files lib "\\.so$")))))))) + (find-files lib "\\.so$"))))) + + (add-after 'install 'remove-extra-references + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libc (assoc-ref inputs "libc")) + (config1 (car (find-files (string-append out "/lib/perl5") + "^Config_heavy\\.pl$"))) + (config2 (find-files (string-append out "/lib/perl5") + "^Config\\.pm$"))) + ;; Force the library search path to contain only libc because + ;; it is recorded in Config.pm and Config_heavy.pl; we don't + ;; want to keep a reference to everything that's in + ;; $LIBRARY_PATH at build time (GCC, Binutils, bzip2, file, + ;; etc.) + (substitute* config1 + (("^incpth=.*$") + (string-append "incpth='" libc "/include'\n")) + (("^(libpth|plibpth|libspath)=.*$" _ variable) + (string-append variable "='" libc "/lib'\n"))) + + (for-each (lambda (file) + (substitute* config2 + (("libpth => .*$") + (string-append "libpth => '" libc + "/lib',\n")))) + config2) + #t)))))) (native-search-paths (list (search-path-specification (variable "PERL5LIB") (files '("lib/perl5/site_perl"))))) -- cgit v1.2.3 From 61516a1613efd0e12afc83922b005e5218b3624a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 17:09:42 +0200 Subject: Revert "gnu: binutils: Update to 2.26." This reverts commit 5d9356f0fe67e679e35b92b5020a4a7b850af81c. Binutils 2.26 and ld in particular reportedly has serious bugs. For us, ld from 'binutils-cross-boot0' fails when linking 'cc1plus' in the first stage. --- gnu/packages/base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 7bd2ba4121..2010bc0d57 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -346,14 +346,14 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package (name "binutils") - (version "2.26") + (version "2.25.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 (base32 - "1ngc2h3knhiw8s22l8y6afycfaxr5grviqy7mwvm4bsl14cf9b62")) + "08lzmhidzc16af1zbx34f8cy4z7mzrswpdbhrb8shy3xxpflmcdm")) (patches (list (search-patch "binutils-ld-new-dtags.patch") (search-patch "binutils-loongson-workaround.patch"))))) (build-system gnu-build-system) -- cgit v1.2.3 From e37595d9617658e3098b1d1b3f9f5d9aad4daf53 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 22:20:49 +0200 Subject: gnu: glibc: Update to 2.23. * gnu/packages/base.scm (glibc): Update to 2.23. Remove "glibc-locale-incompatibility.patch" and "glibc-CVE-2015-7547.patch", now unneeded. [arguments]: Add "libc_cv_ssp_strong=no" to #:configure-flags. Remove now unneeded patching of 'configure'. * gnu/packages/patches/glibc-CVE-2015-7547.patch: Remove. * gnu/packages/patches/glibc-locale-incompatibility.patch: Remove. * gnu-system.am (dist_patch_DATA): Adjust accordingly. --- gnu-system.am | 2 - gnu/packages/base.scm | 16 +- gnu/packages/patches/glibc-CVE-2015-7547.patch | 559 --------------------- .../patches/glibc-locale-incompatibility.patch | 23 - 4 files changed, 5 insertions(+), 595 deletions(-) delete mode 100644 gnu/packages/patches/glibc-CVE-2015-7547.patch delete mode 100644 gnu/packages/patches/glibc-locale-incompatibility.patch (limited to 'gnu') diff --git a/gnu-system.am b/gnu-system.am index fc5a233ae3..fb5a086555 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -489,12 +489,10 @@ dist_patch_DATA = \ gnu/packages/patches/glib-tests-prlimit.patch \ gnu/packages/patches/glib-tests-timer.patch \ gnu/packages/patches/glib-tests-gapplication.patch \ - gnu/packages/patches/glibc-CVE-2015-7547.patch \ gnu/packages/patches/glibc-bootstrap-system.patch \ gnu/packages/patches/glibc-hurd-extern-inline.patch \ gnu/packages/patches/glibc-ldd-x86_64.patch \ gnu/packages/patches/glibc-locales.patch \ - gnu/packages/patches/glibc-locale-incompatibility.patch \ gnu/packages/patches/glibc-o-largefile.patch \ gnu/packages/patches/glibc-versioned-locpath.patch \ gnu/packages/patches/gmp-arm-asm-nothumb.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 2010bc0d57..7a8844795b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -459,14 +459,14 @@ store.") (define-public glibc (package (name "glibc") - (version "2.22") + (version "2.23") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "0j49682pm2nh4qbdw35bas82p1pgfnz4d2l7iwfyzvrvj0318wzb")) + "1s8krs3y2n6pzav7ic59dz41alqalphv7vww4138ag30wh0fpvwl")) (snippet ;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is ;; required on LFS distros to avoid loading the distro's libc.so @@ -477,10 +477,8 @@ store.") (modules '((guix build utils))) (patches (map search-patch '("glibc-ldd-x86_64.patch" - "glibc-locale-incompatibility.patch" "glibc-versioned-locpath.patch" - "glibc-o-largefile.patch" - "glibc-CVE-2015-7547.patch"))))) + "glibc-o-largefile.patch"))))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc @@ -497,7 +495,7 @@ store.") #:parallel-build? #f ;; The libraries have an empty RUNPATH, but some, such as the versioned - ;; libraries (libdl-2.22.so, etc.) have ld.so marked as NEEDED. Since + ;; libraries (libdl-2.23.so, etc.) have ld.so marked as NEEDED. Since ;; these libraries are always going to be found anyway, just skip ;; RUNPATH checks. #:validate-runpath? #f @@ -539,7 +537,7 @@ store.") "/bin/bash") ;; XXX: Work around "undefined reference to `__stack_chk_guard'". - "libc_cv_ssp=no") + "libc_cv_ssp=no" "libc_cv_ssp_strong=no") #:tests? #f ; XXX #:phases (modify-phases %standard-phases @@ -553,10 +551,6 @@ store.") ;; but cross-base uses it as a native input. (bash (or (assoc-ref inputs "static-bash") (assoc-ref native-inputs "static-bash")))) - ;; Use `pwd', not `/bin/pwd'. - (substitute* "configure" - (("/bin/pwd") "pwd")) - ;; Install the rpc data base file under `$out/etc/rpc'. ;; FIXME: Use installFlags = [ "sysconfdir=$(out)/etc" ]; (substitute* "sunrpc/Makefile" diff --git a/gnu/packages/patches/glibc-CVE-2015-7547.patch b/gnu/packages/patches/glibc-CVE-2015-7547.patch deleted file mode 100644 index 9a0909af74..0000000000 --- a/gnu/packages/patches/glibc-CVE-2015-7547.patch +++ /dev/null @@ -1,559 +0,0 @@ -Copied from Fedora: -http://pkgs.fedoraproject.org/cgit/rpms/glibc.git/tree/glibc-CVE-2015-7547.patch?h=f23&id=9f1734eb6ce3257b788d6e9203572e8204c6c584 - -Adapted to apply cleanly to glibc-2.22. - -Index: b/resolv/nss_dns/dns-host.c -=================================================================== ---- a/resolv/nss_dns/dns-host.c -+++ b/resolv/nss_dns/dns-host.c -@@ -1031,7 +1031,10 @@ gaih_getanswer_slice (const querybuf *an - int h_namelen = 0; - - if (ancount == 0) -- return NSS_STATUS_NOTFOUND; -+ { -+ *h_errnop = HOST_NOT_FOUND; -+ return NSS_STATUS_NOTFOUND; -+ } - - while (ancount-- > 0 && cp < end_of_message && had_error == 0) - { -@@ -1208,7 +1211,14 @@ gaih_getanswer_slice (const querybuf *an - /* Special case here: if the resolver sent a result but it only - contains a CNAME while we are looking for a T_A or T_AAAA record, - we fail with NOTFOUND instead of TRYAGAIN. */ -- return canon == NULL ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND; -+ if (canon != NULL) -+ { -+ *h_errnop = HOST_NOT_FOUND; -+ return NSS_STATUS_NOTFOUND; -+ } -+ -+ *h_errnop = NETDB_INTERNAL; -+ return NSS_STATUS_TRYAGAIN; - } - - -@@ -1222,11 +1232,101 @@ gaih_getanswer (const querybuf *answer1, - - enum nss_status status = NSS_STATUS_NOTFOUND; - -+ /* Combining the NSS status of two distinct queries requires some -+ compromise and attention to symmetry (A or AAAA queries can be -+ returned in any order). What follows is a breakdown of how this -+ code is expected to work and why. We discuss only SUCCESS, -+ TRYAGAIN, NOTFOUND and UNAVAIL, since they are the only returns -+ that apply (though RETURN and MERGE exist). We make a distinction -+ between TRYAGAIN (recoverable) and TRYAGAIN' (not-recoverable). -+ A recoverable TRYAGAIN is almost always due to buffer size issues -+ and returns ERANGE in errno and the caller is expected to retry -+ with a larger buffer. -+ -+ Lastly, you may be tempted to make significant changes to the -+ conditions in this code to bring about symmetry between responses. -+ Please don't change anything without due consideration for -+ expected application behaviour. Some of the synthesized responses -+ aren't very well thought out and sometimes appear to imply that -+ IPv4 responses are always answer 1, and IPv6 responses are always -+ answer 2, but that's not true (see the implemetnation of send_dg -+ and send_vc to see response can arrive in any order, particlarly -+ for UDP). However, we expect it holds roughly enough of the time -+ that this code works, but certainly needs to be fixed to make this -+ a more robust implementation. -+ -+ ---------------------------------------------- -+ | Answer 1 Status / | Synthesized | Reason | -+ | Answer 2 Status | Status | | -+ |--------------------------------------------| -+ | SUCCESS/SUCCESS | SUCCESS | [1] | -+ | SUCCESS/TRYAGAIN | TRYAGAIN | [5] | -+ | SUCCESS/TRYAGAIN' | SUCCESS | [1] | -+ | SUCCESS/NOTFOUND | SUCCESS | [1] | -+ | SUCCESS/UNAVAIL | SUCCESS | [1] | -+ | TRYAGAIN/SUCCESS | TRYAGAIN | [2] | -+ | TRYAGAIN/TRYAGAIN | TRYAGAIN | [2] | -+ | TRYAGAIN/TRYAGAIN' | TRYAGAIN | [2] | -+ | TRYAGAIN/NOTFOUND | TRYAGAIN | [2] | -+ | TRYAGAIN/UNAVAIL | TRYAGAIN | [2] | -+ | TRYAGAIN'/SUCCESS | SUCCESS | [3] | -+ | TRYAGAIN'/TRYAGAIN | TRYAGAIN | [3] | -+ | TRYAGAIN'/TRYAGAIN' | TRYAGAIN' | [3] | -+ | TRYAGAIN'/NOTFOUND | TRYAGAIN' | [3] | -+ | TRYAGAIN'/UNAVAIL | UNAVAIL | [3] | -+ | NOTFOUND/SUCCESS | SUCCESS | [3] | -+ | NOTFOUND/TRYAGAIN | TRYAGAIN | [3] | -+ | NOTFOUND/TRYAGAIN' | TRYAGAIN' | [3] | -+ | NOTFOUND/NOTFOUND | NOTFOUND | [3] | -+ | NOTFOUND/UNAVAIL | UNAVAIL | [3] | -+ | UNAVAIL/SUCCESS | UNAVAIL | [4] | -+ | UNAVAIL/TRYAGAIN | UNAVAIL | [4] | -+ | UNAVAIL/TRYAGAIN' | UNAVAIL | [4] | -+ | UNAVAIL/NOTFOUND | UNAVAIL | [4] | -+ | UNAVAIL/UNAVAIL | UNAVAIL | [4] | -+ ---------------------------------------------- -+ -+ [1] If the first response is a success we return success. -+ This ignores the state of the second answer and in fact -+ incorrectly sets errno and h_errno to that of the second -+ answer. However because the response is a success we ignore -+ *errnop and *h_errnop (though that means you touched errno on -+ success). We are being conservative here and returning the -+ likely IPv4 response in the first answer as a success. -+ -+ [2] If the first response is a recoverable TRYAGAIN we return -+ that instead of looking at the second response. The -+ expectation here is that we have failed to get an IPv4 response -+ and should retry both queries. -+ -+ [3] If the first response was not a SUCCESS and the second -+ response is not NOTFOUND (had a SUCCESS, need to TRYAGAIN, -+ or failed entirely e.g. TRYAGAIN' and UNAVAIL) then use the -+ result from the second response, otherwise the first responses -+ status is used. Again we have some odd side-effects when the -+ second response is NOTFOUND because we overwrite *errnop and -+ *h_errnop that means that a first answer of NOTFOUND might see -+ its *errnop and *h_errnop values altered. Whether it matters -+ in practice that a first response NOTFOUND has the wrong -+ *errnop and *h_errnop is undecided. -+ -+ [4] If the first response is UNAVAIL we return that instead of -+ looking at the second response. The expectation here is that -+ it will have failed similarly e.g. configuration failure. -+ -+ [5] Testing this code is complicated by the fact that truncated -+ second response buffers might be returned as SUCCESS if the -+ first answer is a SUCCESS. To fix this we add symmetry to -+ TRYAGAIN with the second response. If the second response -+ is a recoverable error we now return TRYAGIN even if the first -+ response was SUCCESS. */ -+ - if (anslen1 > 0) - status = gaih_getanswer_slice(answer1, anslen1, qname, - &pat, &buffer, &buflen, - errnop, h_errnop, ttlp, - &first); -+ - if ((status == NSS_STATUS_SUCCESS || status == NSS_STATUS_NOTFOUND - || (status == NSS_STATUS_TRYAGAIN - /* We want to look at the second answer in case of an -@@ -1242,8 +1342,15 @@ gaih_getanswer (const querybuf *answer1, - &pat, &buffer, &buflen, - errnop, h_errnop, ttlp, - &first); -+ /* Use the second response status in some cases. */ - if (status != NSS_STATUS_SUCCESS && status2 != NSS_STATUS_NOTFOUND) - status = status2; -+ /* Do not return a truncated second response (unless it was -+ unavoidable e.g. unrecoverable TRYAGAIN). */ -+ if (status == NSS_STATUS_SUCCESS -+ && (status2 == NSS_STATUS_TRYAGAIN -+ && *errnop == ERANGE && *h_errnop != NO_RECOVERY)) -+ status = NSS_STATUS_TRYAGAIN; - } - - return status; -Index: b/resolv/res_query.c -=================================================================== ---- a/resolv/res_query.c -+++ b/resolv/res_query.c -@@ -396,6 +396,7 @@ __libc_res_nsearch(res_state statp, - { - free (*answerp2); - *answerp2 = NULL; -+ *nanswerp2 = 0; - *answerp2_malloced = 0; - } - } -@@ -447,6 +448,7 @@ __libc_res_nsearch(res_state statp, - { - free (*answerp2); - *answerp2 = NULL; -+ *nanswerp2 = 0; - *answerp2_malloced = 0; - } - -@@ -521,6 +523,7 @@ __libc_res_nsearch(res_state statp, - { - free (*answerp2); - *answerp2 = NULL; -+ *nanswerp2 = 0; - *answerp2_malloced = 0; - } - if (saved_herrno != -1) -Index: b/resolv/res_send.c -=================================================================== ---- a/resolv/res_send.c -+++ b/resolv/res_send.c -@@ -1,3 +1,20 @@ -+/* Copyright (C) 2016 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library 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 -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ . */ -+ - /* - * Copyright (c) 1985, 1989, 1993 - * The Regents of the University of California. All rights reserved. -@@ -361,6 +378,8 @@ __libc_res_nsend(res_state statp, const - #ifdef USE_HOOKS - if (__glibc_unlikely (statp->qhook || statp->rhook)) { - if (anssiz < MAXPACKET && ansp) { -+ /* Always allocate MAXPACKET, callers expect -+ this specific size. */ - u_char *buf = malloc (MAXPACKET); - if (buf == NULL) - return (-1); -@@ -660,6 +679,77 @@ libresolv_hidden_def (res_nsend) - - /* Private */ - -+/* The send_vc function is responsible for sending a DNS query over TCP -+ to the nameserver numbered NS from the res_state STATP i.e. -+ EXT(statp).nssocks[ns]. The function supports sending both IPv4 and -+ IPv6 queries at the same serially on the same socket. -+ -+ Please note that for TCP there is no way to disable sending both -+ queries, unlike UDP, which honours RES_SNGLKUP and RES_SNGLKUPREOP -+ and sends the queries serially and waits for the result after each -+ sent query. This implemetnation should be corrected to honour these -+ options. -+ -+ Please also note that for TCP we send both queries over the same -+ socket one after another. This technically violates best practice -+ since the server is allowed to read the first query, respond, and -+ then close the socket (to service another client). If the server -+ does this, then the remaining second query in the socket data buffer -+ will cause the server to send the client an RST which will arrive -+ asynchronously and the client's OS will likely tear down the socket -+ receive buffer resulting in a potentially short read and lost -+ response data. This will force the client to retry the query again, -+ and this process may repeat until all servers and connection resets -+ are exhausted and then the query will fail. It's not known if this -+ happens with any frequency in real DNS server implementations. This -+ implementation should be corrected to use two sockets by default for -+ parallel queries. -+ -+ The query stored in BUF of BUFLEN length is sent first followed by -+ the query stored in BUF2 of BUFLEN2 length. Queries are sent -+ serially on the same socket. -+ -+ Answers to the query are stored firstly in *ANSP up to a max of -+ *ANSSIZP bytes. If more than *ANSSIZP bytes are needed and ANSCP -+ is non-NULL (to indicate that modifying the answer buffer is allowed) -+ then malloc is used to allocate a new response buffer and ANSCP and -+ ANSP will both point to the new buffer. If more than *ANSSIZP bytes -+ are needed but ANSCP is NULL, then as much of the response as -+ possible is read into the buffer, but the results will be truncated. -+ When truncation happens because of a small answer buffer the DNS -+ packets header feild TC will bet set to 1, indicating a truncated -+ message and the rest of the socket data will be read and discarded. -+ -+ Answers to the query are stored secondly in *ANSP2 up to a max of -+ *ANSSIZP2 bytes, with the actual response length stored in -+ *RESPLEN2. If more than *ANSSIZP bytes are needed and ANSP2 -+ is non-NULL (required for a second query) then malloc is used to -+ allocate a new response buffer, *ANSSIZP2 is set to the new buffer -+ size and *ANSP2_MALLOCED is set to 1. -+ -+ The ANSP2_MALLOCED argument will eventually be removed as the -+ change in buffer pointer can be used to detect the buffer has -+ changed and that the caller should use free on the new buffer. -+ -+ Note that the answers may arrive in any order from the server and -+ therefore the first and second answer buffers may not correspond to -+ the first and second queries. -+ -+ It is not supported to call this function with a non-NULL ANSP2 -+ but a NULL ANSCP. Put another way, you can call send_vc with a -+ single unmodifiable buffer or two modifiable buffers, but no other -+ combination is supported. -+ -+ It is the caller's responsibility to free the malloc allocated -+ buffers by detecting that the pointers have changed from their -+ original values i.e. *ANSCP or *ANSP2 has changed. -+ -+ If errors are encountered then *TERRNO is set to an appropriate -+ errno value and a zero result is returned for a recoverable error, -+ and a less-than zero result is returned for a non-recoverable error. -+ -+ If no errors are encountered then *TERRNO is left unmodified and -+ a the length of the first response in bytes is returned. */ - static int - send_vc(res_state statp, - const u_char *buf, int buflen, const u_char *buf2, int buflen2, -@@ -669,11 +759,7 @@ send_vc(res_state statp, - { - const HEADER *hp = (HEADER *) buf; - const HEADER *hp2 = (HEADER *) buf2; -- u_char *ans = *ansp; -- int orig_anssizp = *anssizp; -- // XXX REMOVE -- // int anssiz = *anssizp; -- HEADER *anhp = (HEADER *) ans; -+ HEADER *anhp = (HEADER *) *ansp; - struct sockaddr *nsap = get_nsaddr (statp, ns); - int truncating, connreset, n; - /* On some architectures compiler might emit a warning indicating -@@ -766,6 +852,8 @@ send_vc(res_state statp, - * Receive length & response - */ - int recvresp1 = 0; -+ /* Skip the second response if there is no second query. -+ To do that we mark the second response as received. */ - int recvresp2 = buf2 == NULL; - uint16_t rlen16; - read_len: -@@ -802,40 +890,14 @@ send_vc(res_state statp, - u_char **thisansp; - int *thisresplenp; - if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) { -+ /* We have not received any responses -+ yet or we only have one response to -+ receive. */ - thisanssizp = anssizp; - thisansp = anscp ?: ansp; - assert (anscp != NULL || ansp2 == NULL); - thisresplenp = &resplen; - } else { -- if (*anssizp != MAXPACKET) { -- /* No buffer allocated for the first -- reply. We can try to use the rest -- of the user-provided buffer. */ --#if __GNUC_PREREQ (4, 7) -- DIAG_PUSH_NEEDS_COMMENT; -- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); --#endif --#if _STRING_ARCH_unaligned -- *anssizp2 = orig_anssizp - resplen; -- *ansp2 = *ansp + resplen; --#else -- int aligned_resplen -- = ((resplen + __alignof__ (HEADER) - 1) -- & ~(__alignof__ (HEADER) - 1)); -- *anssizp2 = orig_anssizp - aligned_resplen; -- *ansp2 = *ansp + aligned_resplen; --#endif --#if __GNUC_PREREQ (4, 7) -- DIAG_POP_NEEDS_COMMENT; --#endif -- } else { -- /* The first reply did not fit into the -- user-provided buffer. Maybe the second -- answer will. */ -- *anssizp2 = orig_anssizp; -- *ansp2 = *ansp; -- } -- - thisanssizp = anssizp2; - thisansp = ansp2; - thisresplenp = resplen2; -@@ -843,10 +905,14 @@ send_vc(res_state statp, - anhp = (HEADER *) *thisansp; - - *thisresplenp = rlen; -- if (rlen > *thisanssizp) { -- /* Yes, we test ANSCP here. If we have two buffers -- both will be allocatable. */ -- if (__glibc_likely (anscp != NULL)) { -+ /* Is the answer buffer too small? */ -+ if (*thisanssizp < rlen) { -+ /* If the current buffer is non-NULL and it's not -+ pointing at the static user-supplied buffer then -+ we can reallocate it. */ -+ if (thisansp != NULL && thisansp != ansp) { -+ /* Always allocate MAXPACKET, callers expect -+ this specific size. */ - u_char *newp = malloc (MAXPACKET); - if (newp == NULL) { - *terrno = ENOMEM; -@@ -858,6 +924,9 @@ send_vc(res_state statp, - if (thisansp == ansp2) - *ansp2_malloced = 1; - anhp = (HEADER *) newp; -+ /* A uint16_t can't be larger than MAXPACKET -+ thus it's safe to allocate MAXPACKET but -+ read RLEN bytes instead. */ - len = rlen; - } else { - Dprint(statp->options & RES_DEBUG, -@@ -1021,6 +1090,66 @@ reopen (res_state statp, int *terrno, in - return 1; - } - -+/* The send_dg function is responsible for sending a DNS query over UDP -+ to the nameserver numbered NS from the res_state STATP i.e. -+ EXT(statp).nssocks[ns]. The function supports IPv4 and IPv6 queries -+ along with the ability to send the query in parallel for both stacks -+ (default) or serially (RES_SINGLKUP). It also supports serial lookup -+ with a close and reopen of the socket used to talk to the server -+ (RES_SNGLKUPREOP) to work around broken name servers. -+ -+ The query stored in BUF of BUFLEN length is sent first followed by -+ the query stored in BUF2 of BUFLEN2 length. Queries are sent -+ in parallel (default) or serially (RES_SINGLKUP or RES_SNGLKUPREOP). -+ -+ Answers to the query are stored firstly in *ANSP up to a max of -+ *ANSSIZP bytes. If more than *ANSSIZP bytes are needed and ANSCP -+ is non-NULL (to indicate that modifying the answer buffer is allowed) -+ then malloc is used to allocate a new response buffer and ANSCP and -+ ANSP will both point to the new buffer. If more than *ANSSIZP bytes -+ are needed but ANSCP is NULL, then as much of the response as -+ possible is read into the buffer, but the results will be truncated. -+ When truncation happens because of a small answer buffer the DNS -+ packets header feild TC will bet set to 1, indicating a truncated -+ message, while the rest of the UDP packet is discarded. -+ -+ Answers to the query are stored secondly in *ANSP2 up to a max of -+ *ANSSIZP2 bytes, with the actual response length stored in -+ *RESPLEN2. If more than *ANSSIZP bytes are needed and ANSP2 -+ is non-NULL (required for a second query) then malloc is used to -+ allocate a new response buffer, *ANSSIZP2 is set to the new buffer -+ size and *ANSP2_MALLOCED is set to 1. -+ -+ The ANSP2_MALLOCED argument will eventually be removed as the -+ change in buffer pointer can be used to detect the buffer has -+ changed and that the caller should use free on the new buffer. -+ -+ Note that the answers may arrive in any order from the server and -+ therefore the first and second answer buffers may not correspond to -+ the first and second queries. -+ -+ It is not supported to call this function with a non-NULL ANSP2 -+ but a NULL ANSCP. Put another way, you can call send_vc with a -+ single unmodifiable buffer or two modifiable buffers, but no other -+ combination is supported. -+ -+ It is the caller's responsibility to free the malloc allocated -+ buffers by detecting that the pointers have changed from their -+ original values i.e. *ANSCP or *ANSP2 has changed. -+ -+ If an answer is truncated because of UDP datagram DNS limits then -+ *V_CIRCUIT is set to 1 and the return value non-zero to indicate to -+ the caller to retry with TCP. The value *GOTSOMEWHERE is set to 1 -+ if any progress was made reading a response from the nameserver and -+ is used by the caller to distinguish between ECONNREFUSED and -+ ETIMEDOUT (the latter if *GOTSOMEWHERE is 1). -+ -+ If errors are encountered then *TERRNO is set to an appropriate -+ errno value and a zero result is returned for a recoverable error, -+ and a less-than zero result is returned for a non-recoverable error. -+ -+ If no errors are encountered then *TERRNO is left unmodified and -+ a the length of the first response in bytes is returned. */ - static int - send_dg(res_state statp, - const u_char *buf, int buflen, const u_char *buf2, int buflen2, -@@ -1030,8 +1159,6 @@ send_dg(res_state statp, - { - const HEADER *hp = (HEADER *) buf; - const HEADER *hp2 = (HEADER *) buf2; -- u_char *ans = *ansp; -- int orig_anssizp = *anssizp; - struct timespec now, timeout, finish; - struct pollfd pfd[1]; - int ptimeout; -@@ -1064,6 +1191,8 @@ send_dg(res_state statp, - int need_recompute = 0; - int nwritten = 0; - int recvresp1 = 0; -+ /* Skip the second response if there is no second query. -+ To do that we mark the second response as received. */ - int recvresp2 = buf2 == NULL; - pfd[0].fd = EXT(statp).nssocks[ns]; - pfd[0].events = POLLOUT; -@@ -1227,55 +1356,56 @@ send_dg(res_state statp, - int *thisresplenp; - - if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) { -+ /* We have not received any responses -+ yet or we only have one response to -+ receive. */ - thisanssizp = anssizp; - thisansp = anscp ?: ansp; - assert (anscp != NULL || ansp2 == NULL); - thisresplenp = &resplen; - } else { -- if (*anssizp != MAXPACKET) { -- /* No buffer allocated for the first -- reply. We can try to use the rest -- of the user-provided buffer. */ --#if _STRING_ARCH_unaligned -- *anssizp2 = orig_anssizp - resplen; -- *ansp2 = *ansp + resplen; --#else -- int aligned_resplen -- = ((resplen + __alignof__ (HEADER) - 1) -- & ~(__alignof__ (HEADER) - 1)); -- *anssizp2 = orig_anssizp - aligned_resplen; -- *ansp2 = *ansp + aligned_resplen; --#endif -- } else { -- /* The first reply did not fit into the -- user-provided buffer. Maybe the second -- answer will. */ -- *anssizp2 = orig_anssizp; -- *ansp2 = *ansp; -- } -- - thisanssizp = anssizp2; - thisansp = ansp2; - thisresplenp = resplen2; - } - - if (*thisanssizp < MAXPACKET -- /* Yes, we test ANSCP here. If we have two buffers -- both will be allocatable. */ -- && anscp -+ /* If the current buffer is non-NULL and it's not -+ pointing at the static user-supplied buffer then -+ we can reallocate it. */ -+ && (thisansp != NULL && thisansp != ansp) - #ifdef FIONREAD -+ /* Is the size too small? */ - && (ioctl (pfd[0].fd, FIONREAD, thisresplenp) < 0 - || *thisanssizp < *thisresplenp) - #endif - ) { -+ /* Always allocate MAXPACKET, callers expect -+ this specific size. */ - u_char *newp = malloc (MAXPACKET); - if (newp != NULL) { -- *anssizp = MAXPACKET; -- *thisansp = ans = newp; -+ *thisanssizp = MAXPACKET; -+ *thisansp = newp; - if (thisansp == ansp2) - *ansp2_malloced = 1; - } - } -+ /* We could end up with truncation if anscp was NULL -+ (not allowed to change caller's buffer) and the -+ response buffer size is too small. This isn't a -+ reliable way to detect truncation because the ioctl -+ may be an inaccurate report of the UDP message size. -+ Therefore we use this only to issue debug output. -+ To do truncation accurately with UDP we need -+ MSG_TRUNC which is only available on Linux. We -+ can abstract out the Linux-specific feature in the -+ future to detect truncation. */ -+ if (__glibc_unlikely (*thisanssizp < *thisresplenp)) { -+ Dprint(statp->options & RES_DEBUG, -+ (stdout, ";; response may be truncated (UDP)\n") -+ ); -+ } -+ - HEADER *anhp = (HEADER *) *thisansp; - socklen_t fromlen = sizeof(struct sockaddr_in6); - assert (sizeof(from) <= fromlen); diff --git a/gnu/packages/patches/glibc-locale-incompatibility.patch b/gnu/packages/patches/glibc-locale-incompatibility.patch deleted file mode 100644 index baf30a79a7..0000000000 --- a/gnu/packages/patches/glibc-locale-incompatibility.patch +++ /dev/null @@ -1,23 +0,0 @@ -This patch avoids an assertion failure when incompatible locale data -is encountered: - - https://sourceware.org/ml/libc-alpha/2015-09/msg00575.html - ---- glibc-2.22/locale/loadlocale.c 2015-09-22 17:16:02.321981548 +0200 -+++ glibc-2.22/locale/loadlocale.c 2015-09-22 17:17:34.814659064 +0200 -@@ -120,10 +120,11 @@ - _nl_value_type_LC_XYZ array. There are all pointers. */ - switch (category) - { --#define CATTEST(cat) \ -- case LC_##cat: \ -- assert (cnt < (sizeof (_nl_value_type_LC_##cat) \ -- / sizeof (_nl_value_type_LC_##cat[0]))); \ -+#define CATTEST(cat) \ -+ case LC_##cat: \ -+ if (cnt >= (sizeof (_nl_value_type_LC_##cat) \ -+ / sizeof (_nl_value_type_LC_##cat[0]))) \ -+ goto puntdata; \ - break - CATTEST (NUMERIC); - CATTEST (TIME); -- cgit v1.2.3 From 425b8537e8a46b6e7e32e65103ee87542d6ed3dc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 22:55:23 +0200 Subject: gnu: pcre: Fix CVE-2016-3191. * gnu/packages/patches/pcre-CVE-2016-3191.patch: New file. * gnu/packages/pcre.scm (pcre)[source]: Use it. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + gnu/packages/patches/pcre-CVE-2016-3191.patch | 151 ++++++++++++++++++++++++++ gnu/packages/pcre.scm | 3 +- 3 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/pcre-CVE-2016-3191.patch (limited to 'gnu') diff --git a/gnu-system.am b/gnu-system.am index fb5a086555..03d034c031 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -656,6 +656,7 @@ dist_patch_DATA = \ gnu/packages/patches/patchelf-rework-for-arm.patch \ gnu/packages/patches/patchutils-xfail-gendiff-tests.patch \ gnu/packages/patches/patch-hurd-path-max.patch \ + gnu/packages/patches/pcre-CVE-2016-3191.patch \ gnu/packages/patches/perl-CVE-2015-8607.patch \ gnu/packages/patches/perl-CVE-2016-2381.patch \ gnu/packages/patches/perl-autosplit-default-time.patch \ diff --git a/gnu/packages/patches/pcre-CVE-2016-3191.patch b/gnu/packages/patches/pcre-CVE-2016-3191.patch new file mode 100644 index 0000000000..89cce2a36f --- /dev/null +++ b/gnu/packages/patches/pcre-CVE-2016-3191.patch @@ -0,0 +1,151 @@ +Fix for CVE-2016-3191. +See . +This is svn r1631 at . + +Index: trunk/testdata/testoutput11-16 +=================================================================== +--- trunk/testdata/testoutput11-16 (revision 1630) ++++ trunk/testdata/testoutput11-16 (revision 1631) +@@ -765,4 +765,7 @@ + 25 End + ------------------------------------------------------------------ + ++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/ ++Failed: regular expression is too complicated at offset 490 ++ + /-- End of testinput11 --/ +Index: trunk/testdata/testinput11 +=================================================================== +--- trunk/testdata/testinput11 (revision 1630) ++++ trunk/testdata/testinput11 (revision 1631) +@@ -138,4 +138,6 @@ + + /.((?2)(?R)\1)()/B + ++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/ ++ + /-- End of testinput11 --/ +Index: trunk/testdata/testoutput11-8 +=================================================================== +--- trunk/testdata/testoutput11-8 (revision 1630) ++++ trunk/testdata/testoutput11-8 (revision 1631) +@@ -765,4 +765,7 @@ + 38 End + ------------------------------------------------------------------ + ++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/ ++Failed: missing ) at offset 509 ++ + /-- End of testinput11 --/ +Index: trunk/testdata/testoutput11-32 +=================================================================== +--- trunk/testdata/testoutput11-32 (revision 1630) ++++ trunk/testdata/testoutput11-32 (revision 1631) +@@ -765,4 +765,7 @@ + 25 End + ------------------------------------------------------------------ + ++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/ ++Failed: missing ) at offset 509 ++ + /-- End of testinput11 --/ +Index: trunk/pcre_internal.h +=================================================================== +--- trunk/pcre_internal.h (revision 1630) ++++ trunk/pcre_internal.h (revision 1631) +@@ -7,7 +7,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -2289,7 +2289,7 @@ + ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59, + ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69, + ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79, +- ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERRCOUNT }; ++ ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERRCOUNT }; + + /* JIT compiling modes. The function list is indexed by them. */ + +Index: trunk/pcre_compile.c +=================================================================== +--- trunk/pcre_compile.c (revision 1630) ++++ trunk/pcre_compile.c (revision 1631) +@@ -6,7 +6,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -560,6 +560,7 @@ + /* 85 */ + "parentheses are too deeply nested (stack check)\0" + "digits missing in \\x{} or \\o{}\0" ++ "regular expression is too complicated\0" + ; + + /* Table to identify digits and hex digits. This is used when compiling +@@ -4591,7 +4592,8 @@ + if (code > cd->start_workspace + cd->workspace_size - + WORK_SIZE_SAFETY_MARGIN) /* Check for overrun */ + { +- *errorcodeptr = ERR52; ++ *errorcodeptr = (code >= cd->start_workspace + cd->workspace_size)? ++ ERR52 : ERR87; + goto FAILED; + } + +@@ -6626,8 +6628,21 @@ + cd->had_accept = TRUE; + for (oc = cd->open_caps; oc != NULL; oc = oc->next) + { +- *code++ = OP_CLOSE; +- PUT2INC(code, 0, oc->number); ++ if (lengthptr != NULL) ++ { ++#ifdef COMPILE_PCRE8 ++ *lengthptr += 1 + IMM2_SIZE; ++#elif defined COMPILE_PCRE16 ++ *lengthptr += 2 + IMM2_SIZE; ++#elif defined COMPILE_PCRE32 ++ *lengthptr += 4 + IMM2_SIZE; ++#endif ++ } ++ else ++ { ++ *code++ = OP_CLOSE; ++ PUT2INC(code, 0, oc->number); ++ } + } + setverb = *code++ = + (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT; +Index: trunk/pcreposix.c +=================================================================== +--- trunk/pcreposix.c (revision 1630) ++++ trunk/pcreposix.c (revision 1631) +@@ -6,7 +6,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -173,7 +173,8 @@ + REG_BADPAT, /* group name must start with a non-digit */ + /* 85 */ + REG_BADPAT, /* parentheses too deeply nested (stack check) */ +- REG_BADPAT /* missing digits in \x{} or \o{} */ ++ REG_BADPAT, /* missing digits in \x{} or \o{} */ ++ REG_BADPAT /* pattern too complicated */ + }; + + /* Table of texts corresponding to POSIX error codes */ diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index d2933bbe38..e0cff5a2e0 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -40,7 +40,8 @@ version "/pcre-" version ".tar.bz2"))) (sha256 (base32 - "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r")))) + "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r")) + (patches (list (search-patch "pcre-CVE-2016-3191.patch"))))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.8 MiB of HTML -- cgit v1.2.3 From d46dd72c3289adf762e4d20953153f7fde2ec3e2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 23:08:21 +0200 Subject: gnu: pcre: Add missing #:use-module. This is a followup to 425b853. * gnu/packages/pcre.scm: Add missing #:use-module. --- gnu/packages/pcre.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index e0cff5a2e0..d5c2294a8d 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -22,6 +22,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages compression) #:use-module (gnu packages readline) + #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) -- cgit v1.2.3 From d786d2f891c3257a36e0c0658c618c75d67190cf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 23:09:55 +0200 Subject: gnu: pcre: Disallow references to the "doc" output. * gnu/packages/pcre.scm (pcre)[arguments]: Add #:disallowed-references. --- gnu/packages/pcre.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index d5c2294a8d..cb6eddddb7 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -50,7 +50,8 @@ ("readline" ,readline) ("zlib" ,zlib))) (arguments - `(#:configure-flags '("--enable-utf" + '(#:disallowed-references ("doc") + #:configure-flags '("--enable-utf" "--enable-pcregrep-libz" "--enable-pcregrep-libbz2" "--enable-pcretest-libreadline" -- cgit v1.2.3 From 28181faf4598a2b7d01e6d0426929615cac13559 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 8 Apr 2016 09:19:22 +0300 Subject: gnu: gzip: Fix download url. * gnu/packages/compression.scm (gzip)[source]: Change to '.tar.xz'. --- gnu/packages/compression.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 66eec1b5c5..f3d6ae1bfc 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -133,7 +133,7 @@ adding and extracting files to/from a tar archive.") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gzip/gzip-" - version ".tar.gz")) + version ".tar.xz")) (sha256 (base32 "1as1ddq58spflzz5kxm0ni0xfpswrkkrncjpxyb3aw77gizcacgv")))) -- cgit v1.2.3 From dd581e9ab360a3fcb589d07780a299fc76aaadac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Apr 2016 21:36:28 +0200 Subject: gnu: util-linux: Add "static" output. * gnu/packages/linux.scm: (util-linux)[outputs]: New field. [arguments]: Remove "--disable-static" from #:configure-flags. Add 'move-static-libraries' phase. Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0eb379eb77..30ab138a5e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -464,12 +464,11 @@ providing the system administrator with some help in common tasks.") (("build_kill=yes") "build_kill=no")) #t)))) (build-system gnu-build-system) + (outputs '("out" + "static")) ; >2 MiB of static .a libraries (arguments `(#:configure-flags (list "--disable-use-tty-group" - ;; Do not build .a files to save 2 MiB. - "--disable-static" - ;; Install completions where our ;; bash-completion package expects them. (string-append "--with-bashcompletiondir=" @@ -494,6 +493,19 @@ providing the system administrator with some help in common tasks.") (substitute* "tests/ts/misc/mcookie" (("/etc/services") (string-append net "/etc/services"))) + #t))) + (add-after + 'install 'move-static-libraries + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (mkdir-p (string-append static "/lib")) + (with-directory-excursion out + (for-each (lambda (file) + (rename-file file + (string-append static "/" + file))) + (find-files "lib" "\\.a$"))) #t)))))) (inputs `(("zlib" ,zlib) ("ncurses" ,ncurses))) -- cgit v1.2.3 From 7cad981dfc4ed4d68c1b42c489ca8b945df35e36 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Apr 2016 21:36:29 +0200 Subject: gnu: btrfs-progs: Add "static" output. * gnu/packages/linux.scm (btrfs-progs)[outputs]: New field. [inputs]: Add "static" outputs of util-linux for libuuid and libblkid. [arguments]: Add 'build-static' and 'install-static' phases. Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 30ab138a5e..59258af15f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2509,12 +2509,26 @@ and copy/paste text in the console and in xterm.") (base32 "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r")))) (build-system gnu-build-system) + (outputs '("out" + "static")) ; static versions of binaries in "out" (~16MiB!) (arguments - '(#:test-target "test" + '(#:phases (modify-phases %standard-phases + (add-after 'build 'build-static + (lambda _ (zero? (system* "make" "static")))) + (add-after 'install 'install-static + (let ((staticbin (string-append (assoc-ref %outputs "static") + "/bin"))) + (lambda _ + (zero? (system* "make" + (string-append "bindir=" staticbin) + "install-static")))))) + #:test-target "test" #:parallel-tests? #f)) ; tests fail when run in parallel (inputs `(("e2fsprogs" ,e2fsprogs) ("libblkid" ,util-linux) + ("libblkid:static" ,util-linux "static") ("libuuid" ,util-linux) + ("libuuid:static" ,util-linux "static") ("zlib" ,zlib) ("lzo" ,lzo))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 81068f178457db48f3e417e709d3dcf54268e23f Mon Sep 17 00:00:00 2001 From: Nils Gillmann Date: Sun, 17 Apr 2016 11:49:16 +0200 Subject: gnu: libgcrypt: Update to 1.7.0. * gnu/packages/gnupg.scm (libgcrypt): Update to 1.7.0. Signed-off-by: Leo Famulari --- gnu/packages/gnupg.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index c3b859b7a2..18ed6f9714 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Nils Gillmann ;;; ;;; This file is part of GNU Guix. ;;; @@ -70,14 +71,14 @@ Daemon and possibly more in the future.") (define-public libgcrypt (package (name "libgcrypt") - (version "1.6.5") + (version "1.7.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" version ".tar.bz2")) (sha256 (base32 - "0959mwfzsxhallxdqlw359xg180ll2skxwyy35qawmfl89cbr7pl")))) + "14pspxwrqcgfklw3dgmywbxqwdzcym7fznfrqh9rk4vl8jkpxrmh")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error-host" ,libgpg-error))) -- cgit v1.2.3 From 868c13c53a9788f8f27e77d8c8f99df14be512ba Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 24 Apr 2016 21:55:37 +0200 Subject: gnu: gcc-5: Remove dependency on Texinfo. * gnu/packages/gcc.scm (gcc-5): Set 'native-inputs' to '(). --- gnu/packages/gcc.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 1df5150ab3..1c9bd7dad6 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014, 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge @@ -153,7 +153,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC ("libelf" ,libelf) ("zlib" ,zlib))) - ;; GCC is one of the few packages that doesn't ship .info files. + ;; GCC < 5 is one of the few packages that doesn't ship .info files. (native-inputs `(("texinfo" ,texinfo))) (arguments @@ -352,7 +352,10 @@ Go. It also includes runtime support libraries for these languages.") (sha256 (base32 "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq")) - (patches (list (search-patch "gcc-5.0-libvtv-runpath.patch"))))))) + (patches (list (search-patch "gcc-5.0-libvtv-runpath.patch"))))) + + ;; GCC 5 ships with .info files, so no need for Texinfo. + (native-inputs '()))) ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions accordingly. -- cgit v1.2.3 From e3d0fcbf7e55e8cbe8d0a1c5a24d73f341d7243b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 24 Apr 2016 22:41:45 +0200 Subject: gnu: Default to GCC 5. * gnu/packages/patches/gcc-libiberty-printf-decl.patch: New file. * gnu/packages/gcc.scm (gcc-5)[source]: Use it. (gcc): Switch to GCC-5. * gnu/packages/commencement.scm (libstdc++-boot0): New variable. (gcc-boot0)[inputs]: Add it. [native-inputs]: Remove. (gcc-toolchain-4.9): Switch to GCC-4.9. (gcc-toolchain-5): Switch to GCC-FINAL. * gnu-system.am (dist_patch_DATA): Add 'gcc-libiberty-printf-decl.patch'. --- gnu-system.am | 1 + gnu/packages/commencement.scm | 33 +++++++++++++++++----- gnu/packages/gcc.scm | 6 ++-- .../patches/gcc-libiberty-printf-decl.patch | 28 ++++++++++++++++++ 4 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/gcc-libiberty-printf-decl.patch (limited to 'gnu') diff --git a/gnu-system.am b/gnu-system.am index 03d034c031..c8dc524579 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -478,6 +478,7 @@ dist_patch_DATA = \ gnu/packages/patches/gawk-shell.patch \ gnu/packages/patches/gcc-arm-link-spec-fix.patch \ gnu/packages/patches/gcc-cross-environment-variables.patch \ + gnu/packages/patches/gcc-libiberty-printf-decl.patch \ gnu/packages/patches/gcc-libvtv-runpath.patch \ gnu/packages/patches/gcc-5.0-libvtv-runpath.patch \ gnu/packages/patches/geoclue-config.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 0d9133fb9c..463f42537c 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -170,6 +170,26 @@ ,cf))))) (inputs %boot0-inputs)))) +(define libstdc++-boot0 + ;; GCC's libcc1 is always built as a shared library (the top-level + ;; 'Makefile.def' forcefully adds --enable-shared) and thus needs to refer + ;; to libstdc++.so. We cannot build libstdc++-5.3 because it relies on + ;; C++14 features missing in our bootstrap compiler. + (let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc-4.9)))) + (package + (inherit lib) + (name "libstdc++-boot0") + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + + ;; XXX: libstdc++.so NEEDs ld.so for some reason. + #:validate-runpath? #f + + ,@(package-arguments lib))) + (inputs %boot0-inputs) + (native-inputs '())))) + (define gcc-boot0 (package-with-bootstrap-guile (package (inherit gcc) @@ -255,14 +275,13 @@ ("mpc-source" ,(package-source mpc)) ("binutils-cross" ,binutils-boot0) + ;; The libstdc++ that libcc1 links against. + ("libstdc++" ,libstdc++-boot0) + ;; Call it differently so that the builder can check whether ;; the "libc" input is #f. ("libc-native" ,@(assoc-ref %boot0-inputs "libc")) - ,@(alist-delete "libc" %boot0-inputs))) - - ;; No need for Texinfo at this stage. - (native-inputs (alist-delete "texinfo" - (package-native-inputs gcc)))))) + ,@(alist-delete "libc" %boot0-inputs)))))) (define perl-boot0 (let ((perl (package @@ -882,9 +901,9 @@ and binaries, plus debugging symbols in the 'debug' output), and Binutils.") (gcc-toolchain gcc-4.8)) (define-public gcc-toolchain-4.9 - (gcc-toolchain gcc-final)) + (gcc-toolchain gcc-4.9)) (define-public gcc-toolchain-5 - (gcc-toolchain gcc-5)) + (gcc-toolchain gcc-final)) ;;; commencement.scm ends here diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 1c9bd7dad6..8b3c891c52 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -352,14 +352,16 @@ Go. It also includes runtime support libraries for these languages.") (sha256 (base32 "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq")) - (patches (list (search-patch "gcc-5.0-libvtv-runpath.patch"))))) + (patches (list (search-patch "gcc-5.0-libvtv-runpath.patch") + (search-patch + "gcc-libiberty-printf-decl.patch"))))) ;; GCC 5 ships with .info files, so no need for Texinfo. (native-inputs '()))) ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions accordingly. -(define-public gcc gcc-4.9) +(define-public gcc gcc-5) (define-public (make-libstdc++ gcc) "Return a libstdc++ package based on GCC. The primary use case is when diff --git a/gnu/packages/patches/gcc-libiberty-printf-decl.patch b/gnu/packages/patches/gcc-libiberty-printf-decl.patch new file mode 100644 index 0000000000..a612c9e00e --- /dev/null +++ b/gnu/packages/patches/gcc-libiberty-printf-decl.patch @@ -0,0 +1,28 @@ +This patch makes the exeception specifier of libiberty's 'asprintf' +and 'vasprintf' declarations match those of glibc to work around the +problem described at . + +The problem in part stems from the fact that libiberty is configured +without _GNU_SOURCE (thus, it sets HAVE_DECL_ASPRINTF to 0), whereas libcc1 +is configured and built with _GNU_SOURCE, hence the conflicting declarations. + +--- gcc-5.3.0/include/libiberty.h 2016-04-23 22:45:46.262709079 +0200 ++++ gcc-5.3.0/include/libiberty.h 2016-04-23 22:45:37.110635439 +0200 +@@ -625,7 +625,7 @@ extern int pwait (int, int *, int); + /* Like sprintf but provides a pointer to malloc'd storage, which must + be freed by the caller. */ + +-extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2; ++extern int asprintf (char **, const char *, ...) __THROWNL ATTRIBUTE_PRINTF_2; + #endif + + /* Like asprintf but allocates memory without fail. This works like +@@ -637,7 +637,7 @@ extern char *xasprintf (const char *, .. + /* Like vsprintf but provides a pointer to malloc'd storage, which + must be freed by the caller. */ + +-extern int vasprintf (char **, const char *, va_list) ATTRIBUTE_PRINTF(2,0); ++extern int vasprintf (char **, const char *, va_list) __THROWNL ATTRIBUTE_PRINTF(2,0); + #endif + + /* Like vasprintf but allocates memory without fail. This works like -- cgit v1.2.3 From 4d31bdb095397661ee3d941d8d01459cafdc119e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 24 Apr 2016 22:53:03 +0200 Subject: gnu: grep: Update to 2.25. * gnu/packages/base.scm (grep): Update to 2.25. --- gnu/packages/base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 7a8844795b..2b491aa17c 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -74,14 +74,14 @@ command-line arguments, multiple languages, and so on.") (define-public grep (package (name "grep") - (version "2.24") + (version "2.25") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/grep/grep-" version ".tar.xz")) (sha256 (base32 - "057cir4p19h7yv4xir1wiaxfa1fp45d3pl7xsaaannlc16wvwj7j")) + "0c38b67cnwchwzv4wq2gpz6smkhdxrac2hhssv8f0l04qnx867p2")) (patches (list (search-patch "grep-timing-sensitive-test.patch"))))) (build-system gnu-build-system) -- cgit v1.2.3 From 0bfb9b439953b755a510974e51e651f79526a5a4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Apr 2016 18:14:18 +0300 Subject: gnu: gzip: Update to 1.8. * gnu/packages/compression.scm (gzip): Update to 1.8. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index f3d6ae1bfc..8508c617e1 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -129,14 +129,14 @@ adding and extracting files to/from a tar archive.") (define-public gzip (package (name "gzip") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gzip/gzip-" version ".tar.xz")) (sha256 (base32 - "1as1ddq58spflzz5kxm0ni0xfpswrkkrncjpxyb3aw77gizcacgv")))) + "1lxv3p4iyx7833mlihkn5wfwmz4cys5nybwpz3dfawag8kn6f5zz")))) (build-system gnu-build-system) (synopsis "General file (de)compression (using lzw)") (arguments -- cgit v1.2.3 From c74c7c13176a97c84ace3e2417456ddc561b0638 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Mon, 18 Apr 2016 23:21:42 +0200 Subject: gnu: libxslt: Make generated documentation reproducible. * gnu/packages/patches/libxslt-generated-ids.patch: New file. * gnu/packages/patches/libxslt-remove-date-timestamps.patch: Likewise. * gnu/packages/xml.scm (libxslt)[source]: Use them. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 2 + gnu/packages/patches/libxslt-generated-ids.patch | 173 +++++++++++++++++++++ .../patches/libxslt-remove-date-timestamps.patch | 66 ++++++++ gnu/packages/xml.scm | 5 +- 4 files changed, 245 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libxslt-generated-ids.patch create mode 100644 gnu/packages/patches/libxslt-remove-date-timestamps.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 8d945e835d..da377fdbb3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -603,6 +603,8 @@ dist_patch_DATA = \ gnu/packages/patches/libwmf-CVE-2015-4695.patch \ gnu/packages/patches/libwmf-CVE-2015-4696.patch \ gnu/packages/patches/libxslt-CVE-2015-7995.patch \ + gnu/packages/patches/libxslt-generated-ids.patch \ + gnu/packages/patches/libxslt-remove-date-timestamps.patch \ gnu/packages/patches/lirc-localstatedir.patch \ gnu/packages/patches/libpthread-glibc-preparation.patch \ gnu/packages/patches/lm-sensors-hwmon-attrs.patch \ diff --git a/gnu/packages/patches/libxslt-generated-ids.patch b/gnu/packages/patches/libxslt-generated-ids.patch new file mode 100644 index 0000000000..4273875c7c --- /dev/null +++ b/gnu/packages/patches/libxslt-generated-ids.patch @@ -0,0 +1,173 @@ +This makes generated IDs deterministic. + +Written by Daniel Veillard. + +This should be fixed in next release (2.29). +See https://bugzilla.gnome.org/show_bug.cgi?id=751621. + +diff --git a/libxslt/functions.c b/libxslt/functions.c +index 6448bde..5b00a6d 100644 +--- a/libxslt/functions.c ++++ b/libxslt/functions.c +@@ -651,6 +651,63 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) + } + + /** ++ * xsltCleanupIds: ++ * @ctxt: the transformation context ++ * @root: the root of the resulting document ++ * ++ * This clean up ids which may have been saved in Element contents ++ * by xsltGenerateIdFunction() to provide stable IDs on elements. ++ * ++ * Returns the number of items cleaned or -1 in case of error ++ */ ++int ++xsltCleanupIds(xsltTransformContextPtr ctxt, xmlNodePtr root) { ++ xmlNodePtr cur; ++ int count = 0; ++ ++ if ((ctxt == NULL) || (root == NULL)) ++ return(-1); ++ if (root->type != XML_ELEMENT_NODE) ++ return(-1); ++ ++ cur = root; ++ while (cur != NULL) { ++ if (cur->type == XML_ELEMENT_NODE) { ++ if (cur->content != NULL) { ++ cur->content = NULL; ++ count++; ++ } ++ if (cur->children != NULL) { ++ cur = cur->children; ++ continue; ++ } ++ } ++ if (cur->next != NULL) { ++ cur = cur->next; ++ continue; ++ } ++ do { ++ cur = cur->parent; ++ if (cur == NULL) ++ break; ++ if (cur == (xmlNodePtr) root) { ++ cur = NULL; ++ break; ++ } ++ if (cur->next != NULL) { ++ cur = cur->next; ++ break; ++ } ++ } while (cur != NULL); ++ } ++ ++fprintf(stderr, "Attributed %d IDs for element, cleaned up %d\n", ++ ctxt->nextid, count); ++ ++ return(count); ++} ++ ++/** + * xsltGenerateIdFunction: + * @ctxt: the XPath Parser context + * @nargs: the number of arguments +@@ -701,7 +758,39 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ + if (obj) + xmlXPathFreeObject(obj); + +- val = (long)((char *)cur - (char *)&base_address); ++ /* ++ * Try to provide stable ID for generated document: ++ * - usually ID are computed to be placed on elements via attributes ++ * so using the element as the node for the ID ++ * - the cur->content should be a correct placeholder for this, we use ++ * it to hold element node numbers in xmlXPathOrderDocElems to ++ * speed up XPath too ++ * - xsltCleanupIds() clean them up before handing the XSLT output ++ * to the API client. ++ * - other nodes types use the node address method but that should ++ * not end up in resulting document ID ++ * - we can enable this by default without risk of performance issues ++ * only the one pass xsltCleanupIds() is added ++ */ ++ if (cur->type == XML_ELEMENT_NODE) { ++ if (cur->content == NULL) { ++ xsltTransformContextPtr tctxt; ++ ++ tctxt = xsltXPathGetTransformContext(ctxt); ++ if (tctxt == NULL) { ++ val = (long)((char *)cur - (char *)&base_address); ++ } else { ++ tctxt->nextid++; ++ val = tctxt->nextid; ++ cur->content = (void *) (val); ++ } ++ } else { ++ val = (long) cur->content; ++ } ++ } else { ++ val = (long)((char *)cur - (char *)&base_address); ++ } ++ + if (val >= 0) { + sprintf((char *)str, "idp%ld", val); + } else { +diff --git a/libxslt/functions.h b/libxslt/functions.h +index e0e0bf9..4a1e163 100644 +--- a/libxslt/functions.h ++++ b/libxslt/functions.h +@@ -64,6 +64,13 @@ XSLTPUBFUN void XSLTCALL + int nargs); + + /* ++ * Cleanup for ID generation ++ */ ++XSLTPUBFUN int XSLTCALL ++ xsltCleanupIds (xsltTransformContextPtr ctxt, ++ xmlNodePtr root); ++ ++/* + * And the registration + */ + +diff --git a/libxslt/transform.c b/libxslt/transform.c +index 24f9eb2..2bdf6bf 100644 +--- a/libxslt/transform.c ++++ b/libxslt/transform.c +@@ -700,6 +700,7 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) { + cur->traceCode = (unsigned long*) &xsltDefaultTrace; + cur->xinclude = xsltGetXIncludeDefault(); + cur->keyInitLevel = 0; ++ cur->nextid = 0; + + return(cur); + +@@ -6092,6 +6093,13 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc, + if (root != NULL) { + const xmlChar *doctype = NULL; + ++ /* ++ * cleanup ids which may have been saved in Elements content ptrs ++ */ ++ if (ctxt->nextid != 0) { ++ xsltCleanupIds(ctxt, root); ++ } ++ + if ((root->ns != NULL) && (root->ns->prefix != NULL)) + doctype = xmlDictQLookup(ctxt->dict, root->ns->prefix, root->name); + if (doctype == NULL) +diff --git a/libxslt/xsltInternals.h b/libxslt/xsltInternals.h +index 95e8fe6..8eedae4 100644 +--- a/libxslt/xsltInternals.h ++++ b/libxslt/xsltInternals.h +@@ -1786,6 +1786,8 @@ struct _xsltTransformContext { + int funcLevel; /* Needed to catch recursive functions issues */ + int maxTemplateDepth; + int maxTemplateVars; ++ ++ unsigned long nextid;/* for generating stable ids */ + }; + + /** diff --git a/gnu/packages/patches/libxslt-remove-date-timestamps.patch b/gnu/packages/patches/libxslt-remove-date-timestamps.patch new file mode 100644 index 0000000000..51470d0847 --- /dev/null +++ b/gnu/packages/patches/libxslt-remove-date-timestamps.patch @@ -0,0 +1,66 @@ +Use deterministic SOURCE_DATE_EPOCH for embedded timestamps in generated documentation. + +Written by Eduard Sanou. + +https://bugzilla.gnome.org/show_bug.cgi?id=758148 + +--- libxslt-1.1.28.orig/libexslt/date.c ++++ libxslt-1.1.28/libexslt/date.c +@@ -46,6 +46,7 @@ + #include "exslt.h" + + #include ++#include + + #ifdef HAVE_MATH_H + #include +@@ -747,21 +748,46 @@ static exsltDateValPtr + exsltDateCurrent (void) + { + struct tm localTm, gmTm; ++ struct tm *tb = NULL; + time_t secs; + int local_s, gm_s; + exsltDateValPtr ret; ++ char *source_date_epoch; + + ret = exsltDateCreateDate(XS_DATETIME); + if (ret == NULL) + return NULL; + +- /* get current time */ + secs = time(NULL); ++ /* ++ * Allow the date and time to be set externally by an exported ++ * environment variable to enable reproducible builds. ++ */ ++ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); ++ if (source_date_epoch) { ++ errno = 0; ++ secs = (time_t) strtol (source_date_epoch, NULL, 10); ++ if (errno == 0) { ++ tb = gmtime(&secs); ++ if (tb == NULL) { ++ /* SOURCE_DATE_EPOCH is not a valid date */ ++ return NULL; ++ } else { ++ localTm = *tb; ++ } ++ } else { ++ /* SOURCE_DATE_EPOCH is not a valid number */ ++ return NULL; ++ } ++ } else { ++ /* get current time */ + #if HAVE_LOCALTIME_R +- localtime_r(&secs, &localTm); ++ localtime_r(&secs, &localTm); + #else +- localTm = *localtime(&secs); ++ localTm = *localtime(&secs); + #endif ++ } ++ + + /* get real year, not years since 1900 */ + ret->value.date.year = localTm.tm_year + 1900; diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 838ce34364..538996f88f 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Efraim Flashner ;;; Copyright © 2015 Raimon Grau +;;; Copyright © 2016 Mathieu Lirzin ;;; ;;; This file is part of GNU Guix. ;;; @@ -131,7 +132,9 @@ project (but it is usable outside of the Gnome platform).") (sha256 (base32 "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz")) - (patches (search-patches "libxslt-CVE-2015-7995.patch")))) + (patches (search-patches "libxslt-generated-ids.patch" + "libxslt-remove-date-timestamps.patch" + "libxslt-CVE-2015-7995.patch")))) (build-system gnu-build-system) (home-page "http://xmlsoft.org/XSLT/index.html") (synopsis "C library for applying XSLT stylesheets to XML documents") -- cgit v1.2.3 From 6d49ca3bad613700b539c30272e164207455735b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 May 2016 15:41:23 +0200 Subject: gnu: pcre: Add "bin" output. * gnu/packages/pcre.scm (pcre)[outputs]: Add "bin". --- gnu/packages/pcre.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 248242af4d..42a6a9b0c4 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -45,8 +45,9 @@ "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r")) (patches (list (search-patch "pcre-CVE-2016-3191.patch"))))) (build-system gnu-build-system) - (outputs '("out" - "doc")) ;1.8 MiB of HTML + (outputs '("out" ;library & headers + "bin" ;depends on Readline (adds 20MiB to the closure) + "doc")) ;1.8 MiB of HTML (inputs `(("bzip2" ,bzip2) ("readline" ,readline) ("zlib" ,zlib))) -- cgit v1.2.3 From 503409b543186df5839f7029a42acff50cc53761 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 May 2016 15:41:46 +0200 Subject: gnu: qpdf: Remove run-time dependency on Perl. * gnu/packages/pdf.scm (qpdf)[source](snippet): New field. [arguments]: Add #:disallowed-references. [inputs]: Move PERL to... [native-inputs]: ... here. --- gnu/packages/pdf.scm | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 8f9f5dd503..cfa9a9c2e6 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -471,27 +471,38 @@ and examining the file structure (pdfshow).") (uri (string-append "mirror://sourceforge/qpdf/qpdf-" version ".tar.gz")) (sha256 (base32 - "1lq1v7xghvl6p4hgrwbps3a13ad6lh4ib3myimb83hxgsgd4n5nm")))) + "1lq1v7xghvl6p4hgrwbps3a13ad6lh4ib3myimb83hxgsgd4n5nm")) + (modules '((guix build utils))) + (snippet + ;; Replace shebang with the bi-lingual shell/Perl trick to remove + ;; dependency on Perl. + '(substitute* "qpdf/fix-qdf" + (("#!/usr/bin/env perl") + "\ +eval '(exit $?0)' && eval 'exec perl -wS \"$0\" ${1+\"$@\"}' + & eval 'exec perl -wS \"$0\" $argv:q' + if 0;\n"))))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-before - 'configure 'patch-paths - (lambda _ - (substitute* "make/libtool.mk" - (("SHELL=/bin/bash") - (string-append "SHELL=" (which "bash")))) - (substitute* (append - '("qtest/bin/qtest-driver") - (find-files "." "\\.test")) - (("/usr/bin/env") (which "env")))) - %standard-phases))) + `(#:disallowed-references (,perl) + #:phases (alist-cons-before + 'configure 'patch-paths + (lambda _ + (substitute* "make/libtool.mk" + (("SHELL=/bin/bash") + (string-append "SHELL=" (which "bash")))) + (substitute* (append + '("qtest/bin/qtest-driver") + (find-files "." "\\.test")) + (("/usr/bin/env") (which "env")))) + %standard-phases))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("perl" ,perl))) (propagated-inputs `(("pcre" ,pcre))) (inputs - `(("zlib" ,zlib) - ("perl" ,perl))) + `(("zlib" ,zlib))) (synopsis "Command-line tools and library for transforming PDF files") (description "QPDF is a command-line program that does structural, content-preserving -- cgit v1.2.3 From d03781c3bc6cbdec721fdd9752feae6556009000 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 May 2016 15:42:50 +0200 Subject: gnu: openssl: Disallow references to Perl. * gnu/packages/tls.scm (openssl)[arguments]: Add #:disallowed-references. --- gnu/packages/tls.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 4ec0ed7d34..d013cdf4b5 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -213,7 +213,8 @@ required structures.") (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (arguments - `(#:parallel-build? #f + `(#:disallowed-references (,perl) + #:parallel-build? #f #:parallel-tests? #f #:test-target "test" -- cgit v1.2.3 From 8c78aeb72436ff4b152cfd29f593753e2e759b75 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 May 2016 15:43:11 +0200 Subject: gnu: openssl: Move static libraries to "static" output. * gnu/packages/tls.scm (openssl)[outputs]: New field. [arguments]: Add 'move-static-libraries' phase. --- gnu/packages/tls.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d013cdf4b5..08c869bc30 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -211,6 +211,8 @@ required structures.") (patches (search-patches "openssl-runpath.patch" "openssl-c-rehash-in.patch")))) (build-system gnu-build-system) + (outputs '("out" + "static")) ;6MiB of .a files (native-inputs `(("perl" ,perl))) (arguments `(#:disallowed-references (,perl) @@ -267,6 +269,19 @@ required structures.") (find-files (string-append out "/lib") "\\.so")) #t))) + (add-after 'install 'move-static-libraries + (lambda* (#:key outputs #:allow-other-keys) + ;; Move static libraries to the "static" output. + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (static (assoc-ref outputs "static")) + (slib (string-append static "/lib"))) + (mkdir-p slib) + (for-each (lambda (file) + (install-file file slib) + (delete-file file)) + (find-files lib "\\.a$")) + #t))) (add-before 'patch-source-shebangs 'patch-tests (lambda* (#:key inputs native-inputs #:allow-other-keys) -- cgit v1.2.3 From a909b5765883cfecd6913ac24b44b1e3e22eab76 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 May 2016 15:43:50 +0200 Subject: gnu: openssl: Add "doc" output. * gnu/packages/tls.scm (openssl)[outputs]: Add "doc". [arguments]: Add 'move-man3-pages' phase. --- gnu/packages/tls.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 08c869bc30..f1e7a21c1c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -212,6 +212,7 @@ required structures.") "openssl-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" + "doc" ;1.5MiB of man3 pages "static")) ;6MiB of .a files (native-inputs `(("perl" ,perl))) (arguments @@ -282,6 +283,20 @@ required structures.") (delete-file file)) (find-files lib "\\.a$")) #t))) + (add-after 'install 'move-man3-pages + (lambda* (#:key outputs #:allow-other-keys) + ;; Move section 3 man pages to "doc". + (let* ((out (assoc-ref outputs "out")) + (man3 (string-append out "/share/man/man3")) + (doc (assoc-ref outputs "doc")) + (target (string-append doc "/share/man/man3"))) + (mkdir-p target) + (for-each (lambda (file) + (rename-file file + (string-append target "/" + (basename file)))) + (find-files man3)) + #t))) (add-before 'patch-source-shebangs 'patch-tests (lambda* (#:key inputs native-inputs #:allow-other-keys) -- cgit v1.2.3 From b5e0c870cb2c4a6864455308c74684fd024f101f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 May 2016 17:55:17 +0200 Subject: gnu: guile: Do not build static libraries. * gnu/packages/guile.scm (guile-2.0)[arguments]: Add #:configure-flags. --- gnu/packages/guile.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 53ea3e53bb..7ca79272fb 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -161,7 +161,8 @@ without requiring the source code to be rewritten.") (outputs '("out" "debug")) (arguments - `(#:phases (alist-cons-before + `(#:configure-flags '("--disable-static") ;saves 3MiB + #:phases (alist-cons-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) ;; Tell (ice-9 popen) the file name of Bash. -- cgit v1.2.3 From d46123aade7bc5226004eb46ee1084dc84f2b30a Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Wed, 27 Apr 2016 23:33:56 +0300 Subject: gnu: procps: Make procps build on non Linux systems. * gnu/packages/patches/procps-non-linux.patch.patch: New patch. * gnu/packages/linux.scm (procps)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 4 ++- gnu/packages/patches/procps-non-linux.patch | 40 +++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/procps-non-linux.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index da377fdbb3..d223d39bcd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -683,6 +683,7 @@ dist_patch_DATA = \ gnu/packages/patches/poppler-CVE-2015-8868.patch \ gnu/packages/patches/portaudio-audacity-compat.patch \ gnu/packages/patches/procmail-ambiguous-getline-debian.patch \ + gnu/packages/patches/procps-non-linux.patch \ gnu/packages/patches/pt-scotch-build-parallelism.patch \ gnu/packages/patches/pulseaudio-fix-mult-test.patch \ gnu/packages/patches/pulseaudio-longer-test-timeout.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5f4b041694..7a4f496a3e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -535,7 +535,9 @@ block devices, UUIDs, TTYs, and many other tools.") "procps-ng-" version ".tar.xz")) (sha256 (base32 - "1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9")))) + "1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9")) + (patches + (list (search-patch "procps-non-linux.patch"))))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) diff --git a/gnu/packages/patches/procps-non-linux.patch b/gnu/packages/patches/procps-non-linux.patch new file mode 100644 index 0000000000..9d369aeb2c --- /dev/null +++ b/gnu/packages/patches/procps-non-linux.patch @@ -0,0 +1,40 @@ +From aa9bd38d0a6fe53aff7f78fb2d9f61e55677c7b5 Mon Sep 17 00:00:00 2001 +From: Craig Small +Date: Sun, 17 Apr 2016 09:09:41 +1000 +Subject: [PATCH] tests: Conditionally add prctl to test process + +prctl was already bypassed on Cygwin systems. This extends to +non-Linux systems such as kFreeBSD and Hurd. + +--- + lib/test_process.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/test_process.c b/lib/test_process.c +index 6e652ed..6a4776c 100644 +--- a/lib/test_process.c ++++ b/lib/test_process.c +@@ -21,7 +21,9 @@ + #include + #include + #include ++#ifdef __linux__ + #include ++#endif + #include "c.h" + + #define DEFAULT_SLEEPTIME 300 +@@ -78,8 +80,10 @@ + sigaction(SIGUSR1, &signal_action, NULL); + sigaction(SIGUSR2, &signal_action, NULL); + ++#ifdef __linux__ + /* set process name */ + prctl(PR_SET_NAME, MY_NAME, NULL, NULL, NULL); ++#endif + + while (sleep_time > 0) { + sleep_time = sleep(sleep_time); +-- +2.8.2 + -- cgit v1.2.3 From 478e75b53bdf754cdf911226d37e517387f73c09 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 5 May 2016 16:29:20 -0400 Subject: gnu: wrap-python3: Create more symlinks. Suggested by Hartmut Goebel . * gnu/packages/python.scm (wrap-python3): Add symlinks for 'pip' and 'python-config'. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ef06c89298..4824ff3eaa 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -324,8 +324,8 @@ data types.") (lambda (old new) (symlink (string-append python old) (string-append bin "/" new))) - '("python3" "pydoc3" "idle3") - '("python" "pydoc" "idle")))))) + '("python3" "pydoc3" "idle3" "pip3" "python3-config") + '("python" "pydoc" "idle" "pip" "python-config")))))) (synopsis "Wrapper for the Python 3 commands") (description "This package provides wrappers for the commands of Python@tie{}3.x such -- cgit v1.2.3 From ff1f39e3a02d0fd2c0ee279b9e8294e91bc132fd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 9 May 2016 15:51:04 +0200 Subject: gnu: bdb: Disallow references to "doc" output. * gnu/packages/databases.scm (bdb)[arguments]: Add #:disallowed-references. --- gnu/packages/databases.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 88a784d293..ee28a4cf99 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2012, 2014, 2015 Andreas Enge ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 David Thompson @@ -95,6 +95,7 @@ and provides interfaces to the traditional file format.") "doc")) ; 94 MiB of HTML docs (arguments '(#:tests? #f ; no check target available + #:disallowed-references ("doc") #:phases (alist-replace 'configure -- cgit v1.2.3 From 0e50d521c9724d6efbfb3081adf4e6f5fb3ba7a3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 9 May 2016 15:51:38 +0200 Subject: gnu: bdb: Do not build static libraries. * gnu/packages/databases.scm (bdb)[arguments]: Pass --disable-static. --- gnu/packages/databases.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ee28a4cf99..6676950a4d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -113,6 +113,9 @@ and provides interfaces to the traditional file format.") (string-append "CONFIG_SHELL=" (which "bash")) (string-append "SHELL=" (which "bash")) + ;; Remove 7 MiB of .a files. + "--disable-static" + ;; The compatibility mode is needed by some packages, ;; notably iproute2. "--enable-compat185" -- cgit v1.2.3 From 958d25ad2a0f09cbc70d6d69c0f94180a2a77212 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 9 May 2016 15:52:18 +0200 Subject: gnu: ghostscript: Disallow references to "doc". * gnu/packages/ghostscript.scm (ghostscript)[arguments]: Add #:disallowed-references. --- gnu/packages/ghostscript.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 0a65813f97..8c3a99a04d 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Ricardo Wurmus -;;; Copyright © 2013, 2015 Ludovic Courtès +;;; Copyright © 2013, 2015, 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -156,7 +156,8 @@ printing, and psresize, for adjusting page sizes.") ("python" ,python-wrapper) ("tcl" ,tcl))) (arguments - `(#:phases + `(#:disallowed-references ("doc") + #:phases (modify-phases %standard-phases (add-after 'configure 'patch-config-files (lambda _ -- cgit v1.2.3 From eb354bdacbf4154ec66038dac07f19bf4ced1fad Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 9 May 2016 15:54:34 +0200 Subject: gnu: ghostscript: Do not build the statically-linked 'gs' binary. * gnu/packages/ghostscript.scm (ghostscript)[arguments]: Remove 'build-so' and 'install-so' phases. Replace 'build' and 'install' phases. --- gnu/packages/ghostscript.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 8c3a99a04d..ae00eea1dc 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -173,12 +173,15 @@ printing, and psresize, for adjusting page sizes.") (substitute* "base/gscdef.c" (("GS_DOCDIR") "\"~/.guix-profile/share/doc/ghostscript\"")))) - (add-after 'build 'build-so - (lambda _ - (zero? (system* "make" "so")))) - (add-after 'install 'install-so - (lambda _ - (zero? (system* "make" "install-so"))))))) + (replace 'build + (lambda _ + ;; Build 'libgs.so', but don't build the statically-linked 'gs' + ;; binary (saves 18 MiB). + (zero? (system* "make" "so" "-j" + (number->string (parallel-job-count)))))) + (replace 'install + (lambda _ + (zero? (system* "make" "soinstall"))))))) (synopsis "PostScript and PDF interpreter") (description "Ghostscript is an interpreter for the PostScript language and the PDF -- cgit v1.2.3 From 6ea06a0e3a161be52a8f0b006f29901ccf1c079a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 9 May 2016 15:55:44 +0200 Subject: gnu: cups-minimal: Use 'modify-phases'. * gnu/packages/cups.scm (cups-minimal)[arguments]: Use 'modify-phases'. --- gnu/packages/cups.scm | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 8437170bfa..c055315321 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -135,20 +135,17 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") ;; cups-filters package. #:tests? #f #:phases - (alist-cons-before - 'configure - 'patch-makedefs - (lambda _ - (substitute* "Makedefs.in" - (("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@") - (("/bin/sh") (which "sh")))) - (alist-cons-before - 'build - 'patch-tests - (lambda _ - (substitute* "test/ippserver.c" - (("# else /\\* HAVE_AVAHI \\*/") "#elif defined(HAVE_AVAHI)"))) - %standard-phases)))) + (modify-phases %standard-phases + (add-before 'configure 'patch-makedefs + (lambda _ + (substitute* "Makedefs.in" + (("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@") + (("/bin/sh") (which "sh"))))) + (add-before 'build 'patch-tests + (lambda _ + (substitute* "test/ippserver.c" + (("# else /\\* HAVE_AVAHI \\*/") + "#elif defined(HAVE_AVAHI)"))))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 55de892b435657f82a25c6499174d09b4a680f15 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Sun, 10 Apr 2016 21:20:51 +0300 Subject: gnu: glibc: Rename linux-headers input to kernel-headers. * gnu/packages/base.scm (glibc)[propagated-inputs]: Use a kernel agnostic name for the kernel headers. [arguments]: Adjust accordingly. * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash) [propagated-inputs]: Adjust accordingly. * gnu/packages/cross-base.scm (cross-gcc-arguments)[arguments]: Adjust accordingly. (cross-gcc)[native-inputs]: Adjust accordingly. * gnu/packages/make-bootstrap.scm (%glibc-stripped)[arguments]: Adjust accordingly. [inputs]: Adjust accordingly. --- gnu/packages/base.scm | 4 ++-- gnu/packages/commencement.scm | 2 +- gnu/packages/cross-base.scm | 24 ++++++++++++------------ gnu/packages/make-bootstrap.scm | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index fce193ceec..d7e069edee 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -479,7 +479,7 @@ store.") ;; Glibc's refers to , for instance, so glibc ;; users should automatically pull Linux headers as well. - (propagated-inputs `(("linux-headers" ,linux-libre-headers))) + (propagated-inputs `(("kernel-headers" ,linux-libre-headers))) (outputs '("out" "debug")) @@ -519,7 +519,7 @@ store.") ,version) (string-append "--with-headers=" - (assoc-ref %build-inputs "linux-headers") + (assoc-ref %build-inputs "kernel-headers") "/include") ;; This is the default for most architectures as of GNU libc 2.21, diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 463f42537c..12cafb78e5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -382,7 +382,7 @@ "export CPATH\n" all "\n")))) ,phases))))) - (propagated-inputs `(("linux-headers" ,(linux-libre-headers-boot0)))) + (propagated-inputs `(("kernel-headers" ,(linux-libre-headers-boot0)))) (native-inputs `(("texinfo" ,texinfo-boot0) ("perl" ,perl-boot0))) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index aa67d21c19..22dfa15674 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -166,18 +166,18 @@ may be either a libc package or #f.)" `(alist-cons-before 'configure 'set-cross-path (lambda* (#:key inputs #:allow-other-keys) - ;; Add the cross Linux headers to CROSS_CPATH, and remove them + ;; Add the cross kernel headers to CROSS_CPATH, and remove them ;; from CPATH. (let ((libc (assoc-ref inputs "libc")) - (linux (assoc-ref inputs "xlinux-headers"))) + (kernel (assoc-ref inputs "xkernel-headers"))) (define (cross? x) ;; Return #t if X is a cross-libc or cross Linux. (or (string-prefix? libc x) - (string-prefix? linux x))) + (string-prefix? kernel x))) (setenv "CROSS_CPATH" (string-append libc "/include:" - linux "/include")) + kernel "/include")) (setenv "CROSS_LIBRARY_PATH" (string-append libc "/lib")) @@ -250,9 +250,9 @@ GCC that does not target a libc; otherwise, target that libc." (alist-delete "libc" %final-inputs)))) (if libc `(("libc" ,libc) - ("xlinux-headers" ;the target headers + ("xkernel-headers" ;the target headers ,@(assoc-ref (package-propagated-inputs libc) - "linux-headers")) + "kernel-headers")) ,@inputs) inputs)))) @@ -314,17 +314,17 @@ XBINUTILS and the cross tool chain." ,flags)) ((#:phases phases) `(alist-cons-before - 'configure 'set-cross-linux-headers-path + 'configure 'set-cross-kernel-headers-path (lambda* (#:key inputs #:allow-other-keys) - (let ((linux (assoc-ref inputs "linux-headers"))) + (let ((kernel (assoc-ref inputs "kernel-headers"))) (setenv "CROSS_CPATH" - (string-append linux "/include")) + (string-append kernel "/include")) #t)) ,phases)))) - ;; Shadow the native "linux-headers" because glibc's recipe expects the - ;; "linux-headers" input to point to the right thing. - (propagated-inputs `(("linux-headers" ,xlinux-headers))) + ;; Shadow the native "kernel-headers" because glibc's recipe expects the + ;; "kernel-headers" input to point to the right thing. + (propagated-inputs `(("kernel-headers" ,xlinux-headers))) ;; FIXME: 'static-bash' should really be an input, not a native input, but ;; to do that will require building an intermediate cross libc. diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 85dfaa6b6f..def9c23b17 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -344,7 +344,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (libdir (string-append out "/lib")) (incdir (string-append out "/include")) (libc (assoc-ref %build-inputs "libc")) - (linux (assoc-ref %build-inputs "linux-headers"))) + (linux (assoc-ref %build-inputs "kernel-headers"))) (mkdir-p libdir) (for-each (lambda (file) (let ((target (string-append libdir "/" @@ -379,7 +379,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (parameterize ((%current-target-system #f)) (cross-libc target))) glibc))) - ("linux-headers" ,linux-libre-headers))) + ("kernel-headers" ,linux-libre-headers))) ;; Only one output. (outputs '("out"))))) -- cgit v1.2.3 From a8938c88580f071ce74146eef9258e3b1afe48a8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 10 May 2016 09:03:00 +0200 Subject: gnu: poppler: Do not build static libraries. * gnu/packages/pdf.scm (poppler)[arguments]: Pass "--disable-static". --- gnu/packages/pdf.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index cfa9a9c2e6..08f7598ce7 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -89,7 +89,10 @@ `(#:tests? #f ; no test data provided with the tarball #:configure-flags '("--enable-xpdf-headers" ; to install header files - "--enable-zlib") + "--enable-zlib" + + ;; Saves 8 MiB of .a files. + "--disable-static") #:phases (alist-cons-before 'configure 'setenv -- cgit v1.2.3 From 9ffe61b0ee38b0df88868706d5918e944a626cd9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 10 May 2016 09:03:55 +0200 Subject: gnu: python: Remove unnecessary installed tests. * gnu/packages/python.scm (python-2)[arguments]: Add 'remove-tests' phase. --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4824ff3eaa..f09ff9694f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -201,6 +201,28 @@ (utime file circa-1980 circa-1980) #t)) #t))) + (add-after 'install 'remove-tests + ;; Remove 25 MiB of unneeded unit tests. Keep test_support.* + ;; because these files are used by some libraries out there. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (match (scandir (string-append out "/lib") + (lambda (name) + (string-prefix? "python" name))) + ((pythonX.Y) + (let ((testdir (string-append out "/lib/" pythonX.Y + "/test"))) + (with-directory-excursion testdir + (for-each delete-file-recursively + (scandir testdir + (match-lambda + ((or "." "..") #f) + (file + (not + (string-prefix? "test_support." + file)))))) + (call-with-output-file "__init__.py" (const #t)) + #t))))))) (add-after 'install 'move-tk-inter (lambda* (#:key outputs #:allow-other-keys) ;; When Tkinter support is built move it to a separate output so -- cgit v1.2.3 From 216c283b0adf0357032019ff73b5d14cff109612 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 10 May 2016 09:04:40 +0200 Subject: gnu: python: Make sure shared libraries are stripped. * gnu/packages/python.scm (python-2)[arguments]: Add 'make-libraries-writable' phase. --- gnu/packages/python.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f09ff9694f..adef5e6529 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -223,6 +223,15 @@ file)))))) (call-with-output-file "__init__.py" (const #t)) #t))))))) + (add-before 'strip 'make-libraries-writable + (lambda* (#:key outputs #:allow-other-keys) + ;; Make .so files writable so they can be stripped. + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (file) + (chmod file #o755)) + (find-files (string-append out "/lib") + "\\.so")) + #t))) (add-after 'install 'move-tk-inter (lambda* (#:key outputs #:allow-other-keys) ;; When Tkinter support is built move it to a separate output so -- cgit v1.2.3 From f10e7ef475da430afa46e0b062010952ed886694 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 10 May 2016 17:51:02 -0400 Subject: gnu: libgpg-error: Update to 1.22. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.22. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 3f3964e74b..fab3bb9811 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -49,7 +49,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.21") + (version "1.22") (source (origin (method url-fetch) @@ -57,7 +57,7 @@ version ".tar.bz2")) (sha256 (base32 - "0kdq2cbnk84fr4jqcv689rlxpbyl6bda2cn6y3ll19v3mlydpnxp")))) + "0ywxwswizmkyciy480kzczxn6nhbgzf3z8my4nk43nvv67k4x87j")))) (build-system gnu-build-system) (home-page "http://gnupg.org") (synopsis "Library of error values for GnuPG components") -- cgit v1.2.3 From 4fa05a81983d4aa33837e1c01457442be7b58aad Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 13 May 2016 02:23:38 -0400 Subject: gnu: libarchive: Update to 3.2.0. * gnu/packages/patches/libarchive-CVE-2013-0211.patch, gnu/packages/patches/libarchive-CVE-2016-1541.patch, gnu/packages/patches/libarchive-bsdtar-test.patch, gnu/packages/patches/libarchive-fix-lzo-test-case.patch, gnu/packages/patches/libarchive-mtree-filename-length-fix.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/backup.scm (libarchive): Update to 3.2.0. [source]: Remove deleted patches. [replacement]: Remove. (libarchive/fixed): Remove variable. --- gnu/local.mk | 5 -- gnu/packages/backup.scm | 18 +---- .../patches/libarchive-CVE-2013-0211.patch | 21 ------ .../patches/libarchive-CVE-2016-1541.patch | 67 ----------------- gnu/packages/patches/libarchive-bsdtar-test.patch | 74 ------------------- .../patches/libarchive-fix-lzo-test-case.patch | 83 ---------------------- .../libarchive-mtree-filename-length-fix.patch | 18 ----- 7 files changed, 2 insertions(+), 284 deletions(-) delete mode 100644 gnu/packages/patches/libarchive-CVE-2013-0211.patch delete mode 100644 gnu/packages/patches/libarchive-CVE-2016-1541.patch delete mode 100644 gnu/packages/patches/libarchive-bsdtar-test.patch delete mode 100644 gnu/packages/patches/libarchive-fix-lzo-test-case.patch delete mode 100644 gnu/packages/patches/libarchive-mtree-filename-length-fix.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 9d3bc1ee8b..8cf5ef5c99 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -561,11 +561,6 @@ dist_patch_DATA = \ gnu/packages/patches/liba52-link-with-libm.patch \ gnu/packages/patches/liba52-set-soname.patch \ gnu/packages/patches/liba52-use-mtune-not-mcpu.patch \ - gnu/packages/patches/libarchive-bsdtar-test.patch \ - gnu/packages/patches/libarchive-CVE-2013-0211.patch \ - gnu/packages/patches/libarchive-CVE-2016-1541.patch \ - gnu/packages/patches/libarchive-fix-lzo-test-case.patch \ - gnu/packages/patches/libarchive-mtree-filename-length-fix.patch \ gnu/packages/patches/libbonobo-activation-test-race.patch \ gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch \ gnu/packages/patches/libcmis-fix-test-onedrive.patch \ diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 917bee78d9..05423f1401 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -136,8 +136,7 @@ backups (called chunks) to allow easy burning to CD/DVD.") (define-public libarchive (package (name "libarchive") - (replacement libarchive/fixed) - (version "3.1.2") + (version "3.2.0") (source (origin (method url-fetch) @@ -145,12 +144,7 @@ backups (called chunks) to allow easy burning to CD/DVD.") version ".tar.gz")) (sha256 (base32 - "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb")) - (patches - (search-patches "libarchive-mtree-filename-length-fix.patch" - "libarchive-fix-lzo-test-case.patch" - "libarchive-CVE-2013-0211.patch" - "libarchive-bsdtar-test.patch")))) + "11xabdpmvdmcdkidigmqh4ymhra95lr7ipcys4hdq0gzf7ylbkkv")))) (build-system gnu-build-system) ;; TODO: Add -L/path/to/nettle in libarchive.pc. (inputs @@ -194,14 +188,6 @@ archive. In particular, note that there is currently no built-in support for random access nor for in-place modification.") (license license:bsd-2))) -(define libarchive/fixed - (package - (inherit libarchive) - (source (origin - (inherit (package-source libarchive)) - (patches (cons (search-patch "libarchive-CVE-2016-1541.patch") - (origin-patches (package-source libarchive)))))))) - (define-public rdup (package (name "rdup") diff --git a/gnu/packages/patches/libarchive-CVE-2013-0211.patch b/gnu/packages/patches/libarchive-CVE-2013-0211.patch deleted file mode 100644 index b024a7d4a8..0000000000 --- a/gnu/packages/patches/libarchive-CVE-2013-0211.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Fix CVE-2013-0211: read buffer overflow on 64-bit systems -Origin: upstream -Bug-Debian: http://bugs.debian.org/703957 -Forwarded: not-needed - ---- libarchive-3.0.4.orig/libarchive/archive_write.c -+++ libarchive-3.0.4/libarchive/archive_write.c -@@ -665,8 +665,13 @@ static ssize_t - _archive_write_data(struct archive *_a, const void *buff, size_t s) - { - struct archive_write *a = (struct archive_write *)_a; -+ const size_t max_write = INT_MAX; -+ - archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC, - ARCHIVE_STATE_DATA, "archive_write_data"); -+ /* In particular, this catches attempts to pass negative values. */ -+ if (s > max_write) -+ s = max_write; - archive_clear_error(&a->archive); - return ((a->format_write_data)(a, buff, s)); - } diff --git a/gnu/packages/patches/libarchive-CVE-2016-1541.patch b/gnu/packages/patches/libarchive-CVE-2016-1541.patch deleted file mode 100644 index 6ac8773244..0000000000 --- a/gnu/packages/patches/libarchive-CVE-2016-1541.patch +++ /dev/null @@ -1,67 +0,0 @@ -Fix CVE-2016-1541 (buffer overflow zip_read_mac_metadata) - -Taken from upstream source repository: -https://github.com/libarchive/libarchive/commit/d0331e8e5b05b475f20b1f3101fe1ad772d7e7e7 - -When reading OS X metadata entries in Zip archives that were stored -without compression, libarchive would use the uncompressed entry size -to allocate a buffer but would use the compressed entry size to limit -the amount of data copied into that buffer. Since the compressed -and uncompressed sizes are provided by data in the archive itself, -an attacker could manipulate these values to write data beyond -the end of the allocated buffer. - -This fix provides three new checks to guard against such -manipulation and to make libarchive generally more robust when -handling this type of entry: - 1. If an OS X metadata entry is stored without compression, - abort the entire archive if the compressed and uncompressed - data sizes do not match. - 2. When sanity-checking the size of an OS X metadata entry, - abort this entry if either the compressed or uncompressed - size is larger than 4MB. - 3. When copying data into the allocated buffer, check the copy - size against both the compressed entry size and uncompressed - entry size. ---- - libarchive/archive_read_support_format_zip.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c -index 0f8262c..0a0be96 100644 ---- a/libarchive/archive_read_support_format_zip.c -+++ b/libarchive/archive_read_support_format_zip.c -@@ -2778,6 +2778,11 @@ zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry, - - switch(rsrc->compression) { - case 0: /* No compression. */ -+ if (rsrc->uncompressed_size != rsrc->compressed_size) { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Malformed OS X metadata entry: inconsistent size"); -+ return (ARCHIVE_FATAL); -+ } - #ifdef HAVE_ZLIB_H - case 8: /* Deflate compression. */ - #endif -@@ -2798,6 +2803,12 @@ zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry, - (intmax_t)rsrc->uncompressed_size); - return (ARCHIVE_WARN); - } -+ if (rsrc->compressed_size > (4 * 1024 * 1024)) { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Mac metadata is too large: %jd > 4M bytes", -+ (intmax_t)rsrc->compressed_size); -+ return (ARCHIVE_WARN); -+ } - - metadata = malloc((size_t)rsrc->uncompressed_size); - if (metadata == NULL) { -@@ -2836,6 +2847,8 @@ zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry, - bytes_avail = remaining_bytes; - switch(rsrc->compression) { - case 0: /* No compression. */ -+ if ((size_t)bytes_avail > metadata_bytes) -+ bytes_avail = metadata_bytes; - memcpy(mp, p, bytes_avail); - bytes_used = (size_t)bytes_avail; - metadata_bytes -= bytes_used; diff --git a/gnu/packages/patches/libarchive-bsdtar-test.patch b/gnu/packages/patches/libarchive-bsdtar-test.patch deleted file mode 100644 index 6a533a9a07..0000000000 --- a/gnu/packages/patches/libarchive-bsdtar-test.patch +++ /dev/null @@ -1,74 +0,0 @@ -commit b539b2e597b566fe3c4b49cb61c9eef83e5e052d -Author: Pavel Raiskup -Date: Thu Jun 27 16:01:30 2013 +0200 - - Use ustar format in the test_option_b test - - .. because the ustar archive does not store SELinux context. As the default - format for bsdtar is "restricted pax" (trying to store xattrs and other - things by default), the test failed on Fedora because our files have by - default SELinux context set. This results in additional data in tested - archive ~> and the test failed because the archive was unexpectedly big: - - tar/test/test_option_b.c:41: File archive1.tar has size 3072, expected 2048 - - Reviewed by Konrad Kleine - -diff --git a/tar/test/test_option_b.c b/tar/test/test_option_b.c -index be2ae65..6fea474 100644 ---- a/tar/test/test_option_b.c -+++ b/tar/test/test_option_b.c -@@ -25,8 +25,14 @@ - #include "test.h" - __FBSDID("$FreeBSD$"); - -+#define USTAR_OPT " --format=ustar" -+ - DEFINE_TEST(test_option_b) - { -+ char *testprog_ustar = malloc(strlen(testprog) + sizeof(USTAR_OPT) + 1); -+ strcpy(testprog_ustar, testprog); -+ strcat(testprog_ustar, USTAR_OPT); -+ - assertMakeFile("file1", 0644, "file1"); - if (systemf("cat file1 > test_cat.out 2> test_cat.err") != 0) { - skipping("Platform doesn't have cat"); -@@ -36,7 +42,7 @@ DEFINE_TEST(test_option_b) - /* - * Bsdtar does not pad if the output is going directly to a disk file. - */ -- assertEqualInt(0, systemf("%s -cf archive1.tar file1 >test1.out 2>test1.err", testprog)); -+ assertEqualInt(0, systemf("%s -cf archive1.tar file1 >test1.out 2>test1.err", testprog_ustar)); - failure("bsdtar does not pad archives written directly to regular files"); - assertFileSize("archive1.tar", 2048); - assertEmptyFile("test1.out"); -@@ -46,24 +52,24 @@ DEFINE_TEST(test_option_b) - * Bsdtar does pad to the block size if the output is going to a socket. - */ - /* Default is -b 20 */ -- assertEqualInt(0, systemf("%s -cf - file1 2>test2.err | cat >archive2.tar ", testprog)); -+ assertEqualInt(0, systemf("%s -cf - file1 2>test2.err | cat >archive2.tar ", testprog_ustar)); - failure("bsdtar does pad archives written to pipes"); - assertFileSize("archive2.tar", 10240); - assertEmptyFile("test2.err"); - -- assertEqualInt(0, systemf("%s -cf - -b 20 file1 2>test3.err | cat >archive3.tar ", testprog)); -+ assertEqualInt(0, systemf("%s -cf - -b 20 file1 2>test3.err | cat >archive3.tar ", testprog_ustar)); - assertFileSize("archive3.tar", 10240); - assertEmptyFile("test3.err"); - -- assertEqualInt(0, systemf("%s -cf - -b 10 file1 2>test4.err | cat >archive4.tar ", testprog)); -+ assertEqualInt(0, systemf("%s -cf - -b 10 file1 2>test4.err | cat >archive4.tar ", testprog_ustar)); - assertFileSize("archive4.tar", 5120); - assertEmptyFile("test4.err"); - -- assertEqualInt(0, systemf("%s -cf - -b 1 file1 2>test5.err | cat >archive5.tar ", testprog)); -+ assertEqualInt(0, systemf("%s -cf - -b 1 file1 2>test5.err | cat >archive5.tar ", testprog_ustar)); - assertFileSize("archive5.tar", 2048); - assertEmptyFile("test5.err"); - -- assertEqualInt(0, systemf("%s -cf - -b 8192 file1 2>test6.err | cat >archive6.tar ", testprog)); -+ assertEqualInt(0, systemf("%s -cf - -b 8192 file1 2>test6.err | cat >archive6.tar ", testprog_ustar)); - assertFileSize("archive6.tar", 4194304); - assertEmptyFile("test6.err"); - diff --git a/gnu/packages/patches/libarchive-fix-lzo-test-case.patch b/gnu/packages/patches/libarchive-fix-lzo-test-case.patch deleted file mode 100644 index ffdc0db922..0000000000 --- a/gnu/packages/patches/libarchive-fix-lzo-test-case.patch +++ /dev/null @@ -1,83 +0,0 @@ -Description: This patch fixes test cases for LZO write support in various - architectures, such as armhf. Writing a certain amount of files would - cause the LZO compressor level 9 to produce a bigger archive than the - default compressor level. -Author: Andres Mejia - ---- a/libarchive/test/test_write_filter_lzop.c -+++ b/libarchive/test/test_write_filter_lzop.c -@@ -39,7 +39,7 @@ - size_t buffsize, datasize; - char path[16]; - size_t used1, used2; -- int i, r, use_prog = 0; -+ int i, r, use_prog = 0, filecount; - - assert((a = archive_write_new()) != NULL); - r = archive_write_add_filter_lzop(a); -@@ -58,9 +58,10 @@ - - datasize = 10000; - assert(NULL != (data = (char *)calloc(1, datasize))); -+ filecount = 10; - - /* -- * Write a 100 files and read them all back. -+ * Write a filecount files and read them all back. - */ - assert((a = archive_write_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a)); -@@ -77,7 +78,7 @@ - assert((ae = archive_entry_new()) != NULL); - archive_entry_set_filetype(ae, AE_IFREG); - archive_entry_set_size(ae, datasize); -- for (i = 0; i < 100; i++) { -+ for (i = 0; i < filecount; i++) { - sprintf(path, "file%03d", i); - archive_entry_copy_pathname(ae, path); - assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae)); -@@ -97,7 +98,7 @@ - } else { - assertEqualIntA(a, ARCHIVE_OK, - archive_read_open_memory(a, buff, used1)); -- for (i = 0; i < 100; i++) { -+ for (i = 0; i < filecount; i++) { - sprintf(path, "file%03d", i); - if (!assertEqualInt(ARCHIVE_OK, - archive_read_next_header(a, &ae))) -@@ -133,7 +134,7 @@ - archive_write_set_options(a, "lzop:compression-level=9")); - assertEqualIntA(a, ARCHIVE_OK, - archive_write_open_memory(a, buff, buffsize, &used2)); -- for (i = 0; i < 100; i++) { -+ for (i = 0; i < filecount; i++) { - sprintf(path, "file%03d", i); - assert((ae = archive_entry_new()) != NULL); - archive_entry_copy_pathname(ae, path); -@@ -161,7 +162,7 @@ - archive_read_support_filter_all(a)); - assertEqualIntA(a, ARCHIVE_OK, - archive_read_open_memory(a, buff, used2)); -- for (i = 0; i < 100; i++) { -+ for (i = 0; i < filecount; i++) { - sprintf(path, "file%03d", i); - if (!assertEqualInt(ARCHIVE_OK, - archive_read_next_header(a, &ae))) -@@ -186,7 +187,7 @@ - archive_write_set_filter_option(a, NULL, "compression-level", "1")); - assertEqualIntA(a, ARCHIVE_OK, - archive_write_open_memory(a, buff, buffsize, &used2)); -- for (i = 0; i < 100; i++) { -+ for (i = 0; i < filecount; i++) { - sprintf(path, "file%03d", i); - assert((ae = archive_entry_new()) != NULL); - archive_entry_copy_pathname(ae, path); -@@ -216,7 +217,7 @@ - } else { - assertEqualIntA(a, ARCHIVE_OK, - archive_read_open_memory(a, buff, used2)); -- for (i = 0; i < 100; i++) { -+ for (i = 0; i < filecount; i++) { - sprintf(path, "file%03d", i); - if (!assertEqualInt(ARCHIVE_OK, - archive_read_next_header(a, &ae))) diff --git a/gnu/packages/patches/libarchive-mtree-filename-length-fix.patch b/gnu/packages/patches/libarchive-mtree-filename-length-fix.patch deleted file mode 100644 index ad94592c05..0000000000 --- a/gnu/packages/patches/libarchive-mtree-filename-length-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Patch to fix filename length calculation when writing mtree archives. -Author: Dave Reisner -Origin: upstream - ---- a/libarchive/archive_write_set_format_mtree.c -+++ b/libarchive/archive_write_set_format_mtree.c -@@ -1855,9 +1855,9 @@ - return (ret); - } - -- /* Make a basename from dirname and slash */ -+ /* Make a basename from file->parentdir.s and slash */ - *slash = '\0'; -- file->parentdir.length = slash - dirname; -+ file->parentdir.length = slash - file->parentdir.s; - archive_strcpy(&(file->basename), slash + 1); - return (ret); - } -- cgit v1.2.3 From ac52b72d1eab30762cc8b04f5d619e08e5d9cd4f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 May 2016 22:18:52 +0300 Subject: gnu: kmod: Update to 22. * gnu/packages/linux.scm (kmod): Update to 22. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ba261f8df8..6e3228f9d1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1578,7 +1578,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") (define-public kmod (package (name "kmod") - (version "17") + (version "22") (source (origin (method url-fetch) (uri @@ -1586,7 +1586,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") "kmod-" version ".tar.xz")) (sha256 (base32 - "1yid3a9b64a60ybj66fk2ysrq5klnl0ijl4g624cl16y8404g9rv")) + "10lzfkmnpq6a43a3gkx7x633njh216w0bjwz31rv8a1jlgg1sfxs")) (patches (search-patches "kmod-module-directory.patch")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From 18e681bf6c290aff2086af42605aaf333b5a19ed Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 May 2016 09:22:31 +0300 Subject: gnu: bdb: Update to 6.2.23. * gnu/packages/databases.scm (bdb): Update to 6.2.23. --- gnu/packages/databases.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 1ccfb9e2ac..1606721368 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -136,13 +136,14 @@ and provides interfaces to the traditional file format.") (define-public bdb (package (name "bdb") - (version "5.3.21") + (version "6.2.23") (source (origin (method url-fetch) - (uri (string-append "http://download.oracle.com/berkeley-db/db-" version - ".tar.gz")) - (sha256 (base32 - "1f2g2612lf8djbwbwhxsvmffmf9d7693kh2l20195pqp0f9jmnfx")))) + (uri (string-append "http://download.oracle.com/berkeley-db/db-" + version ".tar.gz")) + (sha256 + (base32 + "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7")))) (build-system gnu-build-system) (outputs '("out" ; programs, libraries, headers "doc")) ; 94 MiB of HTML docs -- cgit v1.2.3 From 5c1c2254cbf61b57b1d31cfdc40ec042aa55218b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 May 2016 11:04:29 +0300 Subject: gnu: libva: Update to 1.7.0. * gnu/packages/video.scm (libva): Update to 1.7.0. [home-page]: Use https. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6578a4031f..1bd5198d5b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -323,7 +323,7 @@ SMPTE 314M.") (define-public libva (package (name "libva") - (version "1.6.1") + (version "1.7.0") (source (origin (method url-fetch) @@ -331,7 +331,7 @@ SMPTE 314M.") "https://www.freedesktop.org/software/vaapi/releases/libva/libva-" version".tar.bz2")) (sha256 - (base32 "0bjfb5s8dk3lql843l91ffxzlq47isqks5sj19cxh7j3nhzw58kz")))) + (base32 "0py9igf4kicj7ji22bjawkpd6my013qpg0s4ir2np9l1rk5vr2d6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -362,7 +362,7 @@ SMPTE 314M.") #:make-flags (list (string-append "dummy_drv_video_ladir=" (assoc-ref %outputs "out") "/lib/dri")))) - (home-page "http://www.freedesktop.org/wiki/Software/vaapi/") + (home-page "https://www.freedesktop.org/wiki/Software/vaapi/") (synopsis "Video acceleration library") (description "The main motivation for VA-API (Video Acceleration API) is to enable hardware accelerated video decode/encode at various -- cgit v1.2.3 From 0158ca7fdd6bc0d9d3b81e2017ee6c7a9c6fa483 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 14 May 2016 10:13:21 +0200 Subject: gnu: cross-base: Add srfi-26 for glibc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a regression introduced in commit efc4eb147512fa7a2c6d74d9b296cfc22b1ef198. * gnu/packages/cross-base.scm (cross-libc)[arguments]: Add (srfi srfi-26). Signed-off-by: Ludovic Courtès --- gnu/packages/cross-base.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 64d3e1ef67..58cd38beca 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -323,6 +323,11 @@ XBINUTILS and the cross tool chain." ;; itself. #:implicit-cross-inputs? #f + ;; We need SRFI 26. + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26)) + ,@(package-arguments glibc)) ((#:configure-flags flags) `(cons ,(string-append "--host=" target) -- cgit v1.2.3 From 5fdd142072def44b280dbf4ae02e05ad61b0629d Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Fri, 13 May 2016 09:22:44 +0200 Subject: gnu: Add the X color name database file. * gnu/packages/xorg.scm (xorg-rgb): New variable. --- gnu/packages/xorg.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index fd933e36a7..2eff1b28c3 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4281,7 +4281,30 @@ Various information is displayed depending on which options are selected.") formatted dump file, such as produced by xwd.") (license license:x11))) - +(define-public xorg-rgb + (package + (name "xorg-rgb") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/rgb-" + version + ".tar.bz2")) + (sha256 + (base32 + "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "X color name database") + (description + "This package provides the X color name database.") + (license license:x11))) ;; packages of height 1 in the propagated-inputs tree -- cgit v1.2.3 From 1de1c56db72a48c38ad12990e32319eb51b29795 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Fri, 13 May 2016 15:32:49 +0200 Subject: gnu: netpbm: Use 'modify-phases' syntax. * gnu/packages/netpbm.scm (netpbm)[arguments]: Do it. --- gnu/packages/netpbm.scm | 86 ++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 44 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index 475635e7e1..d7d857642e 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -99,50 +99,48 @@ ("python" ,python-wrapper))) (arguments `(#:phases - (alist-replace - 'configure - (lambda _ - (copy-file "config.mk.in" "config.mk") - (chmod "config.mk" #o664) - (let ((f (open-file "config.mk" "a"))) - (display "CC=gcc\n" f) - (display "CFLAGS_SHLIB += -fPIC\n" f) - (display "TIFFLIB = libtiff.so\n" f) - (display "JPEGLIB = libjpeg.so\n" f) - (display "ZLIB = libz.so\n" f) - (display (string-append "LDFLAGS += -Wl,-rpath=" %output "/lib") f) - (close-port f))) - (alist-cons-before - 'check 'setup-check - (lambda _ - ;; install temporarily into /tmp/netpbm - (system* "make" "package") - ;; remove test requiring X - (substitute* "test/all-in-place.test" (("pamx") "")) - ;; do not worry about non-existing file - (substitute* "test/all-in-place.test" (("^rm ") "rm -f ")) - ;; remove four tests that fail for unknown reasons - (substitute* "test/Test-Order" - (("all-in-place.test") "") - (("pnmpsnr.test") "") - (("pnmremap1.test") "") - (("gif-roundtrip.test") ""))) - (alist-replace - 'install - (lambda* (#:key outputs make-flags #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (apply system* "make" "package" - (string-append "pkgdir=" out) make-flags) - ;; copy static library - (copy-file (string-append out "/link/libnetpbm.a") - (string-append out "/lib/libnetpbm.a")) - ;; remove superfluous folders and files - (system* "rm" "-r" (string-append out "/link")) - (system* "rm" "-r" (string-append out "/misc")) - (with-directory-excursion out - (for-each delete-file - '("config_template" "pkginfo" "README" "VERSION"))))) - %standard-phases))))) + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (copy-file "config.mk.in" "config.mk") + (chmod "config.mk" #o664) + (let ((f (open-file "config.mk" "a"))) + (display "CC=gcc\n" f) + (display "CFLAGS_SHLIB += -fPIC\n" f) + (display "TIFFLIB = libtiff.so\n" f) + (display "JPEGLIB = libjpeg.so\n" f) + (display "ZLIB = libz.so\n" f) + (display (string-append "LDFLAGS += -Wl,-rpath=" %output "/lib") f) + (close-port f)))) + (add-before 'check 'setup-check + (lambda _ + ;; install temporarily into /tmp/netpbm + (system* "make" "package") + ;; remove test requiring X + (substitute* "test/all-in-place.test" (("pamx") "")) + ;; do not worry about non-existing file + (substitute* "test/all-in-place.test" (("^rm ") "rm -f ")) + ;; remove four tests that fail for unknown reasons + (substitute* "test/Test-Order" + (("all-in-place.test") "") + (("pnmpsnr.test") "") + (("pnmremap1.test") "") + (("gif-roundtrip.test") "")))) + (replace 'install + (lambda* (#:key outputs make-flags #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (apply system* "make" "package" + (string-append "pkgdir=" out) make-flags) + ;; copy static library + (copy-file (string-append out "/link/libnetpbm.a") + (string-append out "/lib/libnetpbm.a")) + ;; remove superfluous folders and files + (system* "rm" "-r" (string-append out "/link")) + (system* "rm" "-r" (string-append out "/misc")) + (with-directory-excursion out + (for-each delete-file + '("config_template" "pkginfo" "README" + "VERSION"))))))))) (synopsis "Toolkit for manipulation of images") (description "Netpbm is a toolkit for the manipulation of graphic images, including -- cgit v1.2.3 From 2492581f0c7a77db5e7da231a62aa09cfaed0987 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Fri, 13 May 2016 20:39:20 +0200 Subject: gnu: netpbm: Fix location of X color name database. * gnu/packages/netpbm.scm (netpbm)[inputs]: Add 'xorg-rgb'. [arguments]: In the 'configure' phase, patch 'pm_config.in.h' with the full path to the 'rgb.txt' file. --- gnu/packages/netpbm.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index d7d857642e..d0955fe80a 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:select (gpl2)) #:use-module (guix packages) @@ -91,6 +92,7 @@ ("libpng" ,libpng) ("libtiff" ,libtiff) ("libxml2" ,libxml2) + ("xorg-rgb" ,xorg-rgb) ("zlib" ,zlib))) (native-inputs `(("flex" ,flex) @@ -111,7 +113,11 @@ (display "JPEGLIB = libjpeg.so\n" f) (display "ZLIB = libz.so\n" f) (display (string-append "LDFLAGS += -Wl,-rpath=" %output "/lib") f) - (close-port f)))) + (close-port f)) + (let ((rgb (string-append (assoc-ref inputs "xorg-rgb") + "/share/X11/rgb.txt"))) + (substitute* "pm_config.in.h" + (("/usr/share/X11/rgb.txt") rgb))))) (add-before 'check 'setup-check (lambda _ ;; install temporarily into /tmp/netpbm -- cgit v1.2.3 From 9f9861d7e5af9dd79796fce2c7bf9e44d02f2e32 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Mon, 16 May 2016 14:26:27 +0200 Subject: gnu: netpbm: Return #t from custom phases. * gnu/packages/netpbm.scm (netpbm)[arguments]: Do it. --- gnu/packages/netpbm.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index d0955fe80a..e2d409abe2 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -117,7 +117,8 @@ (let ((rgb (string-append (assoc-ref inputs "xorg-rgb") "/share/X11/rgb.txt"))) (substitute* "pm_config.in.h" - (("/usr/share/X11/rgb.txt") rgb))))) + (("/usr/share/X11/rgb.txt") rgb))) + #t)) (add-before 'check 'setup-check (lambda _ ;; install temporarily into /tmp/netpbm @@ -131,7 +132,8 @@ (("all-in-place.test") "") (("pnmpsnr.test") "") (("pnmremap1.test") "") - (("gif-roundtrip.test") "")))) + (("gif-roundtrip.test") "")) + #t)) (replace 'install (lambda* (#:key outputs make-flags #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -146,7 +148,8 @@ (with-directory-excursion out (for-each delete-file '("config_template" "pkginfo" "README" - "VERSION"))))))))) + "VERSION"))) + #t)))))) (synopsis "Toolkit for manipulation of images") (description "Netpbm is a toolkit for the manipulation of graphic images, including -- cgit v1.2.3 From 549f95128352ec72ba722ea4f634b6ae32f8a1d4 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Thu, 12 May 2016 14:57:25 +0200 Subject: gnu: Add Chez-Scheme. * gnu/packages/scheme.scm (chez-scheme): New variable. --- gnu/packages/scheme.scm | 162 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 160 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 6cf75c2471..5601d6c78e 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015 Federico Beffa +;;; Copyright © 2015, 2016 Federico Beffa ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Efraim Flashner ;;; @@ -22,15 +22,19 @@ (define-module (gnu packages scheme) #:use-module (gnu packages) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:select (gpl2+ lgpl2.0+ lgpl2.1+ asl2.0 bsd-3)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (gnu packages compression) #:use-module (gnu packages m4) #:use-module (gnu packages multiprecision) + #:use-module (gnu packages ncurses) #:use-module (gnu packages databases) #:use-module (gnu packages emacs) + #:use-module (gnu packages ghostscript) + #:use-module (gnu packages netpbm) #:use-module (gnu packages texinfo) #:use-module (gnu packages texlive) #:use-module (gnu packages base) @@ -544,6 +548,160 @@ an isolated heap allowing multiple VMs to run simultaneously in different OS threads.") (license bsd-3))) +(define nanopass + (let ((version "1.9")) + (origin + (method url-fetch) + (uri (string-append + "https://github.com/nanopass/nanopass-framework-scheme/archive" + "/v" version ".tar.gz")) + (sha256 (base32 "11pwyy4jiwhcl2am3a4ciczacjbjkyvdizqzdglb3l1hj2gj6nv2")) + (file-name (string-append "nanopass-" version ".tar.gz"))))) + +(define stex + (let ((version "1.2.1")) + (origin + (method url-fetch) + (uri (string-append + "https://github.com/dybvig/stex/archive" + "/v" version ".tar.gz")) + (sha256 (base32 "03pl3f668h24dn51vccr1sj5lsba9zq3j37bnxjvdadcdaj4qy5z")) + (file-name (string-append "stex-" version ".tar.gz"))))) + +(define-public chez-scheme + (package + (name "chez-scheme") + (version "9.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/cisco/ChezScheme/archive/" + "v" version ".tar.gz")) + (sha256 + (base32 "0lprmpsjg2plc6ykgkz482zyvhkzv6gd0vnar71ph21h6zknyklz")) + (file-name (string-append "chez-scheme-" version ".tar.gz")))) + (build-system gnu-build-system) + (inputs + `(("ncurses" ,ncurses) + ("libx11" ,libx11) + ("xorg-rgb" ,xorg-rgb) + ("nanopass" ,nanopass) + ("zlib" ,zlib) + ("stex" ,stex))) + (native-inputs + `(("texlive" ,texlive) + ("ghostscript" ,ghostscript) + ("netpbm" ,netpbm))) + (outputs '("out" "doc")) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 match)) + #:test-target "test" + #:phases + (modify-phases %standard-phases + ;; Adapt the custom 'configure' script. + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (nanopass (assoc-ref inputs "nanopass")) + (stex (assoc-ref inputs "stex")) + (zlib (assoc-ref inputs "zlib")) + (unpack (assoc-ref %standard-phases 'unpack)) + (patch-source-shebangs + (assoc-ref %standard-phases 'patch-source-shebangs))) + (map (match-lambda + ((src orig-name new-name) + (with-directory-excursion "." + (apply unpack (list #:source src)) + (apply patch-source-shebangs (list #:source src))) + (delete-file-recursively new-name) + (system* "mv" orig-name new-name))) + `((,nanopass "nanopass-framework-scheme-1.9" "nanopass") + (,stex "stex-1.2.1" "stex"))) + ;; The Makefile wants to download and compile "zlib". We patch + ;; it to use the one from our 'zlib' package. + (substitute* "configure" + (("rmdir zlib .*$") "echo \"using system zlib\"\n")) + (substitute* (find-files "./c" "Mf-[a-zA-Z0-9.]+") + (("\\$\\{Kernel\\}: \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a") + "${Kernel}: ${kernelobj}") + (("ld -melf_x86_64 -r -X -o \\$\\{Kernel\\} \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a") + (string-append "ld -melf_x86_64 -r -X -o ${Kernel} ${kernelobj} " + zlib "/lib/libz.a")) + (("\\(cd \\.\\./zlib; CFLAGS=-m64 \\./configure --64)") + (which "true")) + (("(cd \\.\\./zlib; make)") + (which "true"))) + (substitute* (find-files "mats" "Mf-.*") + (("^[[:space:]]+(cc ) *") "\tgcc ")) + (substitute* + (find-files "." (string-append + "(" + "Mf-[a-zA-Z0-9.]+" + "|Makefile[a-zA-Z0-9.]*" + "|checkin" + "|stex\\.stex" + "|newrelease" + "|workarea" + ;;"|[a-zA-Z0-9.]+\\.ms" ; guile can't read + ")")) + (("/bin/rm") (which "rm")) + (("/bin/ln") (which "ln")) + (("/bin/cp") (which "cp"))) + (substitute* "makefiles/installsh" + (("/bin/true") (which "true"))) + (substitute* "stex/Makefile" + (("PREFIX=/usr") (string-append "PREFIX=" out))) + (zero? (system* "./configure" "--threads" + (string-append "--installprefix=" out)))))) + ;; Installation of the documentation requires a running "chez". + (add-after 'install 'install-doc + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin")) + (doc (string-append (assoc-ref outputs "doc") + "/share/doc/" ,name "-" ,version))) + (setenv "HOME" (getcwd)) + (setenv "PATH" (string-append (getenv "PATH") ":" bin)) + (with-directory-excursion "stex" + (system* "make" (string-append "BIN=" bin))) + (system* "make" "docs") + (with-directory-excursion "csug" + (substitute* "Makefile" + (("/tmp/csug9") doc) + (("^m = a6le") + "m := $(shell echo '(machine-type)' | scheme -q)")) + (system* "make" "install") + (install-file "csug.pdf" doc)) + (with-directory-excursion "release_notes" + (install-file "release_notes.pdf" doc)) + #t))) + ;; The binary file name is called "scheme" as the one from MIT/GNU + ;; Scheme. We add a symlink to use in case both are installed. + (add-after 'install 'install-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib")) + (name "chez-scheme")) + (symlink (string-append bin "/scheme") + (string-append bin "/" name)) + (map (lambda (file) + (symlink file (string-append (dirname file) + "/" name ".boot"))) + (find-files lib "scheme.boot")) + #t)))))) + ;; According to the documentation MIPS is not supported. + (supported-systems (delete "mips64el-linux" %supported-systems)) + (home-page "http://www.scheme.com") + (synopsis "R6RS Scheme compiler and run-time") + (description + "Chez Scheme is a compiler and run-time system for the language of the +Revised^6 Report on Scheme (R6RS), with numerous extensions. The compiler +generates native code for each target processor, with support for x86, x86_64, +and 32-bit PowerPC architectures.") + (license asl2.0))) + (define-public scmutils (let () (define (system-suffix) -- cgit v1.2.3 From 1d30d554b5389eb53eaa1ef7efb07772d0383510 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 May 2016 19:55:16 -0400 Subject: gnu: openssl: Update to 1.0.2h. * gnu/packages/tls.scm (openssl): Update to 1.0.2h. [replacement]: Remove field. (openssl/fixed): Remove variable. --- gnu/packages/tls.scm | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e61428510a..92c1263808 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -197,8 +197,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.0.2g") - (replacement openssl/fixed) + (version "1.0.2h") (source (origin (method url-fetch) (uri (list (string-append "ftp://ftp.openssl.org/source/" @@ -208,7 +207,7 @@ required structures.") "/" name "-" version ".tar.gz"))) (sha256 (base32 - "0cxajjayi859czi545ddafi24m9nwsnjsw4q82zrmqvwj2rv315p")) + "06996ds1rk8xhnyb5y273a7xkcxhggp4bq1g02rab55d7bjhfh0x")) (patches (search-patches "openssl-runpath.patch" "openssl-c-rehash-in.patch")))) (build-system gnu-build-system) @@ -334,25 +333,6 @@ required structures.") (license license:openssl) (home-page "http://www.openssl.org/"))) -(define openssl/fixed - (package - (inherit openssl) - (source - (let ((name "openssl") - (version "1.0.2h")) - (origin - (method url-fetch) - (uri (list (string-append "ftp://ftp.openssl.org/source/" - name "-" version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/old/" - (string-trim-right version char-set:letter) - "/" name "-" version ".tar.gz"))) - (sha256 - (base32 - "06996ds1rk8xhnyb5y273a7xkcxhggp4bq1g02rab55d7bjhfh0x")) - (patches (search-patches "openssl-runpath.patch" - "openssl-c-rehash-in.patch"))))))) - (define-public libressl (package (name "libressl") -- cgit v1.2.3 From dffded6211313e9ebe9fb853a502c60aa6ccd90c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 May 2016 19:58:05 -0400 Subject: gnu: libtasn1: Update to 4.8. * gnu/packages/tls.scm (libtasn1): Update to 4.8. [replacement]: Remove field. (libtasn1/fixed): Remove variable. --- gnu/packages/tls.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 92c1263808..8ec8e603a9 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -47,7 +47,7 @@ (define-public libtasn1 (package (name "libtasn1") - (version "4.7") + (version "4.8") (source (origin (method url-fetch) @@ -55,7 +55,7 @@ version ".tar.gz")) (sha256 (base32 - "1j8iixynchziw1y39lnibyl5h81m4p78w3i4f28q2vgwjgf801x4")))) + "04y5m29pqmvkfdbppmsdifyx89v8xclxzklpfc7a1fkr9p4jz07s")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (home-page "http://www.gnu.org/software/libtasn1/") @@ -65,22 +65,8 @@ for transmitting machine-neutral encodings of data objects in computer networking, allowing for formal validation of data according to some specifications.") - (replacement libtasn1/fixed) (license license:lgpl2.0+))) -(define libtasn1/fixed ;for CVE-2016-4008 - (package - (inherit libtasn1) - (source - (let ((version "4.8")) - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/libtasn1/libtasn1-" - version ".tar.gz")) - (sha256 - (base32 - "04y5m29pqmvkfdbppmsdifyx89v8xclxzklpfc7a1fkr9p4jz07s"))))))) - (define-public p11-kit (package (name "p11-kit") -- cgit v1.2.3 From ec0ea24d1ad85686161259be0f0f62589dcdc7dd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 May 2016 20:00:40 -0400 Subject: gnu: openldap: Update to 2.4.44. * gnu/packages/openldap.scm (openldap): Update to 2.4.44. [replacement]: Remove field. (openldap-2.4.44): Remove variable. --- gnu/packages/openldap.scm | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 429078fc92..adb6f36fe8 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -34,9 +34,8 @@ (define-public openldap (package - (replacement openldap-2.4.44) (name "openldap") - (version "2.4.42") + (version "2.4.44") (source (origin (method url-fetch) @@ -53,7 +52,7 @@ "openldap-release/openldap-" version ".tgz"))) (sha256 (base32 - "0qwfpb5ipp2l76v11arghq5mr0sjc6xhjfg8a0kgsaw5qpib1dzf")))) + "0044p20hx07fwgw2mbwj1fkx04615hhs1qyx4mawj2bhqvrnppnp")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb) ("openssl" ,openssl) @@ -78,24 +77,3 @@ "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.") (license openldap2.8) (home-page "http://www.openldap.org/"))) - -(define openldap-2.4.44 - (package - (inherit openldap) - (replacement #f) - (source - (let ((version "2.4.44")) - (origin - (method url-fetch) - (uri (list (string-append - "ftp://mirror.switch.ch/mirror/OpenLDAP/" - "openldap-release/openldap-" version ".tgz") - (string-append - "ftp://ftp.OpenLDAP.org/pub/OpenLDAP/" - "openldap-release/openldap-" version ".tgz") - (string-append - "ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/" - "openldap-release/openldap-" version ".tgz"))) - (sha256 - (base32 - "0044p20hx07fwgw2mbwj1fkx04615hhs1qyx4mawj2bhqvrnppnp"))))))) -- cgit v1.2.3 From 2135d1eb3faa061bcdceaf174bba4334770d44d4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 17 May 2016 09:45:06 +0200 Subject: gnu: gdbm: Update to 1.12. * gnu/packages/databases.scm (gdbm): Update to 1.12. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 1606721368..a7f3837161 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -114,14 +114,14 @@ either single machines or networked clusters.") (define-public gdbm (package (name "gdbm") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdbm/gdbm-" version ".tar.gz")) (sha256 (base32 - "1hz3jgh3pd4qzp6jy0l8pd8x01g9abw7csnrlnj1a2sxy122z4cd")))) + "1smwz4x5qa4js0zf1w3asq6z7mh20zlgwbh2bk5dczw6xrk22yyr")))) (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/gdbm/") -- cgit v1.2.3 From 74d637397b44a90d2dbc2ac100b38591dd4f81eb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 17 May 2016 10:46:26 +0200 Subject: gnu: tar: Update to 1.29. * gnu/packages/base.scm (tar): Update to 1.29. [source]: Remove 'tar-d_ino_in_dirent-fix.patch'. [arguments]: New field. * gnu/packages/patches/tar-d_ino_in_dirent-fix.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/base.scm | 18 +++++++++--- gnu/packages/patches/tar-d_ino_in_dirent-fix.patch | 33 ---------------------- 3 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/tar-d_ino_in_dirent-fix.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 8cf5ef5c99..a1700a5e23 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -721,7 +721,6 @@ dist_patch_DATA = \ gnu/packages/patches/sudo-CVE-2015-5602.patch \ gnu/packages/patches/superlu-dist-scotchmetis.patch \ gnu/packages/patches/synfig-build-fix.patch \ - gnu/packages/patches/tar-d_ino_in_dirent-fix.patch \ gnu/packages/patches/tar-skip-unreliable-tests.patch \ gnu/packages/patches/tcl-mkindex-deterministic.patch \ gnu/packages/patches/tclxml-3.2-install.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 0d12376057..f5da787d6b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -137,17 +137,27 @@ implementation offers several extensions over the standard utility.") (define-public tar (package (name "tar") - (version "1.28") + (version "1.29") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/tar/tar-" version ".tar.xz")) (sha256 (base32 - "1wi2zwm4c9r3h3b8y4w0nm0qq897kn8kyj9k22ba0iqvxj48vvk4")) - (patches (search-patches "tar-d_ino_in_dirent-fix.patch" - "tar-skip-unreliable-tests.patch")))) + "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0")) + (patches (search-patches "tar-skip-unreliable-tests.patch")))) (build-system gnu-build-system) + ;; Note: test suite requires ~1GiB of disk space. + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'build 'set-shell-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Do not use "/bin/sh" to run programs. + (let ((bash (assoc-ref inputs "bash"))) + (substitute* "src/system.c" + (("/bin/sh") + (string-append bash "/bin/sh"))) + #t)))))) (synopsis "Managing tar archives") (description "Tar provides the ability to create tar archives, as well as the diff --git a/gnu/packages/patches/tar-d_ino_in_dirent-fix.patch b/gnu/packages/patches/tar-d_ino_in_dirent-fix.patch deleted file mode 100644 index 39d8e2b20a..0000000000 --- a/gnu/packages/patches/tar-d_ino_in_dirent-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit e9ddc08da0982f36581ae5a8c7763453ff41cfe8 -Author: Sergey Poznyakoff -Date: Thu Sep 25 00:22:16 2014 +0300 - - Bugfixes. - - * doc/tar.1: Fix typo in font spec. - * src/tar.c (sort_mode_arg, sort_mode_flag): Protect "inode" - (SAVEDIR_SORT_INODE) with D_INO_IN_DIRENT - -diff --git a/src/tar.c b/src/tar.c -index 225c624..f8102e0 100644 ---- a/src/tar.c -+++ b/src/tar.c -@@ -1341,14 +1341,18 @@ static char filename_terminator; - static char const *const sort_mode_arg[] = { - "none", - "name", -+#if D_INO_IN_DIRENT - "inode", -+#endif - NULL - }; - - static int sort_mode_flag[] = { - SAVEDIR_SORT_NONE, - SAVEDIR_SORT_NAME, -+#if D_INO_IN_DIRENT - SAVEDIR_SORT_INODE -+#endif - }; - - ARGMATCH_VERIFY (sort_mode_arg, sort_mode_flag); \ No newline at end of file -- cgit v1.2.3 From c19700c396f66426d7ec4cea01ef19614775ce88 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 May 2016 17:06:29 +0300 Subject: gnu: gnutls: Update to 3.5.0. * gnu/packages/tls.scm (gnutls): Update to 3.5.0. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 8ec8e603a9..430540493c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -108,7 +108,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.4.9") + (version "3.5.0") (source (origin (method url-fetch) (uri @@ -119,7 +119,7 @@ living in the same process.") "/gnutls-" version ".tar.xz")) (sha256 (base32 - "0gvwyl0kdp1qpzbzp46wqfdzzrmwy9n54sgcjvvm1m1kpanlyna8")))) + "09dfb0fn4spmdja6hs2yl470fn85fx0pa5nn9njnq7j19ma3nszw")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -169,7 +169,7 @@ living in the same process.") ("libidn" ,libidn) ("nettle" ,nettle) ("zlib" ,zlib))) - (home-page "http://www.gnu.org/software/gnutls/") + (home-page "https://www.gnu.org/software/gnutls/") (synopsis "Transport layer security library") (description "GnuTLS is a secure communications library implementing the SSL, TLS -- cgit v1.2.3 From 45ff4b568d5adac1ba0185055844517af3c9b318 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 May 2016 17:07:47 +0300 Subject: gnu: sqlite: Update to 3.12.2. * gnu/packages/databases.scm (sqlite): Update to 3.12.2. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a7f3837161..6bf829f9d9 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -408,7 +408,7 @@ types are supported, as is encryption.") (define-public sqlite (package (name "sqlite") - (version "3.11.1") + (version "3.12.2") (source (origin (method url-fetch) ;; TODO: Download from sqlite.org once this bug : @@ -439,7 +439,7 @@ types are supported, as is encryption.") )) (sha256 (base32 - "0xs3gl3kbxqfx2ahrymgcf2n8c8sy37724jr05pncbhw4z8g2gsk")))) + "1fwss0i2lixv39b27gkqiibdd2syym90wh3qbiaxnfgxk867f07x")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 12b6f6527e49c8c4191929a72b1692dbd9eb2440 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 May 2016 12:49:24 -0400 Subject: gnu: openssl: Remove workaround for GCC 4.9.3 (no longer used). * gnu/packages/tls.scm (openssl)[arguments]: In the 'configure' phase, remove the workaround that passed "-mfpu=vfpv3" on armhf systems. --- gnu/packages/tls.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 430540493c..35bd64faa9 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -237,15 +237,7 @@ required structures.") (string-append "--openssldir=" out "/share/openssl-" ,version) - (string-append "--prefix=" out) - - ;; XXX FIXME: Work around a code generation bug in GCC - ;; 4.9.3 on ARM when compiled with -mfpu=neon. See: - ;; - ,@(if (and (not (%current-target-system)) - (string-prefix? "armhf" (%current-system))) - '("-mfpu=vfpv3") - '())))))) + (string-append "--prefix=" out)))))) (add-after 'install 'make-libraries-writable (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 2cf0221f0e5d380ca164a2e89f5da6980ea40731 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 23 May 2016 15:02:55 +0200 Subject: gnu: pcre: Remove now-unneeded replacement. * gnu/packages/pcre.scm (pcre)[replacement]: Remove. (pcre-fixed): Remove. --- gnu/packages/pcre.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 42a6a9b0c4..aea7d6fcb3 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -31,7 +31,6 @@ (package (name "pcre") (version "8.38") - (replacement pcre-fixed) (source (origin (method url-fetch) (uri (list @@ -70,13 +69,6 @@ POSIX regular expression API.") (license license:bsd-3) (home-page "http://www.pcre.org/"))) -(define pcre-fixed ;for CVE-2016-3191 - (package - (inherit pcre) - (source (origin - (inherit (package-source pcre)) - (patches (search-patches "pcre-CVE-2016-3191.patch")))))) - (define-public pcre2 (package (name "pcre2") -- cgit v1.2.3 From 5d4d7a9aa9d76b7c626c50f3d07d9a03770981e3 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Thu, 2 Jun 2016 12:36:05 +0300 Subject: gnu: glibc-hurd: Update to 20160518. * gnu/packages/base.scm (glibc/hurd)[version]: Update to version 20160518. [propagated-inputs]: Use hurd-core-headers. [native-inputs]: Remove libpthread's source and "patch/libpthread-patch". [arguments]: Add augment-libc.so and pre-configure-set-pwd phases. Remove prepare-libpthread phase. Stop removing "--with-headers=" from original-configure-flags. * gnu/packages/patches/glibc-hurd-extern-inline.patch: Remove patch. * gnu/packages/patches/libpthread-glibc-preparation.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 2 - gnu/packages/base.scm | 74 +++++------ .../patches/glibc-hurd-extern-inline.patch | 35 ----- .../patches/libpthread-glibc-preparation.patch | 146 --------------------- 4 files changed, 32 insertions(+), 225 deletions(-) delete mode 100644 gnu/packages/patches/glibc-hurd-extern-inline.patch delete mode 100644 gnu/packages/patches/libpthread-glibc-preparation.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0287befd22..641963daf2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -502,7 +502,6 @@ dist_patch_DATA = \ gnu/packages/patches/glib-networking-ssl-cert-file.patch \ gnu/packages/patches/glib-tests-timer.patch \ gnu/packages/patches/glibc-bootstrap-system.patch \ - gnu/packages/patches/glibc-hurd-extern-inline.patch \ gnu/packages/patches/glibc-ldd-x86_64.patch \ gnu/packages/patches/glibc-locales.patch \ gnu/packages/patches/glibc-o-largefile.patch \ @@ -601,7 +600,6 @@ dist_patch_DATA = \ gnu/packages/patches/libxslt-generated-ids.patch \ gnu/packages/patches/libxslt-remove-date-timestamps.patch \ gnu/packages/patches/lirc-localstatedir.patch \ - gnu/packages/patches/libpthread-glibc-preparation.patch \ gnu/packages/patches/lm-sensors-hwmon-attrs.patch \ gnu/packages/patches/lua-pkgconfig.patch \ gnu/packages/patches/lua51-liblua-so.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f5da787d6b..b7ab7f14ce 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -761,66 +761,56 @@ command.") ;; The Hurd's libc variant. (package (inherit glibc) (name "glibc-hurd") - (version "2.18") + (version "2.19") (source (origin - (method git-fetch) - (uri (git-reference - (url "git://git.sv.gnu.org/hurd/glibc") - (commit "cc94b3cfe65523f980359e5f0e93a26196bda1d3"))) + (method url-fetch) + (uri (string-append "http://alpha.gnu.org/gnu/hurd/glibc-" + version "-hurd+libpthread-20160518" ".tar.gz")) (sha256 (base32 - "17gsh0kaz0zyvghjmx861mi2p65m9901lngi179x61zm6v2v3xc4")) - (file-name (string-append name "-" version)) - (patches (search-patches "glibc-hurd-extern-inline.patch")))) + "12zmdjviybpsdb2kq4cg98rds7909f0cc96fzdahdfrzlxx1q0px")))) ;; Libc provides , which includes a bunch of Hurd and Mach headers, ;; so both should be propagated. - (propagated-inputs `(("gnumach-headers" ,gnumach-headers) - ("hurd-headers" ,hurd-headers) - ("hurd-minimal" ,hurd-minimal))) + (propagated-inputs `(("hurd-core-headers" ,hurd-core-headers))) (native-inputs `(,@(package-native-inputs glibc) - ("patch/libpthread-patch" ,(search-patch "libpthread-glibc-preparation.patch")) ("mig" ,mig) - ("perl" ,perl) - ("libpthread" ,(origin - (method git-fetch) - (uri (git-reference - (url "git://git.sv.gnu.org/hurd/libpthread") - (commit "0ef7b75c4ba91b6660f0d3d8b51d14d25e3d5bfb"))) - (sha256 - (base32 - "031py18fls15z0wprni33mf762kg6fx8xqijppimhp83yp6ky3l3")) - (file-name "libpthread"))))) + ("perl" ,perl))) (arguments (substitute-keyword-arguments (package-arguments glibc) - ((#:configure-flags original-configure-flags) - `(append (list "--host=i686-pc-gnu" + ((#:phases original-phases) + ;; Add libmachuser.so and libhurduser.so to libc.so's search path. + ;; See . + `(alist-cons-after + 'install 'augment-libc.so + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/lib/libc.so") + (("/[^ ]+/lib/libc.so.0.3") + (string-append out "/lib/libc.so.0.3" " libmachuser.so" " libhurduser.so")))) + #t) + (alist-cons-after + 'pre-configure 'pre-configure-set-pwd + (lambda _ + ;; Use the right 'pwd'. + (substitute* "configure" + (("/bin/pwd") "pwd"))) + ,original-phases))) + ((#:configure-flags original-configure-flags) + `(append (list "--host=i586-pc-gnu" + + ;; We need this to get a working openpty() function. + "--enable-pt_chown" ;; nscd fails to build for GNU/Hurd: ;; . ;; Disable it. "--disable-nscd") (filter (lambda (flag) - (not (or (string-prefix? "--with-headers=" flag) - (string-prefix? "--enable-kernel=" flag)))) - ;; Evaluate 'original-configure-flags' in a - ;; lexical environment that has a dummy - ;; "linux-headers" input, to prevent errors. - (let ((%build-inputs `(("linux-headers" . "@DUMMY@") - ,@%build-inputs))) - ,original-configure-flags)))) - ((#:phases phases) - `(alist-cons-after - 'unpack 'prepare-libpthread - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "libpthread") "libpthread") - - (system* "patch" "--force" "-p1" "-i" - (assoc-ref inputs "patch/libpthread-patch")) - #t) - ,phases)))) + (not (string-prefix? "--enable-kernel=" flag))) + ,original-configure-flags))))) (synopsis "The GNU C Library (GNU Hurd variant)") (supported-systems %hurd-systems))) diff --git a/gnu/packages/patches/glibc-hurd-extern-inline.patch b/gnu/packages/patches/glibc-hurd-extern-inline.patch deleted file mode 100644 index a609b1f54a..0000000000 --- a/gnu/packages/patches/glibc-hurd-extern-inline.patch +++ /dev/null @@ -1,35 +0,0 @@ -This changes the way _EXTERN_INLINE is defined so we can -avoid external definition errors. -https://lists.gnu.org/archive/html/bug-hurd/2014-04/msg00002.html - -diff --git a/signal/sigsetops.c b/signal/sigsetops.c -index 0317662..b92c296 100644 ---- a/signal/sigsetops.c -+++ b/signal/sigsetops.c -@@ -3,7 +3,9 @@ - - #include - --#define _EXTERN_INLINE -+#ifndef _EXTERN_INLINE -+#define _EXTERN_INLINE __extern_inline -+#endif - #ifndef __USE_EXTERN_INLINES - # define __USE_EXTERN_INLINES 1 - #endif - -Link libmachuser and libhurduser automatically with libc, since they are -considered a standard part of the API in GNU-land. - ---- a/Makerules -+++ b/Makerules -@@ -978,6 +978,9 @@ - '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\ - ' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \ - ) > $@.new -+ifeq ($(patsubst gnu%,,$(config-os)),) -+ echo 'INPUT ( AS_NEEDED ( -lmachuser -lhurduser ) )' >> $@.new -+endif - mv -f $@.new $@ - - endif \ No newline at end of file diff --git a/gnu/packages/patches/libpthread-glibc-preparation.patch b/gnu/packages/patches/libpthread-glibc-preparation.patch deleted file mode 100644 index a43245436c..0000000000 --- a/gnu/packages/patches/libpthread-glibc-preparation.patch +++ /dev/null @@ -1,146 +0,0 @@ -This patch helps to integrate the Hurd's libpthread as a libc add-on. - -It writes the configure file, removes an rpc call not yet -implemented on the version of gnumach we use and defines -a missing macro. - -diff --git a/libpthread/configure b/libpthread/configure -new file mode 100644 -index 0000000..2cdbc71 ---- /dev/null -+++ b/libpthread/configure -@@ -0,0 +1,2 @@ -+libc_add_on_canonical=libpthread -+libc_add_on_subdirs=. --- -1.9.0 - -We are using a version of GNU Mach that lacks 'thread_terminate_release' -(not introduced yet). The 'thread_terminate' RPC call will be enough for -our needs. -See . - -diff --git a/libpthread/sysdeps/mach/pt-thread-terminate.c b/libpthread/sysdeps/mach/pt-thread-terminate.c -index 6672065..129a611 100644 ---- a/libpthread/sysdeps/mach/pt-thread-terminate.c -+++ b/libpthread/sysdeps/mach/pt-thread-terminate.c -@@ -70,9 +70,9 @@ __pthread_thread_terminate (struct __pthread *thread) - __mach_port_destroy (__mach_task_self (), wakeup_port); - - /* Terminate and release all that's left. */ -- err = __thread_terminate_release (kernel_thread, mach_task_self (), -- kernel_thread, reply_port, -- stackaddr, stacksize); -+ /* err = __thread_terminate_release (kernel_thread, mach_task_self (), */ -+ /* kernel_thread, reply_port, */ -+ /* stackaddr, stacksize); */ - - /* The kernel does not support it yet. Leak but at least terminate - correctly. */ --- -1.9.2 - -The __PTHREAD_SPIN_LOCK_INITIALIZER definition is missing, so we -define it to __SPIN_LOCK_INITIALIZER which already exists. -See . - -diff --git a/libpthread/sysdeps/mach/bits/spin-lock.h b/libpthread/sysdeps/mach/bits/spin-lock.h -index 537dac9..fca0e5a 100644 ---- a/libpthread/sysdeps/mach/bits/spin-lock.h -+++ b/libpthread/sysdeps/mach/bits/spin-lock.h -@@ -30,7 +30,7 @@ typedef __spin_lock_t __pthread_spinlock_t; - - /* Initializer for a spin lock object. */ - #ifndef __PTHREAD_SPIN_LOCK_INITIALIZER --#error __PTHREAD_SPIN_LOCK_INITIALIZER undefined: should be defined by . -+#define __PTHREAD_SPIN_LOCK_INITIALIZER __SPIN_LOCK_INITIALIZER - #endif - - __END_DECLS - -The version of the glibc we use doesn't include the shm-directory.c file and does -not yet support IS_IN. -See - -diff --git a/libpthread/Makefile b/libpthread/Makefile -index 2906788..b8dee58 100644 ---- a/libpthread/Makefile -+++ b/libpthread/Makefile -@@ -149,8 +149,6 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ - sem-post sem-timedwait sem-trywait sem-unlink \ - sem-wait \ - \ -- shm-directory \ -- \ - cthreads-compat \ - $(SYSDEPS) - --- -2.3.6 - -diff --git a/libpthread/pthread/pt-create.c b/libpthread/pthread/pt-create.c -index d88afae..84044dc 100644 ---- a/libpthread/pthread/pt-create.c -+++ b/libpthread/pthread/pt-create.c -@@ -28,7 +28,7 @@ - - #include - --#if IS_IN (libpthread) -+#ifdef IS_IN_libpthread - # include - #endif - #ifdef HAVE_USELOCALE -@@ -50,7 +50,7 @@ entry_point (struct __pthread *self, void *(*start_routine)(void *), void *arg) - __resp = &self->res_state; - #endif - --#if IS_IN (libpthread) -+#ifdef IS_IN_libpthread - /* Initialize pointers to locale data. */ - __ctype_init (); - #endif -diff --git a/libpthread/pthread/pt-initialize.c b/libpthread/pthread/pt-initialize.c -index 9e5404b..b9cacbd 100644 ---- a/libpthread/pthread/pt-initialize.c -+++ b/libpthread/pthread/pt-initialize.c -@@ -28,7 +28,7 @@ - - DEFINE_HOOK (__pthread_init, (void)); - --#if IS_IN (libpthread) -+#ifdef IS_IN_libpthread - static const struct pthread_functions pthread_functions = - { - .ptr_pthread_attr_destroy = __pthread_attr_destroy, -@@ -81,7 +81,7 @@ static const struct pthread_functions pthread_functions = - void - ___pthread_init (void) - { --#if IS_IN (libpthread) -+#ifdef IS_IN_libpthread - __libc_pthread_init(&pthread_functions); - #endif - RUN_HOOK (__pthread_init, ()); -diff --git a/libpthread/pthread/pt-internal.h b/libpthread/pthread/pt-internal.h -index 18b5b4c..8cdcfce 100644 ---- a/libpthread/pthread/pt-internal.h -+++ b/libpthread/pthread/pt-internal.h -@@ -35,7 +35,7 @@ - #include - #include - --#if IS_IN (libpthread) -+#ifdef IS_IN_libpthread - # include - #endif - -@@ -60,7 +60,7 @@ enum pthread_state - # define PTHREAD_SYSDEP_MEMBERS - #endif - --#if !(IS_IN (libpthread)) -+#ifndef IS_IN_libpthread - #ifdef ENABLE_TLS - /* Type of the TCB. */ - typedef struct -- cgit v1.2.3 From aa81eb73ce6ee59c078331c709d553130e0443d3 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Thu, 2 Jun 2016 12:49:30 +0300 Subject: gnu: glibc-hurd-headers: Use correct "--host". * gnu/packages/base.scm (glibc/hurd-headers)[arguments]: Use "i586-pc-gnu" instead of "i686-pc-gnu". --- gnu/packages/base.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index b7ab7f14ce..689ab2d3c3 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -825,7 +825,7 @@ command.") ;; We just pass the flags really needed to build the headers. ((#:configure-flags _) `(list "--enable-add-ons" - "--host=i686-pc-gnu" + "--host=i586-pc-gnu" "--enable-obsolete-rpc")) ((#:phases _) '(alist-replace -- cgit v1.2.3 From 9dee9e8ffe4650949bd3ad2edf559cf4a33e9e6e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 Jun 2016 10:52:04 +0200 Subject: Revert "gnu: Default to GCC 5." This reverts commit e3d0fcbf7e55e8cbe8d0a1c5a24d73f341d7243b. This is a temporary measure until GCC 5 builds on ARM, see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71399 --- gnu/local.mk | 1 - gnu/packages/commencement.scm | 33 +++++----------------- gnu/packages/gcc.scm | 5 ++-- .../patches/gcc-libiberty-printf-decl.patch | 28 ------------------ 4 files changed, 9 insertions(+), 58 deletions(-) delete mode 100644 gnu/packages/patches/gcc-libiberty-printf-decl.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 641963daf2..9121b1df40 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -492,7 +492,6 @@ dist_patch_DATA = \ gnu/packages/patches/gawk-shell.patch \ gnu/packages/patches/gcc-arm-link-spec-fix.patch \ gnu/packages/patches/gcc-cross-environment-variables.patch \ - gnu/packages/patches/gcc-libiberty-printf-decl.patch \ gnu/packages/patches/gcc-libvtv-runpath.patch \ gnu/packages/patches/gcc-5.0-libvtv-runpath.patch \ gnu/packages/patches/gd-CVE-2016-3074.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 5f3faad105..8c82644cc6 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -170,26 +170,6 @@ ,cf))))) (inputs %boot0-inputs)))) -(define libstdc++-boot0 - ;; GCC's libcc1 is always built as a shared library (the top-level - ;; 'Makefile.def' forcefully adds --enable-shared) and thus needs to refer - ;; to libstdc++.so. We cannot build libstdc++-5.3 because it relies on - ;; C++14 features missing in our bootstrap compiler. - (let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc-4.9)))) - (package - (inherit lib) - (name "libstdc++-boot0") - (arguments - `(#:guile ,%bootstrap-guile - #:implicit-inputs? #f - - ;; XXX: libstdc++.so NEEDs ld.so for some reason. - #:validate-runpath? #f - - ,@(package-arguments lib))) - (inputs %boot0-inputs) - (native-inputs '())))) - (define gcc-boot0 (package-with-bootstrap-guile (package (inherit gcc) @@ -275,13 +255,14 @@ ("mpc-source" ,(package-source mpc)) ("binutils-cross" ,binutils-boot0) - ;; The libstdc++ that libcc1 links against. - ("libstdc++" ,libstdc++-boot0) - ;; Call it differently so that the builder can check whether ;; the "libc" input is #f. ("libc-native" ,@(assoc-ref %boot0-inputs "libc")) - ,@(alist-delete "libc" %boot0-inputs)))))) + ,@(alist-delete "libc" %boot0-inputs))) + + ;; No need for Texinfo at this stage. + (native-inputs (alist-delete "texinfo" + (package-native-inputs gcc)))))) (define perl-boot0 (let ((perl (package @@ -901,10 +882,10 @@ and binaries, plus debugging symbols in the 'debug' output), and Binutils.") (gcc-toolchain gcc-4.8)) (define-public gcc-toolchain-4.9 - (gcc-toolchain gcc-4.9)) + (gcc-toolchain gcc-final)) (define-public gcc-toolchain-5 - (gcc-toolchain gcc-final)) + (gcc-toolchain gcc-5)) (define-public gcc-toolchain-6 (gcc-toolchain gcc-6)) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index b8e13f3f8e..1ca8ca0d59 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -352,8 +352,7 @@ Go. It also includes runtime support libraries for these languages.") (sha256 (base32 "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq")) - (patches (search-patches "gcc-5.0-libvtv-runpath.patch" - "gcc-libiberty-printf-decl.patch")))) + (patches (search-patches "gcc-5.0-libvtv-runpath.patch")))) ;; GCC 5 ships with .info files, so no need for Texinfo. (native-inputs '()))) @@ -372,7 +371,7 @@ Go. It also includes runtime support libraries for these languages.") ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions accordingly. -(define-public gcc gcc-5) +(define-public gcc gcc-4.9) (define-public (make-libstdc++ gcc) "Return a libstdc++ package based on GCC. The primary use case is when diff --git a/gnu/packages/patches/gcc-libiberty-printf-decl.patch b/gnu/packages/patches/gcc-libiberty-printf-decl.patch deleted file mode 100644 index a612c9e00e..0000000000 --- a/gnu/packages/patches/gcc-libiberty-printf-decl.patch +++ /dev/null @@ -1,28 +0,0 @@ -This patch makes the exeception specifier of libiberty's 'asprintf' -and 'vasprintf' declarations match those of glibc to work around the -problem described at . - -The problem in part stems from the fact that libiberty is configured -without _GNU_SOURCE (thus, it sets HAVE_DECL_ASPRINTF to 0), whereas libcc1 -is configured and built with _GNU_SOURCE, hence the conflicting declarations. - ---- gcc-5.3.0/include/libiberty.h 2016-04-23 22:45:46.262709079 +0200 -+++ gcc-5.3.0/include/libiberty.h 2016-04-23 22:45:37.110635439 +0200 -@@ -625,7 +625,7 @@ extern int pwait (int, int *, int); - /* Like sprintf but provides a pointer to malloc'd storage, which must - be freed by the caller. */ - --extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2; -+extern int asprintf (char **, const char *, ...) __THROWNL ATTRIBUTE_PRINTF_2; - #endif - - /* Like asprintf but allocates memory without fail. This works like -@@ -637,7 +637,7 @@ extern char *xasprintf (const char *, .. - /* Like vsprintf but provides a pointer to malloc'd storage, which - must be freed by the caller. */ - --extern int vasprintf (char **, const char *, va_list) ATTRIBUTE_PRINTF(2,0); -+extern int vasprintf (char **, const char *, va_list) __THROWNL ATTRIBUTE_PRINTF(2,0); - #endif - - /* Like vasprintf but allocates memory without fail. This works like -- cgit v1.2.3 From 3c9e0ddc6f812006df237950bf00e872056b52e0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 Jun 2016 12:01:33 +0200 Subject: gnu: libxml2: Upgrade to 2.9.4. * gnu/packages/xml.scm (libxml2)[replacement]: Remove. [version, source]: Upgrade to 2.9.4. (libxml2/fixed): Remove. --- gnu/packages/xml.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 5b72c805bd..a860f98053 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -66,15 +66,14 @@ things the parser might find in the XML document (like start tags).") (define-public libxml2 (package (name "libxml2") - (version "2.9.3") - (replacement libxml2/fixed) ;multiple CVEs + (version "2.9.4") (source (origin (method url-fetch) (uri (string-append "ftp://xmlsoft.org/libxml2/libxml2-" version ".tar.gz")) (sha256 (base32 - "0bd17g6znn2r98gzpjppsqjg33iraky4px923j3k8kdl8qgy7sad")))) + "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz")))) (build-system gnu-build-system) (home-page "http://www.xmlsoft.org/") (synopsis "C parser for XML") @@ -94,20 +93,6 @@ things the parser might find in the XML document (like start tags).") project (but it is usable outside of the Gnome platform).") (license license:x11))) -(define libxml2/fixed - (package - (inherit libxml2) - (source - (let ((name "libxml2") - (version "2.9.4")) - (origin - (method url-fetch) - (uri (string-append "ftp://xmlsoft.org/libxml2/libxml2-" - version ".tar.gz")) - (sha256 - (base32 - "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz"))))))) - (define-public python-libxml2 (package (inherit libxml2) (name "python-libxml2") -- cgit v1.2.3 From b09617da042ea6adc819df7a2ee04011133f696b Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Mon, 6 Jun 2016 17:21:51 +0300 Subject: gnu: base: Add glibc-for-target macro. * gnu/packages/base.scm (glibc): Add macro. (glibc/linux): Rename glibc to glibc/linux. (glibc/hurd): Adjust accordingly. --- gnu/packages/base.scm | 132 ++++++++++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 59 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d0ef06209f..74194bccdb 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -44,7 +44,9 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial)) + #:use-module (guix build-system trivial) + #:use-module (ice-9 match) + #:export (glibc)) ;;; Commentary: ;;; @@ -464,7 +466,7 @@ store.") (export make-ld-wrapper) -(define-public glibc +(define-public glibc/linux (package (name "glibc") (version "2.23") @@ -641,6 +643,75 @@ with the Linux kernel.") (license lgpl2.0+) (home-page "http://www.gnu.org/software/libc/"))) +(define-public glibc/hurd + ;; The Hurd's libc variant. + (package (inherit glibc/linux) + (name "glibc-hurd") + (version "2.19") + (source (origin + (method url-fetch) + (uri (string-append "http://alpha.gnu.org/gnu/hurd/glibc-" + version "-hurd+libpthread-20160518" ".tar.gz")) + (sha256 + (base32 + "12zmdjviybpsdb2kq4cg98rds7909f0cc96fzdahdfrzlxx1q0px")))) + + ;; Libc provides , which includes a bunch of Hurd and Mach headers, + ;; so both should be propagated. + (propagated-inputs `(("hurd-core-headers" ,hurd-core-headers))) + (native-inputs + `(,@(package-native-inputs glibc/linux) + ("mig" ,mig) + ("perl" ,perl))) + + (arguments + (substitute-keyword-arguments (package-arguments glibc/linux) + ((#:phases original-phases) + ;; Add libmachuser.so and libhurduser.so to libc.so's search path. + ;; See . + `(alist-cons-after + 'install 'augment-libc.so + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/lib/libc.so") + (("/[^ ]+/lib/libc.so.0.3") + (string-append out "/lib/libc.so.0.3" " libmachuser.so" " libhurduser.so")))) + #t) + (alist-cons-after + 'pre-configure 'pre-configure-set-pwd + (lambda _ + ;; Use the right 'pwd'. + (substitute* "configure" + (("/bin/pwd") "pwd"))) + ,original-phases))) + ((#:configure-flags original-configure-flags) + `(append (list "--host=i586-pc-gnu" + + ;; We need this to get a working openpty() function. + "--enable-pt_chown" + + ;; nscd fails to build for GNU/Hurd: + ;; . + ;; Disable it. + "--disable-nscd") + (filter (lambda (flag) + (not (string-prefix? "--enable-kernel=" flag))) + ,original-configure-flags))))) + (synopsis "The GNU C Library (GNU Hurd variant)") + (supported-systems %hurd-systems))) + +(define* (glibc-for-target #:optional + (target (or (%current-target-system) + (%current-system)))) + "Return the glibc for TARGET, GLIBC/LINUX for a Linux host or +GLIBC/HURD for a Hurd host" + (match target + ((or "i586-pc-gnu" "i586-gnu") glibc/hurd) + (_ glibc/linux))) + +(define-syntax glibc + (identifier-syntax (glibc-for-target))) + (define-public glibc-2.21 ;; The old libc, which we use mostly to build locale data in the old format ;; (which the new libc can cope with.) @@ -760,63 +831,6 @@ variety of options. It is an alternative to the shell \"type\" built-in command.") (license gpl3+))) ; some files are under GPLv2+ -(define-public glibc/hurd - ;; The Hurd's libc variant. - (package (inherit glibc) - (name "glibc-hurd") - (version "2.19") - (source (origin - (method url-fetch) - (uri (string-append "http://alpha.gnu.org/gnu/hurd/glibc-" - version "-hurd+libpthread-20160518" ".tar.gz")) - (sha256 - (base32 - "12zmdjviybpsdb2kq4cg98rds7909f0cc96fzdahdfrzlxx1q0px")))) - - ;; Libc provides , which includes a bunch of Hurd and Mach headers, - ;; so both should be propagated. - (propagated-inputs `(("hurd-core-headers" ,hurd-core-headers))) - (native-inputs - `(,@(package-native-inputs glibc) - ("mig" ,mig) - ("perl" ,perl))) - - (arguments - (substitute-keyword-arguments (package-arguments glibc) - ((#:phases original-phases) - ;; Add libmachuser.so and libhurduser.so to libc.so's search path. - ;; See . - `(alist-cons-after - 'install 'augment-libc.so - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (substitute* (string-append out "/lib/libc.so") - (("/[^ ]+/lib/libc.so.0.3") - (string-append out "/lib/libc.so.0.3" " libmachuser.so" " libhurduser.so")))) - #t) - (alist-cons-after - 'pre-configure 'pre-configure-set-pwd - (lambda _ - ;; Use the right 'pwd'. - (substitute* "configure" - (("/bin/pwd") "pwd"))) - ,original-phases))) - ((#:configure-flags original-configure-flags) - `(append (list "--host=i586-pc-gnu" - - ;; We need this to get a working openpty() function. - "--enable-pt_chown" - - ;; nscd fails to build for GNU/Hurd: - ;; . - ;; Disable it. - "--disable-nscd") - (filter (lambda (flag) - (not (string-prefix? "--enable-kernel=" flag))) - ,original-configure-flags))))) - (synopsis "The GNU C Library (GNU Hurd variant)") - (supported-systems %hurd-systems))) - (define-public glibc/hurd-headers (package (inherit glibc/hurd) (name "glibc-hurd-headers") -- cgit v1.2.3 From 26a28c8ae882a6a8e8f295028cec8839a0a0d74c Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Tue, 7 Jun 2016 15:01:22 +0300 Subject: gnu: gnumach-headers: Use "--build=i586-pc-gnu" only when not cross-building. * gnu/packages/hurd.scm (gnumach-headers)[arguments]: Use "--build=i586-pc-gnu" only when not cross-building. --- gnu/packages/hurd.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 2b2e162107..fc47ee9d97 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -55,7 +55,11 @@ ;; GNU Mach supports only IA32 currently, so cheat so that we can at ;; least install its headers. - #:configure-flags '("--build=i686-pc-gnu") + ,@(if (%current-target-system) + '() + ;; See + ;; + '(#:configure-flags '("--build=i586-pc-gnu"))) #:tests? #f)) (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html") -- cgit v1.2.3 From 6648cf63250746a8985bdfe50f77bde6359241e5 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Tue, 7 Jun 2016 21:26:22 +0300 Subject: gnu: hurd-headers: Use "--host=i586-pc-gnu" only when not cross-building. * gnu/packages/hurd.scm (hurd-headers)[arguments]: Use "--host=i586-pc-gnu" only when not cross-building. --- gnu/packages/hurd.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index fc47ee9d97..d48facb004 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -126,7 +126,9 @@ communication.") #:configure-flags '(;; Pretend we're on GNU/Hurd; 'configure' wants ;; that. - "--build=i686-pc-gnu" + ,@(if (%current-target-system) + '() + '("--host=i586-pc-gnu")) ;; Reduce set of dependencies. "--without-parted") -- cgit v1.2.3 From 90b5d00bcb889d274cd9feeaed70725e4120d53f Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Tue, 7 Jun 2016 21:56:03 +0300 Subject: gnu: hurd: Remove inputs no longer needed. * gnu/packages/hurd.scm (hurd-headers, hurd-minimal)[native-inputs]: Remove "autoconf". --- gnu/packages/hurd.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index d48facb004..9eef110901 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -26,7 +26,6 @@ #:use-module (gnu packages flex) #:use-module (gnu packages bison) #:use-module (gnu packages perl) - #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (guix git-download)) @@ -112,11 +111,7 @@ communication.") "1pbc4aqgzxvkgivw80ghp3w755cl0fwxmg357vq7chimj64jk78d")))) (build-system gnu-build-system) (native-inputs - `(;; Autoconf shouldn't be necessary but there seems to be a bug in the - ;; build system triggering its use. - ("autoconf" ,autoconf) - - ("mig" ,mig))) + `(("mig" ,mig))) (arguments `(#:phases (alist-replace 'install @@ -146,8 +141,7 @@ Library and other user programs.") (name "hurd-minimal") (inputs `(("glibc-hurd-headers" ,glibc/hurd-headers))) (native-inputs - `(("autoconf" ,(autoconf-wrapper)) - ("mig" ,mig))) + `(("mig" ,mig))) (arguments `(#:phases (alist-replace -- cgit v1.2.3 From e1ecd50e217ea97bc1183d596a42d8c4f2de34a7 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Tue, 7 Jun 2016 22:16:19 +0300 Subject: gnu: hurd: Move configure flags from "hurd-minimal" to "hurd-headers". * gnu/packages/hurd.scm (hurd-minimal)[arguments]: Move configure-flags from here.. (hurd-headers)[arguments]: ..to here. --- gnu/packages/hurd.scm | 67 ++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 9eef110901..a4c0296b04 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -21,6 +21,7 @@ #:use-module (guix download) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages flex) @@ -126,7 +127,14 @@ communication.") '("--host=i586-pc-gnu")) ;; Reduce set of dependencies. - "--without-parted") + "--without-parted" + "--disable-ncursesw" + "--disable-test" + "--without-libbz2" + "--without-libz" + ;; Skip the clnt_create check because it expects + ;; a working glibc causing a circular dependency. + "ac_cv_search_clnt_create=no") #:tests? #f)) (home-page "http://www.gnu.org/software/hurd/hurd.html") @@ -142,44 +150,27 @@ Library and other user programs.") (inputs `(("glibc-hurd-headers" ,glibc/hurd-headers))) (native-inputs `(("mig" ,mig))) - (arguments - `(#:phases (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; We need to copy libihash.a to the output directory manually, - ;; since there is no target for that in the makefile. - (mkdir-p (string-append out "/include")) - (copy-file "libihash/ihash.h" - (string-append out "/include/ihash.h")) - (mkdir-p (string-append out "/lib")) - (copy-file "libihash/libihash.a" - (string-append out "/lib/libihash.a")) - #t)) - (alist-replace - 'build - (lambda _ - (zero? (system* "make" "-Clibihash" "libihash.a"))) - (alist-cons-before - 'configure 'bootstrap - (lambda _ - (zero? (system* "autoreconf" "-vfi"))) - %standard-phases))) - #:configure-flags '(;; Pretend we're on GNU/Hurd; 'configure' wants - ;; that. - "--host=i686-pc-gnu" - - ;; Reduce set of dependencies. - "--disable-ncursesw" - "--disable-test" - "--without-libbz2" - "--without-libz" - "--without-parted" - ;; Skip the clnt_create check because it expects - ;; a working glibc causing a circular dependency. - "ac_cv_search_clnt_create=no") - #:tests? #f)) + (substitute-keyword-arguments (package-arguments hurd-headers) + ((#:phases _) + '(alist-replace + 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; We need to copy libihash.a to the output directory manually, + ;; since there is no target for that in the makefile. + (mkdir-p (string-append out "/include")) + (copy-file "libihash/ihash.h" + (string-append out "/include/ihash.h")) + (mkdir-p (string-append out "/lib")) + (copy-file "libihash/libihash.a" + (string-append out "/lib/libihash.a")) + #t)) + (alist-replace + 'build + (lambda _ + (zero? (system* "make" "-Clibihash" "libihash.a"))) + %standard-phases))))) (home-page "http://www.gnu.org/software/hurd/hurd.html") (synopsis "GNU Hurd libraries") (description -- cgit v1.2.3 From 36f0c9f2df2a76ae3bc43577b2e5a499ece69dbf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Jun 2016 16:49:14 +0300 Subject: gnu: make: Update to 4.2. * gnu/packages/base.scm (make): Update to 4.2. --- gnu/packages/base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 74194bccdb..502684ff40 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -318,14 +318,14 @@ functionality beyond that which is outlined in the POSIX standard.") (define-public gnu-make (package (name "make") - (version "4.1") + (version "4.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/make/make-" version ".tar.bz2")) (sha256 (base32 - "19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb")) + "0pv5rvz5pp4njxiz3syf786d2xp4j7gzddwjvgw5zmz55yvf6p2f")) (patches (search-patches "make-impure-dirs.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) ; to detect Guile -- cgit v1.2.3 From 99865f6e863c64978379ff5bc741824df61a1614 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Jun 2016 20:46:07 +0300 Subject: gnu: gettext: Update to 0.19.8. * gnu/packages/gettext.scm (gettext): Update to 0.19.8. --- gnu/packages/gettext.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 34338f936b..bf38543178 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -41,14 +41,14 @@ (define-public gnu-gettext (package (name "gettext") - (version "0.19.7") + (version "0.19.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gettext/gettext-" version ".tar.gz")) (sha256 (base32 - "0gy2b2aydj8r0sapadnjw8cmb8j2rynj28d5qs1mfa800njd51jk")))) + "13ylc6n3hsk919c7xl0yyibc3pfddzb53avdykn4hmk8g6yzd91x")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of HTML -- cgit v1.2.3 From bbe032940c1ba4dd4aa0e450b288f7aca1588d90 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 10 Jun 2016 11:25:09 +0200 Subject: gnu: tar: Allow cross-compilation. * gnu/packages/base.scm (tar)[inputs]: New field. --- gnu/packages/base.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 502684ff40..422424cbe8 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -160,6 +160,13 @@ implementation offers several extensions over the standard utility.") (("/bin/sh") (string-append bash "/bin/sh"))) #t)))))) + + ;; When cross-compiling, the 'set-shell-file-name' phase needs to be able + ;; to refer to the target Bash. + (inputs (if (%current-target-system) + `(("bash" ,bash)) + '())) + (synopsis "Managing tar archives") (description "Tar provides the ability to create tar archives, as well as the -- cgit v1.2.3 From 05aa576b378f1d0debb386948857eb451b90b31f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 10 Jun 2016 13:57:14 +0200 Subject: gnu: procmail: Remove unneeded glibc input. * gnu/packages/mail.scm (procmail)[inputs]: Remove GLIBC. --- gnu/packages/mail.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b4563277aa..a1993bc3a5 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2014 Sou Bunnbu @@ -1168,8 +1168,7 @@ deliver it in various ways.") ;; filesystem are performed during 'make install'. However, these ;; are performed before the actual build process. (build-system gnu-build-system) - (inputs `(("glibc" ,glibc) - ("exim" ,exim))) + (inputs `(("exim" ,exim))) (home-page "http://www.procmail.org/") (synopsis "Versatile mail delivery agent (MDA)") (description "Procmail is a mail delivery agent (MDA) featuring support -- cgit v1.2.3 From 8af5cac527eee03005f3809578a0d8258a878f95 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 10 Jun 2016 16:52:50 -0400 Subject: Revert "gnu: openssl: Remove workaround for GCC 4.9.3 (no longer used)." This reverts commit 12b6f6527e49c8c4191929a72b1692dbd9eb2440. --- gnu/packages/tls.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 8895fd774e..45c37f7493 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -237,7 +237,15 @@ required structures.") (string-append "--openssldir=" out "/share/openssl-" ,version) - (string-append "--prefix=" out)))))) + (string-append "--prefix=" out) + + ;; XXX FIXME: Work around a code generation bug in GCC + ;; 4.9.3 on ARM when compiled with -mfpu=neon. See: + ;; + ,@(if (and (not (%current-target-system)) + (string-prefix? "armhf" (%current-system))) + '("-mfpu=vfpv3") + '())))))) (add-after 'install 'make-libraries-writable (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 28b33172c9d67795e3ac641f9230b99905c90664 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 7 Jun 2016 20:42:16 -0400 Subject: gnu: libxslt: Update to 1.1.29. * gnu/packages/patches/libxslt-CVE-2015-7995.patch, gnu/packages/patches/libxslt-remove-date-timestamps.patch: Delete files. * gnu/packages/xml.scm: Update to 1.1.29. [source]: Remove patches. --- gnu/packages/patches/libxslt-CVE-2015-7995.patch | 29 ---------- .../patches/libxslt-remove-date-timestamps.patch | 66 ---------------------- gnu/packages/xml.scm | 8 +-- 3 files changed, 3 insertions(+), 100 deletions(-) delete mode 100644 gnu/packages/patches/libxslt-CVE-2015-7995.patch delete mode 100644 gnu/packages/patches/libxslt-remove-date-timestamps.patch (limited to 'gnu') diff --git a/gnu/packages/patches/libxslt-CVE-2015-7995.patch b/gnu/packages/patches/libxslt-CVE-2015-7995.patch deleted file mode 100644 index f291d5b387..0000000000 --- a/gnu/packages/patches/libxslt-CVE-2015-7995.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard -Date: Thu, 29 Oct 2015 19:33:23 +0800 -Subject: [PATCH] Fix for type confusion in preprocessing attributes - -CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10 -We need to check that the parent node is an element before dereferencing -its namespace ---- - libxslt/preproc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libxslt/preproc.c b/libxslt/preproc.c -index 0eb80a0..7f69325 100644 ---- a/libxslt/preproc.c -+++ b/libxslt/preproc.c -@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) { - } else if (IS_XSLT_NAME(inst, "attribute")) { - xmlNodePtr parent = inst->parent; - -- if ((parent == NULL) || (parent->ns == NULL) || -+ if ((parent == NULL) || -+ (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) || - ((parent->ns != inst->ns) && - (!xmlStrEqual(parent->ns->href, inst->ns->href))) || - (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) { --- -2.6.3 - diff --git a/gnu/packages/patches/libxslt-remove-date-timestamps.patch b/gnu/packages/patches/libxslt-remove-date-timestamps.patch deleted file mode 100644 index 51470d0847..0000000000 --- a/gnu/packages/patches/libxslt-remove-date-timestamps.patch +++ /dev/null @@ -1,66 +0,0 @@ -Use deterministic SOURCE_DATE_EPOCH for embedded timestamps in generated documentation. - -Written by Eduard Sanou. - -https://bugzilla.gnome.org/show_bug.cgi?id=758148 - ---- libxslt-1.1.28.orig/libexslt/date.c -+++ libxslt-1.1.28/libexslt/date.c -@@ -46,6 +46,7 @@ - #include "exslt.h" - - #include -+#include - - #ifdef HAVE_MATH_H - #include -@@ -747,21 +748,46 @@ static exsltDateValPtr - exsltDateCurrent (void) - { - struct tm localTm, gmTm; -+ struct tm *tb = NULL; - time_t secs; - int local_s, gm_s; - exsltDateValPtr ret; -+ char *source_date_epoch; - - ret = exsltDateCreateDate(XS_DATETIME); - if (ret == NULL) - return NULL; - -- /* get current time */ - secs = time(NULL); -+ /* -+ * Allow the date and time to be set externally by an exported -+ * environment variable to enable reproducible builds. -+ */ -+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ if (source_date_epoch) { -+ errno = 0; -+ secs = (time_t) strtol (source_date_epoch, NULL, 10); -+ if (errno == 0) { -+ tb = gmtime(&secs); -+ if (tb == NULL) { -+ /* SOURCE_DATE_EPOCH is not a valid date */ -+ return NULL; -+ } else { -+ localTm = *tb; -+ } -+ } else { -+ /* SOURCE_DATE_EPOCH is not a valid number */ -+ return NULL; -+ } -+ } else { -+ /* get current time */ - #if HAVE_LOCALTIME_R -- localtime_r(&secs, &localTm); -+ localtime_r(&secs, &localTm); - #else -- localTm = *localtime(&secs); -+ localTm = *localtime(&secs); - #endif -+ } -+ - - /* get real year, not years since 1900 */ - ret->value.date.year = localTm.tm_year + 1900; diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index e0d795b62f..e2d031dbd3 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -130,17 +130,15 @@ project (but it is usable outside of the Gnome platform).") (define-public libxslt (package (name "libxslt") - (version "1.1.28") + (version "1.1.29") (source (origin (method url-fetch) (uri (string-append "ftp://xmlsoft.org/libxslt/libxslt-" version ".tar.gz")) (sha256 (base32 - "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz")) - (patches (search-patches "libxslt-generated-ids.patch" - "libxslt-remove-date-timestamps.patch" - "libxslt-CVE-2015-7995.patch")))) + "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm")) + (patches (search-patches "libxslt-generated-ids.patch")))) (build-system gnu-build-system) (home-page "http://xmlsoft.org/XSLT/index.html") (synopsis "C library for applying XSLT stylesheets to XML documents") -- cgit v1.2.3 From 809f17628ffcac04bf7b194c6ee5ef0c872db73d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jun 2016 09:41:48 +0200 Subject: gnu: swig: Adjust to pcre output split. This fixes a regression introduced in commit 6d49ca3bad613700b539c30272e164207455735b. * gnu/packages/swig.scm (swig)[native-inputs]: Add pcre:bin. [inputs]: Remove pcre. --- gnu/packages/swig.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index 273d0c48b1..6a66a71f1b 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2015 Ludovic Courtès +;;; Copyright © 2013, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -41,10 +41,9 @@ (base32 "0g1a69vrqxgsnr1wkx851ljn73a2x3jqzxa66s2l3w0kyblbjk4z")))) (build-system gnu-build-system) - (native-inputs `(("boost" ,boost))) - (inputs `(("pcre" ,pcre) - - ;; Provide these to run the corresponding tests. + (native-inputs `(("boost" ,boost) + ("pcre" ,pcre "bin"))) ;for 'pcre-config' + (inputs `(;; Provide these to run the corresponding tests. ("guile" ,guile-2.0) ("perl" ,perl))) ;; FIXME: reactivate input python as soon as the test failures -- cgit v1.2.3 From 9f44dfc077e68308d80c4ddc684015edf4d9aa5f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Jun 2016 13:11:51 +0200 Subject: build: Update list of libxslt patches. * gnu/local.mk (dist_patch_DATA): Remove libxslt-CVE-2015-7995.patch, unneeded since 28b33172c9d67795e3ac641f9230b99905c90664. Re-add libxslt-generated-ids.patch. --- gnu/local.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 15c5138679..b734576b6e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -626,7 +626,7 @@ dist_patch_DATA = \ %D%/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch \ %D%/packages/patches/libwmf-CVE-2015-4695.patch \ %D%/packages/patches/libwmf-CVE-2015-4696.patch \ - %D%/packages/patches/libxslt-CVE-2015-7995.patch \ + %D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ %D%/packages/patches/lua-CVE-2014-5461.patch \ -- cgit v1.2.3 From 28206a8ebfad9f6cfa786d3cfd00ee1c1dfbbc65 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 14 Jun 2016 09:41:38 +0200 Subject: gnu: automake: Adjust test to ignore new gzip warnings. * gnu/packages/patches/automake-test-gzip-warning.patch: New file. * gnu/packages/autotools.scm (automake)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/autotools.scm | 3 ++- gnu/packages/patches/automake-test-gzip-warning.patch | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/automake-test-gzip-warning.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index b734576b6e..cdb76cb5f0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -435,6 +435,7 @@ dist_patch_DATA = \ %D%/packages/patches/audacity-fix-ffmpeg-binding.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ %D%/packages/patches/automake-regexp-syntax.patch \ + %D%/packages/patches/automake-test-gzip-warning.patch \ %D%/packages/patches/avahi-localstatedir.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/avrdude-fix-libusb.patch \ diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index de7f1f6d15..21ed0e6179 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -218,7 +218,8 @@ output is indexed in many ways to simplify browsing.") "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r")) (patches (search-patches "automake-regexp-syntax.patch" - "automake-skip-amhello-tests.patch")))) + "automake-skip-amhello-tests.patch" + "automake-test-gzip-warning.patch")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,(autoconf-wrapper)) diff --git a/gnu/packages/patches/automake-test-gzip-warning.patch b/gnu/packages/patches/automake-test-gzip-warning.patch new file mode 100644 index 0000000000..bcc9c207ae --- /dev/null +++ b/gnu/packages/patches/automake-test-gzip-warning.patch @@ -0,0 +1,17 @@ +Adjust test to ignore gzip 1.8+ warnings. + +--- automake-1.15/t/distcheck-no-prefix-or-srcdir-override.sh 2016-06-14 00:36:26.554218552 +0200 ++++ automake-1.15/t/distcheck-no-prefix-or-srcdir-override.sh 2016-06-14 00:37:52.903157770 +0200 +@@ -49,7 +49,11 @@ grep "cannot find sources.* in foobar" s + + ./configure + run_make -E -O distcheck +-test ! -s stderr ++ ++# Gzip 1.8+ emits warnings like "gzip: warning: GZIP environment ++# variable is deprecated"; filter them out. ++test `grep -v '^gzip: warning' stderr | wc -l` -eq 0 ++ + # Sanity check: the flags have been actually seen. + $PERL -e 'undef $/; $_ = <>; s/ \\\n/ /g; print;' t + grep '/configure .* --srcdir am-src' t || exit 99 -- cgit v1.2.3 From f828ff5b148e4e083001c25d2e9c3b52c0e87da3 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 8 Jun 2016 12:07:39 -0400 Subject: gnu: boost: Allow for customizable build flags. * gnu/packages/boost.scm (boost)[arguments]: Extract build flags to #:make-flags argument. --- gnu/packages/boost.scm | 80 +++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 0a644e8940..882f9cc7c0 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -51,50 +51,50 @@ ("python" ,python-2) ("tcsh" ,tcsh))) (arguments - (let ((build-flags - `("threading=multi" "link=shared" + `(#:tests? #f + #:make-flags + (list "threading=multi" "link=shared" - ;; Set the RUNPATH to $libdir so that the libs find each other. - (string-append "linkflags=-Wl,-rpath=" - (assoc-ref outputs "out") "/lib") + ;; Set the RUNPATH to $libdir so that the libs find each other. + (string-append "linkflags=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") - ;; Boost's 'context' library is not yet supported on mips64, so - ;; we disable it. The 'coroutine' library depends on 'context', - ;; so we disable that too. - ,@(if (string-prefix? "mips64" (or (%current-target-system) - (%current-system))) - '("--without-context" - "--without-coroutine" "--without-coroutine2") - '())))) - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* '("libs/config/configure" - "libs/spirit/classic/phoenix/test/runtest.sh" - "tools/build/doc/bjam.qbk" - "tools/build/src/engine/execunix.c" - "tools/build/src/engine/Jambase" - "tools/build/src/engine/jambase.c") - (("/bin/sh") (which "sh"))) + ;; Boost's 'context' library is not yet supported on mips64, so + ;; we disable it. The 'coroutine' library depends on 'context', + ;; so we disable that too. + ,@(if (string-prefix? "mips64" (or (%current-target-system) + (%current-system))) + '("--without-context" + "--without-coroutine" "--without-coroutine2") + '())) + #:phases + (modify-phases %standard-phases + (replace + 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* '("libs/config/configure" + "libs/spirit/classic/phoenix/test/runtest.sh" + "tools/build/doc/bjam.qbk" + "tools/build/src/engine/execunix.c" + "tools/build/src/engine/Jambase" + "tools/build/src/engine/jambase.c") + (("/bin/sh") (which "sh"))) - (setenv "SHELL" (which "sh")) - (setenv "CONFIG_SHELL" (which "sh")) + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) - (zero? (system* "./bootstrap.sh" - (string-append "--prefix=" out) - "--with-toolset=gcc"))))) - (replace - 'build - (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "./b2" ,@build-flags)))) - (replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "./b2" "install" ,@build-flags)))))))) + (zero? (system* "./bootstrap.sh" + (string-append "--prefix=" out) + "--with-toolset=gcc"))))) + (replace + 'build + (lambda* (#:key outputs make-flags #:allow-other-keys) + (zero? (apply system* "./b2" make-flags)))) + (replace + 'install + (lambda* (#:key outputs make-flags #:allow-other-keys) + (zero? (apply system* "./b2" "install" make-flags))))))) (home-page "http://boost.org") (synopsis "Peer-reviewed portable C++ source libraries") -- cgit v1.2.3 From a083b5cb21f18e124460f887cb0eee8aca28d6cd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 14 Jun 2016 21:20:30 +0200 Subject: gnu: mit-krb5: Disable parallel build and testing. * gnu/packages/mit-krb5.scm (mit-krb5)[arguments]: Pass #:parallel-build? #f and #:parallel-tests? #f. --- gnu/packages/mit-krb5.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm index 565163732e..e7f46ff4a3 100644 --- a/gnu/packages/mit-krb5.scm +++ b/gnu/packages/mit-krb5.scm @@ -49,7 +49,14 @@ `(("bison" ,bison) ("perl" ,perl))) (arguments - `(#:phases + `(;; Work around "No rule to make target '../../include/gssapi/gssapi.h', + ;; needed by 'authgss_prot.so'." + #:parallel-build? #f + + ;; Likewise with tests. + #:parallel-tests? #f + + #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source-directory (lambda _ -- cgit v1.2.3 From 65efa9ba9c54bf0eb145a20e5d7c34f7d16a2b46 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 14 Jun 2016 21:21:18 +0200 Subject: gnu: mit-krb5: Update to 1.14.2. * gnu/packages/mit-krb5.scm (mit-krb5): Update to 1.14.2. [source]: Remove 'patches'. * gnu/packages/patches/mit-krb5-CVE-2015-8629.patch, gnu/packages/patches/mit-krb5-CVE-2015-8630.patch, gnu/packages/patches/mit-krb5-CVE-2015-8631.patch, gnu/packages/patches/mit-krb5-init-context-null-spnego.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 4 - gnu/packages/mit-krb5.scm | 9 +- gnu/packages/patches/mit-krb5-CVE-2015-8629.patch | 51 -- gnu/packages/patches/mit-krb5-CVE-2015-8630.patch | 81 --- gnu/packages/patches/mit-krb5-CVE-2015-8631.patch | 576 --------------------- .../mit-krb5-init-context-null-spnego.patch | 49 -- 6 files changed, 2 insertions(+), 768 deletions(-) delete mode 100644 gnu/packages/patches/mit-krb5-CVE-2015-8629.patch delete mode 100644 gnu/packages/patches/mit-krb5-CVE-2015-8630.patch delete mode 100644 gnu/packages/patches/mit-krb5-CVE-2015-8631.patch delete mode 100644 gnu/packages/patches/mit-krb5-init-context-null-spnego.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index cdb76cb5f0..ec88bd8ecf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -648,10 +648,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ - %D%/packages/patches/mit-krb5-CVE-2015-8629.patch \ - %D%/packages/patches/mit-krb5-CVE-2015-8630.patch \ - %D%/packages/patches/mit-krb5-CVE-2015-8631.patch \ - %D%/packages/patches/mit-krb5-init-context-null-spnego.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/mplayer2-theora-fix.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm index e7f46ff4a3..43cc376281 100644 --- a/gnu/packages/mit-krb5.scm +++ b/gnu/packages/mit-krb5.scm @@ -30,7 +30,7 @@ (define-public mit-krb5 (package (name "mit-krb5") - (version "1.13.3") + (version "1.14.2") (source (origin (method url-fetch) (uri (string-append "http://web.mit.edu/kerberos/dist/krb5/" @@ -38,12 +38,7 @@ "/krb5-" version ".tar.gz")) (sha256 (base32 - "1gpscn78lv48dxccxq9ncyj53w9l2a15xmngjfa1wylvmn7g0jjx")) - (patches - (search-patches "mit-krb5-init-context-null-spnego.patch" - "mit-krb5-CVE-2015-8629.patch" - "mit-krb5-CVE-2015-8630.patch" - "mit-krb5-CVE-2015-8631.patch")))) + "09wbv969ak4fqlqr1ip5bi62fny1zlp1vwjarvj6a6cdfzkdgjkb")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) diff --git a/gnu/packages/patches/mit-krb5-CVE-2015-8629.patch b/gnu/packages/patches/mit-krb5-CVE-2015-8629.patch deleted file mode 100644 index a296d8cb1b..0000000000 --- a/gnu/packages/patches/mit-krb5-CVE-2015-8629.patch +++ /dev/null @@ -1,51 +0,0 @@ -Copied from Fedora. -http://pkgs.fedoraproject.org/cgit/rpms/krb5.git/tree/krb5-CVE-2015-8629.patch?h=f22 - -From df17a1224a3406f57477bcd372c61e04c0e5a5bb Mon Sep 17 00:00:00 2001 -From: Greg Hudson -Date: Fri, 8 Jan 2016 12:45:25 -0500 -Subject: [PATCH 1/3] Verify decoded kadmin C strings [CVE-2015-8629] - -In xdr_nullstring(), check that the decoded string is terminated with -a zero byte and does not contain any internal zero bytes. - -CVE-2015-8629: - -In all versions of MIT krb5, an authenticated attacker can cause -kadmind to read beyond the end of allocated memory by sending a string -without a terminating zero byte. Information leakage may be possible -for an attacker with permission to modify the database. - - CVSSv2 Vector: AV:N/AC:H/Au:S/C:P/I:N/A:N/E:POC/RL:OF/RC:C - -ticket: 8341 (new) -target_version: 1.14-next -target_version: 1.13-next -tags: pullup ---- - src/lib/kadm5/kadm_rpc_xdr.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c -index 2bef858..ba67084 100644 ---- a/src/lib/kadm5/kadm_rpc_xdr.c -+++ b/src/lib/kadm5/kadm_rpc_xdr.c -@@ -64,7 +64,14 @@ bool_t xdr_nullstring(XDR *xdrs, char **objp) - return FALSE; - } - } -- return (xdr_opaque(xdrs, *objp, size)); -+ if (!xdr_opaque(xdrs, *objp, size)) -+ return FALSE; -+ /* Check that the unmarshalled bytes are a C string. */ -+ if ((*objp)[size - 1] != '\0') -+ return FALSE; -+ if (memchr(*objp, '\0', size - 1) != NULL) -+ return FALSE; -+ return TRUE; - - case XDR_ENCODE: - if (size != 0) --- -2.7.0.rc3 - diff --git a/gnu/packages/patches/mit-krb5-CVE-2015-8630.patch b/gnu/packages/patches/mit-krb5-CVE-2015-8630.patch deleted file mode 100644 index c21d84b1e7..0000000000 --- a/gnu/packages/patches/mit-krb5-CVE-2015-8630.patch +++ /dev/null @@ -1,81 +0,0 @@ -Copied from Fedora. -http://pkgs.fedoraproject.org/cgit/rpms/krb5.git/tree/krb5-CVE-2015-8630.patch?h=f22 - -From b863de7fbf080b15e347a736fdda0a82d42f4f6b Mon Sep 17 00:00:00 2001 -From: Greg Hudson -Date: Fri, 8 Jan 2016 12:52:28 -0500 -Subject: [PATCH 2/3] Check for null kadm5 policy name [CVE-2015-8630] - -In kadm5_create_principal_3() and kadm5_modify_principal(), check for -entry->policy being null when KADM5_POLICY is included in the mask. - -CVE-2015-8630: - -In MIT krb5 1.12 and later, an authenticated attacker with permission -to modify a principal entry can cause kadmind to dereference a null -pointer by supplying a null policy value but including KADM5_POLICY in -the mask. - - CVSSv2 Vector: AV:N/AC:H/Au:S/C:N/I:N/A:C/E:POC/RL:OF/RC:C - -ticket: 8342 (new) -target_version: 1.14-next -target_version: 1.13-next -tags: pullup ---- - src/lib/kadm5/srv/svr_principal.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c -index 5b95fa3..1d4365c 100644 ---- a/src/lib/kadm5/srv/svr_principal.c -+++ b/src/lib/kadm5/srv/svr_principal.c -@@ -395,6 +395,8 @@ kadm5_create_principal_3(void *server_handle, - /* - * Argument sanity checking, and opening up the DB - */ -+ if (entry == NULL) -+ return EINVAL; - if(!(mask & KADM5_PRINCIPAL) || (mask & KADM5_MOD_NAME) || - (mask & KADM5_MOD_TIME) || (mask & KADM5_LAST_PWD_CHANGE) || - (mask & KADM5_MKVNO) || (mask & KADM5_AUX_ATTRIBUTES) || -@@ -403,12 +405,12 @@ kadm5_create_principal_3(void *server_handle, - return KADM5_BAD_MASK; - if ((mask & KADM5_KEY_DATA) && entry->n_key_data != 0) - return KADM5_BAD_MASK; -+ if((mask & KADM5_POLICY) && entry->policy == NULL) -+ return KADM5_BAD_MASK; - if((mask & KADM5_POLICY) && (mask & KADM5_POLICY_CLR)) - return KADM5_BAD_MASK; - if((mask & ~ALL_PRINC_MASK)) - return KADM5_BAD_MASK; -- if (entry == NULL) -- return EINVAL; - - /* - * Check to see if the principal exists -@@ -643,6 +645,8 @@ kadm5_modify_principal(void *server_handle, - - krb5_clear_error_message(handle->context); - -+ if(entry == NULL) -+ return EINVAL; - if((mask & KADM5_PRINCIPAL) || (mask & KADM5_LAST_PWD_CHANGE) || - (mask & KADM5_MOD_TIME) || (mask & KADM5_MOD_NAME) || - (mask & KADM5_MKVNO) || (mask & KADM5_AUX_ATTRIBUTES) || -@@ -651,10 +655,10 @@ kadm5_modify_principal(void *server_handle, - return KADM5_BAD_MASK; - if((mask & ~ALL_PRINC_MASK)) - return KADM5_BAD_MASK; -+ if((mask & KADM5_POLICY) && entry->policy == NULL) -+ return KADM5_BAD_MASK; - if((mask & KADM5_POLICY) && (mask & KADM5_POLICY_CLR)) - return KADM5_BAD_MASK; -- if(entry == (kadm5_principal_ent_t) NULL) -- return EINVAL; - if (mask & KADM5_TL_DATA) { - tl_data_orig = entry->tl_data; - while (tl_data_orig) { --- -2.7.0.rc3 - diff --git a/gnu/packages/patches/mit-krb5-CVE-2015-8631.patch b/gnu/packages/patches/mit-krb5-CVE-2015-8631.patch deleted file mode 100644 index dd1eb2945c..0000000000 --- a/gnu/packages/patches/mit-krb5-CVE-2015-8631.patch +++ /dev/null @@ -1,576 +0,0 @@ -Copied from Fedora. -http://pkgs.fedoraproject.org/cgit/rpms/krb5.git/tree/krb5-CVE-2015-8631.patch?h=f22 - -From 83ed75feba32e46f736fcce0d96a0445f29b96c2 Mon Sep 17 00:00:00 2001 -From: Greg Hudson -Date: Fri, 8 Jan 2016 13:16:54 -0500 -Subject: [PATCH 3/3] Fix leaks in kadmin server stubs [CVE-2015-8631] - -In each kadmind server stub, initialize the client_name and -server_name variables, and release them in the cleanup handler. Many -of the stubs will otherwise leak the client and server name if -krb5_unparse_name() fails. Also make sure to free the prime_arg -variables in rename_principal_2_svc(), or we can leak the first one if -unparsing the second one fails. Discovered by Simo Sorce. - -CVE-2015-8631: - -In all versions of MIT krb5, an authenticated attacker can cause -kadmind to leak memory by supplying a null principal name in a request -which uses one. Repeating these requests will eventually cause -kadmind to exhaust all available memory. - - CVSSv2 Vector: AV:N/AC:L/Au:S/C:N/I:N/A:C/E:POC/RL:OF/RC:C - -ticket: 8343 (new) -target_version: 1.14-next -target_version: 1.13-next -tags: pullup ---- - src/kadmin/server/server_stubs.c | 151 ++++++++++++++++++++------------------- - 1 file changed, 77 insertions(+), 74 deletions(-) - -diff --git a/src/kadmin/server/server_stubs.c b/src/kadmin/server/server_stubs.c -index 1879dc6..6ac797e 100644 ---- a/src/kadmin/server/server_stubs.c -+++ b/src/kadmin/server/server_stubs.c -@@ -334,7 +334,8 @@ create_principal_2_svc(cprinc_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - restriction_t *rp; -@@ -382,10 +383,10 @@ create_principal_2_svc(cprinc_arg *arg, struct svc_req *rqstp) - krb5_free_error_message(handle->context, errmsg); - } - free(prime_arg); -- gss_release_buffer(&minor_stat, &client_name); -- gss_release_buffer(&minor_stat, &service_name); - - exit_func: -+ gss_release_buffer(&minor_stat, &client_name); -+ gss_release_buffer(&minor_stat, &service_name); - free_server_handle(handle); - return &ret; - } -@@ -395,7 +396,8 @@ create_principal3_2_svc(cprinc3_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - restriction_t *rp; -@@ -444,10 +446,10 @@ create_principal3_2_svc(cprinc3_arg *arg, struct svc_req *rqstp) - krb5_free_error_message(handle->context, errmsg); - } - free(prime_arg); -- gss_release_buffer(&minor_stat, &client_name); -- gss_release_buffer(&minor_stat, &service_name); - - exit_func: -+ gss_release_buffer(&minor_stat, &client_name); -+ gss_release_buffer(&minor_stat, &service_name); - free_server_handle(handle); - return &ret; - } -@@ -457,8 +459,8 @@ delete_principal_2_svc(dprinc_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -501,10 +503,10 @@ delete_principal_2_svc(dprinc_arg *arg, struct svc_req *rqstp) - - } - free(prime_arg); -- gss_release_buffer(&minor_stat, &client_name); -- gss_release_buffer(&minor_stat, &service_name); - - exit_func: -+ gss_release_buffer(&minor_stat, &client_name); -+ gss_release_buffer(&minor_stat, &service_name); - free_server_handle(handle); - return &ret; - } -@@ -514,8 +516,8 @@ modify_principal_2_svc(mprinc_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - restriction_t *rp; -@@ -559,9 +561,9 @@ modify_principal_2_svc(mprinc_arg *arg, struct svc_req *rqstp) - krb5_free_error_message(handle->context, errmsg); - } - free(prime_arg); -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -570,10 +572,9 @@ generic_ret * - rename_principal_2_svc(rprinc_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; -- char *prime_arg1, -- *prime_arg2; -- gss_buffer_desc client_name, -- service_name; -+ char *prime_arg1 = NULL, *prime_arg2 = NULL; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - restriction_t *rp; -@@ -655,11 +656,11 @@ rename_principal_2_svc(rprinc_arg *arg, struct svc_req *rqstp) - krb5_free_error_message(handle->context, errmsg); - - } -+exit_func: - free(prime_arg1); - free(prime_arg2); - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -669,8 +670,8 @@ get_principal_2_svc(gprinc_arg *arg, struct svc_req *rqstp) - { - static gprinc_ret ret; - char *prime_arg, *funcname; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -719,9 +720,9 @@ get_principal_2_svc(gprinc_arg *arg, struct svc_req *rqstp) - krb5_free_error_message(handle->context, errmsg); - } - free(prime_arg); -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -731,8 +732,8 @@ get_princs_2_svc(gprincs_arg *arg, struct svc_req *rqstp) - { - static gprincs_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -777,9 +778,9 @@ get_princs_2_svc(gprincs_arg *arg, struct svc_req *rqstp) - krb5_free_error_message(handle->context, errmsg); - - } -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -789,8 +790,8 @@ chpass_principal_2_svc(chpass_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -840,9 +841,9 @@ chpass_principal_2_svc(chpass_arg *arg, struct svc_req *rqstp) - } - - free(prime_arg); -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -852,8 +853,8 @@ chpass_principal3_2_svc(chpass3_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -909,9 +910,9 @@ chpass_principal3_2_svc(chpass3_arg *arg, struct svc_req *rqstp) - } - - free(prime_arg); -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -921,8 +922,8 @@ setv4key_principal_2_svc(setv4key_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -969,9 +970,9 @@ setv4key_principal_2_svc(setv4key_arg *arg, struct svc_req *rqstp) - } - - free(prime_arg); -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -981,8 +982,8 @@ setkey_principal_2_svc(setkey_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -1029,9 +1030,9 @@ setkey_principal_2_svc(setkey_arg *arg, struct svc_req *rqstp) - } - - free(prime_arg); -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -1041,8 +1042,8 @@ setkey_principal3_2_svc(setkey3_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -1092,9 +1093,9 @@ setkey_principal3_2_svc(setkey3_arg *arg, struct svc_req *rqstp) - } - - free(prime_arg); -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -1106,8 +1107,8 @@ chrand_principal_2_svc(chrand_arg *arg, struct svc_req *rqstp) - krb5_keyblock *k; - int nkeys; - char *prime_arg, *funcname; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -1164,9 +1165,9 @@ chrand_principal_2_svc(chrand_arg *arg, struct svc_req *rqstp) - krb5_free_error_message(handle->context, errmsg); - } - free(prime_arg); -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -1178,8 +1179,8 @@ chrand_principal3_2_svc(chrand3_arg *arg, struct svc_req *rqstp) - krb5_keyblock *k; - int nkeys; - char *prime_arg, *funcname; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -1241,9 +1242,9 @@ chrand_principal3_2_svc(chrand3_arg *arg, struct svc_req *rqstp) - krb5_free_error_message(handle->context, errmsg); - } - free(prime_arg); -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -1253,8 +1254,8 @@ create_policy_2_svc(cpol_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -1295,9 +1296,9 @@ create_policy_2_svc(cpol_arg *arg, struct svc_req *rqstp) - if (errmsg != NULL) - krb5_free_error_message(handle->context, errmsg); - } -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -1307,8 +1308,8 @@ delete_policy_2_svc(dpol_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -1347,9 +1348,9 @@ delete_policy_2_svc(dpol_arg *arg, struct svc_req *rqstp) - if (errmsg != NULL) - krb5_free_error_message(handle->context, errmsg); - } -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -1359,8 +1360,8 @@ modify_policy_2_svc(mpol_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -1400,9 +1401,9 @@ modify_policy_2_svc(mpol_arg *arg, struct svc_req *rqstp) - if (errmsg != NULL) - krb5_free_error_message(handle->context, errmsg); - } -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -1413,8 +1414,8 @@ get_policy_2_svc(gpol_arg *arg, struct svc_req *rqstp) - static gpol_ret ret; - kadm5_ret_t ret2; - char *prime_arg, *funcname; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_principal_ent_rec caller_ent; - kadm5_server_handle_t handle; -@@ -1475,9 +1476,9 @@ get_policy_2_svc(gpol_arg *arg, struct svc_req *rqstp) - log_unauth(funcname, prime_arg, - &client_name, &service_name, rqstp); - } -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - -@@ -1488,8 +1489,8 @@ get_pols_2_svc(gpols_arg *arg, struct svc_req *rqstp) - { - static gpols_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -1531,9 +1532,9 @@ get_pols_2_svc(gpols_arg *arg, struct svc_req *rqstp) - if (errmsg != NULL) - krb5_free_error_message(handle->context, errmsg); - } -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -1541,7 +1542,8 @@ exit_func: - getprivs_ret * get_privs_2_svc(krb5_ui_4 *arg, struct svc_req *rqstp) - { - static getprivs_ret ret; -- gss_buffer_desc client_name, service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -1571,9 +1573,9 @@ getprivs_ret * get_privs_2_svc(krb5_ui_4 *arg, struct svc_req *rqstp) - if (errmsg != NULL) - krb5_free_error_message(handle->context, errmsg); - -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -1583,7 +1585,8 @@ purgekeys_2_svc(purgekeys_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg, *funcname; -- gss_buffer_desc client_name, service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - -@@ -1629,9 +1632,9 @@ purgekeys_2_svc(purgekeys_arg *arg, struct svc_req *rqstp) - krb5_free_error_message(handle->context, errmsg); - } - free(prime_arg); -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -1641,8 +1644,8 @@ get_strings_2_svc(gstrings_arg *arg, struct svc_req *rqstp) - { - static gstrings_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -1688,9 +1691,9 @@ get_strings_2_svc(gstrings_arg *arg, struct svc_req *rqstp) - krb5_free_error_message(handle->context, errmsg); - } - free(prime_arg); -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -1700,8 +1703,8 @@ set_string_2_svc(sstring_arg *arg, struct svc_req *rqstp) - { - static generic_ret ret; - char *prime_arg; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - OM_uint32 minor_stat; - kadm5_server_handle_t handle; - const char *errmsg = NULL; -@@ -1744,9 +1747,9 @@ set_string_2_svc(sstring_arg *arg, struct svc_req *rqstp) - krb5_free_error_message(handle->context, errmsg); - } - free(prime_arg); -+exit_func: - gss_release_buffer(&minor_stat, &client_name); - gss_release_buffer(&minor_stat, &service_name); --exit_func: - free_server_handle(handle); - return &ret; - } -@@ -1754,8 +1757,8 @@ exit_func: - generic_ret *init_2_svc(krb5_ui_4 *arg, struct svc_req *rqstp) - { - static generic_ret ret; -- gss_buffer_desc client_name, -- service_name; -+ gss_buffer_desc client_name = GSS_C_EMPTY_BUFFER; -+ gss_buffer_desc service_name = GSS_C_EMPTY_BUFFER; - kadm5_server_handle_t handle; - OM_uint32 minor_stat; - const char *errmsg = NULL; -@@ -1797,10 +1800,10 @@ generic_ret *init_2_svc(krb5_ui_4 *arg, struct svc_req *rqstp) - rqstp->rq_cred.oa_flavor); - if (errmsg != NULL) - krb5_free_error_message(NULL, errmsg); -- gss_release_buffer(&minor_stat, &client_name); -- gss_release_buffer(&minor_stat, &service_name); - - exit_func: -+ gss_release_buffer(&minor_stat, &client_name); -+ gss_release_buffer(&minor_stat, &service_name); - return(&ret); - } - --- -2.7.0.rc3 - diff --git a/gnu/packages/patches/mit-krb5-init-context-null-spnego.patch b/gnu/packages/patches/mit-krb5-init-context-null-spnego.patch deleted file mode 100644 index 195db38d08..0000000000 --- a/gnu/packages/patches/mit-krb5-init-context-null-spnego.patch +++ /dev/null @@ -1,49 +0,0 @@ -Copied from Fedora. -http://pkgs.fedoraproject.org/cgit/rpms/krb5.git/tree/krb5-init_context_null_spnego.patch?h=f22 - -From 3beb564cea3d219efcf71682b6576cad548c2d23 Mon Sep 17 00:00:00 2001 -From: Simo Sorce -Date: Tue, 5 Jan 2016 12:11:59 -0500 -Subject: [PATCH] Check internal context on init context errors - -If the mechanism deletes the internal context handle on error, the -mechglue must do the same with the union context, to avoid crashes if -the application calls other functions with this invalid union context. - -[ghudson@mit.edu: edit commit message and code comment] - -ticket: 8337 (new) -target_version: 1.14-next -target_version: 1.13-next -tags: pullup ---- - src/lib/gssapi/mechglue/g_init_sec_context.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/lib/gssapi/mechglue/g_init_sec_context.c b/src/lib/gssapi/mechglue/g_init_sec_context.c -index aaae767..9f154b8 100644 ---- a/src/lib/gssapi/mechglue/g_init_sec_context.c -+++ b/src/lib/gssapi/mechglue/g_init_sec_context.c -@@ -224,12 +224,15 @@ OM_uint32 * time_rec; - - if (status != GSS_S_COMPLETE && status != GSS_S_CONTINUE_NEEDED) { - /* -- * the spec says (the preferred) method is to delete all -- * context info on the first call to init, and on all -- * subsequent calls make the caller responsible for -- * calling gss_delete_sec_context -+ * The spec says the preferred method is to delete all context info on -+ * the first call to init, and on all subsequent calls make the caller -+ * responsible for calling gss_delete_sec_context. However, if the -+ * mechanism decided to delete the internal context, we should also -+ * delete the union context. - */ - map_error(minor_status, mech); -+ if (union_ctx_id->internal_ctx_id == GSS_C_NO_CONTEXT) -+ *context_handle = GSS_C_NO_CONTEXT; - if (*context_handle == GSS_C_NO_CONTEXT) { - free(union_ctx_id->mech_type->elements); - free(union_ctx_id->mech_type); --- -2.6.4 - -- cgit v1.2.3 From 8956d07a03f7c909680d9882498ee3dd7e9a32eb Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Wed, 15 Jun 2016 14:28:58 +0300 Subject: gnu: cross-gcc: Allow Hurd libraries to be found. * gnu/packages/cross-base.scm (cross-gcc-arguments)[arguments]: Add 'KERNEL/lib' to 'CROSS_LIBRARY_PATH'. --- gnu/packages/cross-base.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 9d0f86af86..718e56e3de 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -184,7 +184,8 @@ may be either a libc package or #f.)" "CROSS_OBJC_INCLUDE_PATH" "CROSS_OBJCPLUS_INCLUDE_PATH"))) (setenv "CROSS_LIBRARY_PATH" - (string-append libc "/lib")) + (string-append libc "/lib:" + kernel "/lib")) ;for Hurd's libihash (for-each (lambda (var) (and=> (getenv var) -- cgit v1.2.3 From 61dc82d9b90d0545739c30bfc33003bd062071f0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jun 2016 15:21:11 +0200 Subject: gnu: netpbm: Look for 'gsc' instead of 'gs'. This is a followup to commit eb354bdacbf4154ec66038dac07f19bf4ced1fad. * gnu/packages/netpbm.scm (netpbm)[arguments]: In 'configure' phase, patch 'pstopnm.c' to look for 'gsc'. --- gnu/packages/netpbm.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index e2d409abe2..20ca87b4f1 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2015 Ludovic Courtès +;;; Copyright © 2015, 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -114,10 +114,17 @@ (display "ZLIB = libz.so\n" f) (display (string-append "LDFLAGS += -Wl,-rpath=" %output "/lib") f) (close-port f)) + (let ((rgb (string-append (assoc-ref inputs "xorg-rgb") "/share/X11/rgb.txt"))) (substitute* "pm_config.in.h" - (("/usr/share/X11/rgb.txt") rgb))) + (("/usr/share/X11/rgb.txt") rgb)) + + ;; Our Ghostscript no longer provides the 'gs' command, only + ;; 'gsc', so look for that instead. + (substitute* "converter/other/pstopnm.c" + (("\"%s/gs\"") + "\"%s/gsc\""))) #t)) (add-before 'check 'setup-check (lambda _ -- cgit v1.2.3 From 56501d3b1727cbafed25be4268c4e6c9387088d9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 17 Jun 2016 15:41:48 +0200 Subject: gnu: netpbm: Remove timestamps from build products. * gnu/packages/netpbm.scm (netpbm)[source]: Patch "buildtools/stamp-date". --- gnu/packages/netpbm.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index 20ca87b4f1..cd0c3d950d 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -55,9 +55,8 @@ (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet - ;; Remove non-FSDG-compliant code. '(begin - (use-modules (guix build utils)) + ;; Remove non-FSDG-compliant code. (define-syntax drop (syntax-rules (in) @@ -85,7 +84,15 @@ (drop "pbmto4425" "pbmtoln03" "pbmtolps" "pbmtopk" "pktopbm" in "converter/pbm") (drop "spottopgm" in "converter/pgm") - (drop "ppmtopjxl" in "converter/ppm"))))) + (drop "ppmtopjxl" in "converter/ppm") + + ;; Remove timestamps from the generated code. + (substitute* "buildtools/stamp-date" + (("^DATE=.*") + "DATE=\"Thu Jan 01 00:00:00+0000 1970\"\n") + (("^USER=.*") + "USER=Guix\n")))))) + (build-system gnu-build-system) (inputs `(("ghostscript" ,ghostscript) ("libjpeg" ,libjpeg) -- cgit v1.2.3 From 557fa39caa4d0b6e332f18935aefa5a6166a555b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Jun 2016 22:19:58 +0300 Subject: gnu: Add bdb-5.3. * gnu/packages/databases.scm (bdb-5.3): New variable. --- gnu/packages/databases.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2fbb439083..8a902546fc 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -188,6 +188,18 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") (home-page "http://www.oracle.com/us/products/database/berkeley-db/overview/index.html"))) +(define-public bdb-5.3 + (package (inherit bdb) + (name "bdb") + (version "5.3.28") + (source (origin + (method url-fetch) + (uri (string-append "http://download.oracle.com/berkeley-db/db-" + version ".tar.gz")) + (sha256 + (base32 + "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0")))))) + (define-public mysql (package (name "mysql") -- cgit v1.2.3 From a0adbb046382d0575abaf285a7d9c928ee478fe3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Jun 2016 22:20:43 +0300 Subject: gnu: openldap: Use bdb-5.3. * gnu/packages/openldap.scm (openldap)[inputs]: Switch to bdb-5.3. --- gnu/packages/openldap.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index adb6f36fe8..4bbc6a6bf8 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -54,7 +54,7 @@ (base32 "0044p20hx07fwgw2mbwj1fkx04615hhs1qyx4mawj2bhqvrnppnp")))) (build-system gnu-build-system) - (inputs `(("bdb" ,bdb) + (inputs `(("bdb" ,bdb-5.3) ("openssl" ,openssl) ("cyrus-sasl" ,cyrus-sasl) ("groff" ,groff) -- cgit v1.2.3 From 09cbd53c5fd871cf5ac1d7f80a5ed1c70b615340 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jun 2016 21:36:12 +0300 Subject: gnu: libarchive: Update to 3.2.1. * gnu/packages/backup.scm (libarchive): Update to 3.2.1. [arguments]: Build with '-std=C99'. --- gnu/packages/backup.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index a0ff535dfe..eb36238b44 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -136,7 +136,7 @@ backups (called chunks) to allow easy burning to CD/DVD.") (define-public libarchive (package (name "libarchive") - (version "3.2.0") + (version "3.2.1") (source (origin (method url-fetch) @@ -144,7 +144,7 @@ backups (called chunks) to allow easy burning to CD/DVD.") version ".tar.gz")) (sha256 (base32 - "11xabdpmvdmcdkidigmqh4ymhra95lr7ipcys4hdq0gzf7ylbkkv")))) + "1lngng84k1kkljl74q0cdqc3s82vn2kimfm02dgm4d6m7x71mvkj")))) (build-system gnu-build-system) ;; TODO: Add -L/path/to/nettle in libarchive.pc. (inputs @@ -175,7 +175,10 @@ backups (called chunks) to allow easy burning to CD/DVD.") (zero? (system* "./libarchive_test" "^test_*_disk*")) (zero? (system* "./bsdcpio_test" "^test_owner_parse")) (zero? (system* "./bsdtar_test")))) - %standard-phases)))) + %standard-phases)) + ;; libarchive/test/test_write_format_gnutar_filenames.c needs to be + ;; compiled with C99 or C11 or a gnu variant. + #:configure-flags '("CFLAGS=-O2 -g -std=c99"))) (home-page "http://libarchive.org/") (synopsis "Multi-format archive and compression library") (description -- cgit v1.2.3 From 28b49c07915c6fd15674f7e26a876bd21ab14169 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jun 2016 21:39:50 +0300 Subject: gnu: cmake: Disable checking for libarchive in tests. * gnu/packages/cmake.scm (cmake)[arguments]: Remove check on libarchive. --- gnu/packages/cmake.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index cac059ec37..0d4520926a 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -100,7 +100,17 @@ archive_write_set_format_shar.c" ,(string-append "--docdir=share/doc/cmake-" (version-major+minor version)))))) - %standard-phases))))) + (alist-cons-after + 'unpack 'remove-libarchive-version-test + ; This test check has been failing consistantly over + ; libarchive 3.2.x and cmake 3.4.x and 3.5.x so we + ; disable it for now + (lambda _ + (substitute* + "Tests/CMakeOnly/AllFindModules/CMakeLists.txt" + (("LibArchive") "")) + #t) + %standard-phases)))))) (inputs `(("file" ,file) ("curl" ,curl) -- cgit v1.2.3 From 6e261af1e7141f10267af8995bb6f06329612e8a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jun 2016 21:49:11 +0300 Subject: gnu: cmake: Use 'modify-phases'. * gnu/packages/cmake.scm (cmake)[arguments]: Use 'modify-phases'. --- gnu/packages/cmake.scm | 117 +++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 61 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 0d4520926a..7167eb6a9e 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -50,67 +50,62 @@ (build-system gnu-build-system) (arguments `(#:test-target "test" - #:phases (alist-cons-before - 'configure 'patch-bin-sh - (lambda _ - ;; Replace "/bin/sh" by the right path in... a lot of - ;; files. - (substitute* - '("Modules/CompilerId/Xcode-3.pbxproj.in" - "Modules/CompilerId/Xcode-1.pbxproj.in" - "Modules/CompilerId/Xcode-2.pbxproj.in" - "Modules/CPack.RuntimeScript.in" - "Source/cmakexbuild.cxx" - "Source/cmGlobalXCodeGenerator.cxx" - "Source/CTest/cmCTestBatchTestHandler.cxx" - "Source/cmLocalUnixMakefileGenerator3.cxx" - "Source/cmExecProgramCommand.cxx" - "Utilities/cmbzip2/Makefile-libbz2_so" - "Utilities/Release/release_cmake.cmake" - "Utilities/cmlibarchive/libarchive/\ -archive_write_set_format_shar.c" - "Tests/CMakeLists.txt" - "Tests/RunCMake/File_Generate/RunCMakeTest.cmake") - (("/bin/sh") (which "sh")))) - (alist-cons-before - 'configure 'set-paths - (lambda _ - ;; Help cmake's bootstrap process to find system libraries - (begin - (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) - ;; Get verbose output from failed tests - (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE"))) - (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (zero? (system* - "./configure" - (string-append "--prefix=" out) - "--system-libs" - "--no-system-jsoncpp" ; not packaged yet - ;; By default, the man pages and other docs land - ;; in PREFIX/man and PREFIX/doc, but we want them - ;; in share/{man,doc}. Note that unlike - ;; autoconf-generated configure scripts, cmake's - ;; configure prepends "PREFIX/" to what we pass - ;; to --mandir and --docdir. - "--mandir=share/man" - ,(string-append - "--docdir=share/doc/cmake-" - (version-major+minor version)))))) - (alist-cons-after - 'unpack 'remove-libarchive-version-test - ; This test check has been failing consistantly over - ; libarchive 3.2.x and cmake 3.4.x and 3.5.x so we - ; disable it for now - (lambda _ - (substitute* - "Tests/CMakeOnly/AllFindModules/CMakeLists.txt" - (("LibArchive") "")) - #t) - %standard-phases)))))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-bin-sh + (lambda _ + ;; Replace "/bin/sh" by the right path in... a lot of + ;; files. + (substitute* + '("Modules/CompilerId/Xcode-3.pbxproj.in" + "Modules/CompilerId/Xcode-1.pbxproj.in" + "Modules/CompilerId/Xcode-2.pbxproj.in" + "Modules/CPack.RuntimeScript.in" + "Source/cmakexbuild.cxx" + "Source/cmGlobalXCodeGenerator.cxx" + "Source/CTest/cmCTestBatchTestHandler.cxx" + "Source/cmLocalUnixMakefileGenerator3.cxx" + "Source/cmExecProgramCommand.cxx" + "Utilities/cmbzip2/Makefile-libbz2_so" + "Utilities/Release/release_cmake.cmake" + "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c" + "Tests/CMakeLists.txt" + "Tests/RunCMake/File_Generate/RunCMakeTest.cmake") + (("/bin/sh") (which "sh"))))) + (add-before 'configure 'set-paths + (lambda _ + ;; Help cmake's bootstrap process to find system libraries + (begin + (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) + (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) + ;; Get verbose output from failed tests + (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE")))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (zero? (system* + "./configure" + (string-append "--prefix=" out) + "--system-libs" + "--no-system-jsoncpp" ; not packaged yet + ;; By default, the man pages and other docs land + ;; in PREFIX/man and PREFIX/doc, but we want them + ;; in share/{man,doc}. Note that unlike + ;; autoconf-generated configure scripts, cmake's + ;; configure prepends "PREFIX/" to what we pass + ;; to --mandir and --docdir. + "--mandir=share/man" + ,(string-append + "--docdir=share/doc/cmake-" + (version-major+minor version))))))) + (add-after 'unpack 'remove-libarchive-version-test + ; This test check has been failing consistantly over libarchive 3.2.x + ; and cmake 3.4.x and 3.5.x so we disable it for now + (lambda _ + (substitute* + "Tests/CMakeOnly/AllFindModules/CMakeLists.txt" + (("LibArchive") "")) + #t))))) (inputs `(("file" ,file) ("curl" ,curl) -- cgit v1.2.3 From a12f6f498a7d1087fdf901e9e9604baf702c6c1e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 21 Jun 2016 21:50:23 +0300 Subject: gnu: cmake: Update to 3.5.2. * gnu/packages/cmake.scm (cmake): Update to 3.5.2. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 7167eb6a9e..ac88e59ec1 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -37,7 +37,7 @@ (define-public cmake (package (name "cmake") - (version "3.5.0") + (version "3.5.2") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -45,7 +45,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1yly38mpk2s08b4rglp9xcw5pxalk0whp9hrcg7j8qpxlkc3mj4j")) + "0ap6nlmv6nda942db43k9k9mhnm5dm3fsapzvy0vh6wq7l6l3n4j")) (patches (search-patches "cmake-fix-tests.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 74c8b174e8015de753ba5cab44f76f944e6fd4ba Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Jun 2016 23:54:00 +0200 Subject: gnu: Adjust to PCRE split. This is a followup to commit 6d49ca3bad613700b539c30272e164207455735b. * gnu/packages/databases.scm (4store)[inputs]: Remove PCRE. [native-inputs]: Add PCRE:bin. * gnu/packages/web.scm (httpd): Likewise. --- gnu/packages/databases.scm | 2 +- gnu/packages/web.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8a902546fc..4f2f211fb3 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -86,6 +86,7 @@ ("automake" ,automake) ("gettext" ,gnu-gettext) ("libtool" ,libtool) + ("pcre" ,pcre "bin") ;for 'pcre-config' ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) @@ -94,7 +95,6 @@ ("raptor2" ,raptor2) ("readline" ,readline) ("avahi" ,avahi) - ("pcre" ,pcre) ("cyrus-sasl" ,cyrus-sasl) ("openssl" ,openssl) ("util-linux" ,util-linux))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9f36fce027..3e145fc5d7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -84,10 +84,10 @@ (base32 "0hrpy6gjwma0kba7p7m61vwh82qcnkf08123lrwpg257m93hnrmc")))) (build-system gnu-build-system) + (native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(("apr" ,apr) ("apr-util" ,apr-util) ("openssl" ,openssl) - ("pcre" ,pcre) ("perl" ,perl))) ; needed to run bin/apxs (arguments `(#:test-target "test" -- cgit v1.2.3 From 01497dfe6c0a2ce69287d0fd0008747965a000df Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 27 Jun 2016 09:30:01 +0200 Subject: Merge branch 'master' into core-updates --- Makefile.am | 1 - build-aux/hydra/evaluate.scm | 15 +- build-aux/hydra/gnu-system.scm | 37 +- build-aux/run-system-tests.scm | 24 +- build-aux/test-env.in | 12 +- doc/guix.texi | 140 +- gnu/build/vm.scm | 6 +- gnu/local.mk | 11 +- gnu/packages.scm | 9 +- gnu/packages/admin.scm | 27 + gnu/packages/algebra.scm | 4 +- gnu/packages/assembly.scm | 114 + gnu/packages/bioinformatics.scm | 59 +- gnu/packages/crypto.scm | 59 + gnu/packages/dav.scm | 6 +- gnu/packages/debug.scm | 4 +- gnu/packages/dictionaries.scm | 25 +- gnu/packages/emacs.scm | 207 ++ gnu/packages/enlightenment.scm | 4 +- gnu/packages/erlang.scm | 179 ++ gnu/packages/game-development.scm | 27 + gnu/packages/games.scm | 96 + gnu/packages/gnome.scm | 8 +- gnu/packages/gnuzilla.scm | 2 +- gnu/packages/gstreamer.scm | 2 +- gnu/packages/guile.scm | 119 +- gnu/packages/haskell.scm | 647 +++--- gnu/packages/imagemagick.scm | 4 +- gnu/packages/java.scm | 8 +- gnu/packages/kodi.scm | 2 +- gnu/packages/lightning.scm | 44 - gnu/packages/linux.scm | 12 +- gnu/packages/music.scm | 12 +- gnu/packages/package-management.scm | 76 +- gnu/packages/password-utils.scm | 37 + .../patches/beets-image-test-failure.patch | 46 + gnu/packages/patches/hydra-automake-1.15.patch | 4 +- gnu/packages/patches/nasm-no-ps-pdf.patch | 20 + .../patches/ruby-puma-ignore-broken-test.patch | 13 + gnu/packages/perl.scm | 5 +- gnu/packages/python.scm | 406 +++- gnu/packages/ruby.scm | 64 + gnu/packages/scheme.scm | 4 +- gnu/packages/screen.scm | 4 +- gnu/packages/serialization.scm | 53 +- gnu/packages/statistics.scm | 44 + gnu/packages/tex.scm | 20 +- gnu/packages/version-control.scm | 6 +- gnu/packages/video.scm | 8 +- gnu/packages/web.scm | 5 +- gnu/packages/xorg.scm | 357 ++-- gnu/packages/yasm.scm | 55 - gnu/services.scm | 28 + gnu/services/mcron.scm | 115 ++ gnu/system/install.scm | 3 +- gnu/tests.scm | 92 +- gnu/tests/base.scm | 297 ++- gnu/tests/install.scm | 212 ++ guix/build-system/python.scm | 2 +- guix/build/bournish.scm | 62 +- guix/build/emacs-build-system.scm | 11 +- guix/config.scm.in | 4 +- guix/gexp.scm | 6 +- guix/import/pypi.scm | 6 +- guix/scripts/substitute.scm | 28 +- guix/store.scm | 31 +- guix/utils.scm | 36 +- nix/libstore/globals.cc | 2 +- nix/local.mk | 2 +- po/guix/fr.po | 2170 ++++++++++++++++---- tests/containers.scm | 17 +- tests/packages.scm | 2 +- 72 files changed, 4984 insertions(+), 1295 deletions(-) create mode 100644 gnu/packages/assembly.scm create mode 100644 gnu/packages/erlang.scm delete mode 100644 gnu/packages/lightning.scm create mode 100644 gnu/packages/patches/beets-image-test-failure.patch create mode 100644 gnu/packages/patches/nasm-no-ps-pdf.patch create mode 100644 gnu/packages/patches/ruby-puma-ignore-broken-test.patch delete mode 100644 gnu/packages/yasm.scm create mode 100644 gnu/services/mcron.scm create mode 100644 gnu/tests/install.scm (limited to 'gnu') diff --git a/Makefile.am b/Makefile.am index fd76be4d72..b7792d0721 100644 --- a/Makefile.am +++ b/Makefile.am @@ -328,7 +328,6 @@ check-local: endif !CAN_RUN_TESTS check-system: $(GOBJECTS) - $(AM_V_at)echo "Running system tests..." $(AM_V_at)$(top_builddir)/pre-inst-env \ $(GUILE) --no-auto-compile \ -e '(@@ (run-system-tests) run-system-tests)' \ diff --git a/build-aux/hydra/evaluate.scm b/build-aux/hydra/evaluate.scm index afc7730ff2..ab10253f31 100644 --- a/build-aux/hydra/evaluate.scm +++ b/build-aux/hydra/evaluate.scm @@ -49,6 +49,17 @@ values." (/ (time-nanosecond time) 1e9))) (apply values results)))) +(define (assert-valid-job job thing) + "Raise an error if THING is not an alist with a valid 'derivation' entry. +Otherwise return THING." + (unless (and (list? thing) + (and=> (assoc-ref thing 'derivation) + (lambda (value) + (and (string? value) + (string-suffix? ".drv" value))))) + (error "job did not produce a valid alist" job thing)) + thing) + ;; Without further ado... (match (command-line) @@ -83,7 +94,9 @@ values." (map (lambda (job thunk) (format (current-error-port) "evaluating '~a'... " job) (force-output (current-error-port)) - (cons job (call-with-time-display thunk))) + (cons job + (assert-valid-job job + (call-with-time-display thunk)))) names thunks))) port)))) ((command _ ...) diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index d15be1bad2..a84cdebbad 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -59,6 +59,7 @@ (gnu system) (gnu system vm) (gnu system install) + (gnu tests) (srfi srfi-1) (srfi srfi-26) (ice-9 match)) @@ -129,6 +130,9 @@ SYSTEM." (file (string-append dir "/demo-os.scm"))) (read-operating-system file))) +(define %guixsd-supported-systems + '("x86_64-linux" "i686-linux")) + (define (qemu-jobs store system) "Return a list of jobs that build QEMU images for SYSTEM." (define (->alist drv) @@ -150,7 +154,7 @@ system.") (define MiB (expt 2 20)) - (if (member system '("x86_64-linux" "i686-linux")) + (if (member system %guixsd-supported-systems) (list (->job 'qemu-image (run-with-store store (mbegin %store-monad @@ -167,6 +171,36 @@ system.") (* 1024 MiB)))))) '())) +(define (system-test-jobs store system) + "Return a list of jobs for the system tests." + (define (test->thunk test) + (lambda () + (define drv + (run-with-store store + (mbegin %store-monad + (set-current-system system) + (set-grafting #f) + (set-guile-for-build (default-guile)) + (system-test-value test)))) + + `((derivation . ,(derivation-file-name drv)) + (description . ,(format #f "GuixSD '~a' system test" + (system-test-name test))) + (long-description . ,(system-test-description test)) + (license . ,gpl3+) + (home-page . ,%guix-home-page-url) + (maintainers . ("bug-guix@gnu.org"))))) + + (define (->job test) + (let ((name (string->symbol + (string-append "test." (system-test-name test) + "." system)))) + (cons name (test->thunk test)))) + + (if (member system %guixsd-supported-systems) + (map ->job (all-system-tests)) + '())) + (define (tarball-jobs store system) "Return Hydra jobs to build the self-contained Guix binary tarball." (define (->alist drv) @@ -274,6 +308,7 @@ valid." system)))) (append (filter-map job all) (qemu-jobs store system) + (system-test-jobs store system) (tarball-jobs store system) (cross-jobs system)))) ((core) diff --git a/build-aux/run-system-tests.scm b/build-aux/run-system-tests.scm index e98de9cb7e..3f3a70e7b4 100644 --- a/build-aux/run-system-tests.scm +++ b/build-aux/run-system-tests.scm @@ -17,13 +17,14 @@ ;;; along with GNU Guix. If not, see . (define-module (run-system-tests) - #:use-module (gnu tests base) + #:use-module (gnu tests) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix derivations) #:use-module (guix ui) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) + #:use-module (ice-9 match) #:export (run-system-tests)) (define (built-derivations* drv) @@ -44,13 +45,26 @@ lst) (lift1 reverse %store-monad)))) -(define %system-tests - (list %test-basic-os)) - (define (run-system-tests . args) + (define tests + ;; Honor the 'TESTS' environment variable so that one can select a subset + ;; of tests to run in the usual way: + ;; + ;; make check-system TESTS=installed-os + (match (getenv "TESTS") + (#f + (all-system-tests)) + ((= string-tokenize (tests ...)) + (filter (lambda (test) + (member (system-test-name test) tests)) + (all-system-tests))))) + + (format (current-error-port) "Running ~a system tests...~%" + (length tests)) + (with-store store (run-with-store store - (mlet* %store-monad ((drv (sequence %store-monad %system-tests)) + (mlet* %store-monad ((drv (mapm %store-monad system-test-value tests)) (out -> (map derivation->output-path drv))) (mbegin %store-monad (show-what-to-build* drv) diff --git a/build-aux/test-env.in b/build-aux/test-env.in index c153763a56..1657556b19 100644 --- a/build-aux/test-env.in +++ b/build-aux/test-env.in @@ -69,16 +69,16 @@ then fi # The configuration directory, for import/export signing keys. - NIX_CONF_DIR="@GUIX_TEST_ROOT@/etc" - if [ ! -d "$NIX_CONF_DIR" ] + GUIX_CONFIGURATION_DIRECTORY="@GUIX_TEST_ROOT@/etc" + if [ ! -d "$GUIX_CONFIGURATION_DIRECTORY" ] then # Copy the keys so that the secret key has the right permissions (the # daemon errors out when this is not the case.) - mkdir -p "$NIX_CONF_DIR" + mkdir -p "$GUIX_CONFIGURATION_DIRECTORY" cp "@abs_top_srcdir@/tests/signing-key.sec" \ "@abs_top_srcdir@/tests/signing-key.pub" \ - "$NIX_CONF_DIR" - chmod 400 "$NIX_CONF_DIR/signing-key.sec" + "$GUIX_CONFIGURATION_DIRECTORY" + chmod 400 "$GUIX_CONFIGURATION_DIRECTORY/signing-key.sec" fi # A place to store data of the substituter. @@ -100,7 +100,7 @@ then NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR \ NIX_ROOT_FINDER GUIX_BINARY_SUBSTITUTE_URL \ GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES \ - NIX_CONF_DIR XDG_CACHE_HOME NIXPKGS + GUIX_CONFIGURATION_DIRECTORY XDG_CACHE_HOME NIXPKGS # Launch the daemon without chroot support because is may be # unavailable, for instance if we're not running as root. diff --git a/doc/guix.texi b/doc/guix.texi index 0bb68bb477..7204f2e939 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -204,6 +204,7 @@ System Configuration Services * Base Services:: Essential system services. +* Scheduled Job Execution:: The mcron service. * Networking Services:: Network setup, SSH daemon, etc. * X Window:: Graphical display. * Desktop Services:: D-Bus and desktop services. @@ -619,6 +620,31 @@ Upon failure, please email @email{bug-guix@@gnu.org} and attach the as well as version numbers of the dependencies (@pxref{Requirements}) in your message. +Guix also comes with a whole-system test suite that tests complete +GuixSD operating system instances. It can only run on systems where +Guix is already installed, using: + +@example +make check-system +@end example + +@noindent +or, again, by defining @code{TESTS} to select a subset of tests to run: + +@example +make check-system TESTS="basic mcron" +@end example + +These system tests are defined in the @code{(gnu tests @dots{})} +modules. They work by running the operating systems under test with +lightweight instrumentation in a virtual machine (VM). They can be +computationally intensive or rather cheap, depending on whether +substitutes are available for their dependencies (@pxref{Substitutes}). +Some of them require a lot of storage space to hold VM images. + +Again in case of test failures, please send @email{bug-guix@@gnu.org} +all the details. + @node Setting Up the Daemon @section Setting Up the Daemon @@ -682,8 +708,13 @@ Bash syntax and the @code{shadow} commands): @noindent The number of build users determines how many build jobs may run in parallel, as specified by the @option{--max-jobs} option -(@pxref{Invoking guix-daemon, @option{--max-jobs}}). The -@code{guix-daemon} program may then be run as @code{root} with the +(@pxref{Invoking guix-daemon, @option{--max-jobs}}). To use +@command{guix system vm} and related commands, you may need to add the +build users to the @code{kvm} group so they can access @file{/dev/kvm}, +using @code{-G guixbuild,kvm} instead of @code{-G guixbuild} +(@pxref{Invoking guix system}). + +The @code{guix-daemon} program may then be run as @code{root} with the following command@footnote{If your machine uses the systemd init system, dropping the @file{@var{prefix}/lib/systemd/system/guix-daemon.service} file in @file{/etc/systemd/system} will ensure that @@ -7185,6 +7216,7 @@ declaration. @menu * Base Services:: Essential system services. +* Scheduled Job Execution:: The mcron service. * Networking Services:: Network setup, SSH daemon, etc. * X Window:: Graphical display. * Desktop Services:: D-Bus and desktop services. @@ -7463,6 +7495,100 @@ archive}). If that is not the case, the service will fail to start. @end deffn +@node Scheduled Job Execution +@subsubsection Scheduled Job Execution + +@cindex cron +@cindex scheduling jobs +The @code{(gnu services mcron)} module provides an interface to +GNU@tie{}mcron, a daemon to run jobs at scheduled times (@pxref{Top,,, +mcron, GNU@tie{}mcron}). GNU@tie{}mcron is similar to the traditional +Unix @command{cron} daemon; the main difference is that it is +implemented in Guile Scheme, which provides a lot of flexibility when +specifying the scheduling of jobs and their actions. + +The example below defines an operating system that runs the +@command{updatedb} (@pxref{Invoking updatedb,,, find, Finding Files}) +and the @command{guix gc} commands (@pxref{Invoking guix gc}) daily, as +well as the @command{mkid} command on behalf of an unprivileged user +(@pxref{mkid invocation,,, idutils, ID Database Utilities}). It uses +gexps to introduce job definitions that are passed to mcron +(@pxref{G-Expressions}). + +@lisp +(use-modules (guix) (gnu) (gnu services mcron)) +(use-package-modules base idutils) + +(define updatedb-job + ;; Run 'updatedb' at 3AM every day. Here we write the + ;; job's action as a Scheme procedure. + #~(job '(next-hour '(3)) + (lambda () + (execl (string-append #$findutils "/bin/updatedb") + "updatedb" + "--prunepaths=/tmp /var/tmp /gnu/store")))) + +(define garbage-collector-job + ;; Collect garbage 5 minutes after midnight every day. + ;; The job's action is a shell command. + #~(job "5 0 * * *" ;Vixie cron syntax + "guix gc -F 1G")) + +(define idutils-jobs + ;; Update the index database as user "charlie" at 12:15PM + ;; and 19:15PM. This runs from the user's home directory. + #~(job '(next-minute-from (next-hour '(12 19)) '(15)) + (string-append #$idutils "/bin/mkid src") + #:user "charlie")) + +(operating-system + ;; @dots{} + (services (cons (mcron-service (list garbage-collector-job + updatedb-job + idutils-job)) + %base-services))) +@end lisp + +@xref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron}, +for more information on mcron job specifications. Below is the +reference of the mcron service. + +@deffn {Scheme Procedure} mcron-service @var{jobs} [#:mcron @var{mcron2}] +Return an mcron service running @var{mcron} that schedules @var{jobs}, a +list of gexps denoting mcron job specifications. + +This is a shorthand for: +@example + (service mcron-service-type + (mcron-configuration (mcron mcron) (jobs jobs))) +@end example +@end deffn + +@defvr {Scheme Variable} mcron-service-type +This is the type of the @code{mcron} service, whose value is an +@code{mcron-configuration} object. + +This service type can be the target of a service extension that provides +it additional job specifications (@pxref{Service Composition}). In +other words, it is possible to define services that provide addition +mcron jobs to run. +@end defvr + +@deftp {Data Type} mcron-configuration +Data type representing the configuration of mcron. + +@table @asis +@item @code{mcron} (default: @var{mcron2}) +The mcron package to use. + +@item @code{jobs} +This is a list of gexps (@pxref{G-Expressions}), where each gexp +corresponds to an mcron job specification (@pxref{Syntax, mcron job +specifications,, mcron, GNU@tie{}mcron}). +@end table +@end deftp + + @node Networking Services @subsubsection Networking Services @@ -10121,12 +10247,14 @@ a list of available debugging commands. @end table @end table -Note that all the actions above, except @code{build} and @code{init}, -rely on KVM support in the Linux-Libre kernel. Specifically, the -machine should have hardware virtualization support, the corresponding +@quotation Note +All the actions above, except @code{build} and @code{init}, +can use KVM support in the Linux-libre kernel. Specifically, if the +machine has hardware virtualization support, the corresponding KVM kernel module should be loaded, and the @file{/dev/kvm} device node must exist and be readable and writable by the user and by the -build users of the daemon. +build users of the daemon (@pxref{Build Environment Setup}). +@end quotation Once you have built, configured, re-configured, and re-re-configured your GuixSD installation, you may find it useful to list the operating diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 48e701adbe..cc5cf45362 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Leo Famulari ;;; @@ -55,8 +55,8 @@ (define* (qemu-command #:optional (system %host-type)) "Return the default name of the QEMU command for SYSTEM." - (let ((cpu (substring %host-type 0 - (string-index %host-type #\-)))) + (let ((cpu (substring system 0 + (string-index system #\-)))) (string-append "qemu-system-" (if (string-match "^i[3456]86$" cpu) "i386" diff --git a/gnu/local.mk b/gnu/local.mk index 4b83de2f2a..ce4cdf65c1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -41,6 +41,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/apl.scm \ %D%/packages/apr.scm \ %D%/packages/aspell.scm \ + %D%/packages/assembly.scm \ %D%/packages/attr.scm \ %D%/packages/audacity.scm \ %D%/packages/audio.scm \ @@ -108,6 +109,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/engineering.scm \ %D%/packages/enlightenment.scm \ %D%/packages/entr.scm \ + %D%/packages/erlang.scm \ %D%/packages/fcitx.scm \ %D%/packages/feh.scm \ %D%/packages/figlet.scm \ @@ -205,7 +207,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/libusb.scm \ %D%/packages/libunwind.scm \ %D%/packages/libupnp.scm \ - %D%/packages/lightning.scm \ %D%/packages/links.scm \ %D%/packages/linux.scm \ %D%/packages/lirc.scm \ @@ -363,7 +364,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/xdisorg.scm \ %D%/packages/xorg.scm \ %D%/packages/xfce.scm \ - %D%/packages/yasm.scm \ %D%/packages/yubico.scm \ %D%/packages/zile.scm \ %D%/packages/zip.scm \ @@ -378,6 +378,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/dict.scm \ %D%/services/lirc.scm \ %D%/services/mail.scm \ + %D%/services/mcron.scm \ %D%/services/networking.scm \ %D%/services/shepherd.scm \ %D%/services/herd.scm \ @@ -409,7 +410,8 @@ GNU_SYSTEM_MODULES = \ %D%/build/vm.scm \ \ %D%/tests.scm \ - %D%/tests/base.scm + %D%/tests/base.scm \ + %D%/tests/install.scm patchdir = $(guilemoduledir)/%D%/packages/patches @@ -442,6 +444,7 @@ dist_patch_DATA = \ %D%/packages/patches/avrdude-fix-libusb.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/bash-completion-directories.patch \ + %D%/packages/patches/beets-image-test-failure.patch \ %D%/packages/patches/bigloo-gc-shebangs.patch \ %D%/packages/patches/binutils-ld-new-dtags.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ @@ -656,6 +659,7 @@ dist_patch_DATA = \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \ %D%/packages/patches/mutt-store-references.patch \ + %D%/packages/patches/nasm-no-ps-pdf.patch \ %D%/packages/patches/net-tools-bitrot.patch \ %D%/packages/patches/netcdf-config-date.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ @@ -741,6 +745,7 @@ dist_patch_DATA = \ %D%/packages/patches/rpm-CVE-2014-8118.patch \ %D%/packages/patches/rsem-makefile.patch \ %D%/packages/patches/ruby-concurrent-ignore-broken-test.patch \ + %D%/packages/patches/ruby-puma-ignore-broken-test.patch \ %D%/packages/patches/ruby-symlinkfix.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/rush-CVE-2013-6889.patch \ diff --git a/gnu/packages.scm b/gnu/packages.scm index 7130f58fdd..9496a270eb 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -45,6 +45,7 @@ %package-module-path fold-packages + scheme-modules ;XXX: for lack of a better place find-packages-by-name find-best-packages-by-name @@ -158,8 +159,8 @@ returned list is sorted in alphabetical order." (map string->symbol (string-tokenize (string-drop-right file 4) not-slash))))) -(define* (package-modules directory #:optional sub-directory) - "Return the list of modules that provide packages for the distribution. +(define* (scheme-modules directory #:optional sub-directory) + "Return the list of Scheme modules available under DIRECTORY. Optionally, narrow the search to SUB-DIRECTORY." (define prefix-len (string-length directory)) @@ -184,9 +185,9 @@ search." (fold-right (lambda (spec result) (match spec ((? string? directory) - (append (package-modules directory) result)) + (append (scheme-modules directory) result)) ((directory . sub-directory) - (append (package-modules directory sub-directory) + (append (scheme-modules directory sub-directory) result)))) '() path)) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 78f36a18cf..415a35aab3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1681,3 +1681,30 @@ controller, or compare the network bandwidth numbers directly with the disk throughput (in the same interval).") (home-page "http://dag.wiee.rs/home-made/dstat/") (license license:gpl2+))) + +(define-public thefuck + (package + (name "thefuck") + (version "3.9") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/nvbn/thefuck/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0g4s2vkpl0mqhkdkbzib07qr4xf0cq25fvhdhna52290qgd69pwf")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (inputs + `(("python-colorama" ,python-colorama) + ("python-decorator" ,python-decorator) + ("python-psutil" ,python-psutil) + ("python-six" ,python-six))) + (home-page "https://github.com/nvbn/thefuck") + (synopsis "Correct mistyped console command") + (description + "The Fuck tries to match a rule for a previous, mistyped command, creates +a new command using the matched rule, and runs it.") + (license license:x11))) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 12691da17d..b0ffd7009b 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -128,7 +128,7 @@ solve the shortest vector problem.") (define-public pari-gp (package (name "pari-gp") - (version "2.7.5") + (version "2.7.6") (source (origin (method url-fetch) (uri (string-append @@ -136,7 +136,7 @@ solve the shortest vector problem.") version ".tar.gz")) (sha256 (base32 - "0c8l83a0gjq73r9hndsrzkypwxvnnm4pxkkzbg6jm95m80nzwh11")))) + "04dqi697czd8mmw8aiwzrkgbvkjassqagg6lfy3lkf1k5qi9g9rr")))) (build-system gnu-build-system) (native-inputs `(("texlive" ,texlive-minimal))) (inputs `(("gmp" ,gmp) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm new file mode 100644 index 0000000000..40e40e8f93 --- /dev/null +++ b/gnu/packages/assembly.scm @@ -0,0 +1,114 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2013, 2015 Ludovic Courtès +;;; Copyright © 2013 Andreas Enge +;;; Copyright © 2016 Efraim Flashner +;;; +;;; 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 assembly) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (gnu packages) + #:use-module (gnu packages perl) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages python) + #:use-module (gnu packages xml)) + +(define-public nasm + (package + (name "nasm") + (version "2.12.01") + (source (origin + (method url-fetch) + (uri (string-append "http://www.nasm.us/pub/nasm/releasebuilds/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "12bl6vc5sjp9nnhf0iwy6l27vq783y0rxrjpp8sy84h5cb7a3fwx")) + (patches (search-patches "nasm-no-ps-pdf.patch")))) + (build-system gnu-build-system) + (native-inputs `(("perl" ,perl) ;for doc and test target + ("texinfo" ,texinfo))) + (arguments + `(#:test-target "test" + #:phases (modify-phases %standard-phases + (add-after 'install 'install-info + (lambda _ + (zero? (system* "make" "install_doc"))))))) + (home-page "http://www.nasm.us/") + (synopsis "80x86 and x86-64 assembler") + (description + "NASM, the Netwide Assembler, is an 80x86 and x86-64 assembler designed +for portability and modularity. It supports a range of object file formats, +including Linux and *BSD a.out, ELF, COFF, Mach-O, Microsoft 16-bit OBJ, +Windows32 and Windows64. It will also output plain binary files. Its syntax +is designed to be simple and easy to understand, similar to Intel's but less +complex. It supports all currently known x86 architectural extensions, and +has strong support for macros.") + (supported-systems '("x86_64-linux" "i686-linux")) + (license license:bsd-3))) + +(define-public yasm + (package + (name "yasm") + (version "1.3.0") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.tortall.net/projects/yasm/releases/yasm-" + version ".tar.gz")) + (sha256 + (base32 + "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix")))) + (build-system gnu-build-system) + (inputs + `(("python" ,python-wrapper) + ("xmlto" ,xmlto))) + (home-page "http://yasm.tortall.net/") + (synopsis "Rewrite of the NASM assembler") + (description + "Yasm is a complete rewrite of the NASM assembler. + +Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM +and GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit +Mach-O, RDOFF2, COFF, Win32, and Win64 object formats, and generates source +debugging information in STABS, DWARF 2, and CodeView 8 formats.") + (license (license:non-copyleft "file://COPYING" + "See COPYING in the distribution.")))) + +(define-public lightning + (package + (name "lightning") + (version "2.1.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/lightning/lightning-" + version ".tar.gz")) + (sha256 + (base32 + "19j9nwl88k660045s40cbz5zrl1wpd2mcxnnc8qqnnaj311a58qz")))) + (build-system gnu-build-system) + (synopsis "Library for generating assembly code at runtime") + (description + "GNU Lightning is a library that generates assembly language code at +run-time. Thus, it is useful in creating Just-In-Time compilers. It +abstracts over the target CPU by exposing a standardized RISC instruction set +to the clients.") + (home-page "http://www.gnu.org/software/lightning/") + (license license:gpl3+))) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 04ed769cd8..f5e7285193 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1482,7 +1482,7 @@ identify enrichments with functional annotations of the genome.") (define-public diamond (package (name "diamond") - (version "0.8.5") + (version "0.8.7") (source (origin (method url-fetch) (uri (string-append @@ -1491,7 +1491,7 @@ identify enrichments with functional annotations of the genome.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "18zx8k3axnsrg016kikl8xs1ifnjmj36dk1sv3fq1jgpg9j9584b")))) + "15r7gcrqc4pv5d4kvv530zc3xnni92c74y63zrxzidriss7591yx")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no "check" target @@ -3815,10 +3815,61 @@ data in the form of VCF files.") ;; at https://vcftools.github.io/license.html (license license:lgpl3))) +(define-public r-vegan + (package + (name "r-vegan") + (version "2.4-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "vegan" version)) + (sha256 + (base32 + "10cygzkyg2m0y054ygivqxrkvqz792qsg6bmbdfzaqq37qv4wc7z")))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'revert-test-deletion + ;; The distributed sources do not include tests with the CRAN + ;; package. Here we revert the commit + ;; `591d0e8ba1deaaf82445474ec6619c0b43db4e63' which deletes these + ;; tests. There are plans to not delete tests in future as + ;; documented at https://github.com/vegandevs/vegan/issues/181. + (lambda* (#:key inputs #:allow-other-keys) + (zero? + (system* "patch" "-R" "-p1" "-i" + (assoc-ref inputs "r-vegan-delete-tests-patch")))))))) + (native-inputs + `(("gfortran" ,gfortran) + ("r-knitr" ,r-knitr) + ("r-vegan-delete-tests-patch" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/vegandevs/vegan/commit/" + "591d0e8ba1deaaf82445474ec6619c0b43db4e63.patch")) + (sha256 + (base32 + "0b1bi7y4jjdl3ph721vm9apm51dr2z9piwvhy4355sf2b4kyyj5a")))))) + (propagated-inputs + `(("r-cluster" ,r-cluster) + ("r-lattice" ,r-lattice) + ("r-mgcv" ,r-mgcv) + ("r-permute" ,r-permute))) + (home-page "https://cran.r-project.org/web/packages/vegan") + (synopsis "Functions for community ecology") + (description + "The vegan package provides tools for descriptive community ecology. It +has most basic functions of diversity analysis, community ordination and +dissimilarity analysis. Most of its multivariate tools can be used for other +data types as well.") + (license license:gpl2+))) + (define-public vsearch (package (name "vsearch") - (version "1.11.1") + (version "2.0.0") (source (origin (method url-fetch) @@ -3828,7 +3879,7 @@ data in the form of VCF files.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1pdvm3znjgq3zryy240yj9gc0bf1z31k6vf9jxrxgdgkvzgw85c7")) + "1sd57abgx077icqrbj36jq9q7pdpzc6dbics2pn1555kisq2jhfh")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 3f0b508d3c..f167f3320c 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 David Thompson ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2016 Lukas Gradl ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,8 +21,14 @@ (define-module (gnu packages crypto) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages pkg-config) #:use-module (gnu packages libbsd) + #:use-module (gnu packages nettle) + #:use-module (gnu packages password-utils) + #:use-module (gnu packages readline) + #:use-module (gnu packages serialization) + #:use-module (gnu packages tls) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) @@ -88,3 +95,55 @@ OpenBSD tool of the same name.") (non-copyleft "file://base64.c" "See base64.c in the distribution for the license from IBM."))))) + + +(define-public opendht + (package + (name "opendht") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://github.com/savoirfairelinux/" name + "/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/argon2") + (substitute* "src/Makefile.am" + (("./argon2/libargon2.la") "") + (("SUBDIRS = argon2") "")) + (substitute* "src/crypto.cpp" + (("argon2/argon2.h") "argon2.h")) + (substitute* "configure.ac" + (("src/argon2/Makefile") "")))) + (sha256 + (base32 + "09yvkmbqbym3b5md4n96qc1s9sf2n8ji404hagih45rmsj49599x")))) + (build-system gnu-build-system) + (inputs + `(("gnutls" ,gnutls) + ("nettle" ,nettle) + ("msgpack" ,msgpack) + ("readline" ,readline) + ("argon2" ,argon2))) + (native-inputs + `(("autoconf" ,autoconf) + ("pkg-config" ,pkg-config) + ("automake" ,automake) + ("libtool" ,libtool))) + (arguments + `(#:configure-flags '("--disable-tools" "--disable-python") + #:phases (modify-phases %standard-phases + (add-before 'configure 'autoconf + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (home-page "https://github.com/savoirfairelinux/opendht/") + (synopsis "Distributed Hash Table (DHT) library") + (description "OpenDHT is a Distributed Hash Table (DHT) library. It may +be used to manage peer-to-peer network connections as needed for real time +communication.") + (license gpl3))) diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index 126a21bf66..4aa954bd6f 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -52,16 +52,16 @@ clients.") (define-public vdirsyncer (package (name "vdirsyncer") - (version "0.11.0") + (version "0.11.2") (source (origin (method url-fetch) (uri (string-append "https://pypi.python.org/packages/" - "39/e5/1e7097b5f0cd6de79ec9014f162a6000b77ca2a369ea8a1588a2eebff570/" + "6c/fb/20c32861134579fdce67060bf4cc074e171d30c70590137adc73924f94a6/" name "-" version ".tar.gz")) (sha256 (base32 - "1bf0vk29qdswar0q4267aamfriq3134302i2p3qcqxpmmcwx3qfv")))) + "15isw2jhjfxi213wdj9d8mwq2m58k8bwf831qnxrjcz7j7bwy7mj")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 72fd993037..556a1051f1 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -169,7 +169,7 @@ tools that process C/C++ code.") (_ "UNSUPPORTED")))) (package (name "american-fuzzy-lop") - (version "1.96b") ;It seems all releases have the 'b' suffix + (version "2.15b") ;It seems all releases have the 'b' suffix (source (origin (method url-fetch) @@ -177,7 +177,7 @@ tools that process C/C++ code.") "afl-" version ".tgz")) (sha256 (base32 - "0z7j231p6v2h1dxxijgdzj1lq1lxr8cxllwf6iyv7p4ki5pv1gh3")))) + "04n2jfkchpz6a07w694b0im1vcmc3220ryqcaasa7vix7784wzs2")))) (build-system gnu-build-system) (inputs `(("custom-qemu" diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 5aea716150..931db626d8 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Sou Bunnbu ;;; @@ -22,6 +22,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages base) #:use-module (gnu packages texinfo) @@ -115,3 +116,25 @@ be used via the GNU Dico program or accessed online at http://gcide.gnu.org.ua/") (home-page "http://gcide.gnu.org.ua/") (license gpl3+))) + +(define-public diction + ;; Not quite a dictionary, not quite a spell checker either… + (package + (name "diction") + (version "1.11") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/diction/diction-" + version ".tar.gz")) + (sha256 + (base32 + "1xi4l1x1vvzmzmbhpx0ghmfnwwrhabjwizrpyylmy3fzinzz3him")))) + (build-system gnu-build-system) + (synopsis "Identifies wordy and commonly misused phrases") + (description + "A package providing two classic Unix commands, style and diction. +Diction is used to identify wordy and commonly misused phrases in a +body of text. Style instead analyzes surface aspects of a written +work, such as sentence length and other readability measures.") + (home-page "https://www.gnu.org/software/diction/") + (license gpl3+))) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ae25b54297..7b60722c10 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1638,6 +1638,27 @@ that it correctly finds RFCs even when a space appears before the number.") (license license:gpl3+))) +(define-public emacs-org-bullets + (package + (name "emacs-org-bullets") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/sabof/org-bullets/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dyxvpb73vj80v8br2q9rf255hfphrgaw91fbvwdcd735np9pcnh")))) + (build-system emacs-build-system) + (home-page "https://github.com/sabof/org-bullets") + (synopsis "Show bullets in org-mode as UTF-8 characters") + (description + "This package provides an Emacs minor mode causing bullets in +@code{org-mode} to be rendered as UTF-8 characters.") + (license license:gpl3+))) + (define-public emacs-zenburn-theme (package (name "emacs-zenburn-theme") @@ -1688,6 +1709,170 @@ features found in other packages it also brings many improvements as well as completely new features.") (license license:gpl3+))) +(define-public emacs-hydra + (package + (name "emacs-hydra") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/abo-abo/hydra/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19ynkjlg3jj7x90xxbz885324h6nkxmzlb2c2c95xkr20zckn0lk")))) + (build-system emacs-build-system) + (home-page "https://github.com/abo-abo/hydra") + (synopsis "Make Emacs bindings that stick around") + (description + "This package can be used to tie related commands into a family of short +bindings with a common prefix---a Hydra. Once you summon the Hydra (through +the prefixed binding), all the heads can be called in succession with only a +short extension. Any binding that isn't the Hydra's head vanquishes the +Hydra. Note that the final binding, besides vanquishing the Hydra, will still +serve its original purpose, calling the command assigned to it. This makes +the Hydra very seamless; it's like a minor mode that disables itself +automatically.") + (license license:gpl3+))) + +(define-public emacs-ivy + (package + (name "emacs-ivy") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/abo-abo/swiper/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18nqwl05is71dzswnvpfhlg7b0v3apvbsfxrwab9c0apwavi892q")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-hydra" ,emacs-hydra))) + (home-page "http://oremacs.com/swiper/") + (synopsis "Incremental vertical completion for Emacs") + (description + "This package provides @code{ivy-read} as an alternative to +@code{completing-read} and similar functions. No attempt is made to determine +the best candidate. Instead, the user can navigate candidates with +@code{ivy-next-line} and @code{ivy-previous-line}. The matching is done by +splitting the input text by spaces and re-building it into a regular +expression.") + (license license:gpl3+))) + +(define-public emacs-avy + (package + (name "emacs-avy") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/abo-abo/avy/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wdrq512h25ymzjbf2kbsdymvd2ryfwzb6bh5bc3yv7q203im796")))) + (build-system emacs-build-system) + (home-page "https://github.com/abo-abo/avy") + (synopsis "Tree-based completion for Emacs") + (description + "This package provides a generic completion method based on building a +balanced decision tree with each candidate being a leaf. To traverse the tree +from the root to a desired leaf, typically a sequence of @code{read-key} can +be used. + +In order for @code{read-key} to make sense, the tree needs to be visualized +appropriately, with a character at each branch node. So this completion +method works only for things that you can see on your screen, all at once, +such as the positions of characters, words, line beginnings, links, or +windows.") + (license license:gpl3+))) + +(define-public emacs-ace-window + (package + (name "emacs-ace-window") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/abo-abo/ace-window/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1p2sgfl5dml4zbd6ldql6lm2m9vmd236ah996ni32x254s48j5pn")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-avy" ,emacs-avy))) + (home-page "https://github.com/abo-abo/ace-window") + (synopsis "Quickly switch windows in Emacs") + (description + "@code{ace-window} is meant to replace @code{other-window}. +In fact, when there are only two windows present, @code{other-window} is +called. If there are more, each window will have its first character +highlighted. Pressing that character will switch to that window.") + (license license:gpl3+))) + +(define-public emacs-iedit + (package + (name "emacs-iedit") + (version "0.9.9") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/victorhge/iedit/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "00v86zllcsivmiibigbr91qij2zdf1lr9db8z8again1sn63wkdj")))) + (build-system emacs-build-system) + (home-page "http://www.emacswiki.org/emacs/Iedit") + (synopsis "Edit multiple regions in the same way simultaneously") + (description + "This package is an Emacs minor mode and allows you to edit one +occurrence of some text in a buffer (possibly narrowed) or region, and +simultaneously have other occurrences edited in the same way. + +You can also use Iedit mode as a quick way to temporarily show only the buffer +lines that match the current text being edited. This gives you the effect of +a temporary @code{keep-lines} or @code{occur}.") + (license license:gpl3+))) + +(define-public emacs-lispy + (package + (name "emacs-lispy") + (version "0.26.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/abo-abo/lispy/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15gig95cvamw5zlw99cxggd27c18b9scznjj97gvjn2zbljcaqzl")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ace-window" ,emacs-ace-window) + ("emacs-iedit" ,emacs-iedit) + ("emacs-ivy" ,emacs-ivy) + ("emacs-hydra" ,emacs-hydra))) + (home-page "https://github.com/abo-abo/lispy") + (synopsis "Modal S-expression editing") + (description + "Due to the structure of Lisp syntax it's very rare for the programmer to +want to insert characters right before \"(\" or right after \")\". Thus +unprefixed printable characters can be used to call commands when the point is +at one of these special locations. Lispy provides unprefixed keybindings for +S-expression editing when point is at the beginning or end of an +S-expression.") + (license license:gpl3+))) + (define-public emacs-clojure-mode (package (name "emacs-clojure-mode") @@ -2191,3 +2376,25 @@ Lua programing language}.") "This Emacs package provides modes for ebuild, eclass, eblit, GLEP42 news items, openrc and runscripts.") (license license:gpl2+))) + +(define-public emacs-writegood-mode + (package + (name "emacs-writegood-mode") + (version "2.0.2") + (home-page "http://github.com/bnbeckwith/writegood-mode") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 + "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b")) + (file-name (string-append name "-checkout")))) + (build-system emacs-build-system) + (synopsis "Polish up poor writing on the fly") + (description + "This minor mode tries to find and highlight problems with your writing +in English as you type. It primarily detects \"weasel words\" and abuse of +passive voice.") + (license license:gpl3+))) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 5531dcd367..2a606ebd7e 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -54,7 +54,7 @@ (define-public efl (package (name "efl") - (version "1.17.1") + (version "1.17.2") (source (origin (method url-fetch) (uri (string-append @@ -62,7 +62,7 @@ version ".tar.xz")) (sha256 (base32 - "0d58bhvwg7c5hp07wywlwnqi01k4jhmpgac7gkx9lil1x6kmahqs")))) + "1dpq5flygrjg931nzsr2ra8icqffzrzbs1lnrzarbpsbmgq3zacs")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm new file mode 100644 index 0000000000..39da7e939b --- /dev/null +++ b/gnu/packages/erlang.scm @@ -0,0 +1,179 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Steve Sprang +;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2016 Pjotr Prins +;;; +;;; 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 erlang) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (gnu packages autotools) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gl) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl) + #:use-module (gnu packages tls) + #:use-module (gnu packages wxwidgets)) + +(define-public erlang + (package + (name "erlang") + ;; When updating, remember to update the hash of erlang-manpages! + (version "19.0") + (source (origin + (method url-fetch) + ;; The tarball from http://erlang.org/download contains many + ;; pre-compiled files, so we use this snapshot of the source + ;; repository. + (uri (string-append "https://github.com/erlang/otp/archive/OTP-" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dxyz6x1yfv33fd0xfry2ihylkyfa2d655q1vxvbz8dflyd64yqh")))) + (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl) + ("autoconf" ,autoconf) + ("automake" ,automake) + + ;; Erlang's documentation is distributed in a separate tarball. + ("erlang-manpages" + ,(origin + (method url-fetch) + (uri (string-append "http://erlang.org/download/otp_doc_man_" + version ".tar.gz")) + (sha256 + (base32 + "07j0l7ary936hil38xr3hvfw6j74pshkyyi98kc9cassbbcdd8y7")))))) + (inputs + `(("ncurses" ,ncurses) + ("openssl" ,openssl) + ("wxwidgets" ,wxwidgets))) + (propagated-inputs + `(("fontconfig" ,fontconfig) + ("glu" ,glu) + ("mesa" ,mesa))) + (arguments + `(#:test-target "release_tests" + #:configure-flags + (list "--disable-saved-compile-time" + "--enable-dynamic-ssl-lib" + "--enable-native-libs" + "--enable-shared-zlib" + "--enable-smp-support" + "--enable-threads" + "--enable-wx" + (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl"))) + #:modules ((srfi srfi-19) ; make-time, et cetera. + (guix build utils) + (guix build gnu-build-system)) + #:phases + (modify-phases %standard-phases + ;; The are several code fragments that embed timestamps into the + ;; output. Here, we alter those fragments to use the value of + ;; SOURCE_DATE_EPOCH instead. + (add-after 'unpack 'remove-timestamps + (lambda _ + (let ((source-date-epoch + (time-utc->date + (make-time time-utc 0 (string->number + (getenv "SOURCE_DATE_EPOCH")))))) + (substitute* "lib/reltool/src/reltool_target.erl" + (("Date = date\\(\\),") + (string-append "Date = " + (date->string source-date-epoch + "'{~Y,~m,~d}',")))) + (substitute* "lib/reltool/src/reltool_target.erl" + (("Time = time\\(\\),") + (string-append "Time = " + (date->string source-date-epoch + "'{~H,~M,~S}',")))) + (substitute* '("lib/reltool/src/reltool_target.erl" + "lib/sasl/src/systools_make.erl") + (("date\\(\\), time\\(\\),") + (date->string source-date-epoch + "{~Y,~m,~d}, {~H,~M,~S},"))) + (substitute* '("lib/dialyzer/test/small_SUITE_data/src/gs_make.erl" + "lib/gs/src/gs_make.erl") + (("tuple_to_list\\(date\\(\\)\\),tuple_to_list\\(time\\(\\)\\)") + (date->string + source-date-epoch + "tuple_to_list({~Y,~m,~d}), tuple_to_list({~H,~M,~S})"))) + (substitute* "lib/snmp/src/compile/snmpc_mib_to_hrl.erl" + (("\\{Y,Mo,D\\} = date\\(\\),") + (date->string source-date-epoch + "{Y,Mo,D} = {~Y,~m,~d},"))) + (substitute* "lib/snmp/src/compile/snmpc_mib_to_hrl.erl" + (("\\{H,Mi,S\\} = time\\(\\),") + (date->string source-date-epoch + "{H,Mi,S} = {~H,~M,~S},")))))) + (add-after 'patch-source-shebangs 'patch-source-env + (lambda _ + (let ((escripts + (append + (find-files "." "\\.escript") + (find-files "lib/stdlib/test/escript_SUITE_data/") + '("erts/lib_src/utils/make_atomics_api" + "erts/preloaded/src/add_abstract_code" + "lib/diameter/bin/diameterc" + "lib/reltool/examples/display_args" + "lib/reltool/examples/mnesia_core_dump_viewer" + "lib/snmp/src/compile/snmpc.src" + "make/verify_runtime_dependencies" + "make/emd2exml.in")))) + (substitute* escripts + (("/usr/bin/env") (which "env")))))) + (add-before 'configure 'set-erl-top + (lambda _ + (setenv "ERL_TOP" (getcwd)))) + (add-before 'configure 'autoconf + (lambda _ (zero? (system* "./otp_build" "autoconf")))) + (add-after 'install 'patch-erl + ;; This only works after install. + (lambda _ + (substitute* (string-append (assoc-ref %outputs "out") "/bin/erl") + (("sed") (which "sed"))))) + (add-after 'install 'install-doc + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (manpages (assoc-ref inputs "erlang-manpages")) + (share (string-append out "/share/"))) + (mkdir-p share) + (mkdir-p (string-append share "/misc/erlang")) + (with-directory-excursion share + (and + (zero? (system* "tar" "xvf" manpages)) + (rename-file "COPYRIGHT" + (string-append share "/misc/erlang/COPYRIGHT")) + ;; Delete superfluous files. + (for-each delete-file '("PR.template" + "README")))))))))) + (home-page "http://erlang.org/") + (synopsis "The Erlang programming language") + (description + "Erlang is a programming language used to build massively +scalable soft real-time systems with requirements on high +availability. Some of its uses are in telecoms, banking, e-commerce, +computer telephony and instant messaging. Erlang's runtime system has +built-in support for concurrency, distribution and fault tolerance.") + ;; Erlang is distributed under the Apache License 2.0, but some components + ;; have other licenses. See 'system/COPYRIGHT' in the source distribution. + (license (list license:asl2.0 license:bsd-2 license:bsd-3 license:expat + license:lgpl2.0+ license:tcl/tk license:zlib)))) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 56617bb895..b11285ab54 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -34,6 +34,8 @@ #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages fribidi) #:use-module (gnu packages glib) #:use-module (gnu packages gnunet) #:use-module (gnu packages guile) @@ -432,3 +434,28 @@ It offers the following features: import into a database. @end enumerate") (license license:gpl2+))) + +(define-public quesoglc + (package + (name "quesoglc") + (version "0.7.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/" name "/" version "/" + name "-" version "-free.tar.bz2")) + (sha256 + (base32 + "08ddhywdy2qg17m592ng3yr0p1ih96irg8wg729g75hsxxq9ipks")))) + (build-system gnu-build-system) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("fontconfig" ,fontconfig) + ("freeglute" ,freeglut) + ("fribidi" ,fribidi) + ("glew" ,glew))) + (home-page "http://quesoglc.sourceforge.net") + (synopsis "Implementation of the OpenGL Character Renderer (GLC)") + (description + "The OpenGL Character Renderer (GLC) is a state machine that provides +OpenGL programs with character rendering services via an application programming +interface (API).") + (license (list license:expat license:lgpl2.1+)))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b0bf4e3546..39fc6f2666 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2396,3 +2396,99 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.") your way through an underground cave system in search of the Grue. Can you capture it and get out alive?") (license license:agpl3+))) + +(define-public warzone2100 + (package + (name "warzone2100") + (version "3.1.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/" name + "/releases/" version "/" name "-" version + ".tar.xz")) + (sha256 + (base32 + "0hm49i2knvvg3wlnryv7h4m84s3qa7jfyym5yy6365sx8wzcrai1")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'set-paths 'set-sdl-paths + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" + (string-append (assoc-ref inputs "sdl-union") + "/include/SDL")) + #t))))) + (native-inputs `(("pkg-config" ,pkg-config) + ("unzip" ,unzip) + ("zip" ,zip))) + (inputs `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("fribidi" ,fribidi) + ("glew" ,glew) + ("libtheora" ,libtheora) + ("libvorbis" ,libvorbis) + ("libxrandr" ,libxrandr) + ("openal" ,openal) + ("physfs" ,physfs) + ("qt", qt-4) + ("quesoglc" ,quesoglc) + ("sdl-union" ,(sdl-union)))) + (home-page "http://wz2100.net") + (synopsis "3D Real-time strategy and real-time tactics game") + (description + "Warzone 2100 offers campaign, multi-player, and single-player skirmish +modes. An extensive tech tree with over 400 different technologies, combined +with the unit design system, allows for a wide variety of possible units and +tactics.") + ; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL + (license (list license:bsd-3 + license:cc0 + license:cc-by-sa3.0 + license:expat + license:gpl2+ + license:lgpl2.1+)))) + +(define-public starfighter + (package + (name "starfighter") + (version "1.5.1.1") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://savannah/starfighter/" + (version-major+minor version) "/" + name "-" version "-src.tar.gz")) + (sha256 + (base32 + "1qc0hhw9m8sy3n9fips52c7aph3w8a8pdl4n45yaasgxzbvpn9xg")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no check target + #:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "PREFIX=" out) + (string-append "BINDIR=" out "/bin/"))) + #:phases + (modify-phases %standard-phases + ;; no configure script + (delete 'configure)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("sdl2" ,sdl2) + ("sdl2-image" ,sdl2-image) + ("sdl2-mixer" ,sdl2-mixer))) + (home-page "http://starfighter.nongnu.org/") + (synopsis "2D scrolling shooter game") + (description + "In the year 2579, the intergalactic weapons corporation, WEAPCO, has +dominated the galaxy. Guide Chris Bainfield and his friend Sid Wilson on +their quest to liberate the galaxy from the clutches of WEAPCO. Along the +way, you will encounter new foes, make new allies, and assist local rebels +in strikes against the evil corporation.") + ;; gfx and music are under CC-BY 3.0, CC-BY-SA 3.0, CC0 or Public Domain. + (license (list license:gpl3+ + license:cc-by3.0 + license:cc-by-sa3.0 + license:cc0 + license:public-domain)))) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 74c4be6e24..9335005150 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt -;;; Copyright © 2014 Eric Bavier +;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa ;;; Copyright © 2015, 2016 Sou Bunnbu ;;; Copyright © 2015 Mathieu Lirzin @@ -3840,7 +3840,7 @@ metadata in photo and video files of various formats.") (define-public shotwell (package (name "shotwell") - (version "0.22.1") + (version "0.23.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3848,7 +3848,7 @@ metadata in photo and video files of various formats.") name "-" version ".tar.xz")) (sha256 (base32 - "1a9lx9a7p6fgaf838xlw98f73xxyxmg6jmm29830lsl8ynbhq9bk")))) + "12imip32mav0zqg1fh4xm6zk4qsgg2435xsyb6ljz47i37zk6kg2")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ;no "check" target @@ -3876,7 +3876,7 @@ metadata in photo and video files of various formats.") ("libraw" ,libraw) ("json-glib" ,json-glib) ("rest" ,rest) - ("webkitgtk" ,webkitgtk-2.4) + ("webkitgtk" ,webkitgtk) ("sqlite" ,sqlite) ("libsoup" ,libsoup) ("libxml2" ,libxml2) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 46342ee247..b1ffbc8658 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -48,7 +48,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages xorg) #:use-module (gnu packages gl) - #:use-module (gnu packages yasm) + #:use-module (gnu packages assembly) #:use-module (gnu packages icu4c) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 483710f6fe..f9e677bca4 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -57,7 +57,7 @@ #:use-module (gnu packages telephony) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) - #:use-module (gnu packages yasm) + #:use-module (gnu packages assembly) #:use-module (gnu packages xml)) (define-public orc diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 9b761b10b5..4bea9aad76 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages ed) #:use-module (gnu packages base) #:use-module (gnu packages texinfo) + #:use-module (gnu packages man) #:use-module (gnu packages gettext) #:use-module (gnu packages databases) #:use-module (gnu packages python) @@ -200,14 +201,14 @@ without requiring the source code to be rewritten.") (define-public guile-next (package (inherit guile-2.0) (name "guile-next") - (version "2.1.2") + (version "2.1.3") (source (origin (method url-fetch) (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "0p971k3v04jj5klnv145g4172cpcp90arf0wvxxj2aqkg16j9m9c")) + "1k48wqca2hrsbfq4ssiv4pg9jwlqncs5iwwxklk2bnczi7lavv78")) (modules '((guix build utils))) ;; Remove the pre-built object files. Instead, build everything @@ -422,6 +423,55 @@ Guile, so its configuration can be written in Scheme; the original cron format is also supported.") (license gpl3+))) +(define-public mcron2 + ;; This is mthl's mcron development branch, not yet merged in mcron. + (let ((commit "31baff1a5187d8ddc89324cbe42dbeffc309c962")) + (package + (inherit mcron) + (name "mcron2") + (version (string-append (package-version mcron) "-0." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/mthl/mcron/") + (commit commit))) + (sha256 + (base32 + "1h5wxy997hxi718hpx419c23q09939kbxrjbbq54lv0cgw1bb63z")) + (file-name (string-append name "-" version "-checkout")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo) + ("help2man" ,help2man))) + (arguments + `(#:modules ((ice-9 match) (ice-9 ftw) + ,@%gnu-build-system-modules) + + #:phases (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi")))) + (add-after 'install 'wrap-mcron + (lambda* (#:key outputs #:allow-other-keys) + ;; Wrap the 'mcron' command to refer to the right + ;; modules. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (site (string-append + out "/share/guile/site"))) + (match (scandir site) + (("." ".." version) + (let ((modules (string-append site "/" version))) + (wrap-program (string-append bin "/mcron") + `("GUILE_LOAD_PATH" ":" prefix + (,modules)) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix + (,modules))) + #t)))))))))))) + (define-public guile-lib (package (name "guile-lib") @@ -1008,4 +1058,69 @@ provides access to that interface and its types from the Scheme level.") (home-page "http://www.nongnu.org/g-wrap/index.html") (license lgpl2.1+))) +(define-public guile-dbi + (package + (name "guile-dbi") + (version "2.1.6") + (source (origin + (method url-fetch) + (uri (string-append + "http://download.gna.org/guile-dbi/guile-dbi-" + version ".tar.gz")) + (sha256 + (base32 + "116njrprhgrsv1qm904sp3b02rq01fx639r433d657gyhw3x159n")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags + (list (string-append + "--with-guile-site-dir=" %output "/share/guile/site/2.0")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'patch-extension-path + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dbi.scm (string-append + out "/share/guile/site/2.0/dbi/dbi.scm")) + (ext (string-append out "/lib/libguile-dbi"))) + (substitute* dbi.scm (("libguile-dbi") ext)) + #t)))))) + (propagated-inputs + `(("guile" ,guile-2.0))) + (synopsis "Guile database abstraction layer") + (home-page "http://home.gna.org/guile-dbi/guile-dbi.html") + (description + "guile-dbi is a library for Guile that provides a convenient interface to +SQL databases. Database programming with guile-dbi is generic in that the same +programming interface is presented regardless of which database system is used. +It currently supports MySQL, Postgres and SQLite3.") + (license gpl2+))) + +(define-public guile-dbd-sqlite3 + (package + (name "guile-dbd-sqlite3") + (version "2.1.6") + (source (origin + (method url-fetch) + (uri (string-append + "http://download.gna.org/guile-dbi/guile-dbd-sqlite3-" + version ".tar.gz")) + (sha256 + (base32 + "0rg71jchxd2y8x496s8zmfmikr5g8zxi8zv2ar3f7a23pph92iw2")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("sqlite" ,sqlite) + ("zlib" ,(@ (gnu packages compression) zlib)))) + (propagated-inputs + `(("guile-dbi" ,guile-dbi))) + (synopsis "Guile DBI driver for SQLite") + (home-page "https://github.com/jkalbhenn/guile-dbd-sqlite3") + (description + "guile-dbi is a library for Guile that provides a convenient interface to +SQL databases. This package implements the interface for SQLite.") + (license gpl2+))) + ;;; guile.scm ends here diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b043e03ea4..ba8f48d677 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -264,7 +265,7 @@ interactive environment for the functional language Haskell.") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/hostname/" + (uri (string-append "https://hackage.haskell.org/package/hostname/" "hostname-" version ".tar.gz")) (sha256 (base32 @@ -311,14 +312,14 @@ determine the hostname.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/prelude-extras/prelude-extras-" + "https://hackage.haskell.org/package/prelude-extras/prelude-extras-" version ".tar.gz")) (sha256 (base32 "1q7mj9hysy747vimnlyrwsk1wb2axymxixa76fwcbcnmz3fi4llp")))) (build-system haskell-build-system) - (home-page "http://github.com/ekmett/prelude-extras") + (home-page "https://github.com/ekmett/prelude-extras") (synopsis "Higher order versions of Prelude classes") (description "This library provides higher order versions of @code{Prelude} classes to ease programming with polymorphic recursion and @@ -333,7 +334,7 @@ reduce @code{UndecidableInstances}.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/data-default/data-default-" + "https://hackage.haskell.org/package/data-default/data-default-" version ".tar.gz")) (sha256 @@ -350,7 +351,7 @@ reduce @code{UndecidableInstances}.") ,ghc-data-default-instances-dlist) ("ghc-data-default-instances-old-locale" ,ghc-data-default-instances-old-locale))) - (home-page "http://hackage.haskell.org/package/data-default") + (home-page "https://hackage.haskell.org/package/data-default") (synopsis "Types with default values") (description "This package defines a class for types with a default value, and @@ -366,12 +367,12 @@ packages.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/data-default-class/" + "https://hackage.haskell.org/package/data-default-class/" "data-default-class-" version ".tar.gz")) (sha256 (base32 "0ccgr3jllinchqhw3lsn73ic6axk4196if5274rr1rghls0fxj5d")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/data-default-class") + (home-page "https://hackage.haskell.org/package/data-default-class") (synopsis "Types with default values") (description "This package defines a class for types with default values.") @@ -385,7 +386,7 @@ packages.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/" + "https://hackage.haskell.org/package/" "data-default-instances-base/" "data-default-instances-base-" version ".tar.gz")) (sha256 @@ -393,7 +394,7 @@ packages.") (build-system haskell-build-system) (propagated-inputs `(("ghc-data-default-class" ,ghc-data-default-class))) - (home-page "http://hackage.haskell.org/package/data-default-instances-base") + (home-page "https://hackage.haskell.org/package/data-default-instances-base") (synopsis "Default instances for types in base") (description "This package provides default instances for types from the base @@ -408,7 +409,7 @@ package.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/" + "https://hackage.haskell.org/package/" "data-default-instances-containers/" "data-default-instances-containers-" version ".tar.gz")) (sha256 @@ -416,7 +417,7 @@ package.") (build-system haskell-build-system) (propagated-inputs `(("ghc-data-default-class" ,ghc-data-default-class))) - (home-page "http://hackage.haskell.org/package/data-default-instances-containers") + (home-page "https://hackage.haskell.org/package/data-default-instances-containers") (synopsis "Default instances for types in containers") (description "Provides default instances for types from the containers package.") @@ -430,7 +431,7 @@ package.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/" + "https://hackage.haskell.org/package/" "data-default-instances-dlist/" "data-default-instances-dlist-" version ".tar.gz")) (sha256 @@ -439,7 +440,7 @@ package.") (propagated-inputs `(("ghc-data-default-class" ,ghc-data-default-class) ("ghc-dlist" ,ghc-dlist))) - (home-page "http://hackage.haskell.org/package/data-default-instances-dlist") + (home-page "https://hackage.haskell.org/package/data-default-instances-dlist") (synopsis "Default instances for types in dlist") (description "Provides default instances for types from the dlist package.") @@ -453,7 +454,7 @@ package.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/haddock-library/haddock-library-" + "https://hackage.haskell.org/package/haddock-library/haddock-library-" version ".tar.gz")) (sha256 @@ -483,7 +484,7 @@ the ‘haddock’ package.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/haddock-api/haddock-api-" + "https://hackage.haskell.org/package/haddock-api/haddock-api-" version ".tar.gz")) (sha256 @@ -507,7 +508,7 @@ documentation-generation tool for Haskell libraries.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/haddock/haddock-" + "https://hackage.haskell.org/package/haddock/haddock-" version ".tar.gz")) (sha256 @@ -533,7 +534,7 @@ documentation-generation tool for Haskell libraries.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/simple-reflect/simple-reflect-" + "https://hackage.haskell.org/package/simple-reflect/simple-reflect-" version ".tar.gz")) (sha256 @@ -560,7 +561,7 @@ them.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/multipart/multipart-" + "https://hackage.haskell.org/package/multipart/multipart-" version ".tar.gz")) (sha256 @@ -584,7 +585,7 @@ them.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/html/html-" + "https://hackage.haskell.org/package/html/html-" version ".tar.gz")) (sha256 @@ -592,7 +593,7 @@ them.") "0q9hmfii62kc82ijlg238fxrzxhsivn42x5wd6ffcr9xldg4jd8c")))) (build-system haskell-build-system) (home-page - "http://hackage.haskell.org/package/html") + "https://hackage.haskell.org/package/html") (synopsis "HTML combinator library") (description "This package contains a combinator library for constructing HTML @@ -607,7 +608,7 @@ documents.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/xhtml/xhtml-" + "https://hackage.haskell.org/package/xhtml/xhtml-" version ".tar.gz")) (sha256 @@ -629,7 +630,7 @@ Strict, Transitional and Frameset variants.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/haskell-src/haskell-src-" + "https://hackage.haskell.org/package/haskell-src/haskell-src-" version ".tar.gz")) (sha256 @@ -640,7 +641,7 @@ Strict, Transitional and Frameset variants.") `(("ghc-happy" ,ghc-happy) ("ghc-syb" ,ghc-syb))) (home-page - "http://hackage.haskell.org/package/haskell-src") + "https://hackage.haskell.org/package/haskell-src") (synopsis "Support for manipulating Haskell source code") (description @@ -658,7 +659,7 @@ package are to parse or generate Haskell 98 code.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/alex/alex-" + "https://hackage.haskell.org/package/alex/alex-" version ".tar.gz")) (sha256 @@ -687,7 +688,7 @@ tool lex or flex for C/C++.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/cgi/cgi-" + "https://hackage.haskell.org/package/cgi/cgi-" version ".tar.gz")) (sha256 @@ -718,7 +719,7 @@ tool lex or flex for C/C++.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/cmdargs/cmdargs-" + "https://hackage.haskell.org/package/cmdargs/cmdargs-" version ".tar.gz")) (sha256 @@ -739,7 +740,7 @@ tool lex or flex for C/C++.") (source (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/concatenative/concatenative-" + "https://hackage.haskell.org/package/concatenative/concatenative-" version ".tar.gz")) (sha256 (base32 @@ -762,7 +763,7 @@ postfix notation. For more information on stack based languages, see (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/happy/happy-" + "https://hackage.haskell.org/package/happy/happy-" version ".tar.gz")) (sha256 @@ -788,7 +789,7 @@ Happy works in a similar way to the yacc tool for C.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/haskell-src-exts/haskell-src-exts-" + "https://hackage.haskell.org/package/haskell-src-exts/haskell-src-exts-" version ".tar.gz")) (sha256 @@ -822,7 +823,7 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/" name + "https://hackage.haskell.org/package/" name "/" name "-" version ".tar.gz")) (sha256 (base32 @@ -851,7 +852,7 @@ unwanted suggestions, and to add your own custom suggestions.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/resourcet/resourcet-" + "https://hackage.haskell.org/package/resourcet/resourcet-" version ".tar.gz")) (sha256 @@ -868,7 +869,7 @@ unwanted suggestions, and to add your own custom suggestions.") (inputs `(("ghc-lifted-base" ,ghc-lifted-base) ("ghc-hspec" ,ghc-hspec))) - (home-page "http://github.com/snoyberg/conduit") + (home-page "https://github.com/snoyberg/conduit") (synopsis "Deterministic allocation and freeing of scarce resources") (description "ResourceT is a monad transformer which creates a region of code where you can safely allocate resources.") @@ -882,7 +883,7 @@ code where you can safely allocate resources.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/xss-sanitize/xss-sanitize-" + "https://hackage.haskell.org/package/xss-sanitize/xss-sanitize-" version ".tar.gz")) (sha256 @@ -899,7 +900,7 @@ code where you can safely allocate resources.") ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-hspec" ,ghc-hspec) ("ghc-hunit" ,ghc-hunit))) - (home-page "http://github.com/yesodweb/haskell-xss-sanitize") + (home-page "https://github.com/yesodweb/haskell-xss-sanitize") (synopsis "Sanitize untrusted HTML to prevent XSS attacks") (description "This library provides @code{sanitizeXSS}. Run untrusted HTML through @code{Text.HTML.SanitizeXSS.sanitizeXSS} to prevent XSS @@ -914,7 +915,7 @@ attacks.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/ObjectName/ObjectName-" + "https://hackage.haskell.org/package/ObjectName/ObjectName-" version ".tar.gz")) (sha256 @@ -937,7 +938,7 @@ OpenAL.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/SDL/SDL-" + "https://hackage.haskell.org/package/SDL/SDL-" version ".tar.gz")) (sha256 @@ -963,7 +964,7 @@ award winning Linux port of \"Civilization: Call To Power.\"") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/SDL-mixer/SDL-mixer-" + "https://hackage.haskell.org/package/SDL-mixer/SDL-mixer-" version ".tar.gz")) (sha256 @@ -979,7 +980,7 @@ award winning Linux port of \"Civilization: Call To Power.\"") `(("ghc-sdl" ,ghc-sdl))) (inputs `(("sdl-mixer" ,sdl-mixer))) - (home-page "http://hackage.haskell.org/package/SDL-mixer") + (home-page "https://hackage.haskell.org/package/SDL-mixer") (synopsis "Haskell bindings to libSDL_mixer") (description "SDL_mixer is a sample multi-channel audio mixer library. It supports any number of simultaneously playing channels of 16 bit stereo audio, @@ -995,7 +996,7 @@ MIDI, Ogg Vorbis, and SMPEG MP3 libraries.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/SDL-image/SDL-image-" + "https://hackage.haskell.org/package/SDL-image/SDL-image-" version ".tar.gz")) (sha256 @@ -1011,7 +1012,7 @@ MIDI, Ogg Vorbis, and SMPEG MP3 libraries.") `(("ghc-sdl" ,ghc-sdl))) (inputs `(("sdl-image" ,sdl-image))) - (home-page "http://hackage.haskell.org/package/SDL-image") + (home-page "https://hackage.haskell.org/package/SDL-image") (synopsis "Haskell bindings to libSDL_image") (description "SDL_image is an image file loading library. It loads images as SDL surfaces, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, @@ -1026,14 +1027,14 @@ PNG, PNM, TGA, TIFF, XCF, XPM, XV.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/half/half-" + "https://hackage.haskell.org/package/half/half-" version ".tar.gz")) (sha256 (base32 "0zhwc6ps5w4ccnxl8sy623z4rjsafmnry69jpkw4hrbq11l402f1")))) (build-system haskell-build-system) - (home-page "http://github.com/ekmett/half") + (home-page "https://github.com/ekmett/half") (synopsis "Half-precision floating-point computations") (description "This library provides a half-precision floating-point computation library for Haskell.") @@ -1047,7 +1048,7 @@ computation library for Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/OpenGLRaw/OpenGLRaw-" + "https://hackage.haskell.org/package/OpenGLRaw/OpenGLRaw-" version ".tar.gz")) (sha256 @@ -1079,7 +1080,7 @@ found at runtime, a userError is thrown.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/GLUT/GLUT-" + "https://hackage.haskell.org/package/GLUT/GLUT-" version ".tar.gz")) (sha256 @@ -1107,7 +1108,7 @@ programs.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/GLURaw/GLURaw-" + "https://hackage.haskell.org/package/GLURaw/GLURaw-" version ".tar.gz")) (sha256 @@ -1131,7 +1132,7 @@ basis for a nicer interface.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/OpenGL/OpenGL-" + "https://hackage.haskell.org/package/OpenGL/OpenGL-" version ".tar.gz")) (sha256 @@ -1159,7 +1160,7 @@ version 1.3).") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/streaming-commons/streaming-commons-" + "https://hackage.haskell.org/package/streaming-commons/streaming-commons-" version ".tar.gz")) (sha256 @@ -1192,7 +1193,7 @@ various Haskell streaming data libraries, such as @code{conduit} and (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/" name "/" + "https://hackage.haskell.org/package/" name "/" name "-" version ".tar.gz")) (sha256 (base32 @@ -1220,7 +1221,7 @@ unlit literate code files; and an option to turn off macro-expansion.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/reflection/reflection-" + "https://hackage.haskell.org/package/reflection/reflection-" version ".tar.gz")) (sha256 @@ -1228,7 +1229,7 @@ unlit literate code files; and an option to turn off macro-expansion.") "10w3m6v3g6am203wbrikdbp57x9vw6b4jsh7bxdzsss4nmpm81zg")))) (build-system haskell-build-system) (inputs `(("ghc-tagged" ,ghc-tagged))) - (home-page "http://github.com/ekmett/reflection") + (home-page "https://github.com/ekmett/reflection") (synopsis "Reify arbitrary terms into types that can be reflected back into terms") (description "This package addresses the 'configuration problem' which is @@ -1245,13 +1246,13 @@ configurations to coexist without resorting to mutable global variables or (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/old-locale/old-locale-" + "https://hackage.haskell.org/package/old-locale/old-locale-" version ".tar.gz")) (sha256 (base32 "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/old-locale") + (home-page "https://hackage.haskell.org/package/old-locale") (synopsis "Adapt to locale conventions") (description "This package provides the ability to adapt to locale conventions such as @@ -1266,7 +1267,7 @@ date and time formats.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/old-time/old-time-" + "https://hackage.haskell.org/package/old-time/old-time-" version ".tar.gz")) (sha256 @@ -1275,11 +1276,11 @@ date and time formats.") (build-system haskell-build-system) (propagated-inputs `(("ghc-old-locale" ,ghc-old-locale))) - (home-page "http://hackage.haskell.org/package/old-time") + (home-page "https://hackage.haskell.org/package/old-time") (synopsis "Time compatibility library for Haskell") (description "Old-time is a package for backwards compatibility with the old @code{time} library. For new projects, the newer -@uref{http://hackage.haskell.org/package/time, time library} is recommended.") +@uref{https://hackage.haskell.org/package/time, time library} is recommended.") (license license:bsd-3))) (define-public ghc-data-default-instances-old-locale @@ -1290,7 +1291,7 @@ old @code{time} library. For new projects, the newer (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/" + "https://hackage.haskell.org/package/" "data-default-instances-old-locale/" "data-default-instances-old-locale-" version ".tar.gz")) (sha256 @@ -1300,7 +1301,7 @@ old @code{time} library. For new projects, the newer `(("ghc-data-default-class" ,ghc-data-default-class) ("ghc-old-locale" ,ghc-old-locale))) (home-page - "http://hackage.haskell.org/package/data-default-instances-old-locale") + "https://hackage.haskell.org/package/data-default-instances-old-locale") (synopsis "Default instances for types in old-locale") (description "Provides Default instances for types from the old-locale package.") @@ -1314,7 +1315,7 @@ old @code{time} library. For new projects, the newer (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/dlist/dlist-" + "https://hackage.haskell.org/package/dlist/dlist-" version ".tar.gz")) (sha256 @@ -1337,13 +1338,13 @@ Writer monad), where list append quickly becomes too expensive.") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "extensible-exceptions/extensible-exceptions-" version ".tar.gz")) (sha256 (base32 "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/extensible-exceptions") + (home-page "https://hackage.haskell.org/package/extensible-exceptions") (synopsis "Extensible exceptions for Haskell") (description "This package provides extensible exceptions for both new and old @@ -1358,7 +1359,7 @@ versions of GHC (i.e., < 6.10).") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/cabal-install/cabal-install-" + "https://hackage.haskell.org/package/cabal-install/cabal-install-" version ".tar.gz")) (sha256 @@ -1390,14 +1391,14 @@ installation of Haskell libraries and programs.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/mtl/mtl-" + "https://hackage.haskell.org/package/mtl/mtl-" version ".tar.gz")) (sha256 (base32 "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa")))) (build-system haskell-build-system) - (home-page "http://github.com/ekmett/mtl") + (home-page "https://github.com/ekmett/mtl") (synopsis "Monad classes, using functional dependencies") (description "Monad classes using functional dependencies, with instances @@ -1416,7 +1417,7 @@ School of Functional Programming', 1995. See (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/ghc-paths/ghc-paths-" + "https://hackage.haskell.org/package/ghc-paths/ghc-paths-" version ".tar.gz")) (sha256 @@ -1438,13 +1439,13 @@ School of Functional Programming', 1995. See (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/utf8-string/utf8-string-" + "https://hackage.haskell.org/package/utf8-string/utf8-string-" version ".tar.gz")) (sha256 (base32 "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv")))) (build-system haskell-build-system) - (home-page "http://github.com/glguy/utf8-string/") + (home-page "https://github.com/glguy/utf8-string/") (synopsis "Support for reading and writing UTF8 Strings") (description "A UTF8 layer for Strings. The utf8-string package provides operations @@ -1460,14 +1461,14 @@ UTF8 without truncation.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/setenv/setenv-" + "https://hackage.haskell.org/package/setenv/setenv-" version ".tar.gz")) (sha256 (base32 "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/setenv") + (home-page "https://hackage.haskell.org/package/setenv") (synopsis "Library for setting environment variables") (description "This package provides a Haskell library for setting environment variables.") @@ -1480,7 +1481,7 @@ environment variables.") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/X11/" + (uri (string-append "https://hackage.haskell.org/package/X11/" "X11-" version ".tar.gz")) (sha256 (base32 "1kzjcynm3rr83ihqx2y2d852jc49da4p18gv6jzm7g87z22x85jj")))) @@ -1506,7 +1507,7 @@ bindings are a direct translation of the C bindings.") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/X11-xft/" + (uri (string-append "https://hackage.haskell.org/package/X11-xft/" "X11-xft-" version ".tar.gz")) (sha256 (base32 "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf")))) @@ -1520,7 +1521,7 @@ bindings are a direct translation of the C bindings.") (native-inputs `(("pkg-config" ,pkg-config))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/X11-xft") + (home-page "https://hackage.haskell.org/package/X11-xft") (synopsis "Bindings to Xft") (description "Bindings to the Xft, X Free Type interface library, and some Xrender @@ -1535,7 +1536,7 @@ parts.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/stringbuilder/stringbuilder-" + "https://hackage.haskell.org/package/stringbuilder/stringbuilder-" version ".tar.gz")) (sha256 @@ -1544,7 +1545,7 @@ parts.") (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: circular dependencies with tests ; enabled - (home-page "http://hackage.haskell.org/package/stringbuilder") + (home-page "https://hackage.haskell.org/package/stringbuilder") (synopsis "Writer monad for multi-line string literals") (description "This package provides a writer monad for multi-line string literals.") @@ -1559,7 +1560,7 @@ literals.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/zlib/zlib-" + "https://hackage.haskell.org/package/zlib/zlib-" version ".tar.gz")) (sha256 @@ -1567,7 +1568,7 @@ literals.") "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm")))) (build-system haskell-build-system) (inputs `(("zlib" ,zlib))) - (home-page "http://hackage.haskell.org/package/zlib") + (home-page "https://hackage.haskell.org/package/zlib") (synopsis "Compression and decompression in the gzip and zlib formats") (description @@ -1588,14 +1589,14 @@ access to the full zlib feature set.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/stm/stm-" + "https://hackage.haskell.org/package/stm/stm-" version ".tar.gz")) (sha256 (base32 "0gc8zvdijp3rwmidkpxv76b4i0dc8dw6nbd92rxl4vxl0655iysx")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/stm") + (home-page "https://hackage.haskell.org/package/stm") (synopsis "Software Transactional Memory") (description "A modular composable concurrency abstraction.") @@ -1610,14 +1611,14 @@ access to the full zlib feature set.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/parallel/parallel-" + "https://hackage.haskell.org/package/parallel/parallel-" version ".tar.gz")) (sha256 (base32 "0hp6vf4zxsw6vz6lj505xihmnfhgjp39c9q7nyzlgcmps3xx6a5r")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/parallel") + (home-page "https://hackage.haskell.org/package/parallel") (synopsis "Parallel programming library") (description "This package provides a library for parallel programming.") @@ -1632,7 +1633,7 @@ access to the full zlib feature set.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/text/text-" + "https://hackage.haskell.org/package/text/text-" version ".tar.gz")) (sha256 @@ -1662,7 +1663,7 @@ in terms of large data quantities and high speed.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/hashable/hashable-" + "https://hackage.haskell.org/package/hashable/hashable-" version ".tar.gz")) (sha256 @@ -1674,7 +1675,7 @@ in terms of large data quantities and high speed.") ;; these inputs are necessary to use this library (propagated-inputs `(("ghc-text" ,ghc-text))) - (home-page "http://github.com/tibbe/hashable") + (home-page "https://github.com/tibbe/hashable") (synopsis "Class for types that can be converted to a hash value") (description @@ -1693,7 +1694,7 @@ combine hash values.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/HUnit/HUnit-" + "https://hackage.haskell.org/package/HUnit/HUnit-" version ".tar.gz")) (sha256 @@ -1716,13 +1717,13 @@ JUnit tool for Java.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/random/random-" + "https://hackage.haskell.org/package/random/random-" version ".tar.gz")) (sha256 (base32 "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/random") + (home-page "https://hackage.haskell.org/package/random") (synopsis "Random number library") (description "This package provides a basic random number generation library, including the ability to split random number generators.") @@ -1737,7 +1738,7 @@ library, including the ability to split random number generators.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/primitive/primitive-" + "https://hackage.haskell.org/package/primitive/primitive-" version ".tar.gz")) (sha256 @@ -1758,7 +1759,7 @@ library, including the ability to split random number generators.") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/test-framework/" + (uri (string-append "https://hackage.haskell.org/package/test-framework/" "test-framework-" version ".tar.gz")) (sha256 (base32 @@ -1793,7 +1794,7 @@ reporting and test statistics output.") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "test-framework-hunit/test-framework-hunit-" version ".tar.gz")) (sha256 @@ -1817,7 +1818,7 @@ reporting and test statistics output.") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "test-framework-quickcheck2/" "test-framework-quickcheck2-" version ".tar.gz")) (sha256 @@ -1852,7 +1853,7 @@ package.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/tf-random/tf-random-" + "https://hackage.haskell.org/package/tf-random/tf-random-" version ".tar.gz")) (sha256 @@ -1862,7 +1863,7 @@ package.") (propagated-inputs `(("ghc-primitive" ,ghc-primitive) ("ghc-random" ,ghc-random))) - (home-page "http://hackage.haskell.org/package/tf-random") + (home-page "https://hackage.haskell.org/package/tf-random") (synopsis "High-quality splittable pseudorandom number generator") (description "This package contains an implementation of a high-quality splittable pseudorandom number generator. The generator is based on a @@ -1879,7 +1880,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/transformers-base/transformers-base-" + "https://hackage.haskell.org/package/transformers-base/transformers-base-" version ".tar.gz")) (sha256 @@ -1891,7 +1892,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page - "http://hackage.haskell.org/package/transformers-compat") + "https://hackage.haskell.org/package/transformers-compat") (synopsis "Backported transformer library") (description @@ -1908,13 +1909,13 @@ compatibility to run on old versions of the platform.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/transformers-compat" + "https://hackage.haskell.org/package/transformers-compat" "/transformers-compat-" version ".tar.gz")) (sha256 (base32 "0lmg8ry6bgigb0v2lg0n74lxi8z5m85qq0qi4h1k9llyjb4in8ym")))) (build-system haskell-build-system) - (home-page "http://github.com/ekmett/transformers-compat/") + (home-page "https://github.com/ekmett/transformers-compat/") (synopsis "Small compatibility shim between transformers 0.3 and 0.4") (description "This package includes backported versions of types that were added to transformers in transformers 0.3 and 0.4 for users who need strict @@ -1930,7 +1931,7 @@ but also need those types.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/unix-time/unix-time-" + "https://hackage.haskell.org/package/unix-time/unix-time-" version ".tar.gz")) (sha256 @@ -1943,7 +1944,7 @@ but also need those types.") (propagated-inputs `(("ghc-old-time" ,ghc-old-time) ("ghc-old-locale" ,ghc-old-locale))) - (home-page "http://hackage.haskell.org/package/unix-time") + (home-page "https://hackage.haskell.org/package/unix-time") (synopsis "Unix time parser/formatter and utilities") (description "This library provides fast parsing and formatting utilities for Unix time in Haskell.") @@ -1957,7 +1958,7 @@ for Unix time in Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/unix-compat/unix-compat-" + "https://hackage.haskell.org/package/unix-compat/unix-compat-" version ".tar.gz")) (sha256 @@ -1965,7 +1966,7 @@ for Unix time in Haskell.") "0jxk7j5pz2kgfpqr4hznndjg31pqj5xg2qfc5308fcn9xyg1myps")))) (build-system haskell-build-system) (home-page - "http://github.com/jystic/unix-compat") + "https://github.com/jystic/unix-compat") (synopsis "Portable POSIX-compatibility layer") (description "This package provides portable implementations of parts of the unix @@ -1981,7 +1982,7 @@ isn't available, portable implementations are used.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/http-types/http-types-" + "https://hackage.haskell.org/package/http-types/http-types-" version ".tar.gz")) (sha256 @@ -2009,7 +2010,7 @@ both client and server code).") (source (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/indents/indents-" + "https://hackage.haskell.org/package/indents/indents-" version ".tar.gz")) (sha256 (base32 @@ -2035,7 +2036,7 @@ lines continued at an indented level below.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/iproute/iproute-" + "https://hackage.haskell.org/package/iproute/iproute-" version ".tar.gz")) (sha256 @@ -2065,7 +2066,7 @@ removed. Both IPv4 and IPv6 are supported.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/regex-base/regex-base-" + "https://hackage.haskell.org/package/regex-base/regex-base-" version ".tar.gz")) (sha256 @@ -2089,7 +2090,7 @@ regex-posix, regex-pcre, regex-parsec, regex-tdfa, regex-dfa.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/regex-posix/regex-posix-" + "https://hackage.haskell.org/package/regex-posix/regex-posix-" version ".tar.gz")) (sha256 @@ -2112,7 +2113,7 @@ Haskell library @code{regex-base}.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/regex-compat/regex-compat-" + "https://hackage.haskell.org/package/regex-compat/regex-compat-" version ".tar.gz")) (sha256 @@ -2136,7 +2137,7 @@ Haskell library @code{regex-base}.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/regex-tdfa-rc/regex-tdfa-rc-" + "https://hackage.haskell.org/package/regex-tdfa-rc/regex-tdfa-rc-" version ".tar.gz")) (sha256 @@ -2149,7 +2150,7 @@ Haskell library @code{regex-base}.") (inputs `(("ghc-mtl" ,ghc-mtl))) (home-page - "http://hackage.haskell.org/package/regex-tdfa") + "https://hackage.haskell.org/package/regex-tdfa") (synopsis "Tagged DFA regex engine for Haskell") (description "A new all-Haskell \"tagged\" DFA regex engine, inspired by @code{libtre} (fork by Roman Cheplyaka).") @@ -2163,7 +2164,7 @@ Haskell library @code{regex-base}.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/parsers/parsers-" + "https://hackage.haskell.org/package/parsers/parsers-" version ".tar.gz")) (sha256 @@ -2181,7 +2182,7 @@ Haskell library @code{regex-base}.") (inputs `(("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers))) - (home-page "http://github.com/ekmett/parsers/") + (home-page "https://github.com/ekmett/parsers/") (synopsis "Parsing combinators") (description "This library provides convenient combinators for working with and building parsing combinator libraries. Given a few simple instances, @@ -2198,7 +2199,7 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/trifecta/trifecta-" + "https://hackage.haskell.org/package/trifecta/trifecta-" version ".tar.gz")) (sha256 @@ -2226,7 +2227,7 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s ("ghc-parsers" ,ghc-parsers) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string))) - (home-page "http://github.com/ekmett/trifecta/") + (home-page "https://github.com/ekmett/trifecta/") (synopsis "Parser combinator library with convenient diagnostics") (description "Trifecta is a modern parser combinator library for Haskell, with slicing and Clang-style colored diagnostics.") @@ -2240,7 +2241,7 @@ with slicing and Clang-style colored diagnostics.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/attoparsec/attoparsec-" + "https://hackage.haskell.org/package/attoparsec/attoparsec-" version ".tar.gz")) (sha256 @@ -2271,7 +2272,7 @@ complicated text/binary file formats.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/css-text/css-text-" + "https://hackage.haskell.org/package/css-text/css-text-" version ".tar.gz")) (sha256 @@ -2297,7 +2298,7 @@ Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/zip-archive/zip-archive-" + "https://hackage.haskell.org/package/zip-archive/zip-archive-" version ".tar.gz")) (sha256 @@ -2327,7 +2328,7 @@ modifying, and extracting files from zip archives in Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/distributive/distributive-" + "https://hackage.haskell.org/package/distributive/distributive-" version ".tar.gz")) (sha256 @@ -2339,7 +2340,7 @@ modifying, and extracting files from zip archives in Haskell.") (propagated-inputs `(("ghc-tagged" ,ghc-tagged) ("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page "http://github.com/ekmett/distributive/") + (home-page "https://github.com/ekmett/distributive/") (synopsis "Distributive functors for Haskell") (description "This package provides distributive functors for Haskell. Dual to @code{Traversable}.") @@ -2353,14 +2354,14 @@ Dual to @code{Traversable}.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/cereal/cereal-" + "https://hackage.haskell.org/package/cereal/cereal-" version ".tar.gz")) (sha256 (base32 "15rhfn9hrjm01ksh9xpz9syxsp9vkvpp6b736iqq38wv2wb7416z")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/cereal") + (home-page "https://hackage.haskell.org/package/cereal") (synopsis "Binary serialization library") (description "This package provides a binary serialization library, similar to @code{binary}, that introduces an @code{isolate} primitive for @@ -2375,7 +2376,7 @@ parser isolation, and labeled blocks for better error messages.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/comonad/comonad-" + "https://hackage.haskell.org/package/comonad/comonad-" version ".tar.gz")) (sha256 @@ -2392,7 +2393,7 @@ parser isolation, and labeled blocks for better error messages.") `(("ghc-semigroups" ,ghc-semigroups) ("ghc-tagged" ,ghc-tagged) ("ghc-contravariant" ,ghc-contravariant))) - (home-page "http://github.com/ekmett/comonad/") + (home-page "https://github.com/ekmett/comonad/") (synopsis "Comonads for Haskell") (description "This library provides @code{Comonad}s for Haskell.") (license license:bsd-3))) @@ -2405,7 +2406,7 @@ parser isolation, and labeled blocks for better error messages.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/hscolour/hscolour-" + "https://hackage.haskell.org/package/hscolour/hscolour-" version ".tar.gz")) (sha256 @@ -2429,7 +2430,7 @@ and mIRC chat codes.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/polyparse/polyparse-" + "https://hackage.haskell.org/package/polyparse/polyparse-" version ".tar.gz")) (sha256 @@ -2459,7 +2460,7 @@ Strings.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/extra/extra-" + "https://hackage.haskell.org/package/extra/extra-" version ".tar.gz")) (sha256 @@ -2483,7 +2484,7 @@ this package makes them available back to GHC 7.2.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/profunctors/profunctors-" + "https://hackage.haskell.org/package/profunctors/profunctors-" version ".tar.gz")) (sha256 @@ -2495,7 +2496,7 @@ this package makes them available back to GHC 7.2.") (inputs `(("ghc-comonad" ,ghc-comonad) ("ghc-tagged" ,ghc-tagged))) - (home-page "http://github.com/ekmett/profunctors/") + (home-page "https://github.com/ekmett/profunctors/") (synopsis "Profunctors for Haskell") (description "This library provides profunctors for Haskell.") (license license:bsd-3))) @@ -2508,7 +2509,7 @@ this package makes them available back to GHC 7.2.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/reducers/reducers-" + "https://hackage.haskell.org/package/reducers/reducers-" version ".tar.gz")) (sha256 @@ -2523,7 +2524,7 @@ this package makes them available back to GHC 7.2.") ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-semigroups" ,ghc-semigroups))) - (home-page "http://github.com/ekmett/reducers/") + (home-page "https://github.com/ekmett/reducers/") (synopsis "Semigroups, specialized containers and a general map/reduce framework") (description "This library provides various semigroups, specialized containers and a general map/reduce framework for Haskell.") @@ -2537,7 +2538,7 @@ containers and a general map/reduce framework for Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/appar/appar-" + "https://hackage.haskell.org/package/appar/appar-" version ".tar.gz")) (sha256 @@ -2545,7 +2546,7 @@ containers and a general map/reduce framework for Haskell.") "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq")))) (build-system haskell-build-system) (home-page - "http://hackage.haskell.org/package/appar") + "https://hackage.haskell.org/package/appar") (synopsis "Simple applicative parser") (description "This package provides a simple applicative parser in Parsec style.") @@ -2559,7 +2560,7 @@ style.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/safe/safe-" + "https://hackage.haskell.org/package/safe/safe-" version ".tar.gz")) (sha256 @@ -2581,7 +2582,7 @@ exceptions.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/generic-deriving/generic-deriving-" + "https://hackage.haskell.org/package/generic-deriving/generic-deriving-" version ".tar.gz")) (sha256 @@ -2602,7 +2603,7 @@ deriving mechanism in Haskell to arbitrary classes.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/pcre-light/pcre-light-" + "https://hackage.haskell.org/package/pcre-light/pcre-light-" version ".tar.gz")) (sha256 @@ -2627,7 +2628,7 @@ syntax and semantics as Perl 5.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/logict/logict-" + "https://hackage.haskell.org/package/logict/logict-" version ".tar.gz")) (sha256 @@ -2652,7 +2653,7 @@ online}.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/xml/xml-" + "https://hackage.haskell.org/package/xml/xml-" version ".tar.gz")) (sha256 @@ -2674,7 +2675,7 @@ online}.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/exceptions/exceptions-" + "https://hackage.haskell.org/package/exceptions/exceptions-" version ".tar.gz")) (sha256 @@ -2686,7 +2687,7 @@ online}.") `(("ghc-stm" ,ghc-stm) ("ghc-mtl" ,ghc-mtl) ("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page "http://github.com/ekmett/exceptions/") + (home-page "https://github.com/ekmett/exceptions/") (synopsis "Extensible optionally-pure exceptions") (description "This library provides extensible optionally-pure exceptions for Haskell.") @@ -2700,7 +2701,7 @@ for Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/temporary/temporary-" + "https://hackage.haskell.org/package/temporary/temporary-" version ".tar.gz")) (sha256 @@ -2725,7 +2726,7 @@ installed.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/temporary-rc/temporary-rc-" + "https://hackage.haskell.org/package/temporary-rc/temporary-rc-" version ".tar.gz")) (sha256 @@ -2754,7 +2755,7 @@ This is a better maintained fork of the \"temporary\" package.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/smallcheck/smallcheck-" + "https://hackage.haskell.org/package/smallcheck/smallcheck-" version ".tar.gz")) (sha256 @@ -2781,7 +2782,7 @@ automatically by SmallCheck.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/tasty-ant-xml/tasty-ant-xml-" + "https://hackage.haskell.org/package/tasty-ant-xml/tasty-ant-xml-" version ".tar.gz")) (sha256 @@ -2797,7 +2798,7 @@ automatically by SmallCheck.") ("ghc-tagged" ,ghc-tagged) ("ghc-tasty" ,ghc-tasty))) (home-page - "http://github.com/ocharles/tasty-ant-xml") + "https://github.com/ocharles/tasty-ant-xml") (synopsis "Render tasty output to XML for Jenkins") (description @@ -2814,7 +2815,7 @@ framework.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/tasty-smallcheck/tasty-smallcheck-" + "https://hackage.haskell.org/package/tasty-smallcheck/tasty-smallcheck-" version ".tar.gz")) (sha256 @@ -2840,7 +2841,7 @@ Haskell test framework.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/silently/silently-" + "https://hackage.haskell.org/package/silently/silently-" version ".tar.gz")) (sha256 @@ -2864,7 +2865,7 @@ writing to stdout and other handles.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/" + "https://hackage.haskell.org/package/" "quickcheck-instances/quickcheck-instances-" version ".tar.gz")) (sha256 @@ -2893,7 +2894,7 @@ provided by the Haskell Platform.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/quickcheck-unicode/quickcheck-unicode-" + "https://hackage.haskell.org/package/quickcheck-unicode/quickcheck-unicode-" version ".tar.gz")) (sha256 @@ -2916,7 +2917,7 @@ testing Unicode-related software.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/quickcheck-io/quickcheck-io-" + "https://hackage.haskell.org/package/quickcheck-io/quickcheck-io-" version ".tar.gz")) (sha256 @@ -2942,7 +2943,7 @@ use HUnit assertions as QuickCheck properties.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/QuickCheck/QuickCheck-" + "https://hackage.haskell.org/package/QuickCheck/QuickCheck-" version ".tar.gz")) (sha256 @@ -2972,7 +2973,7 @@ use HUnit assertions as QuickCheck properties.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/case-insensitive/case-insensitive-" + "https://hackage.haskell.org/package/case-insensitive/case-insensitive-" version ".tar.gz")) (sha256 @@ -3006,7 +3007,7 @@ to cases.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/syb/syb-" + "https://hackage.haskell.org/package/syb/syb-" version ".tar.gz")) (sha256 @@ -3036,7 +3037,7 @@ variety of traversals.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/fgl/fgl-" + "https://hackage.haskell.org/package/fgl/fgl-" version ".tar.gz")) (sha256 @@ -3060,7 +3061,7 @@ encourages inductive, recursive definitions of graph algorithms.") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/ChasingBottoms/" + (uri (string-append "https://hackage.haskell.org/package/ChasingBottoms/" "ChasingBottoms-" version ".tar.gz")) (sha256 (base32 @@ -3078,7 +3079,7 @@ encourages inductive, recursive definitions of graph algorithms.") ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-random" ,ghc-random) ("ghc-syb" ,ghc-syb))) - (home-page "http://hackage.haskell.org/package/ChasingBottoms") + (home-page "https://hackage.haskell.org/package/ChasingBottoms") (synopsis "Testing of partial and infinite values in Haskell") (description ;; FIXME: There should be a @comma{} in the uref text, but it is not @@ -3100,7 +3101,7 @@ Partial and Infinite Values\"}.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/unordered-containers" + "https://hackage.haskell.org/package/unordered-containers" "/unordered-containers-" version ".tar.gz")) (sha256 (base32 @@ -3133,7 +3134,7 @@ and high speed.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/uniplate/uniplate-" + "https://hackage.haskell.org/package/uniplate/uniplate-" version ".tar.gz")) (sha256 @@ -3159,7 +3160,7 @@ work, but is substantially simpler and faster.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/base64-bytestring/base64-bytestring-" + "https://hackage.haskell.org/package/base64-bytestring/base64-bytestring-" version ".tar.gz")) (sha256 @@ -3181,7 +3182,7 @@ Haskell @code{ByteString}s.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/annotated-wl-pprint" + "https://hackage.haskell.org/package/annotated-wl-pprint" "/annotated-wl-pprint-" version ".tar.gz")) (sha256 @@ -3205,13 +3206,13 @@ a variety of ways.") (source (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/wl-pprint/wl-pprint-" + "https://hackage.haskell.org/package/wl-pprint/wl-pprint-" version ".tar.gz")) (sha256 (base32 "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/wl-pprint") + (home-page "https://hackage.haskell.org/package/wl-pprint") (synopsis "Wadler/Leijen pretty printer") (description "This is a pretty printing library based on Wadler's paper @i{A Prettier @@ -3227,7 +3228,7 @@ instances of the @code{Pretty} class.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/ansi-wl-pprint/ansi-wl-pprint-" + "https://hackage.haskell.org/package/ansi-wl-pprint/ansi-wl-pprint-" version ".tar.gz")) (sha256 @@ -3236,7 +3237,7 @@ instances of the @code{Pretty} class.") (build-system haskell-build-system) (propagated-inputs `(("ghc-ansi-terminal" ,ghc-ansi-terminal))) - (home-page "http://github.com/ekmett/ansi-wl-pprint") + (home-page "https://github.com/ekmett/ansi-wl-pprint") (synopsis "Wadler/Leijen Pretty Printer for colored ANSI terminal output") (description "This is a pretty printing library based on Wadler's paper \"A Prettier Printer\". It has been enhanced with support for ANSI terminal @@ -3252,7 +3253,7 @@ colored output using the ansi-terminal package.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/split/split-" + "https://hackage.haskell.org/package/split/split-" version ".tar.gz")) (sha256 @@ -3268,7 +3269,7 @@ colored output using the ansi-terminal package.") (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "http://hackage.haskell.org/package/split") + (home-page "https://hackage.haskell.org/package/split") (synopsis "Combinator library for splitting lists") (description "This package provides a collection of Haskell functions for splitting lists into parts, akin to the @code{split} function found in several @@ -3284,7 +3285,7 @@ mainstream languages.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/parsec/parsec-" + "https://hackage.haskell.org/package/parsec/parsec-" version ".tar.gz")) (sha256 @@ -3316,7 +3317,7 @@ is also parametric in the input stream type.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/vector/vector-" + "https://hackage.haskell.org/package/vector/vector-" version ".tar.gz")) (sha256 @@ -3345,7 +3346,7 @@ optimisation framework.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/" + "https://hackage.haskell.org/package/" "vector-binary-instances/vector-binary-instances-" version ".tar.gz")) (sha256 @@ -3374,7 +3375,7 @@ boxed and storable vectors.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/network/network-" + "https://hackage.haskell.org/package/network/network-" version ".tar.gz")) (sha256 @@ -3400,7 +3401,7 @@ boxed and storable vectors.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/network-uri/network-uri-" + "https://hackage.haskell.org/package/network-uri/network-uri-" version ".tar.gz")) (sha256 @@ -3430,7 +3431,7 @@ package into this package.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/ansi-terminal/ansi-terminal-" + "https://hackage.haskell.org/package/ansi-terminal/ansi-terminal-" version ".tar.gz")) (sha256 @@ -3453,7 +3454,7 @@ cursor, and changing the title.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/HTTP/HTTP-" + "https://hackage.haskell.org/package/HTTP/HTTP-" version ".tar.gz")) (sha256 @@ -3486,7 +3487,7 @@ responses coming back.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/hspec/hspec-" + "https://hackage.haskell.org/package/hspec/hspec-" version ".tar.gz")) (sha256 @@ -3514,7 +3515,7 @@ Haskell, inspired by the Ruby library RSpec.") (version "0.3.0") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "hspec-contrib/hspec-contrib-" version ".tar.gz")) (sha256 @@ -3540,7 +3541,7 @@ Haskell, inspired by the Ruby library RSpec.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/hspec-expectations/hspec-expectations-" + "https://hackage.haskell.org/package/hspec-expectations/hspec-expectations-" version ".tar.gz")) (sha256 @@ -3562,7 +3563,7 @@ Haskell, inspired by the Ruby library RSpec.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/hspec-discover/hspec-discover-" + "https://hackage.haskell.org/package/hspec-discover/hspec-discover-" version ".tar.gz")) (sha256 @@ -3586,7 +3587,7 @@ runs Hspec tests.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/hspec-core/hspec-core-" + "https://hackage.haskell.org/package/hspec-core/hspec-core-" version ".tar.gz")) (sha256 @@ -3618,7 +3619,7 @@ be used to extend Hspec's functionality.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/hspec-meta/hspec-meta-" + "https://hackage.haskell.org/package/hspec-meta/hspec-meta-" version ".tar.gz")) (sha256 @@ -3648,7 +3649,7 @@ used to test the in-development version of Hspec.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/vault/vault-" + "https://hackage.haskell.org/package/vault/vault-" version ".tar.gz")) (sha256 @@ -3677,7 +3678,7 @@ representing a store for a single element.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/mmorph/mmorph-" + "https://hackage.haskell.org/package/mmorph/mmorph-" version ".tar.gz")) (sha256 @@ -3685,7 +3686,7 @@ representing a store for a single element.") "0k5zlzmnixfwcjrqvhgi3i6xg532b0gsjvc39v5jigw69idndqr2")))) (build-system haskell-build-system) (home-page - "http://hackage.haskell.org/package/mmorph") + "https://hackage.haskell.org/package/mmorph") (synopsis "Monad morphisms") (description "This library provides monad morphism utilities, most commonly used for @@ -3700,7 +3701,7 @@ manipulating monad transformer stacks.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/monad-control" + "https://hackage.haskell.org/package/monad-control" "/monad-control-" version ".tar.gz")) (sha256 (base32 @@ -3726,7 +3727,7 @@ a subset of @code{MonadBase} into which generic control operations such as (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/byteorder/byteorder-" + "https://hackage.haskell.org/package/byteorder/byteorder-" version ".tar.gz")) (sha256 @@ -3750,7 +3751,7 @@ system.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/base-compat/base-compat-" + "https://hackage.haskell.org/package/base-compat/base-compat-" version ".tar.gz")) (sha256 @@ -3775,7 +3776,7 @@ pragmas in your code.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/blaze-builder/blaze-builder-" + "https://hackage.haskell.org/package/blaze-builder/blaze-builder-" version ".tar.gz")) (sha256 @@ -3786,7 +3787,7 @@ pragmas in your code.") (propagated-inputs `(("ghc-text" ,ghc-text) ("ghc-utf8-string" ,ghc-utf8-string))) - (home-page "http://github.com/lpsmith/blaze-builder") + (home-page "https://github.com/lpsmith/blaze-builder") (synopsis "Efficient buffered output") (description "This library provides an implementation of the older @code{blaze-builder} interface in terms of the new builder that shipped with @@ -3803,7 +3804,7 @@ interoperate with code that uses the new implementation.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/blaze-markup/blaze-markup-" + "https://hackage.haskell.org/package/blaze-markup/blaze-markup-" version ".tar.gz")) (sha256 @@ -3828,7 +3829,7 @@ library for Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/blaze-html/blaze-html-" + "https://hackage.haskell.org/package/blaze-html/blaze-html-" version ".tar.gz")) (sha256 @@ -3853,7 +3854,7 @@ library for Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/easy-file/easy-file-" + "https://hackage.haskell.org/package/easy-file/easy-file-" version ".tar.gz")) (sha256 @@ -3861,7 +3862,7 @@ library for Haskell.") "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz")))) (build-system haskell-build-system) (home-page - "http://github.com/kazu-yamamoto/easy-file") + "https://github.com/kazu-yamamoto/easy-file") (synopsis "File handling library for Haskell") (description "This library provides file handling utilities for Haskell.") (license license:bsd-3))) @@ -3874,7 +3875,7 @@ library for Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/async/async-" + "https://hackage.haskell.org/package/async/async-" version ".tar.gz")) (sha256 @@ -3903,7 +3904,7 @@ will eventually deliver a value of type @code{a}.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/fingertree/fingertree-" + "https://hackage.haskell.org/package/fingertree/fingertree-" version ".tar.gz")) (sha256 @@ -3911,7 +3912,7 @@ will eventually deliver a value of type @code{a}.") "1w6x3kp3by5yjmam6wlrf9vap5l5rrqaip0djbrdp0fpf2imn30n")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. - (home-page "http://hackage.haskell.org/package/fingertree") + (home-page "https://hackage.haskell.org/package/fingertree") (synopsis "Generic finger-tree structure") (description "This library provides finger trees, a general sequence representation with arbitrary annotations, for use as a base for @@ -3928,7 +3929,7 @@ simple general-purpose data structure\".") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/optparse-applicative" + "https://hackage.haskell.org/package/optparse-applicative" "/optparse-applicative-" version ".tar.gz")) (sha256 (base32 @@ -3951,7 +3952,7 @@ command line options in Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/base-orphans/base-orphans-" + "https://hackage.haskell.org/package/base-orphans/base-orphans-" version ".tar.gz")) (sha256 @@ -3975,7 +3976,7 @@ available in later versions of base to a wider (older) range of compilers.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/auto-update/auto-update-" + "https://hackage.haskell.org/package/auto-update/auto-update-" version ".tar.gz")) (sha256 @@ -3996,7 +3997,7 @@ periodic, on-demand actions in Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/tagged/tagged-" + "https://hackage.haskell.org/package/tagged/tagged-" version ".tar.gz")) (sha256 @@ -4017,7 +4018,7 @@ having to unsafely pass dummy arguments.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/unbounded-delays/unbounded-delays-" + "https://hackage.haskell.org/package/unbounded-delays/unbounded-delays-" version ".tar.gz")) (sha256 @@ -4043,7 +4044,7 @@ unbounded @code{Integer} type.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/" + "https://hackage.haskell.org/package/" "clock/" "clock-" version ".tar.gz")) (sha256 @@ -4065,7 +4066,7 @@ timer functions of different operating systems via a unified API.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/" + "https://hackage.haskell.org/package/" "clock/" "clock-" version ".tar.gz")) (sha256 @@ -4088,7 +4089,7 @@ timer functions of different operating systems via a unified API.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/charset/charset-" + "https://hackage.haskell.org/package/charset/charset-" version ".tar.gz")) (sha256 @@ -4099,7 +4100,7 @@ timer functions of different operating systems via a unified API.") `(("ghc-semigroups" ,ghc-semigroups))) (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers))) - (home-page "http://github.com/ekmett/charset") + (home-page "https://github.com/ekmett/charset") (synopsis "Fast unicode character sets for Haskell") (description "This package provides fast unicode character sets for Haskell, based on complemented PATRICIA tries.") @@ -4113,14 +4114,14 @@ Haskell, based on complemented PATRICIA tries.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/bytestring-builder" + "https://hackage.haskell.org/package/bytestring-builder" "/bytestring-builder-" version ".tar.gz")) (sha256 (base32 "1mkg24zl0rapb3gqzkyj5ibp07wx3yzd72hmfczssl0is63rjhww")))) (build-system haskell-build-system) (arguments `(#:haddock? #f)) ; Package contains no documentation. - (home-page "http://hackage.haskell.org/package/bytestring-builder") + (home-page "https://hackage.haskell.org/package/bytestring-builder") (synopsis "The new bytestring builder, packaged outside of GHC") (description "This package provides the bytestring builder that is debuting in bytestring-0.10.4.0, which should be shipping with GHC 7.8. @@ -4135,7 +4136,7 @@ Compatibility package for older packages.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/nats/nats-" + "https://hackage.haskell.org/package/nats/nats-" version ".tar.gz")) (sha256 @@ -4158,7 +4159,7 @@ Compatibility package for older packages.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/void/void-" + "https://hackage.haskell.org/package/void/void-" version ".tar.gz")) (sha256 @@ -4169,7 +4170,7 @@ Compatibility package for older packages.") `(("ghc-semigroups" ,ghc-semigroups))) (inputs `(("ghc-hashable" ,ghc-hashable))) - (home-page "http://github.com/ekmett/void") + (home-page "https://github.com/ekmett/void") (synopsis "Logically uninhabited data type") (description @@ -4185,7 +4186,7 @@ given term should not exist.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/kan-extensions/kan-extensions-" + "https://hackage.haskell.org/package/kan-extensions/kan-extensions-" version ".tar.gz")) (sha256 @@ -4202,7 +4203,7 @@ given term should not exist.") ("ghc-mtl" ,ghc-mtl) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-tagged" ,ghc-tagged))) - (home-page "http://github.com/ekmett/kan-extensions/") + (home-page "https://github.com/ekmett/kan-extensions/") (synopsis "Kan extensions library") (description "This library provides Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") @@ -4216,7 +4217,7 @@ forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/StateVar/StateVar-" + "https://hackage.haskell.org/package/StateVar/StateVar-" version ".tar.gz")) (sha256 @@ -4225,7 +4226,7 @@ forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") (build-system haskell-build-system) (propagated-inputs `(("ghc-stm" ,ghc-stm))) - (home-page "http://hackage.haskell.org/package/StateVar") + (home-page "https://hackage.haskell.org/package/StateVar") (synopsis "State variables for Haskell") (description "This package provides state variables, which are references in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") @@ -4239,7 +4240,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/lens/lens-" + "https://hackage.haskell.org/package/lens/lens-" version ".tar.gz")) (sha256 @@ -4274,7 +4275,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") ("ghc-nats" ,ghc-nats) ("ghc-simple-reflect" ,ghc-simple-reflect) ("hlint" ,hlint))) - (home-page "http://github.com/ekmett/lens/") + (home-page "https://github.com/ekmett/lens/") (synopsis "Lenses, Folds and Traversals") (description "This library provides @code{Control.Lens}. The combinators in @code{Control.Lens} provide a highly generic toolbox for composing families @@ -4290,7 +4291,7 @@ indexed variants.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/tagsoup/tagsoup-" + "https://hackage.haskell.org/package/tagsoup/tagsoup-" version ".tar.gz")) (sha256 @@ -4319,7 +4320,7 @@ for screen-scraping.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/digest/digest-" + "https://hackage.haskell.org/package/digest/digest-" version ".tar.gz")) (sha256 @@ -4329,7 +4330,7 @@ for screen-scraping.") (inputs `(("zlib" ,zlib))) (home-page - "http://hackage.haskell.org/package/digest") + "https://hackage.haskell.org/package/digest") (synopsis "Various cryptographic hashes for bytestrings") (description @@ -4346,7 +4347,7 @@ are implemented as FFI bindings to efficient code from zlib.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/cheapskate/cheapskate-" + "https://hackage.haskell.org/package/cheapskate/cheapskate-" version ".tar.gz")) (sha256 @@ -4366,7 +4367,7 @@ are implemented as FFI bindings to efficient code from zlib.") ("ghc-wai-extra" ,ghc-wai-extra) ("ghc-wai" ,ghc-wai) ("ghc-http-types" ,ghc-http-types))) - (home-page "http://github.com/jgm/cheapskate") + (home-page "https://github.com/jgm/cheapskate") (synopsis "Experimental markdown processor") (description "Cheapskate is an experimental Markdown processor in pure Haskell. It aims to process Markdown efficiently and in the most forgiving @@ -4383,7 +4384,7 @@ attacks.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/bifunctors/bifunctors-" + "https://hackage.haskell.org/package/bifunctors/bifunctors-" version ".tar.gz")) (sha256 @@ -4393,7 +4394,7 @@ attacks.") (inputs `(("ghc-tagged" ,ghc-tagged) ("ghc-semigroups" ,ghc-semigroups))) - (home-page "http://github.com/ekmett/bifunctors/") + (home-page "https://github.com/ekmett/bifunctors/") (synopsis "Bifunctors for Haskell") (description "This package provides bifunctors for Haskell.") (license license:bsd-3))) @@ -4406,7 +4407,7 @@ attacks.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/semigroupoids/semigroupoids-" + "https://hackage.haskell.org/package/semigroupoids/semigroupoids-" version ".tar.gz")) (sha256 @@ -4424,7 +4425,7 @@ attacks.") (inputs `(("ghc-semigroups" ,ghc-semigroups) ("ghc-tagged" ,ghc-tagged))) - (home-page "http://github.com/ekmett/semigroupoids") + (home-page "https://github.com/ekmett/semigroupoids") (synopsis "Semigroupoids operations for Haskell") (description "This library provides a wide array of (semi)groupoids and operations for working with them. A @code{Semigroupoid} is a @code{Category} @@ -4444,7 +4445,7 @@ just a @code{Semigroup} are added.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/contravariant/contravariant-" + "https://hackage.haskell.org/package/contravariant/contravariant-" version ".tar.gz")) (sha256 @@ -4458,7 +4459,7 @@ just a @code{Semigroup} are added.") (inputs `(("ghc-semigroups" ,ghc-semigroups))) (home-page - "http://github.com/ekmett/contravariant/") + "https://github.com/ekmett/contravariant/") (synopsis "Contravariant functors") (description "Contravariant functors for Haskell.") (license license:bsd-3))) @@ -4471,7 +4472,7 @@ just a @code{Semigroup} are added.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/semigroups/semigroups-" + "https://hackage.haskell.org/package/semigroups/semigroups-" version ".tar.gz")) (sha256 @@ -4485,7 +4486,7 @@ just a @code{Semigroup} are added.") (inputs `(("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable))) - (home-page "http://github.com/ekmett/semigroups/") + (home-page "https://github.com/ekmett/semigroups/") (synopsis "Semigroup operations for Haskell") (description "This package provides semigroups for Haskell. In mathematics, a semigroup is an algebraic structure consisting of a set @@ -4504,7 +4505,7 @@ semigroup.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/free/free-" + "https://hackage.haskell.org/package/free/free-" version ".tar.gz")) (sha256 @@ -4522,7 +4523,7 @@ semigroup.") ("ghc-mtl" ,ghc-mtl) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-semigroups" ,ghc-semigroups))) - (home-page "http://github.com/ekmett/free/") + (home-page "https://github.com/ekmett/free/") (synopsis "Unrestricted monads for Haskell") (description "This library provides free monads, which are useful for many tree-like structures and domain specific languages. If @code{f} is a @@ -4541,7 +4542,7 @@ definition of @code{Monad}.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/adjunctions/adjunctions-" + "https://hackage.haskell.org/package/adjunctions/adjunctions-" version ".tar.gz")) (sha256 @@ -4560,7 +4561,7 @@ definition of @code{Monad}.") ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-semigroups" ,ghc-semigroups) ("ghc-void" ,ghc-void))) - (home-page "http://github.com/ekmett/adjunctions/") + (home-page "https://github.com/ekmett/adjunctions/") (synopsis "Adjunctions and representable functors") (description "This library provides adjunctions and representable functors for Haskell.") @@ -4574,7 +4575,7 @@ for Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/fast-logger/fast-logger-" + "https://hackage.haskell.org/package/fast-logger/fast-logger-" version ".tar.gz")) (sha256 @@ -4600,7 +4601,7 @@ for Haskell.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/doctest/doctest-" + "https://hackage.haskell.org/package/doctest/doctest-" version ".tar.gz")) (sha256 @@ -4635,7 +4636,7 @@ It is modeled after doctest for Python, see (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/lifted-base/lifted-base-" + "https://hackage.haskell.org/package/lifted-base/lifted-base-" version ".tar.gz")) (sha256 @@ -4666,7 +4667,7 @@ Kaseorg.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/word8/word8-" + "https://hackage.haskell.org/package/word8/word8-" version ".tar.gz")) (sha256 @@ -4675,7 +4676,7 @@ Kaseorg.") (build-system haskell-build-system) (inputs `(("ghc-hspec" ,ghc-hspec))) - (home-page "http://hackage.haskell.org/package/word8") + (home-page "https://hackage.haskell.org/package/word8") (synopsis "Word8 library for Haskell") (description "Word8 library to be used with @code{Data.ByteString}.") (license license:bsd-3))) @@ -4688,7 +4689,7 @@ Kaseorg.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/stringsearch/stringsearch-" + "https://hackage.haskell.org/package/stringsearch/stringsearch-" version ".tar.gz")) (sha256 @@ -4711,7 +4712,7 @@ occurrences of a substring (the first in case of overlaps) with another.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/tasty-quickcheck/" + "https://hackage.haskell.org/package/tasty-quickcheck/" "tasty-quickcheck-" version ".tar.gz")) (sha256 (base32 @@ -4740,7 +4741,7 @@ Haskell test framework.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/tasty-golden/tasty-golden-" + "https://hackage.haskell.org/package/tasty-golden/tasty-golden-" version ".tar.gz")) (sha256 @@ -4775,7 +4776,7 @@ the correct result for the test.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/tasty/tasty-" + "https://hackage.haskell.org/package/tasty/tasty-" version ".tar.gz")) (sha256 @@ -4807,7 +4808,7 @@ and any other types of tests into a single test suite.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/tasty-hunit/tasty-hunit-" + "https://hackage.haskell.org/package/tasty-hunit/tasty-hunit-" version ".tar.gz")) (sha256 @@ -4830,7 +4831,7 @@ test framework.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/cookie/cookie-" + "https://hackage.haskell.org/package/cookie/cookie-" version ".tar.gz")) (sha256 @@ -4848,7 +4849,7 @@ test framework.") ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "http://github.com/snoyberg/cookie") + (home-page "https://github.com/snoyberg/cookie") (synopsis "HTTP cookie parsing and rendering") (description "HTTP cookie parsing and rendering library for Haskell.") (license license:bsd-3))) @@ -4861,7 +4862,7 @@ test framework.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/scientific/scientific-" + "https://hackage.haskell.org/package/scientific/scientific-" version ".tar.gz")) (sha256 @@ -4897,7 +4898,7 @@ notation}.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/aeson/aeson-" + "https://hackage.haskell.org/package/aeson/aeson-" version ".tar.gz")) (sha256 @@ -4932,7 +4933,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") (source (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/aeson-pretty/aeson-pretty-" + "https://hackage.haskell.org/package/aeson-pretty/aeson-pretty-" version ".tar.gz")) (sha256 (base32 @@ -4946,7 +4947,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") ,ghc-unordered-containers) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-cmdargs" ,ghc-cmdargs))) - (home-page "http://github.com/informatikr/aeson-pretty") + (home-page "https://github.com/informatikr/aeson-pretty") (synopsis "JSON pretty-printing library and command-line tool") (description "This package provides a JSON pretty-printing library compatible with aeson @@ -4966,7 +4967,7 @@ essentially the opposite of pretty-printing.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/wai/wai-" + "https://hackage.haskell.org/package/wai/wai-" version ".tar.gz")) (sha256 @@ -5000,7 +5001,7 @@ communication between web applications and web servers.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/wai-logger/wai-logger-" + "https://hackage.haskell.org/package/wai-logger/wai-logger-" version ".tar.gz")) (sha256 @@ -5021,7 +5022,7 @@ communication between web applications and web servers.") ("ghc-http-types" ,ghc-http-types) ("ghc-network" ,ghc-network) ("ghc-wai" ,ghc-wai))) - (home-page "http://hackage.haskell.org/package/wai-logger") + (home-page "https://hackage.haskell.org/package/wai-logger") (synopsis "Logging system for WAI") (description "This package provides the logging system for WAI.") (license license:bsd-3))) @@ -5034,7 +5035,7 @@ communication between web applications and web servers.") (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/wai-extra/wai-extra-" + "https://hackage.haskell.org/package/wai-extra/wai-extra-" version ".tar.gz")) (sha256 @@ -5068,7 +5069,7 @@ communication between web applications and web servers.") ("ghc-aeson" ,ghc-aeson) ("ghc-hspec" ,ghc-hspec) ("ghc-hunit" ,ghc-hunit))) - (home-page "http://github.com/yesodweb/wai") + (home-page "https://github.com/yesodweb/wai") (synopsis "Some basic WAI handlers and middleware") (description "This library provides basic WAI handlers and middleware functionality.") @@ -5080,7 +5081,7 @@ functionality.") (version "0.1.1.2") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "deepseq-generics/deepseq-generics-" version ".tar.gz")) (sha256 @@ -5113,7 +5114,7 @@ providing an 'rnf' implementation.") (version "1.12.4.7") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "pandoc-types/pandoc-types-" version ".tar.gz")) (sha256 @@ -5138,7 +5139,7 @@ building up, manipulating and serialising @code{Pandoc} structures.") (version "0.8.4") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "texmath/texmath-" version ".tar.gz")) (sha256 (base32 @@ -5154,7 +5155,7 @@ building up, manipulating and serialising @code{Pandoc} structures.") ("ghc-parsec" ,ghc-parsec) ("ghc-mtl" ,ghc-mtl) ("ghc-pandoc-types" ,ghc-pandoc-types))) - (home-page "http://github.com/jgm/texmath") + (home-page "https://github.com/jgm/texmath") (synopsis "Conversion between formats used to represent mathematics") (description "The texmath library provides functions to read and write TeX math, @@ -5171,7 +5172,7 @@ it can parse and apply LaTeX macros.") (version "0.94.4.8.8.35") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "regex-pcre-builtin/regex-pcre-builtin-" version ".tar.gz")) (sha256 @@ -5180,7 +5181,7 @@ it can parse and apply LaTeX macros.") (build-system haskell-build-system) (propagated-inputs `(("ghc-regex-base" ,ghc-regex-base))) - (home-page "http://hackage.haskell.org/package/regex-pcre") + (home-page "https://hackage.haskell.org/package/regex-pcre") (synopsis "Enhancement of the builtin Text.Regex library") (description "This package is an enhancement of the @code{Text.Regex} library, @@ -5194,7 +5195,7 @@ providing the PCRE backend to accompany regex-base, with bundled code from (version "0.3.2") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "Diff/Diff-" version ".tar.gz")) (sha256 (base32 @@ -5213,7 +5214,7 @@ and utilities for pretty printing.") (version "0.6") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "highlighting-kate/highlighting-kate-" version ".tar.gz")) (sha256 @@ -5228,7 +5229,7 @@ and utilities for pretty printing.") ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-mtl" ,ghc-mtl))) - (home-page "http://github.com/jgm/highlighting-kate") + (home-page "https://github.com/jgm/highlighting-kate") (synopsis "Syntax highlighting library") (description "Highlighting-kate is a syntax highlighting library with support for @@ -5245,7 +5246,7 @@ descriptions.") (version "0.4.1") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "cmark/cmark-" version ".tar.gz")) (sha256 (base32 @@ -5270,14 +5271,14 @@ libcmark (0.21.0) and does not require prior installation of the C library.") (version "0.0.3") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "executable-path/executable-path-" version ".tar.gz")) (sha256 (base32 "1jg58qf19qz93c60ryglcavwdcysz4fd4qn8kpw5im9w9kniawlc")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/executable-path") + (home-page "https://hackage.haskell.org/package/executable-path") (synopsis "Find out the full path of the executable") (description "The documentation of @code{System.Environment.getProgName} says that @@ -5292,7 +5293,7 @@ as invoked.\" This library tries to provide the missing path.") (version "1.0.1.1") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "enclosed-exceptions/enclosed-exceptions-" version ".tar.gz")) (sha256 @@ -5321,7 +5322,7 @@ asynchronous exceptions.") (version "0.1.0.1") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "packedstring/packedstring-" version ".tar.gz")) (sha256 @@ -5338,7 +5339,7 @@ asynchronous exceptions.") (substitute* "packedstring.cabal" (("CPP") "CPP, StandaloneDeriving")) #t))))) - (home-page "http://hackage.haskell.org/package/packedstring") + (home-page "https://hackage.haskell.org/package/packedstring") (synopsis "Library for packed strings") (description "This deprecated library provides an implementation of packed strings.") @@ -5350,7 +5351,7 @@ asynchronous exceptions.") (version "0.7.5") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "th-lift/th-lift-" version ".tar.gz")) (sha256 (base32 @@ -5358,7 +5359,7 @@ asynchronous exceptions.") (build-system haskell-build-system) (propagated-inputs `(("ghc-packedstring" ,ghc-packedstring))) - (home-page "http://github.com/mboes/th-lift") + (home-page "https://github.com/mboes/th-lift") (synopsis "Derive Template Haskell's Lift class for datatypes") (description "This is a Haskell library to derive Template Haskell's Lift class for @@ -5371,7 +5372,7 @@ datatypes.") (version "0.3.0.6") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "th-expand-syns/th-expand-syns-" version ".tar.gz")) (sha256 @@ -5380,7 +5381,7 @@ datatypes.") (build-system haskell-build-system) (propagated-inputs `(("ghc-syb" ,ghc-syb))) - (home-page "http://hackage.haskell.org/package/th-expand-syns") + (home-page "https://hackage.haskell.org/package/th-expand-syns") (synopsis "Expands type synonyms in Template Haskell ASTs") (description "This package enables users to expand type synonyms in Template Haskell @@ -5393,7 +5394,7 @@ datatypes.") (version "0.1.3") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "th-reify-many/th-reify-many-" version ".tar.gz")) (sha256 @@ -5404,7 +5405,7 @@ datatypes.") `(("ghc-mtl" ,ghc-mtl) ("ghc-safe" ,ghc-safe) ("ghc-th-expand-syns" ,ghc-th-expand-syns))) - (home-page "http://github.com/mgsloan/th-reify-many") + (home-page "https://github.com/mgsloan/th-reify-many") (synopsis "Recurseively reify template haskell datatype info") (description "th-reify-many provides functions for recursively reifying top level @@ -5419,7 +5420,7 @@ function which generates instances.") (version "0.13.0") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "th-orphans/th-orphans-" version ".tar.gz")) (sha256 (base32 @@ -5432,7 +5433,7 @@ function which generates instances.") ("ghc-generic-deriving" ,ghc-generic-deriving))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) - (home-page "http://hackage.haskell.org/package/th-orphans") + (home-page "https://hackage.haskell.org/package/th-orphans") (synopsis "Orphan instances for TH datatypes") (description "This package provides orphan instances for Template Haskell datatypes. In particular, @@ -5447,7 +5448,7 @@ package, and that's where the version number started.") (version "0.6.0.12") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "haskell-src-meta/haskell-src-meta-" version ".tar.gz")) (sha256 @@ -5458,7 +5459,7 @@ package, and that's where the version number started.") `(("ghc-haskell-src-exts" ,ghc-haskell-src-exts) ("ghc-syb" ,ghc-syb) ("ghc-th-orphans" ,ghc-th-orphans))) - (home-page "http://hackage.haskell.org/package/haskell-src-meta") + (home-page "https://hackage.haskell.org/package/haskell-src-meta") (synopsis "Parse source to template-haskell abstract syntax") (description "This package provides tools to parse Haskell sources to the @@ -5471,7 +5472,7 @@ template-haskell abstract syntax.") (version "0.8.1") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "aeson-qq/aeson-qq-" version ".tar.gz")) (sha256 (base32 @@ -5488,7 +5489,7 @@ template-haskell abstract syntax.") ("ghc-haskell-src-meta" ,ghc-haskell-src-meta))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) - (home-page "http://github.com/zalora/aeson-qq") + (home-page "https://github.com/zalora/aeson-qq") (synopsis "JSON quasiquoter for Haskell") (description "aeson-qq provides a JSON quasiquoter for Haskell. This package exposes @@ -5502,7 +5503,7 @@ of a JSON value into a @code{Data.Aeson.Value}.") (version "1.2.5.1") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "conduit/conduit-" version ".tar.gz")) (sha256 (base32 @@ -5536,7 +5537,7 @@ enumerator/iteratee and pipes." ) (version "0.1.0") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "logging-facade/logging-facade-" version ".tar.gz")) (sha256 @@ -5545,7 +5546,7 @@ enumerator/iteratee and pipes." ) (build-system haskell-build-system) (native-inputs `(("ghc-hspec" ,ghc-hspec))) - (home-page "http://hackage.haskell.org/package/logging-facade") + (home-page "https://hackage.haskell.org/package/logging-facade") (synopsis "Simple logging abstraction that allows multiple back-ends") (description "This package provides a simple logging abstraction that allows multiple @@ -5558,7 +5559,7 @@ back-ends.") (version "0.3.2") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "mockery/mockery-" version ".tar.gz")) (sha256 (base32 @@ -5569,7 +5570,7 @@ back-ends.") ("ghc-logging-facade" ,ghc-logging-facade))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) - (home-page "http://hackage.haskell.org/package/mockery") + (home-page "https://hackage.haskell.org/package/mockery") (synopsis "Support functions for automated testing") (description "The mockery package provides support functions for automated testing.") @@ -5581,7 +5582,7 @@ back-ends.") (version "0.8.15.1") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "yaml/yaml-" version ".tar.gz")) (sha256 (base32 @@ -5603,7 +5604,7 @@ back-ends.") `(("ghc-hspec" ,ghc-hspec) ("ghc-hunit" ,ghc-hunit) ("ghc-mockery" ,ghc-mockery))) - (home-page "http://github.com/snoyberg/yaml/") + (home-page "https://github.com/snoyberg/yaml/") (synopsis "Parsing and rendering YAML documents") (description "This package provides a library to parse and render YAML documents.") @@ -5615,7 +5616,7 @@ back-ends.") (version "0.3.6.3") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "filemanip/filemanip-" version ".tar.gz")) (sha256 (base32 @@ -5638,13 +5639,13 @@ file contents, and more.") (version "0.5.9") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "mmap/mmap-" version ".tar.gz")) (sha256 (base32 "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/mmap") + (home-page "https://hackage.haskell.org/package/mmap") (synopsis "Memory mapped files for Haskell") (description "This library provides a wrapper to @code{mmap}, allowing files or @@ -5659,7 +5660,7 @@ do on-demand loading.") (version "3.2.6.2") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "JuicyPixels/JuicyPixels-" version ".tar.gz")) (sha256 @@ -5685,7 +5686,7 @@ TIFF and GIF formats.") (version "1.6.4.2") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "SHA/SHA-" version ".tar.gz")) (sha256 (base32 @@ -5695,7 +5696,7 @@ TIFF and GIF formats.") `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "http://hackage.haskell.org/package/SHA") + (home-page "https://hackage.haskell.org/package/SHA") (synopsis "SHA suite of message digest functions") (description "This library implements the SHA suite of message digest functions, @@ -5712,7 +5713,7 @@ libraries, like OpenSSL.") (version "0.4.1") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "hslua/hslua-" version ".tar.gz")) (sha256 (base32 @@ -5730,7 +5731,7 @@ libraries, like OpenSSL.") ("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-quickcheck-instances" ,ghc-quickcheck-instances))) - (home-page "http://hackage.haskell.org/package/hslua") + (home-page "https://hackage.haskell.org/package/hslua") (synopsis "Lua language interpreter embedding in Haskell") (description "The Scripting.Lua module is a wrapper of the Lua language interpreter as @@ -5743,7 +5744,7 @@ described in @url{http://www.lua.org/}.") (version "0.1.0.6") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "mime-types/mime-types-" version ".tar.gz")) (sha256 @@ -5764,7 +5765,7 @@ described in @url{http://www.lua.org/}.") (version "0.4.24") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "http-client/http-client-" version ".tar.gz")) (sha256 @@ -5805,13 +5806,13 @@ for more user-friendly packages.") (version "0.1.1") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "byteable/byteable-" version ".tar.gz")) (sha256 (base32 "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4")))) (build-system haskell-build-system) - (home-page "http://github.com/vincenthz/hs-byteable") + (home-page "https://github.com/vincenthz/hs-byteable") (synopsis "Type class for sequence of bytes") (description "This package provides an abstract class to manipulate sequence of bytes. @@ -5825,7 +5826,7 @@ wrapping a bytestring with stronger and more meaniful name.") (version "0.2.9") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "hourglass/hourglass-" version ".tar.gz")) (sha256 (base32 @@ -5854,7 +5855,7 @@ representations of current time.") (version "0.2.2") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "pem/pem-" version ".tar.gz")) (sha256 (base32 @@ -5869,7 +5870,7 @@ representations of current time.") ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "http://github.com/vincenthz/hs-pem") + (home-page "https://github.com/vincenthz/hs-pem") (synopsis "Privacy Enhanced Mail (PEM) format reader and writer") (description "This library provides readers and writers for the @dfn{Privacy Enhanced @@ -5882,7 +5883,7 @@ Mail} (PEM) format.") (version "0.3.1") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "asn1-types/asn1-types-" version ".tar.gz")) (sha256 @@ -5892,7 +5893,7 @@ Mail} (PEM) format.") (propagated-inputs `(("ghc-memory" ,ghc-memory) ("ghc-hourglass" ,ghc-hourglass))) - (home-page "http://github.com/vincenthz/hs-asn1-types") + (home-page "https://github.com/vincenthz/hs-asn1-types") (synopsis "ASN.1 types for Haskell") (description "The package provides the standard types for dealing with the ASN.1 @@ -5905,7 +5906,7 @@ format.") (version "0.9.3") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "asn1-encoding/asn1-encoding-" version ".tar.gz")) (sha256 @@ -5920,7 +5921,7 @@ format.") (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "http://github.com/vincenthz/hs-asn1") + (home-page "https://github.com/vincenthz/hs-asn1") (synopsis "ASN1 data reader and writer in RAW, BER and DER forms") (description "This package provides a reader and writer for ASN1 data in raw form with @@ -5933,7 +5934,7 @@ supports for high level forms of ASN1 (BER, and DER).") (version "0.9.4") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "asn1-parse/asn1-parse-" version ".tar.gz")) (sha256 @@ -5956,7 +5957,7 @@ when ASN1 pattern matching is not convenient.") (version "0.0.3") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "tasty-kat/tasty-kat-" version ".tar.gz")) (sha256 (base32 @@ -5980,7 +5981,7 @@ tasty.") (version "0.9") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "cryptonite/cryptonite-" version ".tar.gz")) (sha256 @@ -6010,7 +6011,7 @@ generators, and more.") (version "0.10") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "memory/memory-" version ".tar.gz")) (sha256 (base32 @@ -6036,7 +6037,7 @@ set, memory copy, ..) and more") (version "1.6.3") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "x509/x509-" version ".tar.gz")) (sha256 (base32 @@ -6054,7 +6055,7 @@ set, memory copy, ..) and more") (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "http://github.com/vincenthz/hs-certificate") + (home-page "https://github.com/vincenthz/hs-certificate") (synopsis "X509 reader and writer") (description "This library provides functions to read and write X509 certificates.") @@ -6066,7 +6067,7 @@ set, memory copy, ..) and more") (version "1.6.1") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "x509-store/x509-store-" version ".tar.gz")) (sha256 @@ -6080,7 +6081,7 @@ set, memory copy, ..) and more") ("ghc-asn1-encoding" ,ghc-asn1-encoding) ("ghc-cryptonite" ,ghc-cryptonite) ("ghc-x509" ,ghc-x509))) - (home-page "http://github.com/vincenthz/hs-certificate") + (home-page "https://github.com/vincenthz/hs-certificate") (synopsis "X.509 collection accessing and storing methods") (description "This package provides functions for accessing and storing X.509 @@ -6093,7 +6094,7 @@ collections, certificates, revocation lists, and exception lists.") (version "1.6.3") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "x509-validation/x509-validation-" version ".tar.gz")) (sha256 @@ -6112,7 +6113,7 @@ collections, certificates, revocation lists, and exception lists.") ("ghc-x509" ,ghc-x509) ("ghc-x509-store" ,ghc-x509-store) ("ghc-cryptonite" ,ghc-cryptonite))) - (home-page "http://github.com/vincenthz/hs-certificate") + (home-page "https://github.com/vincenthz/hs-certificate") (synopsis "X.509 certificate and revocation list validation") (description "This package provides functions for X.509 certificate and revocation @@ -6125,7 +6126,7 @@ list validation.") (version "1.6.1") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "x509-system/x509-system-" version ".tar.gz")) (sha256 @@ -6137,7 +6138,7 @@ list validation.") ("ghc-pem" ,ghc-pem) ("ghc-x509" ,ghc-x509) ("ghc-x509-store" ,ghc-x509-store))) - (home-page "http://github.com/vincenthz/hs-certificate") + (home-page "https://github.com/vincenthz/hs-certificate") (synopsis "Handle system X.509 accessors and storage") (description "This package provides a library to handle system accessors and storage @@ -6150,7 +6151,7 @@ for X.509 certificates.") (version "1.3.3") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "tls/tls-" version ".tar.gz")) (sha256 (base32 @@ -6174,7 +6175,7 @@ for X.509 certificates.") `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "http://github.com/vincenthz/hs-tls") + (home-page "https://github.com/vincenthz/hs-tls") (synopsis "TLS/SSL protocol native implementation (Server and Client)") (description @@ -6193,7 +6194,7 @@ extensions.") (version "0.5.4") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "socks/socks-" version ".tar.gz")) (sha256 (base32 @@ -6202,7 +6203,7 @@ extensions.") (propagated-inputs `(("ghc-cereal" ,ghc-cereal) ("ghc-network" ,ghc-network))) - (home-page "http://github.com/vincenthz/hs-socks") + (home-page "https://github.com/vincenthz/hs-socks") (synopsis "SOCKS proxy (version 5) implementation.") (description "This library provides a SOCKS proxy (version 5) implementation.") @@ -6214,7 +6215,7 @@ extensions.") (version "0.2.5") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "connection/connection-" version ".tar.gz")) (sha256 @@ -6231,7 +6232,7 @@ extensions.") ("ghc-x509-store" ,ghc-x509-store) ("ghc-x509-system" ,ghc-x509-system) ("ghc-x509-validation" ,ghc-x509-validation))) - (home-page "http://github.com/vincenthz/hs-connection") + (home-page "https://github.com/vincenthz/hs-connection") (synopsis "Simple and easy network connections API") (description "This package provides a simple network library for all your connection @@ -6245,7 +6246,7 @@ the choice of SSL/TLS, and SOCKS.") (version "0.2.2") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/" + (uri (string-append "https://hackage.haskell.org/package/" "http-client-tls/http-client-tls-" version ".tar.gz")) (sha256 @@ -6278,7 +6279,7 @@ libraries, such as http-conduit.") (source (origin (method url-fetch) - (uri (string-append "http://hackage.haskell.org/package/pandoc/pandoc-" + (uri (string-append "https://hackage.haskell.org/package/pandoc/pandoc-" version ".tar.gz")) (sha256 (base32 @@ -6351,13 +6352,13 @@ provided for those who need a drop-in replacement for Markdown.pl.") (source (origin (method url-fetch) (uri (string-append - "http://hackage.haskell.org/package/union-find/union-find-" + "https://hackage.haskell.org/package/union-find/union-find-" version ".tar.gz")) (sha256 (base32 "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6")))) (build-system haskell-build-system) - (home-page "http://github.com/nominolo/union-find") + (home-page "https://github.com/nominolo/union-find") (synopsis "Efficient union and equivalence testing of sets") (description "The Union/Find algorithm implements these operations in (effectively) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 79b006f416..4497150db7 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -41,14 +41,14 @@ (define-public imagemagick (package (name "imagemagick") - (version "6.9.4-9") + (version "6.9.4-10") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "0js5l6inar2p7zi5qhr8g34qs0gm2x03gs8k8yjh4cnzzac18d82")))) + "0bbac9zdjl2g8x127jx5jisih9r49980w7ar6m8xj3nyh3m83jd2")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths") diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e1651938b9..753fb7726c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -58,15 +58,15 @@ (define-public java-swt (package (name "java-swt") - (version "4.5") + (version "4.6") (source ;; The types of many variables and procedures differ in the sources ;; dependent on whether the target architecture is a 32-bit system or a ;; 64-bit system. Instead of patching the sources on demand in a build ;; phase we download either the 32-bit archive (which mostly uses "int" ;; types) or the 64-bit archive (which mostly uses "long" types). - (let ((hash32 "03mhzraikcs4fsz7d3h5af9pw1bbcfd6dglsvbk2ciwimy9zj30q") - (hash64 "1qq0pjll6030v4ml0hifcaaik7sx3fl7ghybfdw95vsvxafwp2ff") + (let ((hash32 "0jmx1h65wqxsyjzs64i2z6ryiynllxzm13cq90fky2qrzagcw1ir") + (hash64 "0wnd01xssdq9pgx5xqh5lfiy3dmk60dzzqdxzdzf883h13692lgy") (file32 "x86") (file64 "x86_64")) (let-values (((hash file) @@ -78,7 +78,7 @@ (uri (string-append "http://ftp-stud.fht-esslingen.de/pub/Mirrors/" "eclipse/eclipse/downloads/drops4/R-" version - "-201506032000/swt-" version "-gtk-linux-" file ".zip")) + "-201606061100/swt-" version "-gtk-linux-" file ".zip")) (sha256 (base32 hash)))))) (build-system ant-build-system) (arguments diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 0d5e0a3428..ec4e72e8ba 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -66,7 +66,7 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages yasm) + #:use-module (gnu packages assembly) #:use-module (gnu packages zip)) (define-public crossguid diff --git a/gnu/packages/lightning.scm b/gnu/packages/lightning.scm deleted file mode 100644 index 7dacb8f4cd..0000000000 --- a/gnu/packages/lightning.scm +++ /dev/null @@ -1,44 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès -;;; -;;; 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 lightning) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (guix licenses)) - -(define-public lightning - (package - (name "lightning") - (version "2.1.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/lightning/lightning-" - version ".tar.gz")) - (sha256 - (base32 - "19j9nwl88k660045s40cbz5zrl1wpd2mcxnnc8qqnnaj311a58qz")))) - (build-system gnu-build-system) - (synopsis "Library for generating assembly code at runtime") - (description - "GNU Lightning is a library that generates assembly language code at -run-time. Thus, it is useful in creating Just-In-Time compilers. It -abstracts over the target CPU by exposing a standardized RISC instruction set -to the clients.") - (home-page "http://www.gnu.org/software/lightning/") - (license gpl3+))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a9d1676075..bfb6580cbf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -225,7 +225,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." (search-path %load-path file))) (define-public linux-libre - (let* ((version "4.6.2") + (let* ((version "4.6.3") (build-phase '(lambda* (#:key system inputs #:allow-other-keys #:rest args) ;; Avoid introducing timestamps @@ -303,7 +303,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." (uri (linux-libre-urls version)) (sha256 (base32 - "1sq75sbs85kwngq8l0n5v5v1z973l71by98k3wbw1mfq3g0s323b")))) + "1ajhdk9jq0pfxlhvzwarbxc23418yqav1v0z0mnfs575y5lq2gmp")))) (build-system gnu-build-system) (supported-systems '("x86_64-linux" "i686-linux")) (native-inputs `(("perl" ,perl) @@ -340,13 +340,13 @@ It has been modified to remove all non-free binary blobs.") (define-public linux-libre-4.4 (package (inherit linux-libre) - (version "4.4.13") + (version "4.4.14") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "1qcgnprgl9hy4g51bkx4bjs1cdsyy9kpwqymxggwghrzdid41x9l")))) + "1yfmzrjrkj8mn2dfd7p98w13afchrkpz26gwfcm2fhsmla16n1my")))) (native-inputs (let ((conf (kernel-config (or (%current-target-system) (%current-system)) @@ -357,13 +357,13 @@ It has been modified to remove all non-free binary blobs.") (define-public linux-libre-4.1 (package (inherit linux-libre) - (version "4.1.26") + (version "4.1.27") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "1vrqz7z0b9zl6g8nbvz1hb2jhgy5zpnbdwc1v3zc4wjc35i2c4i4")))) + "0bbp782gdj8kz986a8hfygdrj7is0c8wgbb2mpb9gqhkfxcg74kf")))) (native-inputs (let ((conf (kernel-config (or (%current-target-system) (%current-system)) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 70757149f1..dfc21cc95f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1474,13 +1474,17 @@ websites such as Libre.fm.") (define-public beets (package (name "beets") - (version "1.3.17") + (version "1.3.18") (source (origin (method url-fetch) - (uri (pypi-uri name version)) + (uri (string-append + "https://pypi.python.org/packages/" + "14/6f/c9c79c5339ab3ecced265ca18adbf5bae3d4058bae737b6164d738fb4d2c/" + name "-" version ".tar.gz")) + (patches (search-patches "beets-image-test-failure.patch")) (sha256 (base32 - "0yg7sp18sdpszkinhb0bi6yinbn316jy1baxrwiw0m4byrj3rr6c")))) + "09pgyywa5llbc36y0lrr21ywgsp8m2zx6p8ncf8hxik28knd5kld")))) (build-system python-build-system) (arguments `(#:python ,python-2 ; only Python 2 is supported @@ -1504,7 +1508,7 @@ websites such as Libre.fm.") ("python2-rarfile" ,python2-rarfile) ("python2-responses" ,python2-responses))) ;; TODO: Install optional plugins and dependencies. - (propagated-inputs + (inputs `(("python2-enum34" ,python2-enum34) ("python2-jellyfish" ,python2-jellyfish) ("python2-munkres" ,python2-munkres) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 46743fefb5..f3a1cda149 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -21,9 +21,11 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module ((guix build utils) #:select (with-directory-excursion)) #:use-module ((guix licenses) #:select (gpl2+ gpl3+ lgpl2.1+ asl2.0)) #:use-module (gnu packages) #:use-module (gnu packages guile) @@ -48,7 +50,12 @@ #:use-module (gnu packages popt) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages cpio) - #:use-module (gnu packages tls)) + #:use-module (gnu packages tls) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:use-module (ice-9 popen) + #:use-module (ice-9 rdelim) + #:use-module (ice-9 match)) (define (boot-guile-uri arch) "Return the URI for the bootstrap Guile tarball for ARCH." @@ -246,6 +253,73 @@ the Nix package manager.") (define-public guix guix-devel) +(define (source-file? file stat) + "Return true if FILE is likely a source file, false if it is a typical +generated file." + (define (wrong-extension? file) + (or (string-suffix? "~" file) + (member (file-extension file) + '("o" "a" "lo" "so" "go")))) + + (match (basename file) + ((or ".git" "autom4te.cache" "configure" "Makefile" "Makefile.in" ".libs") + #f) + ((? wrong-extension?) + #f) + (_ + #t))) + +(define (make-git-predicate directory) + "Return a predicate that returns true if a file is part of the Git checkout +living at DIRECTORY. Upon Git failure, return #f instead of a predicate." + (define (parent-directory? thing directory) + ;; Return #t if DIRECTORY is the parent of THING. + (or (string-suffix? thing directory) + (and (string-index thing #\/) + (parent-directory? (dirname thing) directory)))) + + (let* ((pipe (with-directory-excursion directory + (open-pipe* OPEN_READ "git" "ls-files"))) + (files (let loop ((lines '())) + (match (read-line pipe) + ((? eof-object?) + (reverse lines)) + (line + (loop (cons line lines)))))) + (status (close-pipe pipe))) + (and (zero? status) + (lambda (file stat) + (match (stat:type stat) + ('directory + ;; 'git ls-files' does not list directories, only regular files, + ;; so we need this special trick. + (any (cut parent-directory? <> file) files)) + ((or 'regular 'symlink) + (any (cut string-suffix? <> file) files)) + (_ + #f)))))) + +(define-public current-guix + (let ((select? (delay (or (make-git-predicate + (string-append (current-source-directory) + "/../..")) + source-file?)))) + (lambda () + "Return a package representing Guix built from the current source tree. +This works by adding the current source tree to the store (after filtering it +out) and returning a package that uses that as its 'source'." + (package + (inherit guix) + (version (string-append (package-version guix) "+")) + (source (local-file "../.." "guix-current" + #:recursive? #t + #:select? (force select?))))))) + + +;;; +;;; Other tools. +;;; + (define-public nix (package (name "nix") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 30ed13093e..1579821385 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Jessica Tallon ;;; Copyright © 2016 Andreas Enge +;;; Copyright © 2016 Lukas Gradl ;;; ;;; This file is part of GNU Guix. ;;; @@ -295,3 +296,39 @@ Synchronization is possible using the integrated git support, which commits changes to your password database to a git repository that can be managed through the pass command.") (license license:gpl2+))) + +(define-public argon2 + (package + (name "argon2") + (version "20160406") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://codeload.github.com/P-H-C/phc-winner-" + name "/tar.gz/" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0g6wa94sh639xl1qc8z21q43r1mp8y77r1zf8nwx5pfsxd8fmyzv")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags '("CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda _ + (let ((out (assoc-ref %outputs "out"))) + (install-file "argon2" (string-append out "/bin")) + (install-file "libargon2.a" (string-append out "/lib")) + (install-file "libargon2.so" (string-append out "/lib")) + (copy-recursively "include" + (string-append out "/include")))))))) + (home-page "https://www.argon2.com/") + (synopsis "Password hashing library") + (description "Argon2 provides a key derivation function that was declared +winner of the 2015 Password Hashing Competition.") + (license license:cc0))) diff --git a/gnu/packages/patches/beets-image-test-failure.patch b/gnu/packages/patches/beets-image-test-failure.patch new file mode 100644 index 0000000000..360d7d3ed4 --- /dev/null +++ b/gnu/packages/patches/beets-image-test-failure.patch @@ -0,0 +1,46 @@ +Fix test failure due to missing image library backend. + +Cherry-picked from upstream: +https://github.com/beetbox/beets/commit/07c95a1bf16bf86c640436208dda828cc7df0181 + +From 07c95a1bf16bf86c640436208dda828cc7df0181 Mon Sep 17 00:00:00 2001 +From: Adrian Sampson +Date: Thu, 2 Jun 2016 11:39:05 -0700 +Subject: [PATCH] Require an imaging backend for fuzzy ratio tests + +These fail outright if we don't have a way to get image sizes (e.g., +ImageMagick). +--- + test/test_art.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/test/test_art.py b/test/test_art.py +index 02d26f4..1b12b76 100644 +--- a/test/test_art.py ++++ b/test/test_art.py +@@ -561,21 +561,25 @@ def test_respect_enforce_ratio_no(self): + self._assertImageIsValidArt(self.IMG_500x490, True) + + def test_respect_enforce_ratio_px_above(self): ++ self._require_backend() + self.plugin.enforce_ratio = True + self.plugin.margin_px = 5 + self._assertImageIsValidArt(self.IMG_500x490, False) + + def test_respect_enforce_ratio_px_below(self): ++ self._require_backend() + self.plugin.enforce_ratio = True + self.plugin.margin_px = 15 + self._assertImageIsValidArt(self.IMG_500x490, True) + + def test_respect_enforce_ratio_percent_above(self): ++ self._require_backend() + self.plugin.enforce_ratio = True + self.plugin.margin_percent = (500 - 490) / 500 * 0.5 + self._assertImageIsValidArt(self.IMG_500x490, False) + + def test_respect_enforce_ratio_percent_below(self): ++ self._require_backend() + self.plugin.enforce_ratio = True + self.plugin.margin_percent = (500 - 490) / 500 * 1.5 + self._assertImageIsValidArt(self.IMG_500x490, True) diff --git a/gnu/packages/patches/hydra-automake-1.15.patch b/gnu/packages/patches/hydra-automake-1.15.patch index 0d8fa98519..91c7b9202b 100644 --- a/gnu/packages/patches/hydra-automake-1.15.patch +++ b/gnu/packages/patches/hydra-automake-1.15.patch @@ -23,7 +23,7 @@ Automake's parallel test harness. - HYDRA_HOME="$(top_srcdir)/src" \ - HYDRA_CONFIG= \ - NIX_REMOTE= \ -- NIX_CONF_DIR="$(abs_builddir)/nix/etc/nix" \ +- GUIX_CONFIGURATION_DIRECTORY="$(abs_builddir)/nix/etc/nix" \ - NIX_STATE_DIR="$(abs_builddir)/nix/var/nix" \ - NIX_MANIFESTS_DIR="$(abs_builddir)/nix/var/nix/manifests" \ - NIX_STORE_DIR="$(abs_builddir)/nix/store" \ @@ -39,7 +39,7 @@ Automake's parallel test harness. + HYDRA_HOME="$(top_srcdir)/src"; export HYDRA_HOME; \ + HYDRA_CONFIG=; export HYDRA_CONFIG; \ + NIX_REMOTE=; export NIX_REMOTE; \ -+ NIX_CONF_DIR="$(abs_builddir)/nix/etc/nix"; export NIX_CONF_DIR; \ ++ GUIX_CONFIGURATION_DIRECTORY="$(abs_builddir)/nix/etc/nix"; export GUIX_CONFIGURATION_DIRECTORY; \ + NIX_STATE_DIR="$(abs_builddir)/nix/var/nix"; export NIX_STATE_DIR; \ + NIX_MANIFESTS_DIR="$(abs_builddir)/nix/var/nix/manifests"; export NIX_MANIFESTS_DIR; \ + NIX_STORE_DIR="$(abs_builddir)/nix/store"; export NIX_STORE_DIR; \ diff --git a/gnu/packages/patches/nasm-no-ps-pdf.patch b/gnu/packages/patches/nasm-no-ps-pdf.patch new file mode 100644 index 0000000000..b03b57a6ed --- /dev/null +++ b/gnu/packages/patches/nasm-no-ps-pdf.patch @@ -0,0 +1,20 @@ +Avoid building PS and PDF docs, which do not build bit-reproducible. NASM +already installs doc in info and html. + +--- nasm-2.12.01/doc/Makefile.in.orig 2016-06-21 18:02:59.483484829 +0200 ++++ nasm-2.12.01/doc/Makefile.in 2016-06-21 18:03:46.700151410 +0200 +@@ -27,7 +27,7 @@ + PS2PDF = @PS2PDF@ # Part of GhostScript + + SRCS = nasmdoc.src inslist.src changes.src +-OUT = info html nasmdoc.txt nasmdoc.ps nasmdoc.pdf ++OUT = info html nasmdoc.txt + + # exports + export srcdir +@@ -100,4 +100,4 @@ + $(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir) + mkdir -p $(INSTALLROOT)$(docdir)/html + $(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html +- $(INSTALL_DATA) nasmdoc.ps nasmdoc.pdf nasmdoc.txt $(INSTALLROOT)$(docdir) ++ $(INSTALL_DATA) nasmdoc.txt $(INSTALLROOT)$(docdir) diff --git a/gnu/packages/patches/ruby-puma-ignore-broken-test.patch b/gnu/packages/patches/ruby-puma-ignore-broken-test.patch new file mode 100644 index 0000000000..fb653dc0ee --- /dev/null +++ b/gnu/packages/patches/ruby-puma-ignore-broken-test.patch @@ -0,0 +1,13 @@ +diff --git a/test/test_integration.rb b/test/test_integration.rb +index d9b189c..6e21180 100644 +--- a/test/test_integration.rb ++++ b/test/test_integration.rb +@@ -115,7 +115,7 @@ class TestIntegration < Test::Unit::TestCase + assert_kind_of Thread, t.join(1), "server didn't stop" + end + +- def test_phased_restart_via_pumactl ++ def no_test_phased_restart_via_pumactl + if Puma.jruby? || Puma.windows? + assert true + return diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index e2b39c7d12..211505a846 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016 Jochem Raat ;;; Copyright © 2016 Efraim Flashner +;;; Coypright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -5092,7 +5093,7 @@ testing exception-throwing code with about the same amount of typing.") (define-public perl-test-harness (package (name "perl-test-harness") - (version "3.35") + (version "3.36") (source (origin (method url-fetch) @@ -5100,7 +5101,7 @@ testing exception-throwing code with about the same amount of typing.") "Test-Harness-" version ".tar.gz")) (sha256 (base32 - "06l29y1bpizb9vd9g49lgi0wzj1xy4rsk42ahdj3fpgqnvb9wp05")))) + "0gmnjss0hjkyiwvgby50nl5nzv254pn7fjqqdysjil21n09nymp7")))) (build-system perl-build-system) (arguments `(#:phases (alist-cons-before diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7587678dc1..b92746a260 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Daniel Pimentel +;;; Copyright © 2016 Sou Bunnbu ;;; ;;; This file is part of GNU Guix. ;;; @@ -2182,13 +2183,17 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-click (package (name "python-click") - (version "6.2") + (version "6.6") (source (origin (method url-fetch) - (uri (pypi-uri "click" version)) + (uri (string-append + "https://pypi.python.org/packages/" + "7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/" + "click-" version ".tar.gz")) (sha256 - (base32 "10kavbisnk9m93jl2wi34pw7ryr2qbxshh2cysxwxd7bymqgz87v")))) + (base32 + "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc")))) (build-system python-build-system) (native-inputs `(("python-setuptools" ,python-setuptools))) @@ -6942,13 +6947,16 @@ for atomic filesystem operations.") (define-public python-requests-toolbelt (package (name "python-requests-toolbelt") - (version "0.6.0") + (version "0.6.2") (source (origin (method url-fetch) - (uri (pypi-uri "requests-toolbelt" version)) + (uri (string-append + "https://pypi.python.org/packages/" + "e1/a4/a94c037bc72ad70441aff1403d3243510d2542ddca7759faaeffeb11aefe/" + "requests-toolbelt-" version ".tar.gz")) (sha256 (base32 - "07slish560haspn0hpwgy2izhk2snqq06s6acp8xzmhhz079qknc")))) + "15q9nrgp85nqlr4kdz1zvj8z2npafi2sr12y7fqgxbkq28j1aci6")))) (build-system python-build-system) (propagated-inputs `(("python-requests" ,python-requests))) @@ -6961,13 +6969,16 @@ with python-requests.") (define-public python-click-threading (package (name "python-click-threading") - (version "0.1.2") + (version "0.2.0") (source (origin (method url-fetch) - (uri (pypi-uri "click-threading" version)) + (uri (string-append + "https://pypi.python.org/packages/" + "fe/b7/e7f609d18a2a351cb71616adcf54df1acd82f83cb9b5936935a4d20e2c23/" + "click-threading-" version ".tar.gz")) (sha256 (base32 - "0jmrv4334lfxa2ss53c06dafdwqbk1pb3ihd26izn5igw1bm8145")))) + "18bcqikxwb3drb8rf60cclxkxw52521b38ax3byah6j8cn8y9p4j")))) (build-system python-build-system) (propagated-inputs `(("python-click" ,python-click))) @@ -7117,13 +7128,16 @@ framework which enables you to test server connections locally.") (define-public python-wsgi-intercept (package (name "python-wsgi-intercept") - (version "1.1.2") + (version "1.2.2") (source (origin (method url-fetch) - (uri (pypi-uri "wsgi_intercept" version)) + (uri (string-append + "https://pypi.python.org/packages/" + "38/76/ebcbc24d0cb77db34520a3ca6ed1bd43ace17d182bbd8dd7d976f1c176fb/" + "wsgi_intercept-" version ".tar.gz")) (sha256 (base32 - "14ajy415ch5d0dnspg4b592p66wlgzah7ay218flp13517fp49zl")))) + "0kjj2v2dvmnpdd5h5gk9rzz0f54rhjb0yiz3zg65bmp65slfw65d")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest) @@ -9103,10 +9117,7 @@ to provide a high-level synchronous API on top of the libev event loop.") (version "16.2.0") (source (origin (method url-fetch) - (uri (list (pypi-uri "Twisted" version ".tar.bz2") ; 404 - (string-append - "https://pypi.io/packages/source/T/Twisted/" - "Twisted-" version ".tar.bz2"))) + (uri (pypi-uri "Twisted" version ".tar.bz2")) (sha256 (base32 "0ydxrp9myw1mvsz3qfzx5579y5llmqa82pxvqchgp5syczffi450")))) @@ -9300,3 +9311,366 @@ It supports both the original 1.0 specification, as well as the new (proposed) 2.0 spec, which includes batch submission, keyword arguments, etc.") (license asl2.0))) + +(define-public python-chai + (package + (name "python-chai") + (version "1.1.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "chai" version)) + (sha256 + (base32 + "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "https://github.com/agoragames/chai") + (synopsis "Mocking framework for Python") + (description + "Chai provides an api for mocking, stubbing and spying your python +objects, patterned after the Mocha library for Ruby.") + (license bsd-3))) + +(define-public python2-chai + (package-with-python2 python-chai)) + +(define-public python-arrow + (package + (name "python-arrow") + (version "0.8.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "arrow" version)) + (sha256 + (base32 + "1bz7hkdgpqcjs866y58z8jywpy7al0f4rxdr00bh2l5qddyw245j")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools) + ("python-dateutil" ,python-dateutil-2) + ;; For testing + ("python-chai" ,python-chai) + ("python-simplejson" ,python-simplejson))) + (home-page "https://github.com/crsmithdev/arrow/") + (synopsis "Dates and times for Python") + (description + "Arrow is a Python library to creating, manipulating, formatting and +converting dates, times, and timestamps. It implements and updates the +datetime type.") + (license asl2.0))) + +(define-public python2-arrow + (package-with-python2 python-arrow)) + +(define-public python-inflection + (package + (name "python-inflection") + (version "0.3.1") + (source + (origin (method url-fetch) + (uri (pypi-uri "inflection" version)) + (sha256 + (base32 + "1jhnxgnw8y3mbzjssixh6qkc7a3afc4fygajhqrqalnilyvpzshq")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "http://github.com/jpvanhal/inflection") + (synopsis "Python string transformation library") + (description + "Inflection is a string transformation library. It singularizes +and pluralizes English words, and transforms strings from CamelCase to +underscored string.") + (license license:expat))) + +(define-public python2-inflection + (package-with-python2 python-inflection)) + +(define-public python-pylev + (package + (name "python-pylev") + (version "1.3.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "pylev" version)) + (sha256 + (base32 + "1hz1x9blsbxya1y9nnhnwwdnqmakxi9mc0jkwj0rn6b1h44i0f86")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "http://github.com/toastdriven/pylev") + (synopsis "Levenshtein distance implementation in Python") + (description "Pure Python Levenshtein implementation, based off the +Wikipedia code samples at +@url{http://en.wikipedia.org/wiki/Levenshtein_distance}.") + (license bsd-3))) + +(define-public python2-pylev + (package-with-python2 python-pylev)) + +(define-public python-cleo + (package + (name "python-cleo") + (version "0.4.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "cleo" version)) + (sha256 + (base32 + "1k2dcl6mqpn5bljyl6w42rqyd9mb3y9kh2mg7m2x3kfjwvg0rpva")))) + (build-system python-build-system) + (native-inputs + `(("python-psutil" ,python-psutil) + ("python-pylev" ,python-pylev) + ("python-setuptools" ,python-setuptools) + ;; For testing + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/sdispater/cleo") + (synopsis "Command-line arguments library for Python") + (description + "Cleo allows you to create command-line commands with signature in +docstring and colored output.") + (license license:expat))) + +(define-public python2-cleo + (package-with-python2 python-cleo)) + +(define-public python-lazy-object-proxy + (package + (name "python-lazy-object-proxy") + (version "1.2.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "lazy-object-proxy" version)) + (sha256 + (base32 + "0s22aqqkdscyh8sjspyyax7qa1aiz8p4midrnyf39717fhfczm6x")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "https://github.com/ionelmc/python-lazy-object-proxy") + (synopsis "Lazy object proxy for python") + (description + "Lazy object proxy is an object that wraps a callable but defers the call +until the object is actually required, and caches the result of said call.") + (license bsd-2))) + +(define-public python2-lazy-object-proxy + (package-with-python2 python-lazy-object-proxy)) + +(define-public python-dnspython + (package + (name "python-dnspython") + (version "1.14.0") + (source (origin + (method url-fetch) + (uri (string-append "http://www.dnspython.org/kits/" + version "/dnspython-" version ".tar.gz")) + (sha256 + (base32 + "1z472r63gdqsxhsxj3plr5vs478yf4303vrqxxpsccc940g441hl")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; XXX: requires internet access + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "http://www.dnspython.org") + (synopsis "DNS toolkit for Python") + (description + "dnspython is a DNS toolkit for Python. It supports almost all record +types. It can be used for queries, zone transfers, and dynamic updates. +It supports TSIG authenticated messages and EDNS0.") + (license license:expat))) + +(define-public python2-dnspython + (package-with-python2 python-dnspython)) + +(define-public python-email-validator + (package + (name "python-email-validator") + (version "1.0.1") + (source + (origin (method url-fetch) + (uri (pypi-uri "email_validator" version)) + (sha256 + (base32 + "0mn8jg5h8ifl8w6a6m0hq8kbk0mzw9vm054qfamkn89b3npz52qw")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'build 'use-dnspython + (lambda _ + (substitute* "setup.py" + (("dnspython3") "dnspython")) + #t))))) + (native-inputs + `(("python-dnspython" ,python-dnspython) + ("python-idna" ,python-idna) + ("python-setuptools" ,python-setuptools))) + (home-page "https://github.com/JoshData/python-email-validator") + (synopsis "Email address validation library for Python") + (description + "This library validates email address syntax and deliverability.") + (license cc0))) + +(define-public python2-email-validator + (package-with-python2 python-email-validator)) + +(define-public python-ukpostcodeparser + (package + (name "python-ukpostcodeparser") + (version "1.0.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "UkPostcodeParser" version)) + (sha256 + (base32 + "1jwg9z4rz51mcka1821rwgycsd0mcicyp1kiwjfa2kvg8bm9p2qd")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "https://github.com/hamstah/ukpostcodeparser") + (synopsis "UK Postcode parser for Python") + (description + "This library provides the @code{parse_uk_postcode} function for +parsing UK postcodes.") + (license license:expat))) + +(define-public python2-ukpostcodeparser + (package-with-python2 python-ukpostcodeparser)) + +(define-public python-fake-factory + (package + (name "python-fake-factory") + (version "0.5.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "fake-factory" version)) + (sha256 + (base32 + "1chmarnrdzn4r017n8qlic0m0bbnhw04s3hkwribjvm3mqpb6pa0")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'disable-failing-test + ;; XXX: faker/tests/ne_np/__init__.py, line 40, in test_names + ;; first_name, last_name = name.split() + ;; ValueError: too many values to unpack (expected 2) + (lambda _ + (delete-file "faker/tests/ne_np/__init__.py") + #t))))) + (native-inputs + `(("python-dateutil" ,python-dateutil-2) + ("python-setuptools" ,python-setuptools) + ("python-six" ,python-six) + ;; For testing + ("python-email-validator" ,python-email-validator) + ("python-mock" ,python-mock) + ("python-ukpostcodeparser" ,python-ukpostcodeparser))) + (home-page "http://github.com/joke2k/faker") + (synopsis "Python package that generates fake data") + (description + "Faker is a Python package that generates fake data such as names, +addresses, and phone numbers.") + (license license:expat) + (properties `((python2-variant . ,(delay python2-fake-factory)))))) + +(define-public python2-fake-factory + (let ((base (package-with-python2 (strip-python2-variant + python-fake-factory)))) + (package + (inherit base) + (native-inputs + `(("python2-ipaddress" ,python2-ipaddress) + ,@(package-native-inputs base)))))) + +(define-public python-pyaml + (package + (name "python-pyaml") + (version "15.8.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "pyaml" version)) + (sha256 + (base32 + "1f5m28vkh4ksq3d80d8mmd2z8wxvc3mgy2pmrv2751dm2xgznm4w")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (propagated-inputs + `(("python-pyyaml" ,python-pyyaml))) + (home-page "https://github.com/mk-fg/pretty-yaml") + (synopsis "YAML pretty-print library for Python") + (description + "pyaml is a PyYAML based python module to produce pretty and readable +YAML-serialized data.") + (license (non-copyleft "http://www.wtfpl.net/txt/copying/")))) + +(define-public python2-pyaml + (package-with-python2 python-pyaml)) + +(define-public python-flexmock + (package + (name "python-flexmock") + (version "0.10.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "flexmock" version)) + (sha256 + (base32 + "0arc6njvs6i9v9hgvzk5m50296g7zy5m9d7pyb43vdsdgxrci5gy")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "https://flexmock.readthedocs.org") + (synopsis "Testing library for Python") + (description + "flexmock is a testing library for Python that makes it easy to create +mocks, stubs and fakes.") + (license bsd-3))) + +(define-public python2-flexmock + (package-with-python2 python-flexmock)) + +(define-public python-orator + (package + (name "python-orator") + (version "0.8.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "orator" version)) + (sha256 + (base32 + "1li49irsqha17nrda4nsb48biyy0rarp9pphf0jpqwm5zr8hv569")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; no tests + (native-inputs + `(("python-arrow" ,python-arrow) + ("python-blinker" ,python-blinker) + ("python-cleo" ,python-cleo) + ("python-fake-factory" ,python-fake-factory) + ("python-inflection" ,python-inflection) + ("python-lazy-object-proxy" ,python-lazy-object-proxy) + ("python-pyaml" ,python-pyaml) + ("python-setuptools" ,python-setuptools) + ("python-simplejson" ,python-simplejson) + ("python-wrapt" ,python-wrapt))) + (home-page "https://orator-orm.com/") + (synopsis "ActiveRecord ORM for Python") + (description + "Orator provides a simple ActiveRecord-like Object Relational Mapping +implementation for Python.") + (license license:expat) + (properties `((python2-variant . ,(delay python2-orator)))))) + +(define-public python2-orator + (let ((base (package-with-python2 (strip-python2-variant python-orator)))) + (package + (inherit base) + (native-inputs + `(("python2-ipaddress" ,python2-ipaddress) + ,@(package-native-inputs base)))))) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 527f76b404..877f229fe1 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3939,6 +3939,70 @@ part of the Prawn PDF generator.") ;; for details." (license (list license:gpl2 license:gpl3 license:ruby)))) +(define-public ruby-puma + (package + (name "ruby-puma") + (version "3.4.0") + (source + (origin + (method url-fetch) + ;; Fetch from GitHub because distributed gem does not contain tests. + (uri (string-append "https://github.com/puma/puma/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10svyj2jk949y1dmkxyzipk1ddzl4iz9limrcws1zhpganpvq3j8")) + ;; Ignore broken test reported upstream. + ;; https://github.com/puma/puma/issues/995 + (patches (search-patches "ruby-puma-ignore-broken-test.patch")))) + (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'fix-gemspec + (lambda _ + (substitute* "puma.gemspec" + (("git ls-files") "find * |sort")) + #t))))) + (native-inputs + `(("ruby-hoe" ,ruby-hoe) + ("ruby-rake-compiler" ,ruby-rake-compiler) + ("ruby-hoe-git" ,ruby-hoe-git) + ("ruby-rack" ,ruby-rack))) + (synopsis "Simple, concurrent HTTP server for Ruby/Rack") + (description + "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server +for Ruby/Rack applications. Puma is intended for use in both development and +production environments. In order to get the best throughput, it is highly +recommended that you use a Ruby implementation with real threads like Rubinius +or JRuby.") + (home-page "http://puma.io") + (license license:expat))) + +(define-public ruby-hoe-git + (package + (name "ruby-hoe-git") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "hoe-git" version)) + (sha256 + (base32 + "10jmmbjm0lkglwxbn4rpqghgg1ipjxrswm117n50adhmy8yij650")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-hoe" ,ruby-hoe) + ("git" ,git))) + (synopsis "Hoe plugins for tighter Git integration") + (description + "This package provides a set of Hoe plugins for tighter Git integration. +It provides tasks to automate release tagging and pushing and changelog +generation.") + (home-page "http://github.com/jbarnette/hoe-git") + (license license:expat))) + (define-public ruby-sequel (package (name "ruby-sequel") diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index e409dd546e..eac550e4ab 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -323,14 +323,14 @@ mashups, office (web agendas, mail clients, ...), etc.") (define-public chicken (package (name "chicken") - (version "4.10.0") + (version "4.11.0") (source (origin (method url-fetch) (uri (string-append "http://code.call-cc.org/releases/" version "/chicken-" version ".tar.gz")) (sha256 (base32 - "16w96jrhb6qf62fgznk53f55yhfv81damghdjn31k5hirnmza1qf")))) + "12ddyiikqknpr8h6llsxbg2fz75xnayvcnsvr1cwv8xnjn7jpp73")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index 5827a1c53e..a4eefd85a6 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -34,13 +34,13 @@ (define-public screen (package (name "screen") - (version "4.3.1") + (version "4.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/screen/screen-" version ".tar.gz")) (sha256 - (base32 "0qwxd4axkgvxjigz9xs0kcv6qpfkrzr2gm43w9idx0z2mvw4jh7s")))) + (base32 "12r12xwhsg59mlprikbbmn60gh8lqhrvyar7mlxg4fwsfma2lwpg")))) (build-system gnu-build-system) (native-inputs `(("makeinfo" ,texinfo))) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 8dfd21d6a5..42bb2b8f92 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2016 Lukas Gradl ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,8 +22,13 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) #:use-module (gnu packages) - #:use-module (gnu packages documentation)) + #:use-module (gnu packages autotools) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages documentation) + #:use-module (gnu packages pkg-config)) (define-public cereal (package @@ -72,3 +78,48 @@ arbitrary data types and reversibly turns them into different representations, such as compact binary encodings, XML, or JSON.") (license license:bsd-3))) + + +(define-public msgpack + (package + (name "msgpack") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://github.com/msgpack/msgpack-c/releases/download/" + "cpp-" version "/msgpack-" version ".tar.gz")) + (snippet + '(let ((p (open-file "msgpack.pc.in" "a"))) + (begin + (display + (string-append "Requires: " "zlib" "\n") p) + (close-output-port p)))) + (sha256 + (base32 + "0bpjfh9vz0n2k93mph3x15clmigkgs223xfn8h12ymrh5gsi5ica")))) + (build-system gnu-build-system) + (native-inputs + `(("googletest" ,googletest) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("zlib" ,zlib))) ;; Msgpack installs two headers (zbuffer.h, + ;; zbuffer.hpp) which #include . However, 'guix gc --references' + ;; does not detect a store reference to zlib since these headers are not + ;; compiled. + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'autoconf + (lambda _ + (system* "autoreconf" "-vfi")))))) + (home-page "http://www.msgpack.org") + (synopsis "Binary serialization library") + (description "Msgpack is a library for C/C++ that implements binary +serialization.") + (license license:boost1.0))) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1288d9d7ef..c84845dd29 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -378,6 +378,50 @@ and Francois (2011, JSS), and the book by Eddelbuettel (2013, Springer); see 'citation(\"Rcpp\")' for details on these last two.") (license license:gpl2+))) +(define-public r-mgcv + (package + (name "r-mgcv") + (version "1.8-12") + (source + (origin + (method url-fetch) + (uri (cran-uri "mgcv" version)) + (sha256 + (base32 + "1khzy36nn6xbnzqfc2953ng0sv8w91mns1ymhibaqn1150x1qid0")))) + (build-system r-build-system) + (home-page "http://cran.r-project.org/web/packages/mgcv") + (synopsis "Mixed generalised additive model computation") + (description + "GAMs, GAMMs and other generalized ridge regression with multiple smoothing +parameter estimation by GCV, REML or UBRE/AIC. The library includes a +@code{gam()} function, a wide variety of smoothers, JAGS support and +distributions beyond the exponential family.") + (license license:gpl2+))) + +(define-public r-permute + (package + (name "r-permute") + (version "0.9-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "permute" version)) + (sha256 + (base32 + "0w68cqw6s4pixix8bh1qzsy1pm64jqh1cjznw74h82ygp8sj7p73")))) + (build-system r-build-system) + ;; Tests do not run correctly, but running them properly would entail a + ;; circular dependency with vegan. + (home-page "https://github.com/gavinsimpson/permute") + (synopsis "Functions for Generating Restricted Permutations of Data") + (description + "This package provides a set of restricted permutation designs for freely +exchangeable, line transects (time series), spatial grid designs and permutation +of blocks (groups of samples). @code{permute} also allows split-plot designs, +in which the whole-plots or split-plots or both can be freely exchangeable.") + (license license:gpl2+))) + (define-public r-plyr (package (name "r-plyr") diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c1ab8b3f5c..219f6856f8 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Roel Janssen +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,27 +56,27 @@ (define texlive-extra-src (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2015/texlive-20150523-extra.tar.xz") + (uri "ftp://tug.org/historic/systems/texlive/2016/texlive-20160523-extra.tar.xz") (sha256 (base32 - "1dkhhacga8h1v2m9xv1w02glbdda2m8lfp1la1y1zb9yjj8jsa6i")))) + "0q4a92zmwhn4ry6xgrp4k8wq11ax2sg9rg9yrsrdkr719y0x887a")))) (define texlive-texmf-src (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2015/texlive-20150523-texmf.tar.xz") + (uri "ftp://tug.org/historic/systems/texlive/2016/texlive-20160523-texmf.tar.xz") (sha256 (base32 - "1a3hpcg6x69ysqx432v6sk4alg0x34813cwk41frmvzprdajpyqy")))) + "0mfp6kq1p2ys5ni9czx9xl0xh264axri25vqw37yzk8jn3py9l08")))) (define texlive-bin (package (name "texlive-bin") - (version "2015") + (version "2016") (source (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2015/texlive-20150521-source.tar.xz") + (uri "ftp://tug.org/historic/systems/texlive/2016/texlive-20160523-source.tar.xz") (sha256 (base32 - "0sa6kmz4jwhv6lw702gxszhhjkvw071wba0ngk1c76g8vixwv6zd")))) + "07kb8rsw8d42wy3fj1qgqj26y92spx1lbhx6z73wwdb3msnvh4i9")))) (build-system gnu-build-system) (inputs `(("texlive-extra-src" ,texlive-extra-src) @@ -171,7 +172,7 @@ This package contains the binaries.") (define texlive-texmf (package (name "texlive-texmf") - (version "2015") + (version "2016") (source texlive-texmf-src) (build-system gnu-build-system) (inputs @@ -220,6 +221,7 @@ This package contains the binaries.") (system* "updmap-sys" "--nohash" "--syncwithtrees") (system* "mktexlsr") (system* "fmtutil-sys" "--all"))))))) + (properties `((max-silent-time . 9600))) ; don't time out while grafting (synopsis "TeX Live, a package of the TeX typesetting system") (description "TeX Live provides a comprehensive TeX document production system. @@ -234,7 +236,7 @@ This package contains the complete tree of texmf-dist data.") (define-public texlive (package (name "texlive") - (version "2015") + (version "2016") (source #f) (build-system trivial-build-system) (inputs `(("bash" ,bash) ; for wrap-program diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 801bd29442..2b2076c484 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -112,14 +112,14 @@ as well as the classic centralized workflow.") ;; Keep in sync with 'git-manpages'! (package (name "git") - (version "2.8.4") + (version "2.9.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0mqnzs4wz2x1fa6kq2ckgf42fgx6qwp64ra1lgg73245l4r9l3hj")))) + "02dl8yvvl7m4zy39s0xmqr958ah7krvkv94lmx4vz3wl95wsj7zl")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -292,7 +292,7 @@ everything from small to very large projects with speed and efficiency.") version ".tar.xz")) (sha256 (base32 - "1xdpp1i8sgdzk708vnxrm1z6dg4mip12fswihb8hlg2v5qqgrpfj")))) + "0ic4zs4axkkwa44nqv5iihj3q2nm42kx0j8scnfp1z93m6pw31fw")))) (build-system trivial-build-system) (arguments '(#:modules ((guix build utils)) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c77a7e1529..819c0d5f48 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -77,7 +77,7 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages yasm) + #:use-module (gnu packages assembly) #:use-module (gnu packages zip)) (define-public aalib @@ -755,7 +755,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (define-public mpv (package (name "mpv") - (version "0.17.0") + (version "0.18.0") (source (origin (method url-fetch) (uri (string-append @@ -763,7 +763,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ".tar.gz")) (sha256 (base32 - "0vms3viwqcwl1mrgmf2yy4c69fvv7xpbkyrl693l6zpwynqd4b30")) + "0az0zqb2rakak51zsvfqzj9a8jiqpvc61jxap8hjdkkb9y6n6mmn")) (file-name (string-append name "-" version ".tar.gz")))) (build-system waf-build-system) (native-inputs @@ -818,7 +818,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (lambda* (#:key inputs #:allow-other-keys) (copy-file (assoc-ref inputs "waf") "waf") (setenv "CC" "gcc")))) - #:configure-flags (list "--enable-gpl3" "--enable-zsh-comp") + #:configure-flags (list "--enable-zsh-comp") ;; No check function defined. #:tests? #f)) (home-page "https://mpv.io/") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3e145fc5d7..19870ef8f4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Clément Lassieur +;;; Copyright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -2899,14 +2900,14 @@ applications.") (define-public perl-uri (package (name "perl-uri") - (version "1.67") + (version "1.71") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "URI-" version ".tar.gz")) (sha256 (base32 - "0ki7i830gs0cwwwjsyv3s6yy1l76ym8pfqp0lp7vw0j9bwyx923h")))) + "05a1ck1bhvqkkk690xhsxf7276dnagk96qkh2jy4prrrgw6wm3lw")))) (build-system perl-build-system) (license (package-license perl)) (synopsis "Perl Uniform Resource Identifiers (absolute and relative)") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ad81f975dc..61479bef47 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2015 Cyrill Schenkel ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -149,7 +150,7 @@ autotools system.") `(("libxfont" ,libxfont))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Convert X font from BDF to PCF") (description "BDFtoPCF is a font compiler for the X server and font server. It @@ -174,7 +175,7 @@ which can be read by any architecture.") "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg BigReqsProto protocol headers") (description "Big Requests Extension defines a protocol to enable the use of @@ -201,7 +202,7 @@ requests that exceed 262140 bytes in length.") `(("fixesproto" ,fixesproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg CompositeProto protocol headers") (description "Composite Extension contains header files and documentation for @@ -225,7 +226,7 @@ the damage protocol.") "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg DamageProto protocol headers") (description "Damage Extension contains header files and documentation for @@ -249,7 +250,7 @@ the damage protocol.") "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg DMXProto protocol headers") (description "DMX (Distributed Multihead X) Extension defines a protocol for clients @@ -273,7 +274,7 @@ servers making up a large display.") (base32 "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr")))) (build-system gnu-build-system) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg DRI2Proto protocol headers") (description "Direct Rendering Infrastructure 2 Extension defines a protocol to @@ -296,7 +297,7 @@ requiring data to be passed through the X server.") (base32 "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1")))) (build-system gnu-build-system) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg DRI3Proto protocol headers") (description "Direct Rendering Infrastructure 3 Extension provides mechanisms to @@ -326,7 +327,7 @@ provided.") `(("mkfontscale" ,mkfontscale))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg font encoding files") (description "Xorg font encoding files.") (license license:public-domain))) @@ -358,7 +359,7 @@ provided.") ;; install fonts into subdirectory of package output instead of ;; font-util-?.?.?/share/fonts/X11 (string-append "--with-fontrootdir=" %output "/share/fonts/X11")))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg adobe-100dpi fonts") (description "Xorg adobe-100dpi fonts.") (license license:x11))) @@ -388,7 +389,7 @@ provided.") (arguments `(#:configure-flags (list (string-append "--with-fontrootdir=" %output "/share/fonts/X11")))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg adobe-75dpi fonts") (description "Xorg adobe-75dpi fonts.") (license license:x11))) @@ -433,7 +434,7 @@ provided.") (format p "0~%")))) '("75dpi" "100dpi" "misc" "cyrillic")) #t)))))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg font aliases") (description "This package provides some common aliases for Xorg fonts. @@ -461,7 +462,7 @@ For example: '6x10', '9x15bold', etc.") ("bdftopcf" ,bdftopcf))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg arabic-misc font") (description "Xorg arabic-misc font.") (license license:x11))) @@ -498,7 +499,7 @@ For example: '6x10', '9x15bold', etc.") ("bdftopcf" ,bdftopcf))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg cronyx-cyrillic font") (description "Xorg cronyx-cyrillic font.") (license license:x11))) @@ -531,7 +532,7 @@ For example: '6x10', '9x15bold', etc.") ("bdftopcf" ,bdftopcf))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg dec-misc font") (description "Xorg dec-misc font.") (license license:x11))) @@ -560,7 +561,7 @@ For example: '6x10', '9x15bold', etc.") ("bdftopcf" ,bdftopcf))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg isas-misc font") (description "Xorg isas-misc font.") (license license:x11))) @@ -590,7 +591,7 @@ For example: '6x10', '9x15bold', etc.") ("bdftopcf" ,bdftopcf))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg micro-misc font") (description "Xorg micro-misc font.") (license license:public-domain))) @@ -616,7 +617,7 @@ For example: '6x10', '9x15bold', etc.") ("bdftopcf" ,bdftopcf))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg misc-cyrillic fonts") (description "Xorg misc-cyrillic fonts.") (license license:x11))) @@ -641,7 +642,7 @@ For example: '6x10', '9x15bold', etc.") `(("mkfontdir" ,mkfontdir))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg misc-ethiopic fonts") (description "Xorg misc-ethiopic fonts.") (license license:x11))) @@ -675,7 +676,7 @@ For example: '6x10', '9x15bold', etc.") (arguments `(#:configure-flags (list (string-append "--with-fontrootdir=" %output "/share/fonts/X11")))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg misc-misc fonts") (description "Xorg misc-misc fixed fonts.") (license license:public-domain))) @@ -701,7 +702,7 @@ For example: '6x10', '9x15bold', etc.") ("bdftopcf" ,bdftopcf))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg mutt-misc fonts") (description "Xorg mutt-misc fonts.") (license license:x11))) @@ -731,7 +732,7 @@ For example: '6x10', '9x15bold', etc.") (arguments `(#:configure-flags (list (string-append "--with-fontrootdir=" %output "/share/fonts/X11")))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg schumacher-misc fonts") (description "Xorg schumacher-misc fonts.") (license license:x11))) @@ -757,7 +758,7 @@ For example: '6x10', '9x15bold', etc.") ("bdftopcf" ,bdftopcf))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg screen-cyrillic fonts") (description "Xorg screen-cyrillic fonts.") (license license:x11))) @@ -783,7 +784,7 @@ For example: '6x10', '9x15bold', etc.") ("bdftopcf" ,bdftopcf))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg sony-misc fonts") (description "Xorg sony-misc fonts.") (license license:x11))) @@ -809,7 +810,7 @@ For example: '6x10', '9x15bold', etc.") ("bdftopcf" ,bdftopcf))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg sun-misc fonts") (description "Xorg sun-misc fonts.") (license license:x11))) @@ -831,7 +832,7 @@ For example: '6x10', '9x15bold', etc.") "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg font utilities") (description "Xorg font package creation/installation utilities.") @@ -858,7 +859,7 @@ For example: '6x10', '9x15bold', etc.") ("bdftopcf" ,bdftopcf))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg winitzki-cyrillic font") (description "Xorg winitzki-cyrillic font.") (license license:public-domain))) @@ -883,7 +884,7 @@ For example: '6x10', '9x15bold', etc.") `(("mkfontdir" ,mkfontdir))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg xfree86-type1 font") (description "Xorg xfree86-type1 font.") (license license:x11))) @@ -905,7 +906,7 @@ For example: '6x10', '9x15bold', etc.") "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg FontsProto protocol headers") (description "Fonts Extension contains header files and documentation for @@ -929,7 +930,7 @@ the fonts protocol.") "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg GLProto protocol headers") (description "OpenGL Extension defines a protocol for the client to send 3D @@ -956,7 +957,7 @@ rendering commands to the X server.") `(("libice" ,libice))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "ICE authority file utility") (description "ICEAuth program is used to edit and display the authorization @@ -982,7 +983,7 @@ authentication records.") "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg InputProto protocol headers") (description "Input Extension defines a protocol to provide additional input @@ -1006,7 +1007,7 @@ devices management such as graphic tablets.") "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg KBProto protocol headers") (description "X Keyboard (XKB) Extension defines a protocol to provide a number @@ -1040,7 +1041,7 @@ of new capabilities and controls for text keyboards.") ("dmxproto" ,dmxproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg DMX library") (description "DMX (Distributed Multihead X) extension library.") @@ -1092,7 +1093,7 @@ synchronization between the X server and direct-rendering clients.") ("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg font encoding library") (description "Xorg font encoding library.") (license license:x11))) @@ -1119,7 +1120,7 @@ synchronization between the X server and direct-rendering clients.") ("fontsproto" ,fontsproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Font Service client library") (description "Font Service client library is used by clients of X Font @@ -1147,7 +1148,7 @@ themselves.") `(("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg PCI access library") (description "Xorg Generic PCI access library.") (license license:x11))) @@ -1169,7 +1170,7 @@ themselves.") "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Library with pthread stubs") (description "This library provides weak aliases for pthread functions not @@ -1202,7 +1203,7 @@ hit when running single-threaded.") ("util-linux" ,util-linux))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Session Management library") (description "Xorg Session Management library.") (license license:x11))) @@ -1230,7 +1231,7 @@ hit when running single-threaded.") ("windowswmproto" ,windowswmproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg WindowsWM library") (description "Cygwin/X rootless window management extension. @@ -1263,7 +1264,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") ("compositeproto" ,compositeproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Composite library") (description "Client library for the Composite extension to the X11 protocol.") @@ -1289,7 +1290,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") `(("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Display Manager Control Protocol library") (description "Xorg Display Manager Control Protocol library.") (license license:x11))) @@ -1320,7 +1321,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") ("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg FreeType library") (description "Xorg FreeType library connects X applications with the FreeType font @@ -1348,7 +1349,7 @@ configuration files.") `(("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XKB file handling library") (description "Xorg XKB file handling library.") (license license:x11))) @@ -1375,7 +1376,7 @@ configuration files.") ("libxext" ,libxext))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Xmu library") (description "Xmu library contains miscellaneous utilities and is not part of the @@ -1408,7 +1409,7 @@ treat it as part of their software base when porting.") ("libxext" ,libxext))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XPM library") (description "XPM (X Pixmap) image file format library.") (license license:x11))) @@ -1436,7 +1437,7 @@ treat it as part of their software base when porting.") ("resourceproto" ,resourceproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Resource extension library") (description "X Resource extension library.") (license license:x11))) @@ -1464,7 +1465,7 @@ treat it as part of their software base when porting.") `(("scrnsaverproto" ,scrnsaverproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Screen Saver library") (description "X11 Screen Saver extension client library.") (license license:x11))) @@ -1492,7 +1493,7 @@ treat it as part of their software base when porting.") ("libxext" ,libxext))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XFree86-DGA library") (description "Client library for the XFree86-DGA extension.") (license license:x11))) @@ -1520,7 +1521,7 @@ treat it as part of their software base when porting.") `(("libfontenc" ,libfontenc))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Convert terminal I/O from legacy encodings to UTF-8") (description "Luit is a filter that can be run between an arbitrary application and @@ -1548,7 +1549,7 @@ input from UTF-8 into the locale's encoding.") (inputs `(("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg makedepend utility") (description "Makedepend is an utility for creating dependencies in makefiles.") @@ -1577,7 +1578,7 @@ input from UTF-8 into the locale's encoding.") ("libfontenc" ,libfontenc))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Create an index of scalable font files for X server") (description "MkFontScale creates the 'fonts.scale' and 'fonts.dir' index files used @@ -1600,7 +1601,7 @@ by the legacy X11 font system.") (base32 "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41")))) (build-system gnu-build-system) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg PresentProto protocol headers") (description "Present Extension provides a way for applications to update their @@ -1626,7 +1627,7 @@ mechanism than copying the contents of the source pixmap.") "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg PrintProto protocol headers") (description "Print Extension defines a protocol for a portable, @@ -1650,7 +1651,7 @@ network-transparent printing system.") "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg RandRProto protocol headers") (description "Resize and Rotate Extension defines a protocol for clients to @@ -1675,7 +1676,7 @@ window of a screen.") "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg RecordProto protocol headers") (description "Record Extension defines a protocol for the recording and playback @@ -1699,7 +1700,7 @@ of user actions in the X Window System.") "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg RenderProto protocol headers") (description "Rendering Extension defines a protcol for a digital image composition @@ -1723,7 +1724,7 @@ as the foundation of a new rendering model within the X Window System.") "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg ResourceProto protocol headers") (description "Resource Extension defines a protocol that allows a client to @@ -1747,7 +1748,7 @@ query the X server about its usage of various resources.") "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg ScrnSaverProto protocol headers") (description "Screen Saver Extension defines a protocol to control screensaver @@ -1774,7 +1775,7 @@ features and to query screensaver info on specific windows.") `(("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Register X sessions in system utmp/utmpx databases") (description "SessReg is a simple program for managing utmp/wtmp entries for X @@ -1809,7 +1810,7 @@ used with other display managers such as gdm or kdm.") (list (string-append "--with-xkb-config-root=" (assoc-ref %build-inputs "xkeyboard-config") "/share/X11/xkb")))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Set the keyboard using the X Keyboard Extension") (description "Setxkbmap is an X11 client to change the keymaps in the X server @@ -1838,7 +1839,7 @@ listed on the command line.") ("libxmu" ,libxmu))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Session Manager Proxy") (description "SMProxy allows X applications that do not support X11R6 session @@ -1878,7 +1879,7 @@ management to participate in an X11R6 session.") (delete-file "share/util-macros/INSTALL") (rmdir "share/util-macros")))) %standard-phases)))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg autoconf macros") (description "This package provides a set of autoconf macros used by the @@ -1903,7 +1904,7 @@ generate new versions of their configure scripts with autoconf.") "1dnlkd9nb0m135lgd6hd61vc29sdyarsyya8aqpx7z10p261dbld")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg VideoProto protocol headers") (description "Video Extension provides a protocol for a video output mechanism, @@ -1927,7 +1928,7 @@ mainly to rescale video playback in the video controller hardware.") "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg WindowsWMProto protocol headers") (description "WindowsWM Extension defines a protocol, used for coordination between @@ -1959,7 +1960,7 @@ server.") ("libxrender" ,libxrender))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "X server performance benchmarker") (description "X11Perf is a simple performance benchmarker for the Xorg X server.") @@ -1992,7 +1993,7 @@ server.") ;; FIXME: The test suite needs http://liw.fi/cmdtest/ (arguments `(#:tests? #f)) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "X authority file utility") (description "XAuth program is used to edit and display the authorization @@ -2020,7 +2021,7 @@ information used in connecting to the X server.") ("xcb-util" ,xcb-util))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Control display backlight") (description "Xbacklight is used to adjust the backlight brightness where @@ -2046,7 +2047,7 @@ the same way.") "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "X bitmaps") (description "xbitmaps provides basic bitmaps (little pictures) used by some @@ -2071,7 +2072,7 @@ legacy X clients.") (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python-minimal-wrapper))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "XML-XCB protocol descriptions") (description "XCB-Proto provides the XML-XCB protocol descriptions that libxcb @@ -2102,7 +2103,7 @@ generators in individual language bindings.") "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XCMiscProto protocol headers") (description "XC-MISC Extension defines a protocol that provides Xlib two ways @@ -2129,7 +2130,7 @@ to query the server for available resource IDs.") `(("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Device Color Characterization utility") (description "XCMSDB is used to load, query, or remove Device Color @@ -2164,7 +2165,7 @@ X11 Inter-Client Communication Conventions Manual (ICCCM).") (list (string-append "--with-cursordir=" (assoc-ref %outputs "out") "/share/icons")))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Default Xorg cursors") (description "This package provides a default set of cursor themes for the Xorg @@ -2192,7 +2193,7 @@ X server: 'handhelds', 'redglass' and 'whiteglass'.") ("libpng" ,libpng))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Create an X cursor file from PNG images") (description "XCursorGen prepares X11 cursor sets for use with libXcursor.") @@ -2227,7 +2228,7 @@ X server: 'handhelds', 'redglass' and 'whiteglass'.") ("libdmx" ,libdmx))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg display information utility") (description "Xdpyinfo is used to display information about an X server: the @@ -2258,7 +2259,7 @@ available.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Query DRI configuration information") (description "XDRIInfo is used to query configuration information of X11 @@ -2288,7 +2289,7 @@ DRI (Direct Rendering Infrastructure) drivers.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Print contents of X events") (description "XEv creates a window and then asks the X server to send it X11 @@ -2317,7 +2318,7 @@ usage.") "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XExtProto protocol headers") (description "XExtProto provides the following extensions: DOUBLE-BUFFER, DPMS, @@ -2379,7 +2380,7 @@ devices, thus making direct access unnecessary.") (list (string-append "--with-sdkdir=" (assoc-ref %outputs "out") "/include/xorg")))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Generic input driver for X server") (description "xf86-input-evdev is a generic input driver for the Xorg X server. @@ -2409,7 +2410,7 @@ including most mice, keyboards, tablets and touchscreens.") (inputs `(("libinput" ,libinput) ("xorg-server" ,xorg-server))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Input driver for X server based on libinput") (description "xf86-input-libinput is an input driver for the Xorg X server based @@ -2439,7 +2440,7 @@ provide all features that libinput supports it does little beyond.") (list (string-append "--with-sdkdir=" (assoc-ref %outputs "out") "/include/xorg")))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Joystick input driver for X server") (description "xf86-input-joystick is a joystick input driver for the Xorg X server. @@ -2464,7 +2465,7 @@ It is used to cotrol the pointer with a joystick device.") (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Keyboard input driver for X server") (description "xf86-input-keyboard is a keyboard input driver for the Xorg X server.") @@ -2493,7 +2494,7 @@ It is used to cotrol the pointer with a joystick device.") (list (string-append "--with-sdkdir=" (assoc-ref %outputs "out") "/include/xorg")))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Mouse input driver for X server") (description "xf86-input-mouse is a mouse input driver for the Xorg X server. @@ -2532,7 +2533,7 @@ as USB mice.") (string-append "--with-xorg-conf-dir=" (assoc-ref %outputs "out") "/share/X11/xorg.conf.d")))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Touchpad input driver for X server") (description "xf86-input-synaptics is a touchpad driver for the Xorg X server.") @@ -2556,7 +2557,7 @@ as USB mice.") (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Void (null) input driver for X server") (description "xf86-input-void is a null input driver for the Xorg X server.") @@ -2581,7 +2582,7 @@ as USB mice.") (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Ark Logic video driver for X server") (description "xf86-video-ark is an Ark Logic video driver for the Xorg X server.") @@ -2607,7 +2608,7 @@ as USB mice.") ;; (build-system gnu-build-system) ;; (inputs `(("xorg-server" ,xorg-server))) ;; (native-inputs `(("pkg-config" ,pkg-config))) -;; (home-page "http://www.x.org/wiki/") +;; (home-page "https://www.x.org/wiki/") ;; (synopsis "ASpeed Technologies video driver for X server") ;; (description ;; "xf86-video-ast is an ASpeed Technologies video driver for the Xorg @@ -2635,7 +2636,7 @@ as USB mice.") ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments `(#:configure-flags `("--disable-glamor"))) ; TODO: Enable glamor - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "ATI Radeon video driver for X server") (description "xf86-video-ati is an ATI Radeon video driver for the Xorg @@ -2660,7 +2661,7 @@ X server.") (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Cirrus Logic video driver for X server") (description "xf86-video-cirrus is a Cirrus Logic video driver for the Xorg @@ -2689,7 +2690,7 @@ X server.") (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Framebuffer device video driver for X server") (description "xf86-video-fbdev is a video driver for the Xorg X server for @@ -2719,7 +2720,7 @@ framebuffer device.") ;; This driver is only supported on i686 systems. (filter (lambda (system) (string-prefix? "i686-" system)) %supported-systems)) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "AMD Geode GX/LX video driver for X server") (description "xf86-video-geode is an Xorg X server video driver for the AMD @@ -2749,7 +2750,7 @@ compositing. Both support Xv overlay and dynamic rotation with XRandR.") ;; (build-system gnu-build-system) ;; (inputs `(("pkg-config" ,pkg-config) ;; ("xorg-server" ,xorg-server))) -;; (home-page "http://www.x.org/wiki/") +;; (home-page "https://www.x.org/wiki/") ;; (synopsis "Glide video driver for X server") ;; (description ;; "xf86-video-glide is a Glide video driver for the Xorg X server.") @@ -2775,7 +2776,7 @@ compositing. Both support Xv overlay and dynamic rotation with XRandR.") (inputs `(("xf86dgaproto" ,xf86dgaproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "GLINT/Permedia video driver for X server") (description "xf86-video-glint is a GLINT/Permedia video driver for the Xorg @@ -2801,7 +2802,7 @@ X server.") (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "I128 video driver for X server") (description "xf86-video-i128 is an I128 (Imagine 128) video driver for the Xorg @@ -2819,7 +2820,7 @@ X server.") ;; there's no current tarball (method git-fetch) (uri (git-reference - (url "http://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel.git") + (url "https://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel.git") (commit commit))) (sha256 (base32 @@ -2846,7 +2847,7 @@ X server.") (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Intel video driver for X server") (description "xf86-video-intel is a 2D graphics driver for the Xorg X server. @@ -2875,7 +2876,7 @@ It supports a variety of Intel graphics chipsets.") ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Mach64 video driver for X server") (description "xf86-video-mach64 is a video driver for the Xorg X server. @@ -2905,7 +2906,7 @@ the same level of support for generic VGA or 8514/A adapters.") ("xf86driproto" ,xf86driproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Matrox video driver for X server") (description "xf86-video-mga is a Matrox video driver for the Xorg X server.") @@ -2930,7 +2931,7 @@ the same level of support for generic VGA or 8514/A adapters.") ("libx11" ,libx11) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "\"Modesetting\" video driver for X server") (description "This is a generic \"modesetting\" video driver, that relies on the Linux @@ -2955,7 +2956,7 @@ kernel mode setting (KMS).") (inputs `(("xf86dgaproto" ,xf86dgaproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "NeoMagic video driver for X server") (description "xf86-video-neomagic is a NeoMagic video driver for the Xorg X server.") @@ -2981,7 +2982,7 @@ kernel mode setting (KMS).") ;; (build-system gnu-build-system) ;; (inputs `(("xorg-server" ,xorg-server))) ;; (native-inputs `(("pkg-config" ,pkg-config))) -;; (home-page "http://www.x.org/wiki/") +;; (home-page "https://www.x.org/wiki/") ;; (synopsis "Newport video driver for X server") ;; (description ;; "xf86-video-newport is an Xorg X server video driver for the SGI @@ -3007,7 +3008,7 @@ kernel mode setting (KMS).") (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "NVIDIA video driver for X server") (description "This package contains Xorg support for the NVIDIA GeForce 8 series of @@ -3065,7 +3066,7 @@ graphics cards.") ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Openchrome video driver for X server") (description "xf86-video-openchrome is a video driver for the Xorg X server. @@ -3093,7 +3094,7 @@ UniChrome Pro and Chrome9 integrated graphics processors.") ("xf86driproto" ,xf86driproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "ATI Rage 128 video driver for X server") (description "xf86-video-r128 is a video driver for the Xorg X server. @@ -3120,7 +3121,7 @@ This driver is intended for ATI Rage 128 based cards.") ("xf86driproto" ,xf86driproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Savage video driver for X server") (description "xf86-video-savage is an S3 Savage video driver for the Xorg X server.") @@ -3144,7 +3145,7 @@ This driver is intended for ATI Rage 128 based cards.") (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Silicon Motion video driver for X server") (description "xf86-video-siliconmotion is a Silicon Motion video driver for the @@ -3173,7 +3174,7 @@ Xorg X server.") ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Sis video driver for X server") (description "xf86-video-SiS is a SiS video driver for the Xorg X server. @@ -3198,7 +3199,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "GX/TurboGX video driver for X server") (description "xf86-video-suncg6 is a GX/TurboGX video driver for the Xorg X server.") @@ -3222,7 +3223,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "SUNFFB video driver for X server") (description "xf86-video-sunffb is a SUNFFB video driver for the Xorg X server.") @@ -3248,7 +3249,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") ("xf86driproto" ,xf86driproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "3Dfx video driver for X server") (description "xf86-video-tdfx is a 3Dfx video driver for the Xorg X server.") @@ -3274,7 +3275,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") (inputs `(("xf86dgaproto" ,xf86dgaproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "TGA video driver for X server") (description "xf86-video-tga is a TGA (DEC 21030) video driver for the Xorg @@ -3300,7 +3301,7 @@ X server.") (inputs `(("xf86dgaproto" ,xf86dgaproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Trident video driver for X server") (description "xf86-video-trident is a Trident video driver for the Xorg X server.") @@ -3328,7 +3329,7 @@ X server.") (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "VESA video driver for X server") (description "xf86-video-vesa is a generic VESA video driver for the Xorg @@ -3357,7 +3358,7 @@ X server.") ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "VMware SVGA video driver for X server") (description "xf86-video-vmware is a VMware SVGA video driver for the Xorg X server.") @@ -3391,7 +3392,7 @@ xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593") (inputs `(("xf86dgaproto" ,xf86dgaproto) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Voodoo/Voodoo2 video driver for X server") (description "xf86-video-voodoo is a Voodoo video driver for the Xorg X server.") @@ -3417,7 +3418,7 @@ xf86-video-voodoo/patch/?id=9172ae566a0e85313fc80ab62b4455393eefe593") (base32 "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms")))) (build-system gnu-build-system) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XF86BigFontProto protocol headers") (description "XFree86 Bigfont Extension contains header files and documentation @@ -3440,7 +3441,7 @@ for the XF86BigFontProto protocol.") (base32 "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc")))) (build-system gnu-build-system) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XF86DGAProto protocol headers") (description "XFree86 Direct Graphic Access Extension defines a protocol for @@ -3463,7 +3464,7 @@ direct linear framebuffer access.") (base32 "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww")))) (build-system gnu-build-system) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XF86DRIProto protocol headers") (description "XFree86 Direct Rendering Infrastructure Extension defines a @@ -3487,7 +3488,7 @@ requiring data to be passed through the X server.") (base32 "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5")))) (build-system gnu-build-system) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XF86VidModeProto protocol headers") (description "XFree86 Video Mode Extension defines a protocol for dynamically @@ -3515,7 +3516,7 @@ configuring modelines and gamma.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Alter a monitor's gamma correction") (description "XGamma is used to query and alter the gamma correction of a @@ -3544,7 +3545,7 @@ monitor via the X video mode extension.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg server access control utility") (description "XHost is used to manage the list of host names or user names @@ -3568,7 +3569,7 @@ allowed to make connections to the X server.") "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XineramaProto protocol headers") (description "Xinerama Extension allows clients to query information about multiple @@ -3607,7 +3608,7 @@ alternative implementations like XRandR or TwinView.") ("inputproto" ,inputproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Configure input devices for X server") (description "XInput is used to configure and test XInput devices.") @@ -3635,7 +3636,7 @@ alternative implementations like XRandR or TwinView.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Compile XKB keyboard description") (description "xkbcomp keymap compiler converts a description of an XKB keymap @@ -3684,7 +3685,7 @@ make keyboards more accessible to people with physical impairments.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "XKB event daemon demo") (description "XKB event daemon listens for the specified XKB events and executes @@ -3714,7 +3715,7 @@ requested commands if they occur.") ("inputproto" ,inputproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "XKB utilities") (description "XKBUtils is a collection of small utilities for X Keyboard (XKB) @@ -3750,7 +3751,7 @@ extension to the X11 protocol. It includes: (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XKB configuration files") (description "xkeyboard-config provides a database for X Keyboard (XKB) Extension. @@ -3780,7 +3781,7 @@ can be combined together using the 'rules' component of this database.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Kill a client by its X resource") (description "XKill is used to force the X server to close connections to @@ -3808,7 +3809,7 @@ programs that have displayed undesired windows on a user's screen.") `(("libxcb" ,libxcb))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "List interned X server atoms") (description "XLsAtoms is used to list the interned atoms defined on X server.") @@ -3834,7 +3835,7 @@ programs that have displayed undesired windows on a user's screen.") `(("libxcb" ,libxcb))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "List client applications running on a display") (description "XLsClients is used to list information about the client programs @@ -3862,7 +3863,7 @@ running on X server.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "List fonts available from an X server") (description "xlsfonts lists fonts available from an X server via the X11 core @@ -3891,7 +3892,7 @@ protocol.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Modify keymaps and button mappings on X server") (description "Xmodmap is used to display and edit the keyboard modifier map and @@ -3922,7 +3923,7 @@ tastes.") "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg SGML documentation tools") (description "This package provides a common set of SGML entities and XML/CSS style @@ -3955,7 +3956,7 @@ refers to the included common xorg.css stylesheet.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Print an X window dump from xwd") (description "XPr takes as input a window dump file produced by xwd and formats @@ -3983,7 +3984,7 @@ it for output on various types of printers.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Display X server properties") (description "xprop is used to display and/or set window and font properties of @@ -4012,7 +4013,7 @@ an X server.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Command line interface to X RandR extension") (description "xrandr - primitive command line interface to X11 Resize, Rotate, @@ -4040,7 +4041,7 @@ and Reflect (RandR) extension.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "X server resource database utility") (description "XRDB is used to get or set the contents of the RESOURCE_MANAGER @@ -4070,7 +4071,7 @@ file.") `(("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Refresh all or part of an X screen") (description "Xrefresh is a simple X program that causes all or part of your @@ -4101,7 +4102,7 @@ up your screen.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "User preference utility for X server") (description "XSet is used to set various user preference options of the display.") @@ -4129,7 +4130,7 @@ up your screen.") ("xbitmaps" ,xbitmaps))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Root window parameter setting utility for X server") (description "XSetRoot allows you to tailor the appearance of the root window on @@ -4153,7 +4154,7 @@ a display running X server.") "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Network Transport layer library") (description "Xtrans is a library of code that is shared among various X packages to @@ -4184,7 +4185,7 @@ libICE, the X font server, and related components.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Print out X-Video extension adaptor information") (description "XVInfo is used to print out the capabilities of any video adaptors @@ -4214,7 +4215,7 @@ extension.") ("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Dump current contents of X window or screen to file") (description "Xwd is used to store window images in a specially formatted dump @@ -4246,7 +4247,7 @@ dump and twice whenthe dump is completed.") ("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Window information utility for X server") (description "XWinInfo is used to print out information about windows on an X server. @@ -4274,7 +4275,7 @@ Various information is displayed depending on which options are selected.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Display an X window dump from xwd") (description "Xwud is used to display in a window an image saved in a specially @@ -4327,7 +4328,7 @@ formatted dump file, such as produced by xwd.") `(("xextproto" ,xextproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg FixesProto protocol headers") (description "Fixes Extension makes changes to many areas of the protocol to resolve @@ -4359,7 +4360,7 @@ cannot be adequately worked around on the client side of the wire.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Damage Extension library") (description "Xorg library for the XDamage extension.") (license license:x11))) @@ -4387,7 +4388,7 @@ cannot be adequately worked around on the client side of the wire.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Common extensions library") (description "Library for common extensions to the X11 protocol.") @@ -4416,7 +4417,7 @@ cannot be adequately worked around on the client side of the wire.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Xinerama protocol library") (description "API for Xinerama extension to X11 protocol.") (license license:x11))) @@ -4444,7 +4445,7 @@ cannot be adequately worked around on the client side of the wire.") ("libxext" ,libxext))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Print Client library") (description "Xorg Print Client library.") (license license:x11))) @@ -4472,7 +4473,7 @@ cannot be adequately worked around on the client side of the wire.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Render Extension library") (description "Library for the Render Extension to the X11 protocol.") (license license:x11))) @@ -4501,7 +4502,7 @@ cannot be adequately worked around on the client side of the wire.") ("inputproto" ,inputproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg library for Xtest and Record extensions") (description "libXtst provides the Xlib-based client API for the XTEST & RECORD @@ -4540,7 +4541,7 @@ protocol and arbitrary X extension protocol.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XVideo Extension library") (description "Library for the X Video Extension to the X11 protocol.") (license license:x11))) @@ -4565,7 +4566,7 @@ protocol and arbitrary X extension protocol.") `(("mkfontscale" ,mkfontscale))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Create an index of X font files in a directory") (description "MkFontDir creates the 'fonts.dir' files needed by the legacy X @@ -4593,7 +4594,7 @@ script around the mkfontscale program.") `(("util-macros" ,util-macros))) ; to get util-macros in (almost?) all package inputs (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg X11Proto protocol headers") (description "XProto provides the headers and specification documents defining @@ -4629,7 +4630,7 @@ common definitions and porting layer.") `(("xtrans" ,xtrans))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Inter-Client Exchange library") (description "Xorg Inter-Client Exchange library.") (license license:x11))) @@ -4654,7 +4655,7 @@ common definitions and porting layer.") `(("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Authorization library") (description "libXau provides an authorization library for individual access to @@ -4683,7 +4684,7 @@ an X Window System display.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Fixes Extension library") (description "Library for the XFixes Extension to the X11 protocol.") (license license:x11))) @@ -4714,7 +4715,7 @@ an X Window System display.") ("xtrans" ,xtrans))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Font handling library") (description "libXfont provides the core of the legacy X11 font system, handling the @@ -4750,7 +4751,7 @@ new API's in libXft, or the legacy API's in libX11.") `(("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Input Extension library") (description "Library for the XInput Extension to the X11 protocol.") (license license:x11))) @@ -4780,7 +4781,7 @@ new API's in libXft, or the legacy API's in libX11.") ("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Resize and Rotate Extension library") (description "Library for the Resize and Rotate Extension to the X11 protocol.") @@ -4810,7 +4811,7 @@ new API's in libXft, or the legacy API's in libX11.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XvMC library") (description "Xorg XvMC library.") (license license:x11))) @@ -4838,7 +4839,7 @@ new API's in libXft, or the legacy API's in libX11.") `(("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XF86 Video Mode Extension library") (description "Library for the XFree86 Video Mode Extension Extension to the X11 @@ -4873,7 +4874,7 @@ protocol.") ("python" ,python-minimal-wrapper))) (arguments `(#:configure-flags '("--enable-xkb"))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "The X C Binding (XCB) library") (description "libxcb provides an interface to the X Window System protocol, @@ -4984,7 +4985,7 @@ over Xlib, including: (("\\$\\(MKDIR_P\\).*logdir.*") "true\n"))) %standard-phases))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg implementation of the X Window System") (description "This package provides the Xorg X server itself. @@ -5032,7 +5033,7 @@ draggable titlebars and borders.") ("xtrans" ,xtrans))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Core X11 protocol client library") (description "Xorg Core X11 protocol client library.") (license license:x11))) @@ -5062,7 +5063,7 @@ draggable titlebars and borders.") ("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Cursor management library") (description "Xorg Cursor management library.") (license license:x11))) @@ -5097,7 +5098,7 @@ draggable titlebars and borders.") `(("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg XToolkit Intrinsics library") (description "Xorg XToolkit Intrinsics library.") (license license:x11))) @@ -5127,7 +5128,7 @@ draggable titlebars and borders.") `(("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Xaw library") (description "Xaw is the X Athena Widget Set based on the X Toolkit @@ -5151,7 +5152,7 @@ Intrinsics (Xt) Library.") `(("libxcb" ,libxcb))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://cgit.freedesktop.org/xcb/util/") + (home-page "https://cgit.freedesktop.org/xcb/util/") (synopsis "Core XCB utility functions") (description "The XCB util module provides a number of libraries which sit on @@ -5190,7 +5191,7 @@ The XCB util module provides the following libraries: `(("libxcb" ,libxcb) ("xcb-util-renderutil" ,xcb-util-renderutil) ("xcb-util-image" ,xcb-util-image))) - (home-page "http://cgit.freedesktop.org/xcb/util-cursor/") + (home-page "https://cgit.freedesktop.org/xcb/util-cursor/") (synopsis "Port of libxcursor") (description "XCB-util-cursor is a port of libxcursor.") (license @@ -5218,7 +5219,7 @@ The XCB util module provides the following libraries: `(("xcb-util" ,xcb-util))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://cgit.freedesktop.org/xcb/util-image/") + (home-page "https://cgit.freedesktop.org/xcb/util-image/") (synopsis "XCB port of Xlib's XImage and XShmImage") (description "The XCB util module provides a number of libraries which sit on @@ -5250,7 +5251,7 @@ The XCB util-image module provides the following library: `(("libxcb" ,libxcb))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://cgit.freedesktop.org/xcb/util-keysyms/") + (home-page "https://cgit.freedesktop.org/xcb/util-keysyms/") (synopsis "Standard X constants and conversion to/from keycodes") (description "The XCB util module provides a number of libraries which sit on @@ -5282,7 +5283,7 @@ The XCB util-keysyms module provides the following library: `(("libxcb" ,libxcb))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://cgit.freedesktop.org/xcb/util-renderutil/") + (home-page "https://cgit.freedesktop.org/xcb/util-renderutil/") (synopsis "Convenience functions for the Render extension") (description "The XCB util module provides a number of libraries which sit on @@ -5315,7 +5316,7 @@ The XCB util-renderutil module provides the following library: (native-inputs `(("m4" ,m4) ("pkg-config" ,pkg-config))) - (home-page "http://cgit.freedesktop.org/xcb/util-wm/") + (home-page "https://cgit.freedesktop.org/xcb/util-wm/") (synopsis "Client and window-manager helpers for ICCCM and EWMH") (description "The XCB util modules provides a number of libraries which sit on @@ -5385,7 +5386,7 @@ user-friendly mechanism to start the X server.") `(("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") + (home-page "https://www.x.org/wiki/") (synopsis "Xorg Xaw3d library") (description "Xaw is the X 3D Athena Widget Set based on the X Toolkit @@ -5470,7 +5471,7 @@ perl programs to display windows and graphics on X11 servers.") ;; there's no current tarball (method git-fetch) (uri (git-reference - (url "http://anongit.freedesktop.org/git/xorg/app/xcompmgr.git") + (url "https://anongit.freedesktop.org/git/xorg/app/xcompmgr.git") (commit (string-append name "-" version)))) (sha256 (base32 @@ -5498,6 +5499,6 @@ perl programs to display windows and graphics on X11 servers.") (description "xcompmgr is a sample compositing manager for X servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE extensions. It enables basic eye-candy effects.") - (home-page "http://cgit.freedesktop.org/xorg/app/xcompmgr/") + (home-page "https://cgit.freedesktop.org/xorg/app/xcompmgr/") (license (license:x11-style - "http://cgit.freedesktop.org/xorg/app/xcompmgr/tree/COPYING")))) + "https://cgit.freedesktop.org/xorg/app/xcompmgr/tree/COPYING")))) diff --git a/gnu/packages/yasm.scm b/gnu/packages/yasm.scm deleted file mode 100644 index 31a9083cdf..0000000000 --- a/gnu/packages/yasm.scm +++ /dev/null @@ -1,55 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2016 Efraim Flashner -;;; -;;; 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 yasm) - #:use-module (gnu packages) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (gnu packages python) - #:use-module (gnu packages xml)) - -(define-public yasm - (package - (name "yasm") - (version "1.3.0") - (source - (origin - (method url-fetch) - (uri (string-append "http://www.tortall.net/projects/yasm/releases/yasm-" - version ".tar.gz")) - (sha256 - (base32 - "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix")))) - (build-system gnu-build-system) - (inputs - `(("python" ,python-wrapper) - ("xmlto" ,xmlto))) - (home-page "http://yasm.tortall.net/") - (synopsis "Rewrite of the NASM assembler") - (description - "Yasm is a complete rewrite of the NASM assembler. - -Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM -and GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit -Mach-O, RDOFF2, COFF, Win32, and Win64 object formats, and generates source -debugging information in STABS, DWARF 2, and CodeView 8 formats.") - (license (license:non-copyleft "file://COPYING" - "See COPYING in the distribution.")))) diff --git a/gnu/services.scm b/gnu/services.scm index 9268c51dd8..50e76df818 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -73,6 +73,7 @@ setuid-program-service-type profile-service-type firmware-service-type + gc-root-service-type %boot-service %activation-service @@ -489,6 +490,33 @@ kernel." (compose concatenate) (extend append))) +(define (gc-roots->system-entry roots) + "Return an entry in the system's output containing symlinks to ROOTS." + (mlet %store-monad ((entry (gexp->derivation + "gc-roots" + #~(let ((roots '#$roots)) + (mkdir #$output) + (chdir #$output) + (for-each symlink + roots + (map number->string + (iota (length roots)))))))) + (return (if (null? roots) + '() + `(("gc-roots" ,entry)))))) + +(define gc-root-service-type + ;; A service to associate extra garbage-collector roots to the system. This + ;; is a simple hack that guarantees that the system retains references to + ;; the given list of roots. Roots must be "lowerable" objects like + ;; packages, or derivations. + (service-type (name 'gc-roots) + (extensions + (list (service-extension system-service-type + gc-roots->system-entry))) + (compose concatenate) + (extend append))) + ;;; ;;; Service folding. diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm new file mode 100644 index 0000000000..313c8364f8 --- /dev/null +++ b/gnu/services/mcron.scm @@ -0,0 +1,115 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Ludovic Courtès +;;; +;;; 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 services mcron) + #:use-module (gnu services) + #:use-module (gnu services base) + #:use-module (gnu services shepherd) + #:autoload (gnu packages guile) (mcron2) + #:use-module (guix records) + #:use-module (guix gexp) + #:use-module (srfi srfi-1) + #:use-module (ice-9 match) + #:use-module (ice-9 vlist) + #:export (mcron-configuration + mcron-configuration? + mcron-configuration-mcron + mcron-configuration-jobs + + mcron-service-type + mcron-service)) + +;;; Commentary: +;;; +;;; This module implements a service that to run instances of GNU mcron, a +;;; periodic job execution daemon. Example of a service: +;; +;; (service mcron-service-type +;; (mcron-configuration +;; (jobs (list #~(job next-second-from +;; (lambda () +;; (call-with-output-file "/dev/console" +;; (lambda (port) +;; (display "hello!\n" port))))))))) +;;; +;;; Code: + +(define-record-type* mcron-configuration + make-mcron-configuration + mcron-configuration? + (mcron mcron-configuration-mcron ;package + (default mcron2)) + (jobs mcron-configuration-jobs ;list of + (default '()))) + +(define (job-file job) + (scheme-file "mcron-job" job)) + +(define mcron-shepherd-services + (match-lambda + (($ mcron ()) ;nothing to do! + '()) + (($ mcron jobs) + (list (shepherd-service + (provision '(mcron)) + (requirement '(user-processes)) + (modules `((srfi srfi-1) + (srfi srfi-26) + ,@%default-modules)) + (start #~(make-forkexec-constructor + (list (string-append #$mcron "/bin/mcron") + #$@(map job-file jobs)) + + ;; Disable auto-compilation of the job files and set a + ;; sane value for 'PATH'. + #:environment-variables + (cons* "GUILE_AUTO_COMPILE=0" + "PATH=/run/current-system/profile/bin" + (remove (cut string-prefix? "PATH=" <>) + (environ))))) + (stop #~(make-kill-destructor))))))) + +(define mcron-service-type + (service-type (name 'mcron) + (extensions + (list (service-extension shepherd-root-service-type + mcron-shepherd-services) + (service-extension profile-service-type + (compose list + mcron-configuration-mcron)))) + (compose concatenate) + (extend (lambda (config jobs) + (mcron-configuration + (inherit config) + (jobs (append (mcron-configuration-jobs config) + jobs))))))) + +(define* (mcron-service jobs #:optional (mcron mcron2)) + "Return an mcron service running @var{mcron} that schedules @var{jobs}, a +list of gexps denoting mcron job specifications. + +This is a shorthand for: +@example + (service mcron-service-type + (mcron-configuration (mcron mcron) (jobs jobs))) +@end example +" + (service mcron-service-type + (mcron-configuration (mcron mcron) (jobs jobs)))) + +;;; mcron.scm ends here diff --git a/gnu/system/install.scm b/gnu/system/install.scm index a72613e9c5..de14f6fb4c 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -208,8 +208,7 @@ the user's target storage device rather than on the RAM disk." "Return a list of tuples representing configuration templates to add to /etc." (define (file f) - (local-file (search-path %load-path - (string-append "gnu/system/examples/" f)))) + (local-file (string-append "examples/" f))) (define directory (computed-file "configuration-templates" diff --git a/gnu/tests.scm b/gnu/tests.scm index 08d8315ea0..ea779ed6f0 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -18,11 +18,28 @@ (define-module (gnu tests) #:use-module (guix gexp) + #:use-module (guix utils) + #:use-module (guix records) #:use-module (gnu system) #:use-module (gnu services) #:use-module (gnu services shepherd) - #:export (backdoor-service-type - marionette-operating-system)) + #:use-module ((gnu packages) #:select (scheme-modules)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-9 gnu) + #:use-module (ice-9 match) + #:export (marionette-service-type + marionette-operating-system + define-os-with-source + + system-test + system-test? + system-test-name + system-test-value + system-test-description + system-test-location + + fold-system-tests + all-system-tests)) ;;; Commentary: ;;; @@ -112,7 +129,7 @@ (define marionette-service-type ;; This is the type of the "marionette" service, allowing a guest system to ;; be manipulated from the host. This marionette REPL is essentially a - ;; universal marionette. + ;; universal backdoor. (service-type (name 'marionette-repl) (extensions (list (service-extension shepherd-root-service-type @@ -127,4 +144,73 @@ in a virtual machine--i.e., controlled from the host system." (services (cons (service marionette-service-type imported-modules) (operating-system-user-services os))))) +(define-syntax define-os-with-source + (syntax-rules (use-modules operating-system) + "Define two variables: OS containing the given operating system, and +SOURCE containing the source to define OS as an sexp. + +This is convenient when we need both the object so we can +instantiate it, and the source to create it so we can store in in a file in +the system under test." + ((_ (os source) + (use-modules modules ...) + (operating-system fields ...)) + (begin + (define os + (operating-system fields ...)) + (define source + '(begin + (use-modules modules ...) + (operating-system fields ...))))))) + + +;;; +;;; Tests. +;;; + +(define-record-type* system-test make-system-test + system-test? + (name system-test-name) ;string + (value system-test-value) ;%STORE-MONAD value + (description system-test-description) ;string + (location system-test-location (innate) ; + (default (and=> (current-source-location) + source-properties->location)))) + +(define (write-system-test test port) + (match test + (($ name _ _ ($ file line)) + (format port "#" + name file line + (number->string (object-address test) 16))) + (($ name) + (format port "#" name + (number->string (object-address test) 16))))) + +(set-record-type-printer! write-system-test) + +(define (test-modules) + "Return the list of modules that define system tests." + (scheme-modules (dirname (search-path %load-path "guix.scm")) + "gnu/tests")) + +(define (fold-system-tests proc seed) + "Invoke PROC on each system test, passing it the test and the previous +result." + (fold (lambda (module result) + (fold (lambda (thing result) + (if (system-test? thing) + (proc thing result) + result)) + result + (module-map (lambda (sym var) + (false-if-exception (variable-ref var))) + module))) + '() + (test-modules))) + +(define (all-system-tests) + "Return the list of system tests." + (reverse (fold-system-tests cons '()))) + ;;; tests.scm ends here diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 0f19449508..4fe779802b 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -24,13 +24,16 @@ #:use-module (gnu system shadow) #:use-module (gnu system vm) #:use-module (gnu services) + #:use-module (gnu services mcron) #:use-module (gnu services shepherd) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix packages) #:use-module (srfi srfi-1) - #:export (%test-basic-os)) + #:export (run-basic-test + %test-basic-os + %test-mcron)) (define %simple-os (operating-system @@ -56,109 +59,227 @@ %base-user-accounts)))) +(define* (run-basic-test os command #:optional (name "basic")) + "Return a derivation called NAME that tests basic features of the OS started +using COMMAND, a gexp that evaluates to a list of strings. Compare some +properties of running system to what's declared in OS, an ." + (define test + #~(begin + (use-modules (gnu build marionette) + (srfi srfi-1) + (srfi srfi-26) + (srfi srfi-64) + (ice-9 match)) + + (define marionette + (make-marionette #$command)) + + (mkdir #$output) + (chdir #$output) + + (test-begin "basic") + + (test-assert "uname" + (match (marionette-eval '(uname) marionette) + (#("Linux" host-name version _ architecture) + (and (string=? host-name + #$(operating-system-host-name os)) + (string-prefix? #$(package-version + (operating-system-kernel os)) + version) + (string-prefix? architecture %host-type))))) + + (test-assert "shell and user commands" + ;; Is everything in $PATH? + (zero? (marionette-eval '(system " +. /etc/profile +set -e -x +guix --version +ls --version +grep --version +info --version") + marionette))) + + (test-assert "accounts" + (let ((users (marionette-eval '(begin + (use-modules (ice-9 match)) + (let loop ((result '())) + (match (getpw) + (#f (reverse result)) + (x (loop (cons x result)))))) + marionette))) + (lset= string=? + (map passwd:name users) + (list + #$@(map user-account-name + (operating-system-user-accounts os)))))) + + (test-assert "shepherd services" + (let ((services (marionette-eval '(begin + (use-modules (gnu services herd)) + (call-with-values current-services + append)) + marionette))) + (lset= eq? + (pk 'services services) + '(root #$@(operating-system-shepherd-service-names os))))) + + (test-equal "login on tty1" + "root\n" + (begin + (marionette-control "sendkey ctrl-alt-f1" marionette) + ;; Wait for the 'term-tty1' service to be running (using + ;; 'start-service' is the simplest and most reliable way to do + ;; that.) + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'term-tty1)) + marionette) + + ;; Now we can type. + (marionette-type "root\n\nid -un > logged-in\n" marionette) + + ;; It can take a while before the shell commands are executed. + (let loop ((i 0)) + (unless (or (file-exists? "/root/logged-in") (> i 15)) + (sleep 1) + (loop (+ i 1)))) + (marionette-eval '(use-modules (rnrs io ports)) marionette) + (marionette-eval '(call-with-input-file "/root/logged-in" + get-string-all) + marionette))) + + (test-assert "screendump" + (begin + (marionette-control (string-append "screendump " #$output + "/tty1.ppm") + marionette) + (file-exists? "tty1.ppm"))) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0)))) + + (gexp->derivation name test + #:modules '((gnu build marionette)))) + (define %test-basic-os - ;; Monadic derivation that instruments %SIMPLE-OS, runs it in a VM, and runs - ;; a series of basic functionality tests. - (mlet* %store-monad ((os -> (marionette-operating-system - %simple-os - #:imported-modules '((gnu services herd) - (guix combinators)))) - (run (system-qemu-image/shared-store-script - os #:graphic? #f))) + (system-test + (name "basic") + (description + "Instrument %SIMPLE-OS, run it in a VM, and run a series of basic +functionality tests.") + (value + (mlet* %store-monad ((os -> (marionette-operating-system + %simple-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + (run (system-qemu-image/shared-store-script + os #:graphic? #f))) + ;; XXX: Add call to 'virtualized-operating-system' to get the exact same + ;; set of services as the OS produced by + ;; 'system-qemu-image/shared-store-script'. + (run-basic-test (virtualized-operating-system os '()) + #~(list #$run)))))) + + +;;; +;;; Mcron. +;;; + +(define %mcron-os + ;; System with an mcron service, with one mcron job for "root" and one mcron + ;; job for an unprivileged user (note: #:user is an 'mcron2' thing.) + (let ((job1 #~(job next-second-from + (lambda () + (call-with-output-file "witness" + (lambda (port) + (display (list (getuid) (getgid)) port)))))) + (job2 #~(job next-second-from + (lambda () + (call-with-output-file "witness" + (lambda (port) + (display (list (getuid) (getgid)) port)))) + #:user "alice")) + (job3 #~(job next-second-from ;to test $PATH + "touch witness-touch"))) + (operating-system + (inherit %simple-os) + (services (cons (mcron-service (list job1 job2 job3)) + (operating-system-user-services %simple-os)))))) + +(define (run-mcron-test name) + (mlet* %store-monad ((os -> (marionette-operating-system + %mcron-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + (command (system-qemu-image/shared-store-script + os #:graphic? #f))) (define test #~(begin (use-modules (gnu build marionette) - (srfi srfi-1) - (srfi srfi-26) (srfi srfi-64) (ice-9 match)) (define marionette - (make-marionette (list #$run))) + (make-marionette (list #$command))) + + (define (wait-for-file file) + ;; Wait until FILE exists in the guest; 'read' its content and + ;; return it. + (marionette-eval + `(let loop ((i 10)) + (cond ((file-exists? ,file) + (call-with-input-file ,file read)) + ((> i 0) + (sleep 1) + (loop (- i 1))) + (else + (error "file didn't show up" ,file)))) + marionette)) (mkdir #$output) (chdir #$output) - (test-begin "basic") + (test-begin "mcron") - (test-assert "uname" - (match (marionette-eval '(uname) marionette) - (#("Linux" "komputilo" version _ "x86_64") - (string-prefix? #$(package-version - (operating-system-kernel os)) - version)))) + (test-eq "service running" + 'running! + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'mcron) + 'running!) + marionette)) - (test-assert "shell and user commands" - ;; Is everything in $PATH? - (zero? (marionette-eval '(system " -. /etc/profile -set -e -x -guix --version -ls --version -grep --version -info --version") - marionette))) - - (test-assert "accounts" - (let ((users (marionette-eval '(begin - (use-modules (ice-9 match)) - (let loop ((result '())) - (match (getpw) - (#f (reverse result)) - (x (loop (cons x result)))))) - marionette))) - (lset= string=? - (map passwd:name users) - (list - #$@(map user-account-name - (operating-system-user-accounts os)))))) - - (test-assert "shepherd services" - (let ((services (marionette-eval '(begin - (use-modules (gnu services herd)) - (call-with-values current-services - append)) - marionette))) - (lset= eq? - (pk 'services services) - '(root #$@(operating-system-shepherd-service-names - (virtualized-operating-system os '())))))) - - (test-equal "login on tty1" - "root\n" - (begin - (marionette-control "sendkey ctrl-alt-f1" marionette) - ;; Wait for the 'term-tty1' service to be running (using - ;; 'start-service' is the simplest and most reliable way to do - ;; that.) - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'term-tty1)) - marionette) - - ;; Now we can type. - (marionette-type "root\n\nid -un > logged-in\n" marionette) - - ;; It can take a while before the shell commands are executed. - (let loop ((i 0)) - (unless (or (file-exists? "/root/logged-in") (> i 15)) - (sleep 1) - (loop (+ i 1)))) - (marionette-eval '(use-modules (rnrs io ports)) marionette) - (marionette-eval '(call-with-input-file "/root/logged-in" - get-string-all) - marionette))) - - (test-assert "screendump" - (begin - (marionette-control (string-append "screendump " #$output - "/tty1.ppm") - marionette) - (file-exists? "tty1.ppm"))) + ;; Make sure root's mcron job runs, has its cwd set to "/root", and + ;; runs with the right UID/GID. + (test-equal "root's job" + '(0 0) + (wait-for-file "/root/witness")) + + ;; Likewise for Alice's job. We cannot know what its GID is since + ;; it's chosen by 'groupadd', but it's strictly positive. + (test-assert "alice's job" + (match (wait-for-file "/home/alice/witness") + ((1000 gid) + (>= gid 100)))) + + ;; Last, the job that uses a command; allows us to test whether + ;; $PATH is sane. (Note that 'marionette-eval' stringifies objects + ;; that don't have a read syntax, hence the string.) + (test-equal "root's job with command" + "#" + (wait-for-file "/root/witness-touch")) (test-end) (exit (= (test-runner-fail-count (test-runner-current)) 0)))) - (gexp->derivation "basic" test + (gexp->derivation name test #:modules '((gnu build marionette))))) + +(define %test-mcron + (system-test + (name "mcron") + (description "Make sure the mcron service works as advertised.") + (value (run-mcron-test name)))) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm new file mode 100644 index 0000000000..5d893deb4c --- /dev/null +++ b/gnu/tests/install.scm @@ -0,0 +1,212 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Ludovic Courtès +;;; +;;; 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 tests install) + #:use-module (gnu) + #:use-module (gnu tests) + #:use-module (gnu tests base) + #:use-module (gnu system) + #:use-module (gnu system install) + #:use-module (gnu system vm) + #:use-module ((gnu build vm) #:select (qemu-command)) + #:use-module (gnu packages qemu) + #:use-module (gnu packages package-management) + #:use-module (guix store) + #:use-module (guix monads) + #:use-module (guix packages) + #:use-module (guix grafts) + #:use-module (guix gexp) + #:use-module (guix utils) + #:export (%test-installed-os)) + +;;; Commentary: +;;; +;;; Test the installation of GuixSD using the documented approach at the +;;; command line. +;;; +;;; Code: + +(define-os-with-source (%minimal-os %minimal-os-source) + ;; The OS we want to install. + (use-modules (gnu) (gnu tests) (srfi srfi-1)) + + (operating-system + (host-name "liberigilo") + (timezone "Europe/Paris") + (locale "en_US.UTF-8") + + (bootloader (grub-configuration (device "/dev/vdb"))) + (kernel-arguments '("console=ttyS0")) + (file-systems (cons (file-system + (device "my-root") + (title 'label) + (mount-point "/") + (type "ext4")) + %base-file-systems)) + (users (cons (user-account + (name "alice") + (comment "Bob's sister") + (group "users") + (supplementary-groups '("wheel" "audio" "video")) + (home-directory "/home/alice")) + %base-user-accounts)) + (services (cons (service marionette-service-type + '((gnu services herd) + (guix combinators))) + %base-services)))) + +(define (operating-system-with-current-guix os) + "Return a variant of OS that uses the current Guix." + (operating-system + (inherit os) + (services (modify-services (operating-system-user-services os) + (guix-service-type config => + (guix-configuration + (inherit config) + (guix (current-guix)))))))) + +(define (operating-system-with-gc-roots os roots) + "Return a variant of OS where ROOTS are registered as GC roots." + (operating-system + (inherit os) + (services (cons (service gc-root-service-type roots) + (operating-system-user-services os))))) + + +(define MiB (expt 2 20)) + +(define* (run-install #:key + (os (marionette-operating-system + ;; Since the image has no network access, use the + ;; current Guix so the store items we need are in + ;; the image. + (operating-system + (inherit (operating-system-with-current-guix + installation-os)) + (kernel-arguments '("console=ttyS0"))) + #:imported-modules '((gnu services herd) + (guix combinators)))) + (target-size (* 1200 MiB))) + "Run the GuixSD installation procedure from OS and return a VM image of +TARGET-SIZE bytes containing the installed system." + + (mlet* %store-monad ((_ (set-grafting #f)) + (system (current-system)) + (target (operating-system-derivation %minimal-os)) + + ;; Since the installation system has no network access, + ;; we cheat a little bit by adding TARGET to its GC + ;; roots. This way, we know 'guix system init' will + ;; succeed. + (image (system-disk-image + (operating-system-with-gc-roots + os (list target)) + #:disk-image-size (* 1500 MiB)))) + (define install + #~(begin + (use-modules (guix build utils) + (gnu build marionette)) + + (set-path-environment-variable "PATH" '("bin") + (list #$qemu-minimal)) + + (system* "qemu-img" "create" "-f" "qcow2" + #$output #$(number->string target-size)) + + (define marionette + (make-marionette + (cons (which #$(qemu-command system)) + (cons* "-no-reboot" "-m" "800" + "-drive" + (string-append "file=" #$image + ",if=virtio,readonly") + "-drive" + (string-append "file=" #$output ",if=virtio") + (if (file-exists? "/dev/kvm") + '("-enable-kvm") + '()))))) + + (pk 'uname (marionette-eval '(uname) marionette)) + + ;; Wait for tty1. + (marionette-eval '(begin + (use-modules (gnu services herd)) + (start 'term-tty1)) + marionette) + + (marionette-eval '(call-with-output-file "/etc/litl-config.scm" + (lambda (port) + (write '#$%minimal-os-source port))) + marionette) + + (exit (marionette-eval '(zero? (system " +. /etc/profile +set -e -x; +guix --version +guix gc --list-live | grep isc-dhcp + +export GUIX_BUILD_OPTIONS=--no-grafts +guix build isc-dhcp +parted --script /dev/vdb mklabel gpt \\ + mkpart primary ext2 1M 3M \\ + mkpart primary ext2 3M 1G \\ + set 1 boot on \\ + set 1 bios_grub on +mkfs.ext4 -L my-root /dev/vdb2 +ls -l /dev/vdb +mount /dev/vdb2 /mnt +df -h /mnt +herd start cow-store /mnt +mkdir /mnt/etc +cp /etc/litl-config.scm /mnt/etc/config.scm +guix system init /mnt/etc/config.scm /mnt --no-substitutes +sync +reboot\n")) + marionette)))) + + (gexp->derivation "installation" install + #:modules '((guix build utils) + (gnu build marionette))))) + + +(define %test-installed-os + (system-test + (name "installed-os") + (description + "Test basic functionality of an OS installed like one would do by hand. +This test is expensive in terms of CPU and storage usage since we need to +build (current-guix) and then store a couple of full system images.") + (value + (mlet %store-monad ((image (run-install)) + (system (current-system))) + (run-basic-test %minimal-os + #~(let ((image #$image)) + ;; First we need a writable copy of the image. + (format #t "copying image '~a'...~%" image) + (copy-file image "disk.img") + (chmod "disk.img" #o644) + `(,(string-append #$qemu-minimal "/bin/" + #$(qemu-command system)) + ,@(if (file-exists? "/dev/kvm") + '("-enable-kvm") + '()) + "-no-reboot" "-m" "256" + "-drive" "file=disk.img,if=virtio")) + "installed-os"))))) + +;;; install.scm ends here diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index c3d6c62404..705943eb73 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -48,7 +48,7 @@ "Return a URI string for the Python package hosted on the Python Package Index (PyPI) corresponding to NAME and VERSION. EXTENSION is the file name extension, such as '.tar.gz'." - (string-append "https://pypi.python.org/packages/source/" + (string-append "https://pypi.io/packages/source/" (string-take name 1) "/" name "/" name "-" version extension)) diff --git a/guix/build/bournish.scm b/guix/build/bournish.scm index 1f17e0a22d..928bef5b9e 100644 --- a/guix/build/bournish.scm +++ b/guix/build/bournish.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ #:use-module (ice-9 match) #:use-module (ice-9 ftw) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:export (%bournish-language)) @@ -103,6 +105,63 @@ characters." ((@ (guix build utils) dump-port) port (current-output-port)) *unspecified*))) +(define (lines+chars port) + "Return the number of lines and number of chars read from PORT." + (let loop ((lines 0) (chars 0)) + (match (read-char port) + ((? eof-object?) ;done! + (values lines chars)) + (#\newline ;recurse + (loop (1+ lines) (1+ chars))) + (_ ;recurse + (loop lines (1+ chars)))))) + +(define (file-exists?* file) + "Like 'file-exists?' but emits a warning if FILE is not accessible." + (catch 'system-error + (lambda () + (stat file)) + (lambda args + (let ((errno (system-error-errno args))) + (format (current-error-port) "~a: ~a~%" + file (strerror errno)) + #f)))) + +(define (wc-print file) + (let-values (((lines chars) + (call-with-input-file file lines+chars))) + (format #t "~a ~a ~a~%" lines chars file))) + +(define (wc-l-print file) + (let-values (((lines chars) + (call-with-input-file file lines+chars))) + (format #t "~a ~a~%" lines file))) + +(define (wc-c-print file) + (let-values (((lines chars) + (call-with-input-file file lines+chars))) + (format #t "~a ~a~%" chars file))) + +(define (wc-command-implementation . files) + (for-each wc-print (filter file-exists?* files))) + +(define (wc-l-command-implementation . files) + (for-each wc-l-print (filter file-exists?* files))) + +(define (wc-c-command-implementation . files) + (for-each wc-c-print (filter file-exists?* files))) + +(define (wc-command . args) + "Emit code for the 'wc' command." + (cond ((member "-l" args) + `((@@ (guix build bournish) wc-l-command-implementation) + ,@(delete "-l" args))) + ((member "-c" args) + `((@@ (guix build bournish) wc-c-command-implementation) + ,@(delete "-c" args))) + (else + `((@@ (guix build bournish) wc-command-implementation) ,@args)))) + (define (help-command . _) (display "\ Hello, this is Bournish, a minimal Bourne-like shell in Guile! @@ -129,7 +188,8 @@ commands such as 'ls' and 'cd'; it lacks globbing, pipes---everything.\n")) ("help" ,help-command) ("ls" ,ls-command) ("which" ,which-command) - ("cat" ,cat-command))) + ("cat" ,cat-command) + ("wc" ,wc-command))) (define (read-bournish port env) "Read a Bournish expression from PORT, and return the corresponding Scheme diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index ab970012a7..44e8b0d31e 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -1,5 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa +;;; Copyright © 2016 David Thompson +;;; Copyright © 2016 Alex Kost ;;; ;;; This file is part of GNU Guix. ;;; @@ -152,10 +154,11 @@ store in '.el' files." (define (emacs-inputs-el-directories dirs) "Build the list of Emacs Lisp directories from the Emacs package directory DIRS." - (map (lambda (d) - (string-append d %install-suffix "/" - (store-directory->elpa-name-version d))) - dirs)) + (append-map (lambda (d) + (list (string-append d "/share/emacs/site-lisp") + (string-append d %install-suffix "/" + (store-directory->elpa-name-version d)))) + dirs)) (define (package-name-version->elpa-name-version name-ver) "Convert the Guix package NAME-VER to the corresponding ELPA name-version diff --git a/guix/config.scm.in b/guix/config.scm.in index d7df9f7d2b..adffa0cfec 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -59,8 +59,8 @@ (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix")) (define %config-directory - ;; This must match `NIX_CONF_DIR' as defined in `nix/local.mk'. - (or (getenv "NIX_CONF_DIR") "@guix_sysconfdir@/guix")) + ;; This must match `GUIX_CONFIGURATION_DIRECTORY' as defined in `nix/local.mk'. + (or (getenv "GUIX_CONFIGURATION_DIRECTORY") "@guix_sysconfdir@/guix")) (define %guix-register-program ;; The 'guix-register' program. diff --git a/guix/gexp.scm b/guix/gexp.scm index 2bf1013b3c..b929b79c26 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -856,8 +856,10 @@ and in the current monad setting (system type, etc.)" (define %utils-module ;; This file provides 'mkdir-p', needed to implement 'imported-files' and - ;; other primitives below. - (local-file (search-path %load-path "guix/build/utils.scm") + ;; other primitives below. Note: We give the file name relative to this + ;; file you are currently reading; 'search-path' could return a file name + ;; relative to the current working directory. + (local-file "build/utils.scm" "build-utils.scm")) (define* (imported-files files diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 70ef507666..efa69081ef 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -175,8 +175,10 @@ cannot determine package dependencies")) (lambda (port) (let* ((metadata (json->scm port)) (run_requires (hash-ref metadata "run_requires")) - (requirements (hash-ref (list-ref run_requires 0) - "requires"))) + (requirements (if run_requires + (hash-ref (list-ref run_requires 0) + "requires") + '()))) (map (lambda (r) (python->package-name (clean-requirement r))) requirements))))) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 81ce770dc5..5722aa821d 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -94,10 +94,15 @@ ;;; Code: (define %narinfo-cache-directory - ;; A local cache of narinfos, to avoid going to the network. - (or (and=> (getenv "XDG_CACHE_HOME") - (cut string-append <> "/guix/substitute")) - (string-append %state-directory "/substitute/cache"))) + ;; A local cache of narinfos, to avoid going to the network. Most of the + ;; time, 'guix substitute' is called by guix-daemon as root and stores its + ;; cached data in /var/guix/…. However, when invoked from 'guix challenge' + ;; as a user, it stores its cache in ~/.cache. + (if (zero? (getuid)) + (or (and=> (getenv "XDG_CACHE_HOME") + (cut string-append <> "/guix/substitute")) + (string-append %state-directory "/substitute/cache")) + (string-append (cache-directory) "/substitute"))) (define %allow-unauthenticated-substitutes? ;; Whether to allow unchecked substitutes. This is useful for testing @@ -501,17 +506,10 @@ indicates that PATH is unavailable at CACHE-URL." (value ,(and=> narinfo narinfo->string)))) (let ((file (narinfo-cache-file cache-url path))) - (catch 'system-error - (lambda () - (mkdir-p (dirname file)) - (with-atomic-file-output file - (lambda (out) - (write (cache-entry cache-url narinfo) out)))) - (lambda args - ;; We may not have write access to the local cache when called from an - ;; unprivileged process such as 'guix challenge'. - (unless (= EACCES (system-error-errno args)) - (apply throw args))))) + (mkdir-p (dirname file)) + (with-atomic-file-output file + (lambda (out) + (write (cache-entry cache-url narinfo) out)))) narinfo) diff --git a/guix/store.scm b/guix/store.scm index a64016611d..276684e2fb 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -1061,24 +1061,19 @@ Return #t on success. Use with care as it directly modifies the store! This is primarily meant to be used internally by the daemon's build hook." ;; Currently this is implemented by calling out to the fine C++ blob. - (catch 'system-error - (lambda () - (let ((pipe (apply open-pipe* OPEN_WRITE %guix-register-program - `(,@(if prefix - `("--prefix" ,prefix) - '()) - ,@(if state-directory - `("--state-directory" ,state-directory) - '()))))) - (and pipe - (begin - (format pipe "~a~%~a~%~a~%" - path (or deriver "") (length references)) - (for-each (cut format pipe "~a~%" <>) references) - (zero? (close-pipe pipe)))))) - (lambda args - ;; Failed to run %GUIX-REGISTER-PROGRAM. - #f))) + (let ((pipe (apply open-pipe* OPEN_WRITE %guix-register-program + `(,@(if prefix + `("--prefix" ,prefix) + '()) + ,@(if state-directory + `("--state-directory" ,state-directory) + '()))))) + (and pipe + (begin + (format pipe "~a~%~a~%~a~%" + path (or deriver "") (length references)) + (for-each (cut format pipe "~a~%" <>) references) + (zero? (close-pipe pipe)))))) ;;; diff --git a/guix/utils.scm b/guix/utils.scm index a642bd3d62..9e1b8ead0a 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -637,10 +637,11 @@ output port, and PROC's result is returned." (define (cache-directory) "Return the cache directory for Guix, by default ~/.cache/guix." - (or (getenv "XDG_CONFIG_HOME") - (and=> (or (getenv "HOME") - (passwd:dir (getpwuid (getuid)))) - (cut string-append <> "/.cache/guix")))) + (string-append (or (getenv "XDG_CACHE_HOME") + (and=> (or (getenv "HOME") + (passwd:dir (getpwuid (getuid)))) + (cut string-append <> "/.cache"))) + "/guix")) (define (readlink* file) "Call 'readlink' until the result is not a symlink." @@ -702,6 +703,18 @@ output port, and PROC's result is returned." ;;; Source location. ;;; +(define (absolute-dirname file) + "Return the absolute name of the directory containing FILE, or #f upon +failure." + (match (search-path %load-path file) + (#f #f) + ((? string? file) + ;; If there are relative names in %LOAD-PATH, FILE can be relative and + ;; needs to be canonicalized. + (if (string-prefix? "/" file) + (dirname file) + (canonicalize-path (dirname file)))))) + (define-syntax current-source-directory (lambda (s) "Return the absolute name of the current directory, or #f if it could not @@ -711,11 +724,16 @@ be determined." (match (assq 'filename (syntax-source s)) (('filename . (? string? file-name)) ;; If %FILE-PORT-NAME-CANONICALIZATION is 'relative, then FILE-NAME - ;; can be relative. In that case, we try to find out the absolute - ;; file name by looking at %LOAD-PATH. - (if (string-prefix? "/" file-name) - (dirname file-name) - (and=> (search-path %load-path file-name) dirname))) + ;; can be relative. In that case, we try to find out at run time + ;; the absolute file name by looking at %LOAD-PATH; doing this at + ;; run time rather than expansion time is necessary to allow files + ;; to be moved on the file system. + (cond ((not file-name) + #f) ;raising an error would upset Geiser users + ((string-prefix? "/" file-name) + (dirname file-name)) + (else + #`(absolute-dirname #,file-name)))) (_ #f)))))) diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc index 84fc885eba..65dad24d91 100644 --- a/nix/libstore/globals.cc +++ b/nix/libstore/globals.cc @@ -67,7 +67,7 @@ void Settings::processEnvironment() nixLogDir = canonPath(getEnv("NIX_LOG_DIR", NIX_LOG_DIR)); nixStateDir = canonPath(getEnv("NIX_STATE_DIR", NIX_STATE_DIR)); nixDBPath = getEnv("NIX_DB_DIR", nixStateDir + "/db"); - nixConfDir = canonPath(getEnv("NIX_CONF_DIR", NIX_CONF_DIR)); + nixConfDir = canonPath(getEnv("GUIX_CONFIGURATION_DIRECTORY", GUIX_CONFIGURATION_DIRECTORY)); nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR)); nixBinDir = canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR)); nixDaemonSocketFile = canonPath(nixStateDir + DEFAULT_SOCKET_PATH); diff --git a/nix/local.mk b/nix/local.mk index 07a92f74ea..b0e9bc1a2b 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -106,7 +106,7 @@ libstore_a_CPPFLAGS = \ -DNIX_DATA_DIR=\"$(datadir)\" \ -DNIX_STATE_DIR=\"$(localstatedir)/guix\" \ -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\" \ - -DNIX_CONF_DIR=\"$(sysconfdir)/guix\" \ + -DGUIX_CONFIGURATION_DIRECTORY=\"$(sysconfdir)/guix\" \ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ -DNIX_BIN_DIR=\"$(bindir)\" \ -DOPENSSL_PATH="\"guix-authenticate\"" \ diff --git a/po/guix/fr.po b/po/guix/fr.po index d1a49077e2..b5b566a93b 100644 --- a/po/guix/fr.po +++ b/po/guix/fr.po @@ -5,11 +5,11 @@ # msgid "" msgstr "" -"Project-Id-Version: guix 0.8\n" +"Project-Id-Version: guix 0.9.1\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" -"POT-Creation-Date: 2014-11-09 22:32+0100\n" -"PO-Revision-Date: 2014-12-09 09:42+0100\n" -"Last-Translator: Rémy Chevalier \n" +"POT-Creation-Date: 2016-03-04 16:52+0100\n" +"PO-Revision-Date: 2016-06-26 02:43+0200\n" +"Last-Translator: Stéphane Aulery \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -17,47 +17,154 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: gnu/packages.scm:120 +#: gnu/packages.scm:73 #, scheme-format -msgid "cannot access `~a': ~a~%" -msgstr "impossible d'accéder à \"~a\": ~a~%" +msgid "~a: patch not found" +msgstr "~a: paquet introuvable" -#: gnu/packages.scm:350 +#: gnu/packages.scm:84 #, scheme-format -msgid "looking for the latest release of GNU ~a..." -msgstr "recherche de la dernière version de GNU ~a..." +msgid "could not find bootstrap binary '~a' for system '~a'" +msgstr "" -#: gnu/packages.scm:354 +#: gnu/packages.scm:136 #, scheme-format -msgid "~a: note: using ~a but ~a is available upstream~%" -msgstr "~a: note: utilisation de ~a mais ~a est disponible en amont" +msgid "cannot access `~a': ~a~%" +msgstr "impossible d'accéder à \"~a\": ~a~%" -#: gnu/packages.scm:376 guix/scripts/package.scm:305 +#: gnu/packages.scm:289 #, scheme-format msgid "ambiguous package specification `~a'~%" msgstr "spécification du paquet \"~a\" ambiguë~%" -#: gnu/packages.scm:377 guix/scripts/package.scm:307 +#: gnu/packages.scm:290 #, scheme-format msgid "choosing ~a from ~a~%" msgstr "choix de ~a parmi ~a~%" -#: gnu/packages.scm:383 +#: gnu/packages.scm:294 +#, scheme-format +msgid "deprecated NAME-VERSION syntax.~%" +msgstr "" + +#: gnu/packages.scm:298 #, scheme-format msgid "~A: package not found for version ~a~%" msgstr "~A: paquet introuvable pour la version ~a~%" -#: gnu/packages.scm:385 +#: gnu/packages.scm:305 #, scheme-format msgid "~A: unknown package~%" msgstr "~A: paquet inconnu~%" -#: guix/scripts/build.scm:65 +#: gnu/packages.scm:333 +#, scheme-format +msgid "package `~a' lacks output `~a'~%" +msgstr "le paquet \"~a\" requiert la sortie \"~a\"~%" + +#: gnu/services.scm:527 +#, scheme-format +msgid "no target of type '~a' for service ~s" +msgstr "" + +#: gnu/services.scm:538 gnu/services.scm:599 +#, scheme-format +msgid "more than one target service of type '~a'" +msgstr "" + +#: gnu/services.scm:589 +#, scheme-format +msgid "service of type '~a' not found" +msgstr "" + +#: gnu/system.scm:546 +#, scheme-format +msgid "using a string for file '~a' is deprecated; use 'plain-file' instead~%" +msgstr "" + +#: gnu/system.scm:562 +#, scheme-format +msgid "using a monadic value for '~a' is deprecated; use 'plain-file' instead~%" +msgstr "" + +#: gnu/system.scm:679 +#, fuzzy, scheme-format +#| msgid "~a: invalid checker" +msgid "~a: invalid locale name" +msgstr "~a: vérificateur non valide" + +#: gnu/system.scm:798 +#, scheme-format +msgid "unrecognized boot parameters for '~a'~%" +msgstr "paramètres de démarrage non reconus pour \"~a\"~%" + +#: gnu/services/shepherd.scm:166 +#, scheme-format +msgid "service '~a' provided more than once" +msgstr "" + +#: gnu/services/shepherd.scm:181 +#, scheme-format +msgid "service '~a' requires '~a', which is undefined" +msgstr "" + +#: gnu/system/shadow.scm:213 +#, scheme-format +msgid "supplementary group '~a' of user '~a' is undeclared" +msgstr "" + +#: gnu/system/shadow.scm:223 +#, scheme-format +msgid "primary group '~a' of user '~a' is undeclared" +msgstr "" + +#: guix/scripts.scm:52 +#, scheme-format +msgid "invalid argument: ~a~%" +msgstr "argument non valide: ~a~%" + +#: guix/scripts.scm:78 guix/scripts/download.scm:97 guix/scripts/gc.scm:157 +#: guix/scripts/import/cran.scm:78 guix/scripts/import/elpa.scm:77 +#: guix/scripts/pull.scm:219 guix/scripts/lint.scm:874 +#: guix/scripts/publish.scm:354 guix/scripts/graph.scm:346 +#, scheme-format +msgid "~A: unrecognized option~%" +msgstr "~A: option non reconnue~%" + +#: guix/scripts/build.scm:112 #, scheme-format msgid "failed to create GC root `~a': ~a~%" msgstr "impossible de créer la racine du GC \"~a\": ~a~%" -#: guix/scripts/build.scm:102 +#: guix/scripts/build.scm:189 +#, fuzzy, scheme-format +#| msgid "ambiguous package specification `~a'~%" +msgid "invalid replacement specification: ~s~%" +msgstr "spécification du paquet \"~a\" ambiguë~%" + +#: guix/scripts/build.scm:237 +msgid "" +"\n" +" --with-source=SOURCE\n" +" use SOURCE when building the corresponding package" +msgstr "" +"\n" +" --with-source=SOURCE\n" +" utiliser la SOURCE donnée pour compiler le paquet correspondant" + +#: guix/scripts/build.scm:240 +msgid "" +"\n" +" --with-input=PACKAGE=REPLACEMENT\n" +" replace dependency PACKAGE by REPLACEMENT" +msgstr "" + +#: guix/scripts/build.scm:265 +#, scheme-format +msgid "transformation '~a' had no effect on ~a~%" +msgstr "" + +#: guix/scripts/build.scm:283 msgid "" "\n" " -L, --load-path=DIR prepend DIR to the package module search path" @@ -65,7 +172,7 @@ msgstr "" "\n" " -L, --load-path=REP préfixer le chemin de recherche par REP " -#: guix/scripts/build.scm:104 +#: guix/scripts/build.scm:285 msgid "" "\n" " -K, --keep-failed keep build tree of failed builds" @@ -73,7 +180,19 @@ msgstr "" "\n" " -K, --keep-failed garder l'arbre de compilation pour les compilations ayant échoué" -#: guix/scripts/build.scm:106 +#: guix/scripts/build.scm:287 +#, fuzzy +#| msgid "" +#| "\n" +#| " -n, --dry-run do not build the derivations" +msgid "" +"\n" +" -k, --keep-going keep going when some of the derivations fail" +msgstr "" +"\n" +" -n, --dry-run ne pas compiler les dérivations" + +#: guix/scripts/build.scm:289 msgid "" "\n" " -n, --dry-run do not build the derivations" @@ -81,7 +200,7 @@ msgstr "" "\n" " -n, --dry-run ne pas compiler les dérivations" -#: guix/scripts/build.scm:108 +#: guix/scripts/build.scm:291 msgid "" "\n" " --fallback fall back to building when the substituter fails" @@ -89,7 +208,7 @@ msgstr "" "\n" " --fallback revenir à la compilation quand le substitut échoue" -#: guix/scripts/build.scm:110 +#: guix/scripts/build.scm:293 msgid "" "\n" " --no-substitutes build instead of resorting to pre-built substitutes" @@ -97,7 +216,22 @@ msgstr "" "\n" " --no-substitutes compiler plutot que recourir à des substituts pré-compilés" -#: guix/scripts/build.scm:112 +#: guix/scripts/build.scm:295 guix/scripts/size.scm:215 +msgid "" +"\n" +" --substitute-urls=URLS\n" +" fetch substitute from URLS if they are authorized" +msgstr "" + +#: guix/scripts/build.scm:298 +msgid "" +"\n" +" --no-grafts do not graft packages" +msgstr "" +"\n" +" --no-grafts ne pas greffer kes paquets" + +#: guix/scripts/build.scm:300 msgid "" "\n" " --no-build-hook do not attempt to offload builds via the build hook" @@ -105,7 +239,7 @@ msgstr "" "\n" " --no-build-hook ne pas essayer de décharger les compilations via le hook de compilation" -#: guix/scripts/build.scm:114 +#: guix/scripts/build.scm:302 msgid "" "\n" " --max-silent-time=SECONDS\n" @@ -115,7 +249,7 @@ msgstr "" " --max-silent-time=N\n" " marquer la compilation comme ayant échouée après N secondes de silence" -#: guix/scripts/build.scm:117 +#: guix/scripts/build.scm:305 msgid "" "\n" " --timeout=SECONDS mark the build as failed after SECONDS of activity" @@ -123,7 +257,7 @@ msgstr "" "\n" " --timeout=N marquer la compilation comme ayant échouée après N secondes d'activité" -#: guix/scripts/build.scm:119 +#: guix/scripts/build.scm:307 msgid "" "\n" " --verbosity=LEVEL use the given verbosity LEVEL" @@ -131,7 +265,13 @@ msgstr "" "\n" " --verbosity=NIVEAU utiliser le NIVEAU de verbosité donné" -#: guix/scripts/build.scm:121 +#: guix/scripts/build.scm:309 +msgid "" +"\n" +" --rounds=N build N times in a row to detect non-determinism" +msgstr "" + +#: guix/scripts/build.scm:311 msgid "" "\n" " -c, --cores=N allow the use of up to N CPU cores for the build" @@ -139,12 +279,19 @@ msgstr "" "\n" " -c, --cores=N utiliser jusqu'à N coeurs CPU pour la compilation" -#: guix/scripts/build.scm:195 -#, scheme-format -msgid "~a: not a number~%" -msgstr "~a: pas un nombre~%" +#: guix/scripts/build.scm:313 +msgid "" +"\n" +" -M, --max-jobs=N allow at most N build jobs" +msgstr "" + +#: guix/scripts/build.scm:419 guix/scripts/build.scm:426 +#, fuzzy, scheme-format +#| msgid "wrong number of arguments~%" +msgid "not a number: '~a' option argument: ~a~%" +msgstr "nombre d'arguments incorrect~%" -#: guix/scripts/build.scm:213 +#: guix/scripts/build.scm:446 msgid "" "Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...\n" "Build the given PACKAGE-OR-DERIVATION and return their output paths.\n" @@ -152,7 +299,7 @@ msgstr "" "Usage: guix build [OPTION]... PAQUET-OU-DERIVATION...\n" "Compiler le PAQUET-OU-DERIVATION donné et retourner leur chemin de sortie.\n" -#: guix/scripts/build.scm:215 +#: guix/scripts/build.scm:448 msgid "" "\n" " -e, --expression=EXPR build the package or derivation EXPR evaluates to" @@ -160,49 +307,51 @@ msgstr "" "\n" " -e, --expression=EXPR compiler le paquet ou la dérivation évalué par EXPR" -#: guix/scripts/build.scm:217 +#: guix/scripts/build.scm:450 +#, fuzzy +#| msgid "" +#| "\n" +#| " -e, --expression=EXPR build the package or derivation EXPR evaluates to" msgid "" "\n" -" -S, --source build the packages' source derivations" +" -f, --file=FILE build the package or derivation that the code within\n" +" FILE evaluates to" msgstr "" "\n" -" -S, --source compiler les dérivations de source du paquet" +" -e, --expression=EXPR compiler le paquet ou la dérivation évalué par EXPR" -#: guix/scripts/build.scm:219 +#: guix/scripts/build.scm:453 msgid "" "\n" -" -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"" +" -S, --source build the packages' source derivations" msgstr "" "\n" -" -s, --system=SYSTEME essayer de compiler pour le SYSTEME donné, par exemple \"i686-linux\"" +" -S, --source compiler les dérivations de source du paquet" -#: guix/scripts/build.scm:221 +#: guix/scripts/build.scm:455 msgid "" "\n" -" --target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\"" +" --sources[=TYPE] build source derivations; TYPE may optionally be one\n" +" of \"package\", \"all\" (default), or \"transitive\"" msgstr "" -"\n" -" --target=TRIPLET effectuer une compilation croisée pour TRIPLET, par exemple \"armel-linux-gnu\"" -#: guix/scripts/build.scm:223 +#: guix/scripts/build.scm:458 msgid "" "\n" -" --with-source=SOURCE\n" -" use SOURCE when building the corresponding package" +" -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"" msgstr "" "\n" -" --with-source=SOURCE\n" -" utiliser la SOURCE donnée pour compiler le paquet correspondant" +" -s, --system=SYSTEME essayer de compiler pour le SYSTEME donné, par exemple \"i686-linux\"" -#: guix/scripts/build.scm:226 +#: guix/scripts/build.scm:460 msgid "" "\n" -" --no-grafts do not graft packages" +" --target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\"" msgstr "" "\n" -" --no-grafts ne pas greffer kes paquets" +" --target=TRIPLET effectuer une compilation croisée pour TRIPLET, par exemple \"armel-linux-gnu\"" -#: guix/scripts/build.scm:228 +#: guix/scripts/build.scm:462 msgid "" "\n" " -d, --derivations return the derivation paths of the given packages" @@ -210,7 +359,13 @@ msgstr "" "\n" " -d, --derivations retourner les chemins de dérivation pour les paquets donnés" -#: guix/scripts/build.scm:230 +#: guix/scripts/build.scm:464 +msgid "" +"\n" +" --check rebuild items to check for non-determinism issues" +msgstr "" + +#: guix/scripts/build.scm:466 msgid "" "\n" " -r, --root=FILE make FILE a symlink to the result, and register it\n" @@ -220,7 +375,7 @@ msgstr "" " -r, --root=FICHIER faire de FICHIER un lien symbolique pointant sur le résultat\n" " et l'enregistrer en tant que racine du garbage collector" -#: guix/scripts/build.scm:233 +#: guix/scripts/build.scm:469 msgid "" "\n" " --log-file return the log file names for the given derivations" @@ -228,11 +383,15 @@ msgstr "" "\n" " --log-file retourner les fichiers de journalisation pour les dérivations données" -#: guix/scripts/build.scm:238 guix/scripts/download.scm:53 -#: guix/scripts/package.scm:451 guix/scripts/gc.scm:58 -#: guix/scripts/hash.scm:55 guix/scripts/pull.scm:81 -#: guix/scripts/substitute-binary.scm:560 guix/scripts/system.scm:371 -#: guix/scripts/lint.scm:262 +#: guix/scripts/build.scm:476 guix/scripts/download.scm:54 +#: guix/scripts/package.scm:386 guix/scripts/gc.scm:70 +#: guix/scripts/hash.scm:56 guix/scripts/import.scm:91 +#: guix/scripts/import/cran.scm:46 guix/scripts/pull.scm:83 +#: guix/scripts/substitute.scm:758 guix/scripts/system.scm:631 +#: guix/scripts/lint.scm:823 guix/scripts/publish.scm:63 +#: guix/scripts/edit.scm:44 guix/scripts/size.scm:223 +#: guix/scripts/graph.scm:327 guix/scripts/challenge.scm:181 +#: guix/scripts/container.scm:33 guix/scripts/container/exec.scm:43 msgid "" "\n" " -h, --help display this help and exit" @@ -240,11 +399,15 @@ msgstr "" "\n" " -h, --help afficher cette aide et quitter" -#: guix/scripts/build.scm:240 guix/scripts/download.scm:55 -#: guix/scripts/package.scm:453 guix/scripts/gc.scm:60 -#: guix/scripts/hash.scm:57 guix/scripts/pull.scm:83 -#: guix/scripts/substitute-binary.scm:562 guix/scripts/system.scm:373 -#: guix/scripts/lint.scm:266 +#: guix/scripts/build.scm:478 guix/scripts/download.scm:56 +#: guix/scripts/package.scm:388 guix/scripts/gc.scm:72 +#: guix/scripts/hash.scm:58 guix/scripts/import.scm:93 +#: guix/scripts/import/cran.scm:48 guix/scripts/pull.scm:85 +#: guix/scripts/substitute.scm:760 guix/scripts/system.scm:633 +#: guix/scripts/lint.scm:827 guix/scripts/publish.scm:65 +#: guix/scripts/edit.scm:46 guix/scripts/size.scm:225 +#: guix/scripts/graph.scm:329 guix/scripts/challenge.scm:183 +#: guix/scripts/container.scm:35 guix/scripts/container/exec.scm:45 msgid "" "\n" " -V, --version display version information and exit" @@ -252,25 +415,24 @@ msgstr "" "\n" " -V, --version afficher les informations sur la version et quitter" -#: guix/scripts/build.scm:366 +#: guix/scripts/build.scm:505 #, scheme-format -msgid "sources do not match any package:~{ ~a~}~%" -msgstr "les sources ne correspondent à aucun paquet:~{ ~a~}~%" +msgid "" +"invalid argument: '~a' option argument: ~a, ~\n" +"must be one of 'package', 'all', or 'transitive'~%" +msgstr "" -#: guix/scripts/build.scm:395 guix/scripts/download.scm:96 -#: guix/scripts/package.scm:673 guix/scripts/gc.scm:122 -#: guix/scripts/pull.scm:213 guix/scripts/system.scm:426 -#: guix/scripts/lint.scm:313 +#: guix/scripts/build.scm:549 #, scheme-format -msgid "~A: unrecognized option~%" -msgstr "~A: option non reconnue~%" +msgid "~s: not something we can build~%" +msgstr "" -#: guix/scripts/build.scm:423 +#: guix/scripts/build.scm:629 #, scheme-format msgid "no build log for '~a'~%" msgstr "aucun journal de compilation pour \"~a\"~%" -#: guix/scripts/download.scm:44 +#: guix/scripts/download.scm:45 msgid "" "Usage: guix download [OPTION] URL\n" "Download the file at URL, add it to the store, and print its store path\n" @@ -286,7 +448,7 @@ msgstr "" "Formats supportés: 'nix-base32' (défaut), 'base32', et 'base16'\n" "('hex' et 'hexadecimal' peuvent aussi être utilisés).\n" -#: guix/scripts/download.scm:50 guix/scripts/hash.scm:50 +#: guix/scripts/download.scm:51 guix/scripts/hash.scm:51 msgid "" "\n" " -f, --format=FMT write the hash in the given format" @@ -294,73 +456,118 @@ msgstr "" "\n" " -f, --format=FORMAT écrire l'empreinte dans le FORMAT donné" -#: guix/scripts/download.scm:73 guix/scripts/hash.scm:75 +#: guix/scripts/download.scm:74 guix/scripts/hash.scm:76 #, scheme-format msgid "unsupported hash format: ~a~%" msgstr "format d'empreinte non supporté: ~a~%" -#: guix/scripts/download.scm:106 +#: guix/scripts/download.scm:100 guix/scripts/package.scm:836 +#: guix/scripts/publish.scm:356 +#, scheme-format +msgid "~A: extraneous argument~%" +msgstr "~A: argument superflu~%" + +#: guix/scripts/download.scm:109 +#, fuzzy, scheme-format +#| msgid "~a: download failed~%" +msgid "no download URI was specified~%" +msgstr "~a: le téléchargement a échoué~%" + +#: guix/scripts/download.scm:111 #, scheme-format msgid "~a: failed to parse URI~%" msgstr "~a: impossible d'évaluer l'URI~%" -#: guix/scripts/download.scm:117 +#: guix/scripts/download.scm:122 #, scheme-format msgid "~a: download failed~%" msgstr "~a: le téléchargement a échoué~%" -#: guix/scripts/package.scm:97 +#: guix/scripts/package.scm:103 #, scheme-format -msgid "failed to build the empty profile~%" -msgstr "échec de la compilation du profil vide~%" +msgid "Try \"info '(guix) Invoking guix package'\" for more information.~%" +msgstr "Essayez \"info '(guix) Invoking guix package'\" pour plus d'information.~%" -#: guix/scripts/package.scm:113 +#: guix/scripts/package.scm:125 #, scheme-format -msgid "switching from generation ~a to ~a~%" -msgstr "passage de la génération ~a à ~a~%" +msgid "error: while creating directory `~a': ~a~%" +msgstr "erreur: pendant la création du répertoire \"~a\": ~a~%" -#: guix/scripts/package.scm:132 +#: guix/scripts/package.scm:129 #, scheme-format -msgid "nothing to do: already at the empty profile~%" -msgstr "aucune action à faire: profil courant vide" +msgid "Please create the `~a' directory, with you as the owner.~%" +msgstr "Veuillez créer un répertoire \"~a\" dont vous êtes le propriétaire.~%" -#: guix/scripts/package.scm:144 +#: guix/scripts/package.scm:136 #, scheme-format -msgid "deleting ~a~%" -msgstr "suppression de ~a~%" +msgid "error: directory `~a' is not owned by you~%" +msgstr "erreur: vous de possédez pas le répertoire \"~a\"" -#: guix/scripts/package.scm:295 +#: guix/scripts/package.scm:139 #, scheme-format -msgid "package `~a' lacks output `~a'~%" -msgstr "le paquet \"~a\" requiert la sortie \"~a\"~%" +msgid "Please change the owner of `~a' to user ~s.~%" +msgstr "Veuillez définir ~s comme propriétaire de \"~a\".~%" + +#: guix/scripts/package.scm:174 +#, scheme-format +msgid "not removing generation ~a, which is current~%" +msgstr "" + +#: guix/scripts/package.scm:181 +#, fuzzy, scheme-format +#| msgid "cannot switch to generation '~a'~%" +msgid "no matching generation~%" +msgstr "impossible de passer à la génération \"~a\"~%" + +#: guix/scripts/package.scm:184 guix/scripts/package.scm:657 +#: guix/scripts/system.scm:459 +#, scheme-format +msgid "invalid syntax: ~a~%" +msgstr "syntaxe non valide: ~a~%" + +#: guix/scripts/package.scm:209 +#, scheme-format +msgid "nothing to be done~%" +msgstr "aucune action à faire~%" -#: guix/scripts/package.scm:312 +#: guix/scripts/package.scm:223 #, scheme-format -msgid "~a: package not found~%" -msgstr "~a: paquet introuvable~%" +msgid "~a package in profile~%" +msgid_plural "~a packages in profile~%" +msgstr[0] "~a paquet dans le profile~%" +msgstr[1] "~a paquets dans le profile~%" -#: guix/scripts/package.scm:390 +#: guix/scripts/package.scm:311 #, scheme-format msgid "The following environment variable definitions may be needed:~%" msgstr "Il pourrait être nécessaire de définir les variables d'environnement suivantes:~%" -#: guix/scripts/package.scm:406 +#: guix/scripts/package.scm:327 +#, fuzzy +#| msgid "" +#| "Usage: guix package [OPTION]... PACKAGES...\n" +#| "Install, remove, or upgrade PACKAGES in a single transaction.\n" msgid "" -"Usage: guix package [OPTION]... PACKAGES...\n" -"Install, remove, or upgrade PACKAGES in a single transaction.\n" +"Usage: guix package [OPTION]...\n" +"Install, remove, or upgrade packages in a single transaction.\n" msgstr "" "Usage: guix package [OPTION]... PAQUETS...\n" "Installer, supprimer ou mettre à jour les PAQUETS spécifiés en une seule transaction.\n" -#: guix/scripts/package.scm:408 +#: guix/scripts/package.scm:329 +#, fuzzy +#| msgid "" +#| "\n" +#| " -i, --install=PACKAGE install PACKAGE" msgid "" "\n" -" -i, --install=PACKAGE install PACKAGE" +" -i, --install PACKAGE ...\n" +" install PACKAGEs" msgstr "" "\n" " -i, --install=PAQUET installer PAQUET" -#: guix/scripts/package.scm:410 +#: guix/scripts/package.scm:332 msgid "" "\n" " -e, --install-from-expression=EXP\n" @@ -370,15 +577,36 @@ msgstr "" " -e, --install-from-expression=EXP\n" " installer le paquet évalué par EXP" -#: guix/scripts/package.scm:413 +#: guix/scripts/package.scm:335 +#, fuzzy +#| msgid "" +#| "\n" +#| " -e, --install-from-expression=EXP\n" +#| " install the package EXP evaluates to" +msgid "" +"\n" +" -f, --install-from-file=FILE\n" +" install the package that the code within FILE\n" +" evaluates to" +msgstr "" +"\n" +" -e, --install-from-expression=EXP\n" +" installer le paquet évalué par EXP" + +#: guix/scripts/package.scm:339 +#, fuzzy +#| msgid "" +#| "\n" +#| " -r, --remove=PACKAGE remove PACKAGE" msgid "" "\n" -" -r, --remove=PACKAGE remove PACKAGE" +" -r, --remove PACKAGE ...\n" +" remove PACKAGEs" msgstr "" "\n" " -r, --remove=PAQUET supprimer PAQUET" -#: guix/scripts/package.scm:415 +#: guix/scripts/package.scm:342 msgid "" "\n" " -u, --upgrade[=REGEXP] upgrade all the installed packages matching REGEXP" @@ -386,7 +614,26 @@ msgstr "" "\n" " -u, --upgrade[=REGEXP] mettre à jour tous les paquets installés correspondant à REGEXP" -#: guix/scripts/package.scm:417 +#: guix/scripts/package.scm:344 +msgid "" +"\n" +" -m, --manifest=FILE create a new profile generation with the manifest\n" +" from FILE" +msgstr "" + +#: guix/scripts/package.scm:347 +#, fuzzy +#| msgid "" +#| "\n" +#| " -u, --upgrade[=REGEXP] upgrade all the installed packages matching REGEXP" +msgid "" +"\n" +" --do-not-upgrade[=REGEXP] do not upgrade any packages matching REGEXP" +msgstr "" +"\n" +" -u, --upgrade[=REGEXP] mettre à jour tous les paquets installés correspondant à REGEXP" + +#: guix/scripts/package.scm:349 msgid "" "\n" " --roll-back roll back to the previous generation" @@ -394,15 +641,20 @@ msgstr "" "\n" " --roll-back revenir à la génération antérieure" -#: guix/scripts/package.scm:419 +#: guix/scripts/package.scm:351 +#, fuzzy +#| msgid "" +#| "\n" +#| " --search-paths display needed environment variable definitions" msgid "" "\n" -" --search-paths display needed environment variable definitions" +" --search-paths[=KIND]\n" +" display needed environment variable definitions" msgstr "" "\n" " --search-paths afficher les définitions de variable d'environnement requises" -#: guix/scripts/package.scm:421 +#: guix/scripts/package.scm:354 msgid "" "\n" " -l, --list-generations[=PATTERN]\n" @@ -412,7 +664,7 @@ msgstr "" " -l, --list-generations[=PATTERN]\n" " lister les générations correspondant à PATTERN" -#: guix/scripts/package.scm:424 +#: guix/scripts/package.scm:357 msgid "" "\n" " -d, --delete-generations[=PATTERN]\n" @@ -422,7 +674,7 @@ msgstr "" " -d, --delete-generations[=PATTERN]\n" " supprimer les générations correspondant à PATTERN" -#: guix/scripts/package.scm:427 +#: guix/scripts/package.scm:360 msgid "" "\n" " -S, --switch-generation=PATTERN\n" @@ -432,7 +684,7 @@ msgstr "" " -d, --delete-generations[=PATTERN]\n" " basculer vers une génération correspondant à PATTERN" -#: guix/scripts/package.scm:430 +#: guix/scripts/package.scm:363 msgid "" "\n" " -p, --profile=PROFILE use PROFILE instead of the user's default profile" @@ -440,7 +692,7 @@ msgstr "" "\n" " -p, --profile=PROFIL utiliser PROFIL au lieu du profil par défaut de l'utilisateur" -#: guix/scripts/package.scm:433 +#: guix/scripts/package.scm:366 msgid "" "\n" " --bootstrap use the bootstrap Guile to build the profile" @@ -448,7 +700,7 @@ msgstr "" "\n" " --bootstrap utiliser le programme d'amorçage Guile pour compiler le profil" -#: guix/scripts/package.scm:435 guix/scripts/pull.scm:74 +#: guix/scripts/package.scm:368 guix/scripts/pull.scm:76 msgid "" "\n" " --verbose produce verbose output" @@ -456,7 +708,7 @@ msgstr "" "\n" " --verbose utiliser le mode verbeux" -#: guix/scripts/package.scm:438 +#: guix/scripts/package.scm:371 msgid "" "\n" " -s, --search=REGEXP search in synopsis and description using REGEXP" @@ -464,7 +716,7 @@ msgstr "" "\n" " -s, --search=REGEXP chercher dans le synopsis et la description en utilisant REGEXP" -#: guix/scripts/package.scm:440 +#: guix/scripts/package.scm:373 msgid "" "\n" " -I, --list-installed[=REGEXP]\n" @@ -474,7 +726,7 @@ msgstr "" " -I, --list-installed[=REGEXP]\n" " lister les paquets installés correspondant à REGEXP" -#: guix/scripts/package.scm:443 +#: guix/scripts/package.scm:376 msgid "" "\n" " -A, --list-available[=REGEXP]\n" @@ -484,77 +736,39 @@ msgstr "" " -A, --list-available[=REGEXP]\n" " lister les paquets disponibles correspondant à REGEXP" -#: guix/scripts/package.scm:446 +#: guix/scripts/package.scm:379 +#, fuzzy +#| msgid "" +#| "\n" +#| " --show=PACKAGE show details about PACKAGE" msgid "" "\n" -" --show=PACKAGE show details about PACKAGE" +" --show=PACKAGE show details about PACKAGE" msgstr "" "\n" " --show=PAQUET montrer des détails sur le PAQUET" -#: guix/scripts/package.scm:677 -#, scheme-format -msgid "~A: extraneous argument~%" -msgstr "~A: argument superflu~%" - -#: guix/scripts/package.scm:687 -#, scheme-format -msgid "Try \"info '(guix) Invoking guix package'\" for more information.~%" -msgstr "Essayez \"info '(guix) Invoking guix package'\" pour plus d'information.~%" - -#: guix/scripts/package.scm:709 +#: guix/scripts/package.scm:474 #, scheme-format -msgid "error: while creating directory `~a': ~a~%" -msgstr "erreur: pendant la création du répertoire \"~a\": ~a~%" - -#: guix/scripts/package.scm:713 -#, scheme-format -msgid "Please create the `~a' directory, with you as the owner.~%" -msgstr "Veuillez créer un répertoire \"~a\" dont vous êtes le propriétaire.~%" - -#: guix/scripts/package.scm:720 -#, scheme-format -msgid "error: directory `~a' is not owned by you~%" -msgstr "erreur: vous de possédez pas le répertoire \"~a\"" - -#: guix/scripts/package.scm:723 -#, scheme-format -msgid "Please change the owner of `~a' to user ~s.~%" -msgstr "Veuillez définir ~s comme propriétaire de \"~a\".~%" +msgid "~a: unsupported kind of search path~%" +msgstr "" -#: guix/scripts/package.scm:756 +#: guix/scripts/package.scm:753 #, scheme-format msgid "cannot switch to generation '~a'~%" msgstr "impossible de passer à la génération \"~a\"~%" -#: guix/scripts/package.scm:788 guix/scripts/package.scm:889 -#, scheme-format -msgid "invalid syntax: ~a~%" -msgstr "syntaxe non valide: ~a~%" - -#: guix/scripts/package.scm:825 -#, scheme-format -msgid "nothing to be done~%" -msgstr "aucune action à faire~%" - -#: guix/scripts/package.scm:840 -#, scheme-format -msgid "~a package in profile~%" -msgid_plural "~a packages in profile~%" -msgstr[0] "~a paquet dans le profile~%" -msgstr[1] "~a paquets dans le profile~%" - -#: guix/scripts/package.scm:855 +#: guix/scripts/package.scm:769 #, scheme-format -msgid "Generation ~a\t~a" -msgstr "Génération ~a\t~a" +msgid "would install new manifest from '~a' with ~d entries~%" +msgstr "" -#: guix/scripts/package.scm:862 +#: guix/scripts/package.scm:771 #, scheme-format -msgid "~a\t(current)~%" -msgstr "~a\t(actuel)~%" +msgid "installing new manifest from '~a' with ~d entries~%" +msgstr "" -#: guix/scripts/gc.scm:39 +#: guix/scripts/gc.scm:40 msgid "" "Usage: guix gc [OPTION]... PATHS...\n" "Invoke the garbage collector.\n" @@ -562,7 +776,7 @@ msgstr "" "Usage: guix gc [OPTION]... CHEMINS...\n" "Appeller le garbage collector.\n" -#: guix/scripts/gc.scm:41 +#: guix/scripts/gc.scm:42 msgid "" "\n" " -C, --collect-garbage[=MIN]\n" @@ -572,7 +786,7 @@ msgstr "" " -C, --collect-garbage[=MIN]\n" " collecter au moins MIN octets dans le garbage-collector" -#: guix/scripts/gc.scm:44 +#: guix/scripts/gc.scm:45 msgid "" "\n" " -d, --delete attempt to delete PATHS" @@ -580,7 +794,13 @@ msgstr "" "\n" " -d, --delete supprimer les CHEMINS" -#: guix/scripts/gc.scm:46 +#: guix/scripts/gc.scm:47 +msgid "" +"\n" +" --optimize optimize the store by deduplicating identical files" +msgstr "" + +#: guix/scripts/gc.scm:49 msgid "" "\n" " --list-dead list dead paths" @@ -588,7 +808,7 @@ msgstr "" "\n" " --list-dead lister les chemins non valides" -#: guix/scripts/gc.scm:48 +#: guix/scripts/gc.scm:51 msgid "" "\n" " --list-live list live paths" @@ -596,7 +816,7 @@ msgstr "" "\n" " --list-live lister les chemins valides" -#: guix/scripts/gc.scm:51 +#: guix/scripts/gc.scm:54 msgid "" "\n" " --references list the references of PATHS" @@ -604,7 +824,7 @@ msgstr "" "\n" " --references lister les références de CHEMINS" -#: guix/scripts/gc.scm:53 +#: guix/scripts/gc.scm:56 msgid "" "\n" " -R, --requisites list the requisites of PATHS" @@ -612,7 +832,7 @@ msgstr "" "\n" " -R, --requisites lister les prérequis de CHEMINS" -#: guix/scripts/gc.scm:55 +#: guix/scripts/gc.scm:58 msgid "" "\n" " --referrers list the referrers of PATHS" @@ -620,12 +840,44 @@ msgstr "" "\n" " --referrers lister les référents de CHEMINS" -#: guix/scripts/gc.scm:84 +#: guix/scripts/gc.scm:61 +msgid "" +"\n" +" --verify[=OPTS] verify the integrity of the store; OPTS is a\n" +" comma-separated combination of 'repair' and\n" +" 'contents'" +msgstr "" + +#: guix/scripts/gc.scm:65 +#, fuzzy +#| msgid "" +#| "\n" +#| " --list-dead list dead paths" +msgid "" +"\n" +" --list-failures list cached build failures" +msgstr "" +"\n" +" --list-dead lister les chemins non valides" + +#: guix/scripts/gc.scm:67 +msgid "" +"\n" +" --clear-failures remove PATHS from the set of cached failures" +msgstr "" + +#: guix/scripts/gc.scm:96 #, scheme-format msgid "invalid amount of storage: ~a~%" msgstr "quantité de stockage non valide: ~a~%" -#: guix/scripts/hash.scm:45 +#: guix/scripts/gc.scm:187 +#, fuzzy, scheme-format +#| msgid "~A: extraneous argument~%" +msgid "extraneous arguments: ~{~a ~}~%" +msgstr "~A: argument superflu~%" + +#: guix/scripts/hash.scm:46 msgid "" "Usage: guix hash [OPTION] FILE\n" "Return the cryptographic hash of FILE.\n" @@ -639,7 +891,7 @@ msgstr "" "Formats supportés: 'nix-base32' (défaut), 'base32', et 'base16' ('hex'\n" "et 'hexadecimal' peuvent également être utilisés).\n" -#: guix/scripts/hash.scm:52 +#: guix/scripts/hash.scm:53 msgid "" "\n" " -r, --recursive compute the hash on FILE recursively" @@ -647,38 +899,139 @@ msgstr "" "\n" " -r, --recursive calculer l'empreinte de FICHIER de manière récursive" -#: guix/scripts/hash.scm:103 +#: guix/scripts/hash.scm:104 #, scheme-format msgid "unrecognized option: ~a~%" msgstr "option non reconnue: ~a~%" -#: guix/scripts/hash.scm:134 guix/ui.scm:252 +#: guix/scripts/hash.scm:135 guix/ui.scm:460 #, scheme-format msgid "~a~%" msgstr "~a~%" -#: guix/scripts/hash.scm:137 +#: guix/scripts/hash.scm:138 guix/scripts/system.scm:761 #, scheme-format msgid "wrong number of arguments~%" msgstr "nombre d'arguments incorrect~%" -#: guix/scripts/pull.scm:72 +#: guix/scripts/import.scm:85 +#, fuzzy +#| msgid "" +#| "Usage: guix COMMAND ARGS...\n" +#| "Run COMMAND with ARGS.\n" msgid "" -"Usage: guix pull [OPTION]...\n" -"Download and deploy the latest version of Guix.\n" +"Usage: guix import IMPORTER ARGS ...\n" +"Run IMPORTER with ARGS.\n" msgstr "" -"Usage: guix pull [OPTION]...\n" -"Télécharger et déployer la dernière version de Guix.\n" +"Usage: guix COMMANDE ARGS...\n" +"Lance la COMMANDE avec les arguments ARGS.\n" -#: guix/scripts/pull.scm:76 -msgid "" +#: guix/scripts/import.scm:88 +#, fuzzy +#| msgid "COMMAND must be one of the sub-commands listed below:\n" +msgid "IMPORTER must be one of the importers listed below:\n" +msgstr "COMMANDE doit être une des sous-commandes listées ci-dessous:\n" + +#: guix/scripts/import.scm:102 +#, fuzzy, scheme-format +#| msgid "guix: missing command name~%" +msgid "guix import: missing importer name~%" +msgstr "guix: nom de commande manquant~%" + +#: guix/scripts/import.scm:113 +#, scheme-format +msgid "guix import: invalid importer~%" +msgstr "" + +#: guix/scripts/import/cran.scm:42 +msgid "" +"Usage: guix import cran PACKAGE-NAME\n" +"Import and convert the CRAN package for PACKAGE-NAME.\n" +msgstr "" + +#: guix/scripts/import/cran.scm:44 +msgid "" +"\n" +" -a, --archive=ARCHIVE specify the archive repository" +msgstr "" + +#: guix/scripts/import/cran.scm:94 +#, fuzzy, scheme-format +#| msgid "failed to load operating system file '~a': ~s~%" +msgid "failed to download description for package '~a'~%" +msgstr "impossible de charger le fichier du système d'exploitation \"~a\": ~s~%" + +#: guix/scripts/import/cran.scm:98 guix/scripts/import/elpa.scm:95 +#, fuzzy, scheme-format +#| msgid "wrong number of arguments~%" +msgid "too few arguments~%" +msgstr "nombre d'arguments incorrect~%" + +#: guix/scripts/import/cran.scm:100 guix/scripts/import/elpa.scm:97 +#, fuzzy, scheme-format +#| msgid "wrong arguments" +msgid "too many arguments~%" +msgstr "arguments non valides" + +#: guix/scripts/import/elpa.scm:41 +msgid "" +"Usage: guix import elpa PACKAGE-NAME\n" +"Import the latest package named PACKAGE-NAME from an ELPA repository.\n" +msgstr "" + +#: guix/scripts/import/elpa.scm:43 +msgid "" +"\n" +" -a, --archive=ARCHIVE specify the archive repository" +msgstr "" + +#: guix/scripts/import/elpa.scm:45 +#, fuzzy +#| msgid "" +#| "\n" +#| " -h, --help display this help and exit" +msgid "" +"\n" +" -h, --help display this help and exit" +msgstr "" +"\n" +" -h, --help afficher cette aide et quitter" + +#: guix/scripts/import/elpa.scm:47 +#, fuzzy +#| msgid "" +#| "\n" +#| " -V, --version display version information and exit" +msgid "" +"\n" +" -V, --version display version information and exit" +msgstr "" +"\n" +" -V, --version afficher les informations sur la version et quitter" + +#: guix/scripts/import/elpa.scm:92 +#, fuzzy, scheme-format +#| msgid "failed to install locale: ~a~%" +msgid "failed to download package '~a'~%" +msgstr "impossible d'installer la locale: ~a~%" + +#: guix/scripts/pull.scm:74 +msgid "" +"Usage: guix pull [OPTION]...\n" +"Download and deploy the latest version of Guix.\n" +msgstr "" +"Usage: guix pull [OPTION]...\n" +"Télécharger et déployer la dernière version de Guix.\n" + +#: guix/scripts/pull.scm:78 +msgid "" "\n" " --url=URL download the Guix tarball from URL" msgstr "" "\n" " --url=URL télécharger le tarball de Guix depuis URL" -#: guix/scripts/pull.scm:78 +#: guix/scripts/pull.scm:80 msgid "" "\n" " --bootstrap use the bootstrap Guile to build the new Guix" @@ -686,131 +1039,142 @@ msgstr "" "\n" " --bootstrap utiliser le programme d'amorçage Guile pour compiler le nouveau Guix" -#: guix/scripts/pull.scm:132 +#: guix/scripts/pull.scm:134 msgid "tarball did not produce a single source directory" msgstr "la tarball n'a produit aucun répertoire source" -#: guix/scripts/pull.scm:150 +#: guix/scripts/pull.scm:152 #, scheme-format msgid "unpacking '~a'...~%" msgstr "dépaquetage \"~a\"...~%" -#: guix/scripts/pull.scm:159 +#: guix/scripts/pull.scm:161 msgid "failed to unpack source code" msgstr "échec du dépaquetage du code source" -#: guix/scripts/pull.scm:200 +#: guix/scripts/pull.scm:204 +msgid "Guix already up to date\n" +msgstr "Guix est déja à jour\n" + +#: guix/scripts/pull.scm:209 #, scheme-format msgid "updated ~a successfully deployed under `~a'~%" msgstr "~a a été mis à jour et déployé avec succès sous \"~a\"~%" -#: guix/scripts/pull.scm:203 +#: guix/scripts/pull.scm:212 #, scheme-format msgid "failed to update Guix, check the build log~%" msgstr "échec de la mise à jour de Guix; consultez le journal de compilation~%" -#: guix/scripts/pull.scm:205 -msgid "Guix already up to date\n" -msgstr "Guix est déja à jour\n" - -#: guix/scripts/pull.scm:215 +#: guix/scripts/pull.scm:221 #, scheme-format msgid "~A: unexpected argument~%" msgstr "~A: argument inattendu~%" -#: guix/scripts/pull.scm:224 +#: guix/scripts/pull.scm:230 msgid "failed to download up-to-date source, exiting\n" msgstr "impossible de télécharger une source à jour; fin\n" -#: guix/scripts/substitute-binary.scm:80 +#: guix/scripts/substitute.scm:103 #, scheme-format msgid "authentication and authorization of substitutes disabled!~%" msgstr "authentification et autorisation des substituts désactivées !~%" -#: guix/scripts/substitute-binary.scm:163 +#: guix/scripts/substitute.scm:179 #, scheme-format msgid "download from '~a' failed: ~a, ~s~%" msgstr "le téléchargement depuis '~a' a échoué: ~a, ~s~%" -#: guix/scripts/substitute-binary.scm:178 -#, scheme-format -msgid "while fetching ~a: server is unresponsive~%" +#: guix/scripts/substitute.scm:191 +#, fuzzy, scheme-format +#| msgid "while fetching ~a: server is unresponsive~%" +msgid "while fetching ~a: server is somewhat slow~%" msgstr "pendant la recherche de ~a: le serveur ne répond pas~%" -#: guix/scripts/substitute-binary.scm:180 +#: guix/scripts/substitute.scm:193 #, scheme-format msgid "try `--no-substitutes' if the problem persists~%" msgstr "essayez l'option \"--no-substitutes\" si le problème persiste~%" -#: guix/scripts/substitute-binary.scm:244 -#, scheme-format -msgid "signature version must be a number: ~a~%" +#: guix/scripts/substitute.scm:266 +#, fuzzy, scheme-format +#| msgid "signature version must be a number: ~a~%" +msgid "signature version must be a number: ~s~%" msgstr "la version de la signature doit être un nombre: ~a~%" -#: guix/scripts/substitute-binary.scm:248 +#: guix/scripts/substitute.scm:270 #, scheme-format msgid "unsupported signature version: ~a~%" msgstr "version de signature non supportée: ~a~%" -#: guix/scripts/substitute-binary.scm:256 +#: guix/scripts/substitute.scm:278 #, scheme-format msgid "signature is not a valid s-expression: ~s~%" msgstr "la signature n'est pas une s-expression valide: ~s~%" -#: guix/scripts/substitute-binary.scm:260 +#: guix/scripts/substitute.scm:282 #, scheme-format msgid "invalid format of the signature field: ~a~%" msgstr "signature non valide pour \"~a\"~%" -#: guix/scripts/substitute-binary.scm:295 +#: guix/scripts/substitute.scm:317 #, scheme-format msgid "invalid signature for '~a'~%" msgstr "signature non valide pour \"~a\"~%" -#: guix/scripts/substitute-binary.scm:297 +#: guix/scripts/substitute.scm:319 #, scheme-format msgid "hash mismatch for '~a'~%" msgstr "empreinte non valide pour \"~a\"~%" -#: guix/scripts/substitute-binary.scm:299 +#: guix/scripts/substitute.scm:321 #, scheme-format msgid "'~a' is signed with an unauthorized key~%" msgstr "\"~a\" est signé avec une clé non autorisée~%" -#: guix/scripts/substitute-binary.scm:301 +#: guix/scripts/substitute.scm:323 #, scheme-format msgid "signature on '~a' is corrupt~%" msgstr "la signature de \"~a\" est corrompue~%" -#: guix/scripts/substitute-binary.scm:338 +#: guix/scripts/substitute.scm:361 #, scheme-format msgid "substitute at '~a' lacks a signature~%" msgstr "le substitut à \"~a\" requiert une signature~%" -#: guix/scripts/substitute-binary.scm:526 +#: guix/scripts/substitute.scm:537 +#, scheme-format +msgid "updating list of substitutes from '~a'... ~5,1f%" +msgstr "" + +#: guix/scripts/substitute.scm:585 #, scheme-format -msgid "Downloading, please wait...~%" -msgstr "Téléchargement en cours..." +msgid "~s: unsupported server URI scheme~%" +msgstr "" -#: guix/scripts/substitute-binary.scm:528 +#: guix/scripts/substitute.scm:596 #, scheme-format -msgid "(Please consider upgrading Guile to get proper progress report.)~%" -msgstr "(Veuillez mettre Guile à jour pour obtenir le rapport de progression approprié.)~%" +msgid "'~a' uses different store '~a'; ignoring it~%" +msgstr "" -#: guix/scripts/substitute-binary.scm:541 +#: guix/scripts/substitute.scm:739 #, scheme-format msgid "host name lookup error: ~a~%" msgstr "erreur lors de la consultation du nom d'hôte: ~a~%" -#: guix/scripts/substitute-binary.scm:550 +#: guix/scripts/substitute.scm:748 +#, fuzzy +#| msgid "" +#| "Usage: guix substitute-binary [OPTION]...\n" +#| "Internal tool to substitute a pre-built binary to a local build.\n" msgid "" -"Usage: guix substitute-binary [OPTION]...\n" +"Usage: guix substitute [OPTION]...\n" "Internal tool to substitute a pre-built binary to a local build.\n" msgstr "" "Usage: guix substitute-binary [OPTION]...\n" "Outil interne pour substituer un binaire pré-compilé à une compilation locale.\n" -#: guix/scripts/substitute-binary.scm:552 +#: guix/scripts/substitute.scm:750 msgid "" "\n" " --query report on the availability of substitutes for the\n" @@ -821,7 +1185,7 @@ msgstr "" " noms de fichier de dépôt passés sur l'entrée\n" " standard" -#: guix/scripts/substitute-binary.scm:555 +#: guix/scripts/substitute.scm:753 msgid "" "\n" " --substitute STORE-FILE DESTINATION\n" @@ -833,21 +1197,11 @@ msgstr "" " télécharger FICHIER-DEPOT et l'enregistrer comme un Nar\n" " dans le fichier DESTINATION" -#: guix/scripts/substitute-binary.scm:600 +#: guix/scripts/substitute.scm:878 msgid "ACL for archive imports seems to be uninitialized, substitutes may be unavailable\n" msgstr "l'ACL pour l'import d'archives ne semble pas initialisée ; les substituts pourraient être indisponibles\n" -#: guix/scripts/substitute-binary.scm:634 -#, scheme-format -msgid "these substitute URLs will not be used:~{ ~a~}~%" -msgstr "ces URL de substitution ne seront pas utilisées:~{ ~a~}~%" - -#: guix/scripts/substitute-binary.scm:660 -#, scheme-format -msgid "failed to look up host '~a' (~a), substituter disabled~%" -msgstr "impossible de trouver l'hôte \"~a\" (~a), substitution désactivée~%" - -#: guix/scripts/substitute-binary.scm:767 +#: guix/scripts/substitute.scm:960 #, scheme-format msgid "~a: unrecognized options~%" msgstr "~a: options non reconnues~%" @@ -872,7 +1226,7 @@ msgstr "error: clé publique non autorisée: ~a~%" msgid "error: corrupt signature data: ~a~%" msgstr "erreur: signature corrompue: ~a~%" -#: guix/scripts/authenticate.scm:126 +#: guix/scripts/authenticate.scm:120 msgid "" "Usage: guix authenticate OPTION...\n" "Sign or verify the signature on the given file. This tool is meant to\n" @@ -882,215 +1236,950 @@ msgstr "" "Signer ou vérifier la signature du fichier donné. Cet outil est destiné\n" "à être utilisé en interne par \"guix-daemon\".\n" -#: guix/scripts/authenticate.scm:132 +#: guix/scripts/authenticate.scm:126 msgid "wrong arguments" msgstr "arguments non valides" -#: guix/scripts/system.scm:74 +#: guix/scripts/system.scm:111 #, scheme-format -msgid "failed to open operating system file '~a': ~a~%" -msgstr "impossible d'ouvrir le fichier du système d'exploitation \"~a\": ~a~%" +msgid "failed to register '~a' under '~a'~%" +msgstr "impossible d'enregistrer \"~a\" sous \"~a\"~%" -#: guix/scripts/system.scm:78 guix/ui.scm:258 +#: guix/scripts/system.scm:143 #, scheme-format -msgid "~a: ~a~%" +msgid "failed to install GRUB on device '~a'~%" +msgstr "échec de l'installation de GRUB sur le périphérique \"~a\"~%" + +#: guix/scripts/system.scm:161 +#, scheme-format +msgid "initializing the current root file system~%" +msgstr "initialisation du système de fichier racine courant~%" + +#: guix/scripts/system.scm:175 +#, scheme-format +msgid "not running as 'root', so the ownership of '~a' may be incorrect!~%" +msgstr "" + +#: guix/scripts/system.scm:233 +#, scheme-format +msgid "while talking to shepherd: ~a~%" +msgstr "" + +#: guix/scripts/system.scm:279 +#, fuzzy, scheme-format +#| msgid "unpacking '~a'...~%" +msgid "unloading service '~a'...~%" +msgstr "dépaquetage \"~a\"...~%" + +#: guix/scripts/system.scm:287 +#, scheme-format +msgid "loading new services:~{ ~a~}...~%" +msgstr "" + +#: guix/scripts/system.scm:311 +#, scheme-format +msgid "activating system...~%" +msgstr "activation du système...~%" + +#: guix/scripts/system.scm:402 +msgid "the DAG of services" +msgstr "" + +#: guix/scripts/system.scm:415 +msgid "the dependency graph of shepherd services" +msgstr "" + +#: guix/scripts/system.scm:436 +#, fuzzy, scheme-format +#| msgid "invalid number: ~a~%" +msgid " file name: ~a~%" +msgstr "nombre non valide: ~a~%" + +#: guix/scripts/system.scm:437 +#, scheme-format +msgid " canonical file name: ~a~%" +msgstr "" + +#. TRANSLATORS: Please preserve the two-space indentation. +#: guix/scripts/system.scm:439 +#, fuzzy, scheme-format +#| msgid "~a: ~a~%" +msgid " label: ~a~%" msgstr "~a: ~a~%" -#: guix/scripts/system.scm:81 +#: guix/scripts/system.scm:440 #, scheme-format -msgid "failed to load operating system file '~a': ~s~%" -msgstr "impossible de charger le fichier du système d'exploitation \"~a\": ~s~%" +msgid " root device: ~a~%" +msgstr "" -#: guix/scripts/system.scm:116 +#: guix/scripts/system.scm:441 #, scheme-format -msgid "failed to register '~a' under '~a'~%" -msgstr "impossible d'enregistrer \"~a\" sous \"~a\"~%" +msgid " kernel: ~a~%" +msgstr "" + +#: guix/scripts/system.scm:549 +#, scheme-format +msgid "initializing operating system under '~a'...~%" +msgstr "initialisation du système d'exploitation sous \"~a\"...~%" + +#: guix/scripts/system.scm:588 +#, fuzzy +#| msgid "" +#| "Usage: guix system [OPTION] ACTION FILE\n" +#| "Build the operating system declared in FILE according to ACTION.\n" +msgid "" +"Usage: guix system [OPTION] ACTION [FILE]\n" +"Build the operating system declared in FILE according to ACTION.\n" +msgstr "" +"Usage: guix system [OPTION] ACTION FICHIER\n" +"Compiler le système d'exploitation déclaré dans FICHER en suivant ACTION.\n" + +#: guix/scripts/system.scm:591 guix/scripts/container.scm:28 +msgid "The valid values for ACTION are:\n" +msgstr "Les valeurs possibles pour ACTION sont: \n" + +#: guix/scripts/system.scm:593 +#, fuzzy +#| msgid " - 'reconfigure', switch to a new operating system configuration\n" +msgid " reconfigure switch to a new operating system configuration\n" +msgstr " - 'reconfigure', changer la configuration du système d'exploitation\n" + +#: guix/scripts/system.scm:595 +msgid " list-generations list the system generations\n" +msgstr "" + +#: guix/scripts/system.scm:597 +#, fuzzy +#| msgid " - 'build', build the operating system without installing anything\n" +msgid " build build the operating system without installing anything\n" +msgstr " - 'build', compiler le système d'exploitation sans rien installer\n" + +#: guix/scripts/system.scm:599 +#, fuzzy +#| msgid " - 'vm', build a virtual machine image that shares the host's store\n" +msgid " container build a container that shares the host's store\n" +msgstr " - 'vm', compiler une machine virtuelle partageant le dépôt de l'hôte\n" + +#: guix/scripts/system.scm:601 +#, fuzzy +#| msgid " - 'vm', build a virtual machine image that shares the host's store\n" +msgid " vm build a virtual machine image that shares the host's store\n" +msgstr " - 'vm', compiler une machine virtuelle partageant le dépôt de l'hôte\n" + +#: guix/scripts/system.scm:603 +#, fuzzy +#| msgid " - 'vm-image', build a freestanding virtual machine image\n" +msgid " vm-image build a freestanding virtual machine image\n" +msgstr " - 'vm-image', compiler une image autonome de machine virtuelle\n" + +#: guix/scripts/system.scm:605 +#, fuzzy +#| msgid " - 'disk-image', build a disk image, suitable for a USB stick\n" +msgid " disk-image build a disk image, suitable for a USB stick\n" +msgstr " - 'disk-image', compiler une image disque adaptée pour une clé USB\n" + +#: guix/scripts/system.scm:607 +#, fuzzy +#| msgid " - 'init', initialize a root file system to run GNU.\n" +msgid " init initialize a root file system to run GNU\n" +msgstr " - 'init', initialiser un système de fichier racine pour lancer GNU.\n" + +#: guix/scripts/system.scm:609 +msgid " extension-graph emit the service extension graph in Dot format\n" +msgstr "" + +#: guix/scripts/system.scm:611 +msgid " shepherd-graph emit the graph of shepherd services in Dot format\n" +msgstr "" + +#: guix/scripts/system.scm:615 +#, fuzzy +#| msgid "" +#| "\n" +#| " -d, --derivations return the derivation paths of the given packages" +msgid "" +"\n" +" -d, --derivation return the derivation of the given system" +msgstr "" +"\n" +" -d, --derivations retourner les chemins de dérivation pour les paquets donnés" + +#: guix/scripts/system.scm:617 +#, fuzzy +#| msgid "" +#| "\n" +#| " --with-source=SOURCE\n" +#| " use SOURCE when building the corresponding package" +msgid "" +"\n" +" --on-error=STRATEGY\n" +" apply STRATEGY when an error occurs while reading FILE" +msgstr "" +"\n" +" --with-source=SOURCE\n" +" utiliser la SOURCE donnée pour compiler le paquet correspondant" + +#: guix/scripts/system.scm:620 +msgid "" +"\n" +" --image-size=SIZE for 'vm-image', produce an image of SIZE" +msgstr "" +"\n" +" --image-size=TAILLE pour 'vm-image', produire une image de TAILLE" + +#: guix/scripts/system.scm:622 +msgid "" +"\n" +" --no-grub for 'init', do not install GRUB" +msgstr "" +"\n" +" --no-grub pour 'init', ne pas installer GRUB" + +#: guix/scripts/system.scm:624 +msgid "" +"\n" +" --share=SPEC for 'vm', share host file system according to SPEC" +msgstr "" + +#: guix/scripts/system.scm:626 +msgid "" +"\n" +" --expose=SPEC for 'vm', expose host file system according to SPEC" +msgstr "" + +#: guix/scripts/system.scm:628 +msgid "" +"\n" +" --full-boot for 'vm', make a full boot sequence" +msgstr "" +"\n" +" --full-boot pour 'vm', accomplire une séquence complète de démarrage" + +#: guix/scripts/system.scm:713 +#, scheme-format +msgid "no configuration file specified~%" +msgstr "aucun fichier de configuration spécifié~%" + +#: guix/scripts/system.scm:776 +#, scheme-format +msgid "~a: unknown action~%" +msgstr "~a: action inconnue~%" + +#: guix/scripts/system.scm:791 +#, scheme-format +msgid "wrong number of arguments for action '~a'~%" +msgstr "nombre d'arguments incorrect pour l'action \"~a\"~%" + +#: guix/scripts/system.scm:796 +#, fuzzy, scheme-format +#| msgid "guix: missing command name~%" +msgid "guix system: missing command name~%" +msgstr "guix: nom de commande manquant~%" + +#: guix/scripts/system.scm:798 +#, fuzzy, scheme-format +#| msgid "Try `guix --help' for more information.~%" +msgid "Try 'guix system --help' for more information.~%" +msgstr "Essayez \"guix --help\" pour plus d'informations.~%" + +#: guix/scripts/lint.scm:127 +#, scheme-format +msgid "Available checkers:~%" +msgstr "Vérificateurs disponibles:~%" + +#: guix/scripts/lint.scm:147 +msgid "description should not be empty" +msgstr "" + +#: guix/scripts/lint.scm:157 +msgid "Texinfo markup in description is invalid" +msgstr "" + +#: guix/scripts/lint.scm:165 +msgid "description should start with an upper-case letter or digit" +msgstr "" + +#: guix/scripts/lint.scm:181 +#, scheme-format +msgid "" +"sentences in description should be followed ~\n" +"by two spaces; possible infraction~p at ~{~a~^, ~}" +msgstr "" + +#: guix/scripts/lint.scm:205 +msgid "pkg-config should probably be a native input" +msgstr "" + +#: guix/scripts/lint.scm:220 +msgid "synopsis should not be empty" +msgstr "" + +#: guix/scripts/lint.scm:228 +msgid "no period allowed at the end of the synopsis" +msgstr "" + +#: guix/scripts/lint.scm:240 +msgid "no article allowed at the beginning of the synopsis" +msgstr "" + +#: guix/scripts/lint.scm:247 +msgid "synopsis should be less than 80 characters long" +msgstr "" + +#: guix/scripts/lint.scm:253 +msgid "synopsis should start with an upper-case letter or digit" +msgstr "" + +#: guix/scripts/lint.scm:260 +msgid "synopsis should not start with the package name" +msgstr "" + +#: guix/scripts/lint.scm:354 guix/scripts/lint.scm:366 +#, scheme-format +msgid "URI ~a not reachable: ~a (~s)" +msgstr "" + +#: guix/scripts/lint.scm:373 +#, fuzzy, scheme-format +#| msgid "guix: ~a: command not found~%" +msgid "URI ~a domain not found: ~a" +msgstr "guix: ~a: commande introuvable~%" + +#: guix/scripts/lint.scm:381 +#, scheme-format +msgid "URI ~a unreachable: ~a" +msgstr "" + +#: guix/scripts/lint.scm:407 +#, fuzzy +#| msgid "The valid values for ACTION are:\n" +msgid "invalid value for home page" +msgstr "Les valeurs possibles pour ACTION sont: \n" + +#: guix/scripts/lint.scm:410 +#, fuzzy, scheme-format +#| msgid "" +#| "\n" +#| "~a home page: <~a>" +msgid "invalid home page URL: ~s" +msgstr "" +"\n" +"~a page d'accueil: <~a>" + +#: guix/scripts/lint.scm:430 +msgid "file names of patches should start with the package name" +msgstr "" + +#: guix/scripts/lint.scm:467 +#, scheme-format +msgid "~a: ~a: proposed synopsis: ~s~%" +msgstr "" + +#: guix/scripts/lint.scm:479 +#, scheme-format +msgid "~a: ~a: proposed description:~% \"~a\"~%" +msgstr "" + +#: guix/scripts/lint.scm:516 +msgid "all the source URIs are unreachable:" +msgstr "" + +#: guix/scripts/lint.scm:539 +msgid "the source file name should contain the package name" +msgstr "" + +#: guix/scripts/lint.scm:548 guix/scripts/lint.scm:552 +#, fuzzy, scheme-format +#| msgid "failed to create GC root `~a': ~a~%" +msgid "failed to create derivation: ~a" +msgstr "impossible de créer la racine du GC \"~a\": ~a~%" + +#: guix/scripts/lint.scm:566 +#, fuzzy, scheme-format +#| msgid "failed to read expression ~s: ~s~%" +msgid "failed to create derivation: ~s~%" +msgstr "impossible de lire l'expression ~s: ~s~%" + +#: guix/scripts/lint.scm:576 +msgid "invalid license field" +msgstr "" + +#: guix/scripts/lint.scm:602 +#, scheme-format +msgid "failed to retrieve CVE vulnerabilities from ~s: ~a (~s)~%" +msgstr "" + +#: guix/scripts/lint.scm:607 guix/scripts/lint.scm:615 +#, scheme-format +msgid "assuming no CVE vulnerabilities~%" +msgstr "" + +#: guix/scripts/lint.scm:613 +#, fuzzy, scheme-format +#| msgid "failed to install locale: ~a~%" +msgid "failed to lookup NIST host: ~a~%" +msgstr "impossible d'installer la locale: ~a~%" + +#: guix/scripts/lint.scm:644 +#, scheme-format +msgid "probably vulnerable to ~a" +msgstr "" + +#: guix/scripts/lint.scm:659 +#, scheme-format +msgid "tabulation on line ~a, column ~a" +msgstr "" + +#: guix/scripts/lint.scm:668 +#, scheme-format +msgid "trailing white space on line ~a" +msgstr "" + +#: guix/scripts/lint.scm:678 +#, scheme-format +msgid "line ~a is way too long (~a characters)" +msgstr "" + +#: guix/scripts/lint.scm:689 +#, scheme-format +msgid "line ~a: parentheses feel lonely, move to the previous or next line" +msgstr "" + +#: guix/scripts/lint.scm:744 +msgid "Validate package descriptions" +msgstr "Validers des descriptions de paquets" + +#: guix/scripts/lint.scm:748 +#, fuzzy +#| msgid "Validate package descriptions" +msgid "Validate synopsis & description of GNU packages" +msgstr "Validers des descriptions de paquets" + +#: guix/scripts/lint.scm:752 +msgid "Identify inputs that should be native inputs" +msgstr "Identifier les entrées qui devraient être natives" + +#: guix/scripts/lint.scm:756 +#, fuzzy +#| msgid "Validate filenames of patches" +msgid "Validate file names and availability of patches" +msgstr "Valider les noms de patches" + +#: guix/scripts/lint.scm:760 +#, fuzzy +#| msgid "Validate package synopsis" +msgid "Validate home-page URLs" +msgstr "Valider les synopsis de paquets" + +#. TRANSLATORS: is the name of a data type and must not be +#. translated. +#: guix/scripts/lint.scm:766 +msgid "Make sure the 'license' field is a or a list thereof" +msgstr "" + +#: guix/scripts/lint.scm:771 +msgid "Validate source URLs" +msgstr "" + +#: guix/scripts/lint.scm:775 +#, fuzzy +#| msgid "Validate filenames of patches" +msgid "Validate file names of sources" +msgstr "Valider les noms de patches" + +#: guix/scripts/lint.scm:779 +msgid "Report failure to compile a package to a derivation" +msgstr "" + +#: guix/scripts/lint.scm:783 +#, fuzzy +#| msgid "Validate package synopsis" +msgid "Validate package synopses" +msgstr "Valider les synopsis de paquets" + +#: guix/scripts/lint.scm:787 +msgid "Check the Common Vulnerabilities and Exposures (CVE) database" +msgstr "" + +#: guix/scripts/lint.scm:792 +msgid "Look for formatting issues in the source" +msgstr "" + +#: guix/scripts/lint.scm:817 +#, fuzzy +#| msgid "" +#| "Usage: guix lint [OPTION]... [PACKAGE]...\n" +#| "Run a set of checkers on the specified package; if none is specified, run the checkers on all packages.\n" +msgid "" +"Usage: guix lint [OPTION]... [PACKAGE]...\n" +"Run a set of checkers on the specified package; if none is specified,\n" +"run the checkers on all packages.\n" +msgstr "" +"Usage: guix lint [OPTION]... [PAQUET]...\n" +"Lancer un ensemble de vérificateurs sur le paquet spécifié; si aucun n'est spécifié, lancer les vérificateurs sur tous les paquets.\n" + +#: guix/scripts/lint.scm:820 +#, fuzzy +#| msgid "" +#| "\n" +#| " -c, --checkers=CHECKER1,CHECKER2...\n" +#| " only run the specificed checkers" +msgid "" +"\n" +" -c, --checkers=CHECKER1,CHECKER2...\n" +" only run the specified checkers" +msgstr "" +"\n" +" -c, --checkers=CHECKER1,CHECKER2...\n" +" lancer uniquement les vérificateurs spécifiés" + +#: guix/scripts/lint.scm:825 +msgid "" +"\n" +" -l, --list-checkers display the list of available lint checkers" +msgstr "" +"\n" +" -l, --list-checkers affiche la liste des vérificateurs disponibles" + +#: guix/scripts/lint.scm:845 +#, fuzzy, scheme-format +#| msgid "~a: invalid checker" +msgid "~a: invalid checker~%" +msgstr "~a: vérificateur non valide" + +#: guix/scripts/publish.scm:52 +#, scheme-format +msgid "" +"Usage: guix publish [OPTION]...\n" +"Publish ~a over HTTP.\n" +msgstr "" + +#: guix/scripts/publish.scm:54 +msgid "" +"\n" +" -p, --port=PORT listen on PORT" +msgstr "" + +#: guix/scripts/publish.scm:56 +#, fuzzy +#| msgid "" +#| "\n" +#| " --references list the references of PATHS" +msgid "" +"\n" +" --listen=HOST listen on the network interface for HOST" +msgstr "" +"\n" +" --references lister les références de CHEMINS" + +#: guix/scripts/publish.scm:58 +msgid "" +"\n" +" -u, --user=USER change privileges to USER as soon as possible" +msgstr "" + +#: guix/scripts/publish.scm:60 +msgid "" +"\n" +" -r, --repl[=PORT] spawn REPL server on PORT" +msgstr "" + +#: guix/scripts/publish.scm:76 +#, fuzzy, scheme-format +#| msgid "download from '~a' failed: ~a, ~s~%" +msgid "lookup of host '~a' failed: ~a~%" +msgstr "le téléchargement depuis '~a' a échoué: ~a, ~s~%" + +#: guix/scripts/publish.scm:100 +#, scheme-format +msgid "lookup of host '~a' returned nothing" +msgstr "" + +#: guix/scripts/publish.scm:342 +#, scheme-format +msgid "user '~a' not found: ~a~%" +msgstr "" + +#: guix/scripts/publish.scm:377 +#, scheme-format +msgid "server running as root; consider using the '--user' option!~%" +msgstr "" + +#: guix/scripts/publish.scm:379 +#, scheme-format +msgid "publishing ~a on ~a, port ~d~%" +msgstr "" + +#: guix/scripts/edit.scm:41 +msgid "" +"Usage: guix edit PACKAGE...\n" +"Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n" +msgstr "" + +#: guix/scripts/edit.scm:62 +#, scheme-format +msgid "file '~a' not found in search path ~s~%" +msgstr "" + +#: guix/scripts/edit.scm:83 +#, scheme-format +msgid "source location of package '~a' is unknown~%" +msgstr "" + +#: guix/scripts/edit.scm:96 +#, fuzzy, scheme-format +#| msgid "failed to connect to `~a': ~a~%" +msgid "failed to launch '~a': ~a~%" +msgstr "impossible de se connecter à \"~a\": ~a~%" + +#: guix/scripts/size.scm:75 +#, scheme-format +msgid "no available substitute information for '~a'~%" +msgstr "" + +#: guix/scripts/size.scm:83 +msgid "store item" +msgstr "" + +#: guix/scripts/size.scm:83 +msgid "total" +msgstr "" + +#: guix/scripts/size.scm:83 +msgid "self" +msgstr "" + +#. TRANSLATORS: This is the title of a graph, meaning that the graph +#. represents a profile of the store (the "store" being the place where +#. packages are stored.) +#: guix/scripts/size.scm:204 +msgid "store profile" +msgstr "" + +#: guix/scripts/size.scm:213 +#, fuzzy +#| msgid "" +#| "Usage: guix package [OPTION]... PACKAGES...\n" +#| "Install, remove, or upgrade PACKAGES in a single transaction.\n" +msgid "" +"Usage: guix size [OPTION]... PACKAGE\n" +"Report the size of PACKAGE and its dependencies.\n" +msgstr "" +"Usage: guix package [OPTION]... PAQUETS...\n" +"Installer, supprimer ou mettre à jour les PAQUETS spécifiés en une seule transaction.\n" + +#: guix/scripts/size.scm:218 +#, fuzzy +#| msgid "" +#| "\n" +#| " -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"" +msgid "" +"\n" +" -s, --system=SYSTEM consider packages for SYSTEM--e.g., \"i686-linux\"" +msgstr "" +"\n" +" -s, --system=SYSTEME essayer de compiler pour le SYSTEME donné, par exemple \"i686-linux\"" -#: guix/scripts/system.scm:144 -#, scheme-format -msgid "initializing the current root file system~%" -msgstr "initialisation du système de fichier racine courant~%" +#: guix/scripts/size.scm:220 +msgid "" +"\n" +" -m, --map-file=FILE write to FILE a graphical map of disk usage" +msgstr "" -#: guix/scripts/system.scm:162 guix/scripts/system.scm:325 -#, scheme-format -msgid "failed to install GRUB on device '~a'~%" -msgstr "échec de l'installation de GRUB sur le périphérique \"~a\"~%" +#: guix/scripts/size.scm:274 +msgid "missing store item argument\n" +msgstr "" -#: guix/scripts/system.scm:197 -#, scheme-format -msgid "activating system...~%" -msgstr "activation du système...~%" +#: guix/scripts/size.scm:292 +#, fuzzy +#| msgid "wrong arguments" +msgid "too many arguments\n" +msgstr "arguments non valides" -#: guix/scripts/system.scm:239 -#, scheme-format -msgid "unrecognized boot parameters for '~a'~%" -msgstr "paramètres de démarrage non reconus pour \"~a\"~%" +#: guix/scripts/graph.scm:77 +msgid "the DAG of packages, excluding implicit inputs" +msgstr "" -#: guix/scripts/system.scm:330 -#, scheme-format -msgid "initializing operating system under '~a'...~%" -msgstr "initialisation du système d'exploitation sous \"~a\"...~%" +#: guix/scripts/graph.scm:133 +msgid "the DAG of packages, including implicit inputs" +msgstr "" -#: guix/scripts/system.scm:346 -msgid "" -"Usage: guix system [OPTION] ACTION FILE\n" -"Build the operating system declared in FILE according to ACTION.\n" +#: guix/scripts/graph.scm:142 +msgid "the DAG of packages and origins, including implicit inputs" msgstr "" -"Usage: guix system [OPTION] ACTION FICHIER\n" -"Compiler le système d'exploitation déclaré dans FICHER en suivant ACTION.\n" -#: guix/scripts/system.scm:349 -msgid "The valid values for ACTION are:\n" -msgstr "Les valeurs possibles pour ACTION sont: \n" +#: guix/scripts/graph.scm:172 +msgid "same as 'bag', but without the bootstrap nodes" +msgstr "" -#: guix/scripts/system.scm:350 -msgid " - 'reconfigure', switch to a new operating system configuration\n" -msgstr " - 'reconfigure', changer la configuration du système d'exploitation\n" +#: guix/scripts/graph.scm:217 +msgid "the DAG of derivations" +msgstr "" -#: guix/scripts/system.scm:352 -msgid " - 'build', build the operating system without installing anything\n" -msgstr " - 'build', compiler le système d'exploitation sans rien installer\n" +#: guix/scripts/graph.scm:241 +#, scheme-format +msgid "references for '~a' are not known~%" +msgstr "" -#: guix/scripts/system.scm:354 -msgid " - 'vm', build a virtual machine image that shares the host's store\n" -msgstr " - 'vm', compiler une machine virtuelle partageant le dépôt de l'hôte\n" +#: guix/scripts/graph.scm:248 +msgid "the DAG of run-time dependencies (store references)" +msgstr "" -#: guix/scripts/system.scm:356 -msgid " - 'vm-image', build a freestanding virtual machine image\n" -msgstr " - 'vm-image', compiler une image autonome de machine virtuelle\n" +#: guix/scripts/graph.scm:278 +#, fuzzy, scheme-format +#| msgid "~a: unknown action~%" +msgid "~a: unknown node type~%" +msgstr "~a: action inconnue~%" -#: guix/scripts/system.scm:358 -msgid " - 'disk-image', build a disk image, suitable for a USB stick\n" -msgstr " - 'disk-image', compiler une image disque adaptée pour une clé USB\n" +#: guix/scripts/graph.scm:282 +#, fuzzy +#| msgid "The valid values for ACTION are:\n" +msgid "The available node types are:\n" +msgstr "Les valeurs possibles pour ACTION sont: \n" -#: guix/scripts/system.scm:360 -msgid " - 'init', initialize a root file system to run GNU.\n" -msgstr " - 'init', initialiser un système de fichier racine pour lancer GNU.\n" +#. TRANSLATORS: Here 'dot' is the name of a program; it must not be +#. translated. +#: guix/scripts/graph.scm:318 +msgid "" +"Usage: guix graph PACKAGE...\n" +"Emit a Graphviz (dot) representation of the dependencies of PACKAGE...\n" +msgstr "" -#: guix/scripts/system.scm:364 +#: guix/scripts/graph.scm:320 msgid "" "\n" -" --image-size=SIZE for 'vm-image', produce an image of SIZE" +" -t, --type=TYPE represent nodes of the given TYPE" msgstr "" -"\n" -" --image-size=TAILLE pour 'vm-image', produire une image de TAILLE" -#: guix/scripts/system.scm:366 +#: guix/scripts/graph.scm:322 +#, fuzzy +#| msgid "" +#| "\n" +#| " --list-dead list dead paths" msgid "" "\n" -" --no-grub for 'init', do not install GRUB" +" --list-types list the available graph types" msgstr "" "\n" -" --no-grub pour 'init', ne pas installer GRUB" +" --list-dead lister les chemins non valides" -#: guix/scripts/system.scm:368 +#: guix/scripts/graph.scm:324 +#, fuzzy +#| msgid "" +#| "\n" +#| " -e, --expression=EXPR build the package or derivation EXPR evaluates to" msgid "" "\n" -" --full-boot for 'vm', make a full boot sequence" +" -e, --expression=EXPR consider the package EXPR evaluates to" msgstr "" "\n" -" --full-boot pour 'vm', accomplire une séquence complète de démarrage" +" -e, --expression=EXPR compiler le paquet ou la dérivation évalué par EXPR" -#: guix/scripts/system.scm:434 -#, scheme-format -msgid "~a: unknown action~%" -msgstr "~a: action inconnue~%" +#: guix/scripts/challenge.scm:104 +#, fuzzy, scheme-format +#| msgid "substitute at '~a' lacks a signature~%" +msgid "~a: no substitute at '~a'~%" +msgstr "le substitut à \"~a\" requiert une signature~%" -#: guix/scripts/system.scm:451 -#, scheme-format -msgid "wrong number of arguments for action '~a'~%" -msgstr "nombre d'arguments incorrect pour l'action \"~a\"~%" +#: guix/scripts/challenge.scm:120 +#, fuzzy, scheme-format +#| msgid "invalid signature for '~a'~%" +msgid "no substitutes for '~a'~%" +msgstr "signature non valide pour \"~a\"~%" -#: guix/scripts/system.scm:471 -#, scheme-format -msgid "no configuration file specified~%" -msgstr "aucun fichier de configuration spécifié~%" +#: guix/scripts/challenge.scm:137 guix/scripts/challenge.scm:157 +#, fuzzy, scheme-format +#| msgid "no build log for '~a'~%" +msgid "no local build for '~a'~%" +msgstr "aucun journal de compilation pour \"~a\"~%" -#: guix/scripts/lint.scm:51 +#: guix/scripts/challenge.scm:154 #, scheme-format -msgid "~a: ~a: ~a~%" +msgid "~a contents differ:~%" +msgstr "" + +#: guix/scripts/challenge.scm:156 +#, fuzzy, scheme-format +#| msgid "~a: ~a: ~a~%" +msgid " local hash: ~a~%" msgstr "~a: ~a: ~a~%" -#: guix/scripts/lint.scm:72 +#: guix/scripts/challenge.scm:161 +#, fuzzy, scheme-format +#| msgid "~a: ~a~%" +msgid " ~50a: ~a~%" +msgstr "~a: ~a~%" + +#: guix/scripts/challenge.scm:165 #, scheme-format -msgid "Available checkers:~%" -msgstr "Vérificateurs disponibles:~%" +msgid " ~50a: unavailable~%" +msgstr "" -#: guix/scripts/lint.scm:226 -msgid "Validate package descriptions" -msgstr "Validers des descriptions de paquets" +#: guix/scripts/challenge.scm:175 +msgid "" +"Usage: guix challenge [PACKAGE...]\n" +"Challenge the substitutes for PACKAGE... provided by one or more servers.\n" +msgstr "" -#: guix/scripts/lint.scm:230 -msgid "Identify inputs that should be native inputs" -msgstr "Identifier les entrées qui devraient être natives" +#: guix/scripts/challenge.scm:177 +#, fuzzy +#| msgid "" +#| "\n" +#| " --max-silent-time=SECONDS\n" +#| " mark the build as failed after SECONDS of silence" +msgid "" +"\n" +" --substitute-urls=URLS\n" +" compare build results with those at URLS" +msgstr "" +"\n" +" --max-silent-time=N\n" +" marquer la compilation comme ayant échouée après N secondes de silence" -#: guix/scripts/lint.scm:234 -msgid "Validate filenames of patches" -msgstr "Valider les noms de patches" +#: guix/gnu-maintenance.scm:542 +msgid "Updater for GNU packages" +msgstr "" -#: guix/scripts/lint.scm:238 -msgid "Validate package synopsis" -msgstr "Valider les synopsis de paquets" +#: guix/gnu-maintenance.scm:549 +msgid "Updater for GNOME packages" +msgstr "" -#: guix/scripts/lint.scm:257 -msgid "" -"Usage: guix lint [OPTION]... [PACKAGE]...\n" -"Run a set of checkers on the specified package; if none is specified, run the checkers on all packages.\n" +#: guix/gnu-maintenance.scm:556 +msgid "Updater for X.org packages" msgstr "" -"Usage: guix lint [OPTION]... [PAQUET]...\n" -"Lancer un ensemble de vérificateurs sur le paquet spécifié; si aucun n'est spécifié, lancer les vérificateurs sur tous les paquets.\n" -#: guix/scripts/lint.scm:259 +#: guix/scripts/container.scm:25 msgid "" -"\n" -" -c, --checkers=CHECKER1,CHECKER2...\n" -" only run the specificed checkers" +"Usage: guix container ACTION ARGS...\n" +"Build and manipulate Linux containers.\n" +msgstr "" + +#: guix/scripts/container.scm:30 +msgid " exec execute a command inside of an existing container\n" +msgstr "" + +#: guix/scripts/container.scm:53 +#, fuzzy, scheme-format +#| msgid "guix: missing command name~%" +msgid "guix container: missing action~%" +msgstr "guix: nom de commande manquant~%" + +#: guix/scripts/container.scm:63 +#, scheme-format +msgid "guix container: invalid action~%" msgstr "" -"\n" -" -c, --checkers=CHECKER1,CHECKER2...\n" -" lancer uniquement les vérificateurs spécifiés" -#: guix/scripts/lint.scm:264 +#: guix/scripts/container/exec.scm:40 msgid "" -"\n" -" -l, --list-checkers display the list of available lint checkers" +"Usage: guix container exec PID COMMAND [ARGS...]\n" +"Execute COMMMAND within the container process PID.\n" msgstr "" -"\n" -" -l, --list-checkers affiche la liste des vérificateurs disponibles" -#: guix/scripts/lint.scm:283 +#: guix/scripts/container/exec.scm:69 +#, fuzzy, scheme-format +#| msgid "~A: extraneous argument~%" +msgid "~a: extraneous argument~%" +msgstr "~A: argument superflu~%" + +#: guix/scripts/container/exec.scm:80 +#, fuzzy, scheme-format +#| msgid "no configuration file specified~%" +msgid "no pid specified~%" +msgstr "aucun fichier de configuration spécifié~%" + +#: guix/scripts/container/exec.scm:83 +#, fuzzy, scheme-format +#| msgid "no configuration file specified~%" +msgid "no command specified~%" +msgstr "aucun fichier de configuration spécifié~%" + +#: guix/scripts/container/exec.scm:86 #, scheme-format -msgid "~a: invalid checker" -msgstr "~a: vérificateur non valide" +msgid "no such process ~d~%" +msgstr "" -#: guix/gnu-maintenance.scm:373 +#: guix/scripts/container/exec.scm:94 +#, scheme-format +msgid "exec failed with status ~d~%" +msgstr "" + +#: guix/upstream.scm:158 #, scheme-format msgid "signature verification failed for `~a'~%" msgstr "la vérification de la signature a échoué pour \"~a\"~%" -#: guix/gnu-maintenance.scm:375 +#: guix/upstream.scm:160 #, scheme-format msgid "(could be because the public key is not in your keyring)~%" msgstr "(il est possible que la clé publique ne soit pas dans dans votre trousseau)~%" -#: guix/gnu-maintenance.scm:450 +#: guix/upstream.scm:192 +msgid "gz" +msgstr "" + +#: guix/upstream.scm:255 #, scheme-format msgid "~a: could not locate source file" msgstr "~a: le fichier source est introuvable" -#: guix/gnu-maintenance.scm:455 +#: guix/upstream.scm:260 #, scheme-format msgid "~a: ~a: no `version' field in source; skipping~%" msgstr "~a: ~a: aucun champ \"version\" dans la source; ignoré~%" -#: guix/ui.scm:135 +#: guix/ui.scm:236 +msgid "entering debugger; type ',bt' for a backtrace\n" +msgstr "" + +#: guix/ui.scm:252 guix/ui.scm:269 +#, fuzzy, scheme-format +#| msgid "failed to connect to `~a': ~a~%" +msgid "failed to load '~a': ~a~%" +msgstr "impossible de se connecter à \"~a\": ~a~%" + +#: guix/ui.scm:255 +#, fuzzy, scheme-format +#| msgid "~a: ~a: ~a~%" +msgid "~a: error: ~a~%" +msgstr "~a: ~a: ~a~%" + +#: guix/ui.scm:258 guix/ui.scm:512 +#, scheme-format +msgid "exception thrown: ~s~%" +msgstr "" + +#: guix/ui.scm:260 guix/ui.scm:278 +#, fuzzy, scheme-format +#| msgid "failed to install locale: ~a~%" +msgid "failed to load '~a':~%" +msgstr "impossible d'installer la locale: ~a~%" + +#: guix/ui.scm:272 +#, fuzzy, scheme-format +#| msgid "~a: ~a: ~a~%" +msgid "~a: warning: ~a~%" +msgstr "~a: ~a: ~a~%" + +#: guix/ui.scm:275 +#, fuzzy, scheme-format +#| msgid "failed to read expression ~s: ~s~%" +msgid "failed to load '~a': exception thrown: ~s~%" +msgstr "impossible de lire l'expression ~s: ~s~%" + +#: guix/ui.scm:287 #, scheme-format msgid "failed to install locale: ~a~%" msgstr "impossible d'installer la locale: ~a~%" -#: guix/ui.scm:154 +#: guix/ui.scm:306 +#, fuzzy +#| msgid "" +#| "Copyright (C) 2014 the Guix authors\n" +#| "License GPLv3+: GNU GPL version 3 or later \n" +#| "This is free software: you are free to change and redistribute it.\n" +#| "There is NO WARRANTY, to the extent permitted by law.\n" msgid "" -"Copyright (C) 2014 the Guix authors\n" +"Copyright (C) 2016 the Guix authors\n" "License GPLv3+: GNU GPL version 3 or later \n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" @@ -1100,7 +2189,7 @@ msgstr "" "Ceci est un logiciel libre: vous êtes libre de le modifier et de le redistribuer.\n" "Il n'y a AUCUNE GARANTIE, dans la limite de ce qui est autorisé par la loi.\n" -#: guix/ui.scm:162 +#: guix/ui.scm:314 #, scheme-format msgid "" "\n" @@ -1109,7 +2198,7 @@ msgstr "" "\n" "Signalez toute anomalie à : ~a." -#: guix/ui.scm:164 +#: guix/ui.scm:316 #, scheme-format msgid "" "\n" @@ -1118,7 +2207,7 @@ msgstr "" "\n" "~a page d'accueil: <~a>" -#: guix/ui.scm:166 +#: guix/ui.scm:318 msgid "" "\n" "General help using GNU software: " @@ -1126,160 +2215,228 @@ msgstr "" "\n" "Aide générale sur l'utilisation des logiciels GNU: " -#: guix/ui.scm:173 +#: guix/ui.scm:363 +#, fuzzy, scheme-format +#| msgid "signature is not a valid s-expression: ~s~%" +msgid "'~a' is not a valid regular expression: ~a~%" +msgstr "la signature n'est pas une s-expression valide: ~s~%" + +#: guix/ui.scm:369 #, scheme-format msgid "~a: invalid number~%" msgstr "~a: nombre non valide~%" -#: guix/ui.scm:190 +#: guix/ui.scm:386 #, scheme-format msgid "invalid number: ~a~%" msgstr "nombre non valide: ~a~%" -#: guix/ui.scm:213 +#: guix/ui.scm:409 #, scheme-format msgid "unknown unit: ~a~%" msgstr "unité inconnue: ~a~%" -#: guix/ui.scm:224 +#: guix/ui.scm:420 #, scheme-format msgid "~a:~a:~a: package `~a' has an invalid input: ~s~%" msgstr "~a:~a:~a: le paquet \"~a\" a une entrée non valide: ~s~%" -#: guix/ui.scm:231 +#: guix/ui.scm:427 #, scheme-format msgid "~a: ~a: build system `~a' does not support cross builds~%" msgstr "~a: ~a: le système de compilation \"~a\" ne supporte pas la compilation croisée~%" -#: guix/ui.scm:236 +#: guix/ui.scm:432 #, scheme-format msgid "profile '~a' does not exist~%" msgstr "le profile \"~a\" n'existe pas~%" -#: guix/ui.scm:239 +#: guix/ui.scm:435 #, scheme-format msgid "generation ~a of profile '~a' does not exist~%" msgstr "la génération ~a du profile \"~a\" n'existe pas~%" -#: guix/ui.scm:243 +#: guix/ui.scm:442 +#, scheme-format +msgid "corrupt input while restoring '~a' from ~s~%" +msgstr "" + +#: guix/ui.scm:444 +#, fuzzy, scheme-format +#| msgid "corrupt file set archive" +msgid "corrupt input while restoring archive from ~s~%" +msgstr "archive corrompue" + +#: guix/ui.scm:447 #, scheme-format msgid "failed to connect to `~a': ~a~%" msgstr "impossible de se connecter à \"~a\": ~a~%" -#: guix/ui.scm:248 +#: guix/ui.scm:452 #, scheme-format msgid "build failed: ~a~%" msgstr "la compilation a échoué: ~a~%" -#: guix/ui.scm:277 +#: guix/ui.scm:455 +#, scheme-format +msgid "reference to invalid output '~a' of derivation '~a'~%" +msgstr "" + +#: guix/ui.scm:466 +#, scheme-format +msgid "~a: ~a~%" +msgstr "~a: ~a~%" + +#: guix/ui.scm:501 #, scheme-format msgid "failed to read expression ~s: ~s~%" msgstr "impossible de lire l'expression ~s: ~s~%" -#: guix/ui.scm:283 -#, scheme-format -msgid "failed to evaluate expression `~a': ~s~%" +#: guix/ui.scm:507 +#, fuzzy, scheme-format +#| msgid "failed to evaluate expression `~a': ~s~%" +msgid "failed to evaluate expression '~a':~%" msgstr "impossible d'évaluer l'expression `~a': ~s~%" -#: guix/ui.scm:292 +#: guix/ui.scm:510 +#, fuzzy, scheme-format +#| msgid "host name lookup error: ~a~%" +msgid "syntax error: ~a~%" +msgstr "erreur lors de la consultation du nom d'hôte: ~a~%" + +#: guix/ui.scm:524 #, scheme-format msgid "expression ~s does not evaluate to a package~%" msgstr "l'expression ~s ne correspond à aucun paquet~%" -#: guix/ui.scm:339 +#: guix/ui.scm:586 #, scheme-format msgid "~:[The following derivation would be built:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following derivations would be built:~%~{ ~a~%~}~;~]" msgstr[0] "~:[La dérivation suivante serait compilée:~%~{ ~a~%~}~;~]" msgstr[1] "~:[Les dérivations suivantes seraient compilées:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:344 +#: guix/ui.scm:591 #, scheme-format msgid "~:[The following file would be downloaded:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following files would be downloaded:~%~{ ~a~%~}~;~]" msgstr[0] "~:[Le fichier suivant serait téléchargé:~%~{ ~a~%~}~;~]" msgstr[1] "~:[Les fichiers suivants seraient téléchargés:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:350 +#: guix/ui.scm:597 #, scheme-format msgid "~:[The following derivation will be built:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following derivations will be built:~%~{ ~a~%~}~;~]" msgstr[0] "~:[La dérivation suivante sera compilée:~%~{ ~a~%~}~;~]" msgstr[1] "~:[Les dérivations suivantes seront compilées:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:355 +#: guix/ui.scm:602 #, scheme-format msgid "~:[The following file will be downloaded:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following files will be downloaded:~%~{ ~a~%~}~;~]" msgstr[0] "~:[Le fichier suivant sera téléchargé:~%~{ ~a~%~}~;~]" msgstr[1] "~:[Les fichiers suivants seront téléchargés:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:407 +#: guix/ui.scm:657 #, scheme-format msgid "The following package would be removed:~%~{~a~%~}~%" msgid_plural "The following packages would be removed:~%~{~a~%~}~%" msgstr[0] "Le paquet suivant serait supprimé:~%~{~a~%~}~%" msgstr[1] "Les paquets suivants seraient supprimés:~%~{~a~%~}~%" -#: guix/ui.scm:412 +#: guix/ui.scm:662 #, scheme-format msgid "The following package will be removed:~%~{~a~%~}~%" msgid_plural "The following packages will be removed:~%~{~a~%~}~%" msgstr[0] "Le paquet suivant sera supprimé:~%~{~a~%~}~%" msgstr[1] "Les paquets suivants seront supprimés:~%~{~a~%~}~%" -#: guix/ui.scm:425 +#: guix/ui.scm:675 +#, fuzzy, scheme-format +#| msgid "The following package would be upgraded:~%~{~a~%~}~%" +#| msgid_plural "The following packages would be upgraded:~%~{~a~%~}~%" +msgid "The following package would be downgraded:~%~{~a~%~}~%" +msgid_plural "The following packages would be downgraded:~%~{~a~%~}~%" +msgstr[0] "Le paquet suivant serait mis à jour:~%~{~a~%~}~%" +msgstr[1] "Les paquets suivants seraient mis à jour:~%~{~a~%~}~%" + +#: guix/ui.scm:680 +#, fuzzy, scheme-format +#| msgid "The following package will be upgraded:~%~{~a~%~}~%" +#| msgid_plural "The following packages will be upgraded:~%~{~a~%~}~%" +msgid "The following package will be downgraded:~%~{~a~%~}~%" +msgid_plural "The following packages will be downgraded:~%~{~a~%~}~%" +msgstr[0] "Le paquet suivant sera mis à jour:~%~{~a~%~}~%" +msgstr[1] "Les paquets suivants seront mis à jour:~%~{~a~%~}~%" + +#: guix/ui.scm:693 #, scheme-format msgid "The following package would be upgraded:~%~{~a~%~}~%" msgid_plural "The following packages would be upgraded:~%~{~a~%~}~%" msgstr[0] "Le paquet suivant serait mis à jour:~%~{~a~%~}~%" msgstr[1] "Les paquets suivants seraient mis à jour:~%~{~a~%~}~%" -#: guix/ui.scm:430 +#: guix/ui.scm:698 #, scheme-format msgid "The following package will be upgraded:~%~{~a~%~}~%" msgid_plural "The following packages will be upgraded:~%~{~a~%~}~%" msgstr[0] "Le paquet suivant sera mis à jour:~%~{~a~%~}~%" msgstr[1] "Les paquets suivants seront mis à jour:~%~{~a~%~}~%" -#: guix/ui.scm:441 +#: guix/ui.scm:709 #, scheme-format msgid "The following package would be installed:~%~{~a~%~}~%" msgid_plural "The following packages would be installed:~%~{~a~%~}~%" msgstr[0] "Le paquet suivant serait installé:~%~{~a~%~}~%" msgstr[1] "Les paquets suivants seraient installés:~%~{~a~%~}~%" -#: guix/ui.scm:446 +#: guix/ui.scm:714 #, scheme-format msgid "The following package will be installed:~%~{~a~%~}~%" msgid_plural "The following packages will be installed:~%~{~a~%~}~%" msgstr[0] "Le paquet suivant sera installé:~%~{~a~%~}~%" msgstr[1] "Les paquets suivants seront installés:~%~{~a~%~}~%" -#: guix/ui.scm:463 +#: guix/ui.scm:731 msgid "" msgstr "" -#: guix/ui.scm:489 +#: guix/ui.scm:750 #, scheme-format msgid "failed to create configuration directory `~a': ~a~%" msgstr "impossible de créer le répertoire de configuration \"~a\": ~a~%" -#: guix/ui.scm:589 guix/ui.scm:603 +#: guix/ui.scm:869 guix/ui.scm:883 msgid "unknown" msgstr "inconnu" -#: guix/ui.scm:712 +#: guix/ui.scm:1033 #, scheme-format -msgid "invalid argument: ~a~%" -msgstr "argument non valide: ~a~%" +msgid "Generation ~a\t~a" +msgstr "Génération ~a\t~a" + +#: guix/ui.scm:1040 +#, scheme-format +msgid "~a\t(current)~%" +msgstr "~a\t(actuel)~%" + +#: guix/ui.scm:1057 +#, fuzzy, scheme-format +#| msgid "switching from generation ~a to ~a~%" +msgid "switched from generation ~a to ~a~%" +msgstr "passage de la génération ~a à ~a~%" + +#: guix/ui.scm:1073 +#, scheme-format +msgid "deleting ~a~%" +msgstr "suppression de ~a~%" -#: guix/ui.scm:717 +#: guix/ui.scm:1121 #, scheme-format msgid "Try `guix --help' for more information.~%" msgstr "Essayez \"guix --help\" pour plus d'informations.~%" -#: guix/ui.scm:747 +#: guix/ui.scm:1148 msgid "" "Usage: guix COMMAND ARGS...\n" "Run COMMAND with ARGS.\n" @@ -1287,41 +2444,31 @@ msgstr "" "Usage: guix COMMANDE ARGS...\n" "Lance la COMMANDE avec les arguments ARGS.\n" -#: guix/ui.scm:750 +#: guix/ui.scm:1151 msgid "COMMAND must be one of the sub-commands listed below:\n" msgstr "COMMANDE doit être une des sous-commandes listées ci-dessous:\n" -#: guix/ui.scm:770 +#: guix/ui.scm:1171 #, scheme-format msgid "guix: ~a: command not found~%" msgstr "guix: ~a: commande introuvable~%" -#: guix/ui.scm:788 +#: guix/ui.scm:1188 #, scheme-format msgid "guix: missing command name~%" msgstr "guix: nom de commande manquant~%" -#: guix/ui.scm:796 +#: guix/ui.scm:1196 #, scheme-format msgid "guix: unrecognized option '~a'~%" msgstr "guix: option \"~a\" non reconnue ~%" -#: guix/http-client.scm:217 -#, scheme-format -msgid "using Guile ~a, which does not support ~s encoding~%" -msgstr "utilisation de Guile ~a, qui ne supporte pas l'encodage ~s~%" - -#: guix/http-client.scm:220 -#, scheme-format -msgid "download failed; use a newer Guile~%" -msgstr "le téléchargement a échoué; veuillez utiliser une version plus récente de Guile~%" - -#: guix/http-client.scm:232 +#: guix/http-client.scm:261 #, scheme-format msgid "following redirection to `~a'...~%" msgstr "redirection vers \"~a\"...~%" -#: guix/http-client.scm:241 +#: guix/http-client.scm:270 msgid "download failed" msgstr "le téléchargement a échoué" @@ -1354,15 +2501,182 @@ msgstr "archive corrompue" msgid "importing file or directory '~a'...~%" msgstr "import du fichier ou répertoire \"~a\"...~%" -#: guix/nar.scm:220 +#: guix/nar.scm:222 #, scheme-format msgid "found valid signature for '~a'~%" msgstr "signature valide trouvée pour \"~a\"~%" -#: guix/nar.scm:227 +#: guix/nar.scm:229 msgid "imported file lacks a signature" msgstr "les fichiers importés requièrent une signature" -#: guix/nar.scm:266 +#: guix/nar.scm:268 msgid "invalid inter-file archive mark" msgstr "marque d'archive inter-fichier non valide" + +#: nix/nix-daemon/guix-daemon.cc:61 +msgid "guix-daemon -- perform derivation builds and store accesses" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:63 +msgid "This program is a daemon meant to run in the background. It serves requests sent over a Unix-domain socket. It accesses the store, and builds derivations on behalf of its clients." +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:87 +msgid "SYSTEM" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:88 +msgid "assume SYSTEM as the current system type" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:89 nix/nix-daemon/guix-daemon.cc:92 +msgid "N" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:90 +msgid "use N CPU cores to build each derivation; 0 means as many as available" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:93 +msgid "allow at most N build jobs" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:95 +msgid "disable chroot builds" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:96 +msgid "DIR" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:97 +msgid "add DIR to the build chroot" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:98 +msgid "GROUP" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:99 +msgid "perform builds as a user of GROUP" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:101 +msgid "do not use substitutes" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:102 +msgid "URLS" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:103 +msgid "use URLS as the default list of substitute providers" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:105 +msgid "do not use the 'build hook'" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:107 +msgid "cache build failures" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:109 +msgid "build each derivation N times in a row" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:111 +msgid "do not keep build logs" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:113 +msgid "disable compression of the build logs" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:118 +msgid "disable automatic file \"deduplication\" in the store" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:128 +msgid "impersonate Linux 2.6" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:132 +msgid "tell whether the GC must keep outputs of live derivations" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:135 +msgid "tell whether the GC must keep derivations corresponding to live outputs" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:138 +msgid "SOCKET" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:139 +msgid "listen for connections on SOCKET" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:141 +msgid "produce debugging output" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:201 +#, c-format +msgid "error: %s: invalid number of rounds\n" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:220 nix/nix-daemon/guix-daemon.cc:396 +#, c-format +msgid "error: %s\n" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:281 +#, c-format +msgid "error: libgcrypt version mismatch\n" +msgstr "" + +#: nix/nix-daemon/guix-daemon.cc:372 +#, c-format +msgid "warning: daemon is running as root, so using `--build-users-group' is highly recommended\n" +msgstr "" + +#~ msgid "looking for the latest release of GNU ~a..." +#~ msgstr "recherche de la dernière version de GNU ~a..." + +#~ msgid "~a: note: using ~a but ~a is available upstream~%" +#~ msgstr "~a: note: utilisation de ~a mais ~a est disponible en amont" + +#~ msgid "~a: not a number~%" +#~ msgstr "~a: pas un nombre~%" + +#~ msgid "sources do not match any package:~{ ~a~}~%" +#~ msgstr "les sources ne correspondent à aucun paquet:~{ ~a~}~%" + +#~ msgid "failed to build the empty profile~%" +#~ msgstr "échec de la compilation du profil vide~%" + +#~ msgid "nothing to do: already at the empty profile~%" +#~ msgstr "aucune action à faire: profil courant vide" + +#~ msgid "Downloading, please wait...~%" +#~ msgstr "Téléchargement en cours..." + +#~ msgid "(Please consider upgrading Guile to get proper progress report.)~%" +#~ msgstr "(Veuillez mettre Guile à jour pour obtenir le rapport de progression approprié.)~%" + +#~ msgid "these substitute URLs will not be used:~{ ~a~}~%" +#~ msgstr "ces URL de substitution ne seront pas utilisées:~{ ~a~}~%" + +#~ msgid "failed to look up host '~a' (~a), substituter disabled~%" +#~ msgstr "impossible de trouver l'hôte \"~a\" (~a), substitution désactivée~%" + +#~ msgid "failed to open operating system file '~a': ~a~%" +#~ msgstr "impossible d'ouvrir le fichier du système d'exploitation \"~a\": ~a~%" + +#~ msgid "using Guile ~a, which does not support ~s encoding~%" +#~ msgstr "utilisation de Guile ~a, qui ne supporte pas l'encodage ~s~%" + +#~ msgid "download failed; use a newer Guile~%" +#~ msgstr "le téléchargement a échoué; veuillez utiliser une version plus récente de Guile~%" diff --git a/tests/containers.scm b/tests/containers.scm index 5a0f9937bb..bbcff3f51f 100644 --- a/tests/containers.scm +++ b/tests/containers.scm @@ -30,15 +30,18 @@ ;; Skip these tests unless user namespaces are available and the setgroups ;; file (introduced in Linux 3.19 to address a security issue) exists. -(unless (and (user-namespace-supported?) - (unprivileged-user-namespace-supported?) - (setgroups-supported?)) - (test-skip 7)) +(define (skip-if-unsupported) + (unless (and (user-namespace-supported?) + (unprivileged-user-namespace-supported?) + (setgroups-supported?)) + (test-skip 1))) +(skip-if-unsupported) (test-assert "call-with-container, exit with 0 when there is no error" (zero? (call-with-container '() (const #t) #:namespaces '(user)))) +(skip-if-unsupported) (test-assert "call-with-container, user namespace" (zero? (call-with-container '() @@ -47,6 +50,7 @@ (assert-exit (and (zero? (getuid)) (zero? (getgid))))) #:namespaces '(user)))) +(skip-if-unsupported) (test-assert "call-with-container, uts namespace" (zero? (call-with-container '() @@ -57,6 +61,7 @@ (primitive-exit 0)) #:namespaces '(user uts)))) +(skip-if-unsupported) (test-assert "call-with-container, pid namespace" (zero? (call-with-container '() @@ -72,6 +77,7 @@ (status:exit-val status))))))) #:namespaces '(user pid)))) +(skip-if-unsupported) (test-assert "call-with-container, mnt namespace" (zero? (call-with-container '(("none" device "/testing" "tmpfs" () #f #f)) @@ -79,6 +85,7 @@ (assert-exit (file-exists? "/testing"))) #:namespaces '(user mnt)))) +(skip-if-unsupported) (test-equal "call-with-container, mnt namespace, wrong bind mount" `(system-error ,ENOENT) ;; An exception should be raised; see . @@ -91,12 +98,14 @@ (lambda args (list 'system-error (system-error-errno args))))) +(skip-if-unsupported) (test-assert "call-with-container, all namespaces" (zero? (call-with-container '() (lambda () (primitive-exit 0))))) +(skip-if-unsupported) (test-assert "container-excursion" (call-with-temporary-directory (lambda (root) diff --git a/tests/packages.scm b/tests/packages.scm index d3f432ada2..94f5ea71a5 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -797,7 +797,7 @@ #:guile-for-build (%guile-for-build)))) (build-derivations %store (list prof)) (string-match (format #f "^export XML_CATALOG_FILES=\"~a/xml/+bar/baz/catalog\\.xml\"\n" - (derivation->output-path prof)) + (regexp-quote (derivation->output-path prof))) (with-output-to-string (lambda () (guix-package "-p" (derivation->output-path prof) -- cgit v1.2.3 From 98378db6bac5ad7b4fa680f832ade78dd0bcce95 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 27 Jun 2016 09:42:06 +0200 Subject: gnu: git: Use 'modify-phases'. * gnu/packages/version-control.scm (git)[arguments]: Use 'modify-phases'. --- gnu/packages/version-control.scm | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 2b2076c484..9d5a808e3b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -166,25 +166,23 @@ as well as the classic centralized workflow.") #:modules ((srfi srfi-1) ,@%gnu-build-system-modules) #:phases - (alist-cons-after - 'configure 'patch-makefile-shebangs - (lambda _ - (substitute* "Makefile" - (("/bin/sh") (which "sh")) - (("/usr/bin/perl") (which "perl")) - (("/usr/bin/python") (which "python")))) - (alist-cons-after - 'install 'install-shell-completion - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (completions (string-append out "/etc/bash_completion.d"))) - ;; TODO: Install the tcsh and zsh completions in the right place. - (mkdir-p completions) - (copy-file "contrib/completion/git-completion.bash" - (string-append completions "/git")) - #t)) - (alist-cons-after - 'install 'split + (modify-phases %standard-phases + (add-after 'configure 'patch-makefile-shebangs + (lambda _ + (substitute* "Makefile" + (("/bin/sh") (which "sh")) + (("/usr/bin/perl") (which "perl")) + (("/usr/bin/python") (which "python"))))) + (add-after 'install 'install-shell-completion + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (completions (string-append out "/etc/bash_completion.d"))) + ;; TODO: Install the tcsh and zsh completions in the right place. + (mkdir-p completions) + (copy-file "contrib/completion/git-completion.bash" + (string-append completions "/git")) + #t))) + (add-after 'install 'split (lambda* (#:key inputs outputs #:allow-other-keys) ;; Split the binaries to the various outputs. (let* ((out (assoc-ref outputs "out")) @@ -256,8 +254,7 @@ as well as the classic centralized workflow.") ;; specify a single directory, not a search path. (wrap-program (string-append out "/bin/git") `("PATH" ":" prefix - ("$HOME/.guix-profile/libexec/git-core"))))) - %standard-phases))))) + ("$HOME/.guix-profile/libexec/git-core"))))))))) (native-search-paths ;; For HTTPS access, Git needs a single-file certificate bundle, specified -- cgit v1.2.3 From 8601feaea66977bcf559090f98bb1bda091273fa Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 27 Jun 2016 09:50:56 +0200 Subject: gnu: git: Fix builds with Make 4.2. * gnu/packages/version-control.scm (git)[arguments]: Add 'add-PM.stamp' phase. --- gnu/packages/version-control.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9d5a808e3b..e6e7e0011b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -173,6 +173,11 @@ as well as the classic centralized workflow.") (("/bin/sh") (which "sh")) (("/usr/bin/perl") (which "perl")) (("/usr/bin/python") (which "python"))))) + (add-after 'configure 'add-PM.stamp + (lambda _ + ;; Add the "PM.stamp" to avoid "no rule to make target". + (call-with-output-file "perl/PM.stamp" (const #t)) + #t)) (add-after 'install 'install-shell-completion (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From de1b319dbfb03749033fda9e0c86638f12136b5d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 14 May 2016 11:34:30 +0200 Subject: gnu: pulseaudio: Enable support for Bluetooth. * gnu/packages/pulseaudio.scm (pulseaudio)[arguments]: Add "--enable-bluez5" to configure flags. [inputs]: Add "bluez" and "sbc". --- gnu/packages/pulseaudio.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index b2b0508e58..2d97539498 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -138,6 +139,7 @@ rates.") (arguments `(#:configure-flags (list "--localstatedir=/var" ;"--sysconfdir=/etc" "--disable-oss-output" + "--enable-bluez5" (string-append "--with-udev-rules-dir=" (assoc-ref %outputs "out") "/lib/udev/rules.d")) @@ -153,8 +155,9 @@ rates.") %standard-phases))) (inputs ;; TODO: Add optional inputs (GTK+?). - `(;; ("sbc" ,sbc) - ("alsa-lib" ,alsa-lib) + `(("alsa-lib" ,alsa-lib) + ("bluez" ,bluez) + ("sbc" ,sbc) ("json-c" ,json-c) ("speex" ,speex) ("libsndfile" ,libsndfile) -- cgit v1.2.3 From d9ecec9b87d435b5b503605fb0ad55530052bb19 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 28 Jun 2016 14:10:02 +0200 Subject: gnu: mit-krb5: Disable tests on i686. * gnu/packages/mit-krb5.scm (mit-krb5)[arguments]: Add #:tests?. --- gnu/packages/mit-krb5.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm index 43cc376281..8fea060bf6 100644 --- a/gnu/packages/mit-krb5.scm +++ b/gnu/packages/mit-krb5.scm @@ -51,6 +51,10 @@ ;; Likewise with tests. #:parallel-tests? #f + ;; XXX: On i686, 'kdb5_util' hangs on an fcntl/F_SETLKW call while + ;; running the tests in 'src/tests'. + #:tests? ,(not (string=? (%current-system) "i686-linux")) + #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source-directory -- cgit v1.2.3 From d2375c4330c43db3336d275cc55f23fe2aff9d32 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 30 Jun 2016 10:47:24 +0200 Subject: gnu: mit-krb5: Disable tests on all 32-bit platforms. * gnu/packages/mit-krb5.scm (mit-krb5)[arguments]: Change #:tests? to true only on x86_64-linux. --- gnu/packages/mit-krb5.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm index 8fea060bf6..2b8839c7e9 100644 --- a/gnu/packages/mit-krb5.scm +++ b/gnu/packages/mit-krb5.scm @@ -51,9 +51,9 @@ ;; Likewise with tests. #:parallel-tests? #f - ;; XXX: On i686, 'kdb5_util' hangs on an fcntl/F_SETLKW call while - ;; running the tests in 'src/tests'. - #:tests? ,(not (string=? (%current-system) "i686-linux")) + ;; XXX: On 32-bit systems, 'kdb5_util' hangs on an fcntl/F_SETLKW call + ;; while running the tests in 'src/tests'. + #:tests? ,(string=? (%current-system) "x86_64-linux") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 187e9094f7fa79e52820b154bbac855f357553ce Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 1 Jul 2016 17:03:29 -0400 Subject: Revert "gnu: wrap-python3: Create more symlinks." This reverts commit 478e75b53bdf754cdf911226d37e517387f73c09. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b92746a260..8bba7ca256 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -370,8 +370,8 @@ data types.") (lambda (old new) (symlink (string-append python old) (string-append bin "/" new))) - '("python3" "pydoc3" "idle3" "pip3" "python3-config") - '("python" "pydoc" "idle" "pip" "python-config")))))) + '("python3" "pydoc3" "idle3") + '("python" "pydoc" "idle")))))) (synopsis "Wrapper for the Python 3 commands") (description "This package provides wrappers for the commands of Python@tie{}3.x such -- cgit v1.2.3 From 2d02a7789af1e4ab147959d053a001f7c62147ea Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 2 Jul 2016 10:43:45 +0800 Subject: gnu: mozjs-24: Disable parallel build. * gnu/packages/gnuzilla.scm (mozjs-24)[arguments]: Add '#:parallel-build? #f'. --- gnu/packages/gnuzilla.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b1ffbc8658..a18978282b 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -116,7 +116,10 @@ in C/C++.") '(substitute* '("js/src/config/milestone.pl") (("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE"))))) (arguments - '(#:phases + '(;; XXX: parallel build fails, lacking: + ;; mkdir -p "system_wrapper_js/" + #:parallel-build? #f + #:phases (modify-phases %standard-phases (replace 'configure -- cgit v1.2.3 From d8fa9cf7f4173b1b30adc1a7b75f7dd46218c424 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 1 Jul 2016 17:25:10 -0400 Subject: gnu: Add python-imagesize. * gnu/packages/python.scm (python-imagesize, python2-imagesize): New variables. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8bba7ca256..c9c782de13 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9674,3 +9674,29 @@ implementation for Python.") (native-inputs `(("python2-ipaddress" ,python2-ipaddress) ,@(package-native-inputs base)))))) + +(define-public python-imagesize + (package + (name "python-imagesize") + (version "0.7.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "imagesize" version)) + (sha256 + (base32 + "0qk07k0z4241lkzzjji7z4da04pcvg7bfc4xz1934zlqhwmwdcha")))) + (build-system python-build-system) + (synopsis "Calculate the size of an image") + (description "This Python module returns the size of an image. It supports +the PNG, JPEG, JPEG 2000, and GIF formats.") + (home-page "https://github.com/shibukawa/imagesize_py") + (license license:expat) + (properties `((python2-variant . ,(delay python2-imagesize)))))) + +(define-public python2-imagesize + (let ((base (package-with-python2 (strip-python2-variant python-imagesize)))) + (package + (inherit base) + (native-inputs + `(("python2-setuptools" ,python2-setuptools) + ,@(package-native-inputs base)))))) -- cgit v1.2.3 From afcb871954bcafff9aa5969a8a92777647ae2fef Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 1 Jul 2016 17:39:29 -0400 Subject: gnu: Add python-alabaster. * gnu/packages/python.scm (python-alabaster, python2-alabaster): New variables. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c9c782de13..da6dde5d3a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9700,3 +9700,30 @@ the PNG, JPEG, JPEG 2000, and GIF formats.") (native-inputs `(("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs base)))))) + +(define-public python-alabaster + (package + (name "python-alabaster") + (version "0.7.8") + (source (origin + (method url-fetch) + (uri (pypi-uri "alabaster" version)) + (sha256 + (base32 + "1zqz9hsvnmpjklmir6g7rxlv2fslrgsnwb91r9sgz4n1zja1pjx1")))) + (build-system python-build-system) + (synopsis "Default theme for the Sphinx documentation system") + (description "Alabaster is a responsive and configurable theme for the +Sphinx documentation system. It is compatible with Python 2 and 3, and it is +the default Sphinx theme.") + (home-page "https://github.com/bitprophet/alabaster") + (license bsd-3) + (properties `((python2-variant . ,(delay python2-alabaster)))))) + +(define-public python2-alabaster + (let ((base (package-with-python2 (strip-python2-variant python-alabaster)))) + (package + (inherit base) + (native-inputs + `(("python2-setuptools" ,python2-setuptools) + ,@(package-native-inputs base)))))) -- cgit v1.2.3 From 936984b421eebdfcd5870599d5cad9dab2d3b297 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 1 Jul 2016 17:40:02 -0400 Subject: gnu: Add python-snowballstemmer. * gnu/packages/python.scm (python-snowballstemmer, python2-snowballstemmer): New variables. --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index da6dde5d3a..4479dddb2d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9727,3 +9727,25 @@ the default Sphinx theme.") (native-inputs `(("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs base)))))) + +(define-public python-snowballstemmer + (package + (name "python-snowballstemmer") + (version "1.2.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "snowballstemmer" version)) + (sha256 + (base32 + "0a0idq4y5frv7qsg2x62jd7rd272749xk4x99misf5rcifk2d7wi")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; no test suite + (synopsis "Snowball stemming library collection for Python") + (description "This package provides 16 stemmer algorithms generated from +Snowball algorithms.") + (home-page "https://github.com/shibukawa/snowball_py") + (license bsd-2))) + +(define-public python2-snowballstemmer + (package-with-python2 python-snowballstemmer)) -- cgit v1.2.3 From 5ebd95202c4578d29d13a35a2563c20609988f42 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 1 Jul 2016 17:40:47 -0400 Subject: gnu: python-sphinx: Update to 1.4.4. * gnu/packages/python.scm (python-sphinx, python2-sphinx): Update to 1.4.4. [source]: Use pypi-uri. [inputs]: Add python-alabaster, python-babel, python-imagesize, python-six. [propagated-inputs]: New field. --- gnu/packages/python.scm | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4479dddb2d..e9020c1f7e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2677,22 +2677,33 @@ reStructuredText.") (define-public python-sphinx (package (name "python-sphinx") - (version "1.2.3") + (version "1.4.4") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/S/Sphinx/Sphinx-" - version ".tar.gz")) + (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "011xizm3jnmf4cvs5i6kgf6c5nn046h79i8j0vd0f27yw9j3p4wl")))) + "185zklh44fhrwp1dg6251g3w6zmssh5jzvbz8pvmkg9l6wvxdzry")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-jinja2" ,python-jinja2) + `( + ("python-alabaster" ,python-alabaster) + ("python-babel" ,python-babel) ("python-docutils" ,python-docutils) - ("python-pygments" ,python-pygments))) + ("python-imagesize" ,python-imagesize) + ("python-jinja2" ,python-jinja2) + ("python-pygments" ,python-pygments) + ("python-pytz" ,python-pytz) + ("python-setuptools" ,python-setuptools) + ("python-six" ,python-six))) + + ;; Several packages that use Sphinx want to use these propagated + ;; dependencies when using Sphinx. Rather than add them to all the Sphinx + ;; users, we propagate them from Sphinx. + (propagated-inputs + `(("python-pytz" ,python-pytz) + ("python-snowballstemmer" ,python-snowballstemmer))) (home-page "http://sphinx-doc.org/") (synopsis "Python documentation generator") (description "Sphinx is a tool that makes it easy to create documentation -- cgit v1.2.3 From 9852994842785f0e62a6b9046f282beed5271e19 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 1 Jul 2016 19:19:03 -0400 Subject: gnu: python-sphinx-rtd-theme: Update to 0.1.9. * gnu/packages/python.scm (python-sphinx-rtd-theme, python2-sphinx-rtd-theme): Update to 0.1.9. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e9020c1f7e..1deaab79f8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2717,16 +2717,14 @@ sources.") (define-public python-sphinx-rtd-theme (package (name "python-sphinx-rtd-theme") - (version "0.1.6") + (version "0.1.9") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/s/" - "sphinx_rtd_theme/sphinx_rtd_theme-" - version ".tar.gz")) + (uri (pypi-uri "sphinx_rtd_theme" version)) (sha256 (base32 - "19nw3rn7awplcdrz63kg1njqwkbymfg9lwn7l2grhdyhyr2gaa8g")))) + "18d0r63w7jpdrk4q5qy26n08vdlmnj9sar93akwjphyambw4cf17")))) (build-system python-build-system) (arguments `(;; With standard flags, the install phase attempts to create a zip'd -- cgit v1.2.3 From 9a745d76f6594a31994731ef6892290e01cc683f Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Tue, 16 Feb 2016 15:06:33 +0200 Subject: gnu: cross-gcc-arguments: Disable libitm, libvtv and libsanitizer. * gnu/packages/cross-base.scm (cross-gcc-arguments)[arguments]: Add "--disable-libitm", "--disable-libvtv" and "--disable-libsanitizer" when libc is not present. --- gnu/packages/cross-base.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 718e56e3de..3bd30fd78c 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -121,6 +121,14 @@ may be either a libc package or #f.)" "--disable-libquadmath" "--disable-decimal-float" ;would need libc "--disable-libcilkrts" + + ;; When target is any OS other than 'none' these + ;; libraries will fail if there is no libc + ;; present. See + ;; + "--disable-libitm" + "--disable-libvtv" + "--disable-libsanitizer" ))) ,(if libc -- cgit v1.2.3 From 2d634d9b7e2c6aba45658c50cc5029a2a24bae85 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Wed, 6 Jul 2016 18:23:03 +0200 Subject: gnu: texlive: Fix 'texmf-local' search path. * gnu/packages/tex.scm (texlive, texlive-minimal): Add 'native-search-paths'. (texlive-texmf): Correct 'TEXMFLOCAL' definition in 'texmf.cnf' in 'texmf-config' phase. --- gnu/packages/tex.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 219f6856f8..2600b6f20d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 Federico Beffa ;;; ;;; This file is part of GNU Guix. ;;; @@ -206,7 +207,10 @@ This package contains the binaries.") ;; Register SHARE as TEXMFROOT in texmf.cnf. (substitute* texmfcnf (("TEXMFROOT = \\$SELFAUTOPARENT") - (string-append "TEXMFROOT = " share))) + (string-append "TEXMFROOT = " share)) + (("TEXMFLOCAL = \\$SELFAUTOGRANDPARENT/texmf-local") + "TEXMFLOCAL = $SELFAUTODIR/share/texmf-local") + (("!!\\$TEXMFLOCAL") "$TEXMFLOCAL")) ;; Register paths in texmfcnf.lua, needed for context. (substitute* (string-append texmfroot "/texmfcnf.lua") (("selfautodir:") out) @@ -242,6 +246,10 @@ This package contains the complete tree of texmf-dist data.") (inputs `(("bash" ,bash) ; for wrap-program ("texlive-bin" ,texlive-bin) ("texlive-texmf" ,texlive-texmf))) + (native-search-paths + (list (search-path-specification + (variable "TEXMFLOCAL") + (files '("share/texmf-local"))))) (arguments `(#:modules ((guix build utils)) #:builder @@ -353,6 +361,10 @@ This package contains a small subset of the texmf-dist data."))) (inputs `(("texlive-texmf" ,texlive-texmf-minimal) ,@(alist-delete "texlive-texmf" (package-inputs texlive)))) + (native-search-paths + (list (search-path-specification + (variable "TEXMFLOCAL") + (files '("share/texmf-local"))))) (description "TeX Live provides a comprehensive TeX document production system. It includes all the major TeX-related programs, macro packages, and fonts -- cgit v1.2.3 From 8b5ed303dd690a2bbd0758c3478dd4a9bd7cb435 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 9 Jul 2016 13:49:02 +0800 Subject: gnu: conky: Update to 1.10.3. * gnu/packages/conky.scm (conky): Update to 1.10.3. [arguments]: Add #:configure-flags. [inputs]: Add libxinerama. --- gnu/packages/conky.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm index 150d182032..206546b53a 100644 --- a/gnu/packages/conky.scm +++ b/gnu/packages/conky.scm @@ -32,7 +32,7 @@ (define-public conky (package (name "conky") - (version "1.10.0") + (version "1.10.3") (source (origin (method url-fetch) @@ -40,10 +40,15 @@ version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1szq4ckfkvyabv5llf9nkdxipn7429sralsxyr7z0dyc3zwz74pk")))) + (base32 "1m9byrmpc2sprzk44v447yaqjzsvw230a0mlw7y1ngz3m3y44qs5")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests + #:configure-flags + '("-DRELEASE=true" + ;; XXX: it checks ncurses with pkg-config. + ;; TODO: add 'ncurses.pc' to the ncurses package. + "-DBUILD_NCURSES=false") #:phases (alist-cons-after 'unpack 'add-freetype-to-search-path @@ -67,6 +72,7 @@ ("libx11" ,libx11) ("libxdamage" ,libxdamage) ("libxft" ,libxft) + ("libxinerama" ,libxinerama) ("lua" ,lua))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 4277313883c6cd21c2abc652e224e369b258f226 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Jul 2016 09:28:55 +0300 Subject: gnu: exim: Adjust to pcre output split. * gnu/packages/mail.scm (exim)[native-inputs]: Add pcre:bin. [inputs]: Remove pcre. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index cea4c44e50..5ce7ed4254 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -705,12 +705,12 @@ delivery.") ("gzip" ,gzip) ("bzip2" ,bzip2) ("xz" ,xz) - ("pcre" ,pcre) ("perl" ,perl) ("libxt" ,libxt) ("libxaw" ,libxaw))) (native-inputs - `(("perl" ,perl))) + `(("pcre" ,pcre "bin") + ("perl" ,perl))) (arguments '(#:phases (alist-replace -- cgit v1.2.3 From 38e9373b0d668d9e8347e0d6adce218480d41661 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Jul 2016 10:23:08 +0300 Subject: gnu: glibc-2.21: Fix substitutes in glibc-2.21. * gnu/packages/base.scm (glibc-2.21)[arguments]: Add back substitution for /bin/pwd which was removed in the update of glibc to 2.23. --- gnu/packages/base.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 422424cbe8..ed1f84c470 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -732,7 +732,16 @@ GLIBC/HURD for a Hurd host" (sha256 (base32 "1f135546j34s9bfkydmx2nhh9vwxlx60jldi80zmsnln6wj3dsxf")) - (patches (search-patches "glibc-ldd-x86_64.patch")))))) + (patches (search-patches "glibc-ldd-x86_64.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments glibc) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'fix-pwd + (lambda _ + ;; Use `pwd' instead of `/bin/pwd' for glibc-2.21 + (substitute* "configure" + (("/bin/pwd") "pwd")))))))))) (define-public glibc-locales (package -- cgit v1.2.3 From 5edf2f0561e05683c9df3fea8f728b0cecf3a69b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Jul 2016 11:54:57 +0300 Subject: gnu: grue-hunter: Adapt to gzip-1.8 update. * gnu/packages/games.scm (grue-hunter)[arguments]: Change gunzip call to gzip call, add `-d' to the gzip command. --- gnu/packages/games.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 39fc6f2666..6036ce3e19 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 John Darrington +;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016 David Thompson ;;; Copyright © 2014, 2015, 2016 Eric Bavier ;;; Copyright © 2014 Cyrill Schenkel @@ -20,7 +21,7 @@ ;;; Copyright © 2016 Albin Söderqvist ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016 Alex Griffin -;;; Copyright © 2013 Nikita Karetnikov +;;; Copyright © 2016 Efraim Flashner Date: Tue, 12 Jul 2016 18:18:26 -0400 Subject: Revert "gnu: python-sphinx-rtd-theme: Update to 0.1.9." This reverts commit e1257225e7bb211e3dd8d9373fb5a81fe83b6baf. --- gnu/packages/python.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1deaab79f8..e9020c1f7e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2717,14 +2717,16 @@ sources.") (define-public python-sphinx-rtd-theme (package (name "python-sphinx-rtd-theme") - (version "0.1.9") + (version "0.1.6") (source (origin (method url-fetch) - (uri (pypi-uri "sphinx_rtd_theme" version)) + (uri (string-append "https://pypi.python.org/packages/source/s/" + "sphinx_rtd_theme/sphinx_rtd_theme-" + version ".tar.gz")) (sha256 (base32 - "18d0r63w7jpdrk4q5qy26n08vdlmnj9sar93akwjphyambw4cf17")))) + "19nw3rn7awplcdrz63kg1njqwkbymfg9lwn7l2grhdyhyr2gaa8g")))) (build-system python-build-system) (arguments `(;; With standard flags, the install phase attempts to create a zip'd -- cgit v1.2.3 From 1a27944905b0fb843a6460e984238c5a204ed1e3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jul 2016 18:18:32 -0400 Subject: Revert "gnu: python-sphinx: Update to 1.4.4." This reverts commit efb386ca5c07c5a4571de8561fd5dcd2a4d9cec7. --- gnu/packages/python.scm | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e9020c1f7e..4479dddb2d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2677,33 +2677,22 @@ reStructuredText.") (define-public python-sphinx (package (name "python-sphinx") - (version "1.4.4") + (version "1.2.3") (source (origin (method url-fetch) - (uri (pypi-uri "Sphinx" version)) + (uri (string-append + "https://pypi.python.org/packages/source/S/Sphinx/Sphinx-" + version ".tar.gz")) (sha256 (base32 - "185zklh44fhrwp1dg6251g3w6zmssh5jzvbz8pvmkg9l6wvxdzry")))) + "011xizm3jnmf4cvs5i6kgf6c5nn046h79i8j0vd0f27yw9j3p4wl")))) (build-system python-build-system) (inputs - `( - ("python-alabaster" ,python-alabaster) - ("python-babel" ,python-babel) - ("python-docutils" ,python-docutils) - ("python-imagesize" ,python-imagesize) + `(("python-setuptools" ,python-setuptools) ("python-jinja2" ,python-jinja2) - ("python-pygments" ,python-pygments) - ("python-pytz" ,python-pytz) - ("python-setuptools" ,python-setuptools) - ("python-six" ,python-six))) - - ;; Several packages that use Sphinx want to use these propagated - ;; dependencies when using Sphinx. Rather than add them to all the Sphinx - ;; users, we propagate them from Sphinx. - (propagated-inputs - `(("python-pytz" ,python-pytz) - ("python-snowballstemmer" ,python-snowballstemmer))) + ("python-docutils" ,python-docutils) + ("python-pygments" ,python-pygments))) (home-page "http://sphinx-doc.org/") (synopsis "Python documentation generator") (description "Sphinx is a tool that makes it easy to create documentation -- cgit v1.2.3 From ce09c02c4c90eb37854ff6a960dde7d6bd5a8c70 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jul 2016 18:18:33 -0400 Subject: Revert "gnu: Add python-snowballstemmer." This reverts commit b3283dbaf395e024b6d88e63dbb0ccff42209f28. --- gnu/packages/python.scm | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4479dddb2d..da6dde5d3a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9727,25 +9727,3 @@ the default Sphinx theme.") (native-inputs `(("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs base)))))) - -(define-public python-snowballstemmer - (package - (name "python-snowballstemmer") - (version "1.2.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "snowballstemmer" version)) - (sha256 - (base32 - "0a0idq4y5frv7qsg2x62jd7rd272749xk4x99misf5rcifk2d7wi")))) - (build-system python-build-system) - (arguments - `(#:tests? #f)) ; no test suite - (synopsis "Snowball stemming library collection for Python") - (description "This package provides 16 stemmer algorithms generated from -Snowball algorithms.") - (home-page "https://github.com/shibukawa/snowball_py") - (license bsd-2))) - -(define-public python2-snowballstemmer - (package-with-python2 python-snowballstemmer)) -- cgit v1.2.3 From ced40bd7b591da11ff3818aaad53f97cef2d0add Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jul 2016 18:18:35 -0400 Subject: Revert "gnu: Add python-alabaster." This reverts commit 15c36240f0b9ab3e8dc0b57702bb6a5174e4ad58. --- gnu/packages/python.scm | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index da6dde5d3a..c9c782de13 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9700,30 +9700,3 @@ the PNG, JPEG, JPEG 2000, and GIF formats.") (native-inputs `(("python2-setuptools" ,python2-setuptools) ,@(package-native-inputs base)))))) - -(define-public python-alabaster - (package - (name "python-alabaster") - (version "0.7.8") - (source (origin - (method url-fetch) - (uri (pypi-uri "alabaster" version)) - (sha256 - (base32 - "1zqz9hsvnmpjklmir6g7rxlv2fslrgsnwb91r9sgz4n1zja1pjx1")))) - (build-system python-build-system) - (synopsis "Default theme for the Sphinx documentation system") - (description "Alabaster is a responsive and configurable theme for the -Sphinx documentation system. It is compatible with Python 2 and 3, and it is -the default Sphinx theme.") - (home-page "https://github.com/bitprophet/alabaster") - (license bsd-3) - (properties `((python2-variant . ,(delay python2-alabaster)))))) - -(define-public python2-alabaster - (let ((base (package-with-python2 (strip-python2-variant python-alabaster)))) - (package - (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) -- cgit v1.2.3 From 91f9f33a195b20a7b0501da201cec45ff7e9c558 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jul 2016 18:19:29 -0400 Subject: Revert "gnu: Add python-imagesize." This reverts commit d8fa9cf7f4173b1b30adc1a7b75f7dd46218c424. --- gnu/packages/python.scm | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c9c782de13..8bba7ca256 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9674,29 +9674,3 @@ implementation for Python.") (native-inputs `(("python2-ipaddress" ,python2-ipaddress) ,@(package-native-inputs base)))))) - -(define-public python-imagesize - (package - (name "python-imagesize") - (version "0.7.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "imagesize" version)) - (sha256 - (base32 - "0qk07k0z4241lkzzjji7z4da04pcvg7bfc4xz1934zlqhwmwdcha")))) - (build-system python-build-system) - (synopsis "Calculate the size of an image") - (description "This Python module returns the size of an image. It supports -the PNG, JPEG, JPEG 2000, and GIF formats.") - (home-page "https://github.com/shibukawa/imagesize_py") - (license license:expat) - (properties `((python2-variant . ,(delay python2-imagesize)))))) - -(define-public python2-imagesize - (let ((base (package-with-python2 (strip-python2-variant python-imagesize)))) - (package - (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) -- cgit v1.2.3 From 5d4c90ae02f1e0b42d575bba2d828d63aaf79be5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 19 Jul 2016 23:59:22 -0400 Subject: gnu: gnutls: Update to 3.5.2. * gnu/packages/tls.scm (gnutls): Update to 3.5.2. [native-inputs]: Add net-tools. --- gnu/packages/tls.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 39b8e99f11..ec4d3df1a6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages libffi) #:use-module (gnu packages libidn) + #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages perl) @@ -108,7 +109,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.5.0") + (version "3.5.2") (source (origin (method url-fetch) (uri @@ -119,7 +120,7 @@ living in the same process.") "/gnutls-" version ".tar.xz")) (sha256 (base32 - "09dfb0fn4spmdja6hs2yl470fn85fx0pa5nn9njnq7j19ma3nszw")))) + "10l5pv7qc5c850aamih3pdkbqpc4v2a6g164dzd7c7fjpxffji9b")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -158,7 +159,8 @@ living in the same process.") "debug" "doc")) ;4.1 MiB of man pages (native-inputs - `(("pkg-config" ,pkg-config) + `(("net-tools" ,net-tools) + ("pkg-config" ,pkg-config) ("which" ,which))) (inputs `(("guile" ,guile-2.0) -- cgit v1.2.3 From d778fa5ff6f4a860919eaf13db3f84cfc68cbee8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 Jul 2016 17:40:01 -0400 Subject: gnu: mozjs: Disable parallel build. * gnu/packages/gnuzilla.scm (mozjs)[arguments]: Add '#:parallel-build? #f'. --- gnu/packages/gnuzilla.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a18978282b..506ab98e91 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -76,7 +76,10 @@ `(("perl" ,perl) ("python" ,python-2))) (arguments - `(#:phases + `(;; XXX: parallel build fails, lacking: + ;; mkdir -p "system_wrapper_js/" + #:parallel-build? #f + #:phases (alist-cons-before 'configure 'chdir (lambda _ -- cgit v1.2.3 From f75f261f55335baa84dd82f6f465741368f7ab21 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 23 Jul 2016 00:33:28 +0000 Subject: gnu: libepoxy: Update to 1.3.1. * gnu/packages/gl.scm (libepoxy): Update to 1.3.1. Signed-off-by: Andreas Enge --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f36d15a9b9..a4bffe479f 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -443,7 +443,7 @@ OpenGL graphics API.") (define-public libepoxy (package (name "libepoxy") - (version "1.2") + (version "1.3.1") (source (origin (method url-fetch) (uri (string-append @@ -453,7 +453,7 @@ OpenGL graphics API.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1xp8g6b7xlbym2rj4vkbl6xpb7ijq7glpv656mc7k9b01x22ihs2")))) + "1d1brhwfmlzgnphmdwlvn5wbcrxsdyzf1qfcf8nb89xqzznxs037")))) (arguments `(#:phases (alist-cons-after -- cgit v1.2.3 From fe7fa353201286ae1ad78511d5b5cd3fa8213b65 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 23 Jul 2016 20:18:44 +0200 Subject: gnu: bitcoin-core: Build with bdb-5.3. * gnu/packages/finance.scm (bitcoin-core)[inputs]: Replace bdb by bdb-5.3. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 4d6c7392fb..179e32507c 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Andreas Enge +;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; @@ -61,7 +61,7 @@ ("python" ,python-2) ; for the tests ("util-linux" ,util-linux))) ; provides the hexdump command for tests (inputs - `(("bdb" ,bdb) + `(("bdb" ,bdb-5.3) ; with 6.2.23, there is an error: ambiguous overload ("boost" ,boost) ("libevent" ,libevent) ("miniupnpc" ,miniupnpc) -- cgit v1.2.3 From 71eba3ebc1b37b1623ad1cf29fadd711adafc043 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 Jul 2016 11:36:51 +0200 Subject: gnu: Add 'ghostscript-gs' and 'ghostscript-gs-with-x'. * gnu/packages/ghostscript.scm (ghostscript-wrapper): New procedure. (ghostscript-gs, ghostscript-gs/x): New variables. --- gnu/packages/ghostscript.scm | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 417f47e79a..f013a734e5 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -33,7 +33,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial)) (define-public lcms (package @@ -198,6 +199,40 @@ output file formats and printers.") ("libxt" ,libxt) ,@(package-inputs ghostscript))))) +(define (ghostscript-wrapper name ghostscript) + ;; Return a GHOSTSCRIPT wrapper that provides the 'gs' command. + ;; See . + (package + (name name) + (version (package-version ghostscript)) + (source #f) + (build-system trivial-build-system) + (inputs `(("ghostscript" ,ghostscript))) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils)) + + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin")) + (gs (assoc-ref %build-inputs "ghostscript"))) + (mkdir-p bin) + (with-directory-excursion bin + (symlink (string-append gs "/bin/gsc") "gs") + #t))))) + (synopsis "Wrapper providing Ghostscript's 'gs' command") + (description + "This package provides the @command{gs} command, which used to be +provided by Ghostscript itself and no longer is.") + (license (package-license ghostscript)) + (home-page (package-home-page ghostscript)))) + +(define-public ghostscript-gs + (ghostscript-wrapper "ghostscript-gs" ghostscript)) + +(define-public ghostscript-gs/x + (ghostscript-wrapper "ghostscript-gs-with-x" ghostscript/x)) + (define-public ijs (package (name "ijs") -- cgit v1.2.3 From d8eb912132ccdff955e3318fe549c5f7f674adf8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 Jul 2016 11:37:43 +0200 Subject: gnu: Use 'ghostscript-gs' in packages that need the 'gs' command. Fixes a regression introduced in eb354bdacbf4154ec66038dac07f19bf4ced1fad. Reported by Andreas Enge . * gnu/packages/gv.scm (gv)[propagated-inputs]: Change from GHOSTSCRIPT/X to GHOSTSCRIPT-GS/X. * gnu/packages/music.scm (lilypond): Use GHOSTSCRIPT-GS instead of GHOSTSCRIPT. * gnu/packages/ocaml.scm (unison): Likewise. * gnu/packages/plotutils.scm (asymptote): Likewise. * gnu/packages/scheme.scm (chez-scheme): Likewise. --- gnu/packages/gv.scm | 4 ++-- gnu/packages/music.scm | 2 +- gnu/packages/ocaml.scm | 2 +- gnu/packages/plotutils.scm | 2 +- gnu/packages/scheme.scm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gv.scm b/gnu/packages/gv.scm index 5f8532144b..240e3fc96c 100644 --- a/gnu/packages/gv.scm +++ b/gnu/packages/gv.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +39,7 @@ (sha256 (base32 "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1")))) (build-system gnu-build-system) - (propagated-inputs `(("ghostscript" ,ghostscript/x))) + (propagated-inputs `(("ghostscript" ,ghostscript-gs/x))) (inputs `(("libx11" ,libx11) ("libxaw3d" ,libxaw3d) ("libxinerama" ,libxinerama) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5d73790e51..75da9dad20 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -404,7 +404,7 @@ interface. It is implemented as a frontend to @code{klick}.") ("font-tex-gyre" ,font-tex-gyre) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("ghostscript" ,ghostscript) + ("ghostscript" ,ghostscript-gs) ("pango" ,pango) ("python" ,python-2))) (native-inputs diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bd913f6ecd..074f830358 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -569,7 +569,7 @@ libpanel, librsvg and quartz.") (native-inputs `(("ocaml" ,ocaml) ;; For documentation - ("ghostscript" ,ghostscript) + ("ghostscript" ,ghostscript-gs) ("texlive" ,texlive) ("hevea" ,hevea) ("lynx" ,lynx))) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 74d209192f..26864dc317 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -186,7 +186,7 @@ colors, styles, options and details.") ;; "help" command in interactive mode, so adding a "doc" output is not ;; currently useful. (native-inputs - `(("gs" ,ghostscript) ;For tests + `(("gs" ,ghostscript-gs) ;For tests ("texinfo" ,texinfo) ;For generating documentation ("texlive" ,texlive) ;For tests and documentation ("emacs" ,emacs-minimal) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 373b6f37b3..797cd153d2 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -635,7 +635,7 @@ threads.") ("stex" ,stex))) (native-inputs `(("texlive" ,texlive) - ("ghostscript" ,ghostscript) + ("ghostscript" ,ghostscript-gs) ("netpbm" ,netpbm))) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From e83a13faa221fe65eb86dee224a3f2aab9e13c60 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 25 Jul 2016 23:59:47 +0200 Subject: gnu: fastcap: Build with ghostscript-gs. * gnu/packages/engineering.scm (fastcap)[native-inputs]: Replace GHOSTSCRIPT by GHOST_SCRIPT-GS. This is a follow-up to commit d8eb912132ccdff955e3318fe549c5f7f674adf8. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b3e4431138..7383b13ff9 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -233,7 +233,7 @@ optimizer; and it can produce photorealistic and design review images.") (build-system gnu-build-system) (native-inputs `(("texlive" ,texlive) - ("ghostscript" ,ghostscript))) + ("ghostscript" ,ghostscript-gs))) (arguments `(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all") #:parallel-build? #f -- cgit v1.2.3 From 6689d09457c8d55b4f045ef9116478ffe02679df Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 26 Jul 2016 00:40:54 +0200 Subject: gnu: lpsolve: Fail as early as possible. * gnu/packages/maths.scm (lpsolve)[arguments]: In 'build' phase, check the return value of 'system*' and honor it. --- gnu/packages/maths.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ad7d0e22ee..0e6fda3758 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2198,11 +2198,10 @@ specifications.") (delete 'configure) (replace 'build (lambda _ - (with-directory-excursion "lpsolve55" - (system* "bash" "ccc")) - (with-directory-excursion "lp_solve" - (system* "bash" "ccc")) - #t)) + (and (with-directory-excursion "lpsolve55" + (zero? (system* "bash" "ccc"))) + (with-directory-excursion "lp_solve" + (zero? (system* "bash" "ccc")))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 5dbfbef7292a43029b17e89d682d9e24703d5cd2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 26 Jul 2016 00:42:05 +0200 Subject: gnu: lpsolve: Fix compilation issue. Reported by Andreas Enge at . * gnu/packages/maths.scm (lpsolve)[source]: Augment 'snippet'. --- gnu/packages/maths.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0e6fda3758..9f10933a64 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2189,7 +2189,14 @@ specifications.") ;; Pretend to be on a 64 bit platform to obtain a common directory ;; name for the build results on all architectures; nothing else ;; seems to depend on it. - (("^PLATFORM=.*$") "PLATFORM=ux64\n"))))) + (("^PLATFORM=.*$") "PLATFORM=ux64\n") + + ;; The check for 'isnan' as it is written fails with + ;; "non-floating-point argument in call to function + ;; ‘__builtin_isnan’", which leads to the 'NOISNAN' cpp macro + ;; definition, which in turn leads to bad things. Fix the feature + ;; test. + (("isnan\\(0\\)") "isnan(0.)"))))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 5ef469ce317a1915e135dd0eff38b42ffad06770 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 26 Jul 2016 23:06:31 +0200 Subject: gnu: lout: Build with ghostscript-gs. * gnu/packages/engineering.scm (lout)[inputs]: Replace GHOSTSCRIPT by GHOSTSCRIPT-GS. This is a follow-up to commit d8eb912132ccdff955e3318fe549c5f7f674adf8. --- gnu/packages/lout.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lout.scm b/gnu/packages/lout.scm index f6715c88d6..38b35c1d3d 100644 --- a/gnu/packages/lout.scm +++ b/gnu/packages/lout.scm @@ -88,7 +88,7 @@ (build-system gnu-build-system) ; actually, just a makefile (outputs '("out" "doc")) (inputs - `(("ghostscript" ,ghostscript))) + `(("ghostscript" ,ghostscript-gs))) (arguments `(#:modules ((guix build utils) (guix build gnu-build-system) (srfi srfi-1)) ; we need SRFI-1 -- cgit v1.2.3 From 02b934e2c6793a64570c9f5d9fbca8baf411d569 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 26 Jul 2016 23:09:01 +0200 Subject: gnu: lout: Make ghostscript-gs a native input. * gnu/packages/lout.scm (lout)[inputs]: Move to native-inputs. --- gnu/packages/lout.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lout.scm b/gnu/packages/lout.scm index 38b35c1d3d..57265a11c5 100644 --- a/gnu/packages/lout.scm +++ b/gnu/packages/lout.scm @@ -87,7 +87,7 @@ "1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix")))) (build-system gnu-build-system) ; actually, just a makefile (outputs '("out" "doc")) - (inputs + (native-inputs `(("ghostscript" ,ghostscript-gs))) (arguments `(#:modules ((guix build utils) (guix build gnu-build-system) -- cgit v1.2.3 From 5425269bf78ba906b974a20bfbfeb3b0dd6f9598 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 26 Jul 2016 23:28:55 +0200 Subject: gnu: lout: Add input ghostscript. * gnu/packages/lout.scm (lout)[native-inputs]: Add ghostscript, needed for ps2pdf. --- gnu/packages/lout.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lout.scm b/gnu/packages/lout.scm index 57265a11c5..1355e0387a 100644 --- a/gnu/packages/lout.scm +++ b/gnu/packages/lout.scm @@ -88,7 +88,8 @@ (build-system gnu-build-system) ; actually, just a makefile (outputs '("out" "doc")) (native-inputs - `(("ghostscript" ,ghostscript-gs))) + `(("ghostscript" ,ghostscript) + ("ghostscript-gs" ,ghostscript-gs))) (arguments `(#:modules ((guix build utils) (guix build gnu-build-system) (srfi srfi-1)) ; we need SRFI-1 -- cgit v1.2.3 From 0072b3d3f243614975a8691c8a0b968597ead233 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 27 Jul 2016 14:42:40 +0200 Subject: gnu: skribilo: Add input ghostscript-gs. * gnu/packages/engineering.scm (lout)[native-inputs]: Add ghostscript-gs. This is a follow-up to commit d8eb912132ccdff955e3318fe549c5f7f674adf8. --- gnu/packages/skribilo.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm index 52ed1c34e3..40bf659297 100644 --- a/gnu/packages/skribilo.scm +++ b/gnu/packages/skribilo.scm @@ -63,7 +63,8 @@ #:parallel-build? #f)) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config) + ("ghostscript-gs" , ghostscript-gs))) (inputs `(("guile" ,guile-2.0) ("imagemagick" ,imagemagick) -- cgit v1.2.3 From 8b732bf6d93ad2cb529c3c5f886efe2625c5fb72 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 27 Jul 2016 16:05:36 +0200 Subject: gnu: python-2.7: Disable test failing on mips64el-linux. * gnu/packages/python.scm (python-2.7)[source]: In a snippet, remove an additional test that fails on mips64el-linux. --- gnu/packages/python.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a5260f2bff..14f29f0784 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -125,7 +125,9 @@ "Lib/test/test_import.py" "Lib/test/test_shutil.py" "Lib/test/test_socket.py" - "Lib/test/test_subprocess.py")) + "Lib/test/test_subprocess.py" + ;; The following test apparently fails only on mips64el. + "Lib/test/test_ctypes.py")) #t)))) (outputs '("out" "tk")) ;tkinter; adds 50 MiB to the closure -- cgit v1.2.3 From 1bb163b0dd07c8f2cfd7e91f1e428075cd3d5ed2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 28 Jul 2016 00:58:40 +0200 Subject: gnu: python@2.7: Delete faulty test on mips64el only. This amends 8b732bf6d93ad2cb529c3c5f886efe2625c5fb72 and avoids a rebuild. * gnu/packages/python.scm (python-2.7)[arguments] : When (%current-system) starts with "mips64el", delete Lib/test/test_ctypes.py. --- gnu/packages/python.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 14f29f0784..2b42a2c343 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -125,9 +125,7 @@ "Lib/test/test_import.py" "Lib/test/test_shutil.py" "Lib/test/test_socket.py" - "Lib/test/test_subprocess.py" - ;; The following test apparently fails only on mips64el. - "Lib/test/test_ctypes.py")) + "Lib/test/test_subprocess.py")) #t)))) (outputs '("out" "tk")) ;tkinter; adds 50 MiB to the closure @@ -198,6 +196,13 @@ (lambda _ ;; 'Lib/test/test_site.py' needs a valid $HOME (setenv "HOME" (getcwd)) + ,@(if (string-prefix? "mips64el" (%current-system)) + + ;; XXX: The following test fails on mips64el. + '((false-if-exception + (delete-file "Lib/test/test_ctypes.py"))) + + '()) #t)) (add-after 'unpack 'set-source-file-times-to-1980 -- cgit v1.2.3 From 4320c1c39feb6b8f58e2005189d913c236c57d3c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 28 Jul 2016 11:34:57 +0200 Subject: gnu: asymptote: Add native input gs. * gnu/packages/plotutils.scm (asymptote)[native-inputs]: Add gs. This is a follow-up to commit d8eb912132ccdff955e3318fe549c5f7f674adf8. --- gnu/packages/plotutils.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 26864dc317..c913955975 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -187,6 +187,7 @@ colors, styles, options and details.") ;; currently useful. (native-inputs `(("gs" ,ghostscript-gs) ;For tests + ("gs-2" ,ghostscript) ;For dvipdfm ("texinfo" ,texinfo) ;For generating documentation ("texlive" ,texlive) ;For tests and documentation ("emacs" ,emacs-minimal) -- cgit v1.2.3 From d6dfc39f682375441ed4207621d379ab1e72cb52 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 20:13:42 +1000 Subject: gnu: r-s4vectors: Update to 0.10.2. * gnu/packages/bioinformatics.scm (r-s4vectors): Update to 0.10.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6f6ff8811f..26e0f94b2d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4514,13 +4514,13 @@ abnormal copy number.") (define-public r-s4vectors (package (name "r-s4vectors") - (version "0.10.0") + (version "0.10.2") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Vectors" version)) (sha256 (base32 - "1mi6lf6pnb9l657igy0vj4yz03yawbr2jhk22l757fzbjc7n9q3b")))) + "0cvq9yb97cka7lg5nimvzxbz8b2hxkscmjdqb5z23w5c7hrbjffp")))) (properties `((upstream-name . "S4Vectors"))) (build-system r-build-system) -- cgit v1.2.3 From 2d88825183c74d3726a609d6cbd58ef4c2aa0046 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 20:34:00 +1000 Subject: gnu: r-genomicfeatures: Update to 1.24.5. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.24.5. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 26e0f94b2d..5e011531fc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5039,13 +5039,13 @@ as well as query and modify the browser state, such as the current viewport.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.24.2") + (version "1.24.5") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "0ga5a7w8jnnq2k0kc07mshl6cggmbhzh42pzvhnilgl4x3kpbysl")))) + "17qpisdgqyjz2mnaiwc4dx7dg11pwq3mkvmkah9zn07g9rhh8f7p")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit v1.2.3 From 303163c7b99fa299904107601118edb0eaffcb92 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 20:52:50 +1000 Subject: gnu: r-genomeinfodb: Update to 1.8.3. * gnu/packages/bioinformatics.scm (r-genomeinfodb): Update to 1.8.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5e011531fc..9717857cc6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4594,13 +4594,13 @@ possible.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.8.1") + (version "1.8.3") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "0k4s6z5qj53zkfnyrmcbn3l2nzgm56bhv58rv321j22qa56cpz7d")))) + "03s2khhdwz06xr58cjpkil935y6p7f6ljqkbkkcai73qxl1k4ica")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) -- cgit v1.2.3 From 380d3f8657d4700a4d37e78ae8e6bef717c3da93 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 21:07:15 +1000 Subject: gnu: r-rtracklayer: Update to 1.32.2. * gnu/packages/bioinformatics.scm (r-rtracklayer): Update to 1.32.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9717857cc6..2b7d1fe77d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4994,13 +4994,13 @@ alignments.") (define-public r-rtracklayer (package (name "r-rtracklayer") - (version "1.32.0") + (version "1.32.2") (source (origin (method url-fetch) (uri (bioconductor-uri "rtracklayer" version)) (sha256 (base32 - "0nrwk1g8b1ymvbgnqniimbvwfq13r01va9rx3b03xj4hpywzy5nv")))) + "190767zpwc7maqjpy0x5bpkm0jp1vfawy9991fifw0mc634cjkga")))) (build-system r-build-system) (arguments `(#:phases -- cgit v1.2.3 From 722b4c919dcc761247ecf79ff5d5d89a467789cb Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 21:07:34 +1000 Subject: gnu: r-genomicalignments: Update to 1.8.4. * gnu/packages/bioinformatics.scm (r-genomicalignments): Update to 1.8.4. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2b7d1fe77d..36e12ed00a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4961,13 +4961,13 @@ samples.") (define-public r-genomicalignments (package (name "r-genomicalignments") - (version "1.8.0") + (version "1.8.4") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicAlignments" version)) (sha256 (base32 - "1y4qgqxq8dax9swgl59m6i7ggjpqrjllgx87b9vwls3z0nf1i6xj")))) + "1cccvalmm83ilk1kpq31ll8kdy9xclsr4pm4mlcc7bmp0rwkd2p2")))) (properties `((upstream-name . "GenomicAlignments"))) (build-system r-build-system) -- cgit v1.2.3 From 0d159d84e2bbd6140ce524cfe330ea2973a843de Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 21:07:44 +1000 Subject: gnu: r-summarizedexperiment: Update to 1.2.3. * gnu/packages/bioinformatics.scm (r-summarizedexperiment): Update to 1.2.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 36e12ed00a..b592571f08 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4932,13 +4932,13 @@ files.") (define-public r-summarizedexperiment (package (name "r-summarizedexperiment") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (bioconductor-uri "SummarizedExperiment" version)) (sha256 (base32 - "1c81acgw3a0ha5fgapfh9xq8yhryqqf8k259n2dz0mgz1k2d9klg")))) + "0c43fsrha886sd0diislnlf8r5h5x7fbhphkzcm0rw3k2jz8wlyk")))) (properties `((upstream-name . "SummarizedExperiment"))) (build-system r-build-system) -- cgit v1.2.3 From 658f36e56951385642823df6f5b6957d242781f7 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 21:08:33 +1000 Subject: gnu: r-biostrings: Update to 2.40.2. * gnu/packages/bioinformatics.scm (r-biostrings): Update to 2.40.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b592571f08..d927a6225f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4862,13 +4862,13 @@ objects.") (define-public r-biostrings (package (name "r-biostrings") - (version "2.40.0") + (version "2.40.2") (source (origin (method url-fetch) (uri (bioconductor-uri "Biostrings" version)) (sha256 (base32 - "03gyhiz14xy51nzg0glihk1rv19pq4p1aa3y5g23bzcshs67ggj9")))) + "153rfws5sdha324p1nv7jp75ip6ny0f62jzhqcvs46l85h3i8zgh")))) (properties `((upstream-name . "Biostrings"))) (build-system r-build-system) -- cgit v1.2.3 From 7a0594fb5d724b7bc331dbaf96e6c6421ed9bb07 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 21:08:42 +1000 Subject: gnu: r-biocparallel: Update to 1.6.3. * gnu/packages/bioinformatics.scm (r-biocparallel): Update to 1.6.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d927a6225f..fc713fed11 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4838,13 +4838,13 @@ powerful online queries from gene annotation to database mining.") (define-public r-biocparallel (package (name "r-biocparallel") - (version "1.6.2") + (version "1.6.3") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocParallel" version)) (sha256 (base32 - "0ki5xvb3cwjmlsx81gr8ylk1qy3imlj2dd04mzpvl28x42ay4dqj")))) + "1gb3lpafhx9wi7wbjdvczdf837qq1arpymcr438jwx39biv9dwb4")))) (properties `((upstream-name . "BiocParallel"))) (build-system r-build-system) -- cgit v1.2.3 From ae60f3801acb0c2dbaaa30761a505881fd9a660e Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 21:09:06 +1000 Subject: gnu: r-annotationdbi: Update to 1.34.4. * gnu/packages/bioinformatics.scm (r-annotationdbi): Update to 1.34.4. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fc713fed11..016411371b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4781,13 +4781,13 @@ on Bioconductor or which replace R functions.") (define-public r-annotationdbi (package (name "r-annotationdbi") - (version "1.34.2") + (version "1.34.4") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationDbi" version)) (sha256 (base32 - "0nw6c23098gkjlwlrra4rh1m65azczb31qr01pq81cn5gya1zkr4")))) + "1k3gfsjrivc7467vg0h705hh4dvzgdhknz62j7zmfxm67qk9r8rq")))) (properties `((upstream-name . "AnnotationDbi"))) (build-system r-build-system) -- cgit v1.2.3 From 362f39d6672f52c4c0839ac6b0d0e2a679e9ddee Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 21:09:16 +1000 Subject: gnu: r-genomicranges: Update to 1.24.2. * gnu/packages/bioinformatics.scm (r-genomicranges): Update to 1.24.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 016411371b..43df0716fa 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4732,13 +4732,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.") (define-public r-genomicranges (package (name "r-genomicranges") - (version "1.24.0") + (version "1.24.2") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicRanges" version)) (sha256 (base32 - "1iyzg1npl3rnnslwq3h759vf0xhshnn5v801rnlj6bnxzhn9yaqh")))) + "183kdz76rz93v69k6x684bpwa28xixp83bsyf6xfy182h6vh8x89")))) (properties `((upstream-name . "GenomicRanges"))) (build-system r-build-system) -- cgit v1.2.3 From bd0cc378347bbf1edf2a05ffb16dd58c3e34e66a Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 21:09:25 +1000 Subject: gnu: r-xvector: Update to 0.12.1. * gnu/packages/bioinformatics.scm (r-xvector): Update to 0.12.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 43df0716fa..c3c98b9097 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4696,13 +4696,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.") (define-public r-xvector (package (name "r-xvector") - (version "0.12.0") + (version "0.12.1") (source (origin (method url-fetch) (uri (bioconductor-uri "XVector" version)) (sha256 (base32 - "0c9cqjcxxks3an4wiq167h2grxlfyazajn7bmxhbk42zifp8vmqp")))) + "1kydy9f5y0ihn2mbkamr1kh0g1d3g1k9d7s4i09qgw9ysr6j414v")))) (properties `((upstream-name . "XVector"))) (build-system r-build-system) -- cgit v1.2.3 From 1c4ad6076c8a1667b13eb62bef8ca678fe5e8510 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 21:09:41 +1000 Subject: gnu: r-limma: Update to 3.28.17. * gnu/packages/bioinformatics.scm (r-limma): Update to 3.28.17. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c3c98b9097..8edaf3cdd8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4677,13 +4677,13 @@ coding changes and predict coding outcomes.") (define-public r-limma (package (name "r-limma") - (version "3.28.14") + (version "3.28.17") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "1jgn66ajafhjlqpfcw2p85h6ah8mgmz66znmsw6pcapia7d34akw")))) + "124n8dbvl1yy8b1068kqmqszpfhaawk5xfyb73vixma2i66nrcyk")))) (build-system r-build-system) (home-page "http://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") -- cgit v1.2.3 From e426cd7421d18db15a925c1aff58bacccdd3c63a Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 21:10:05 +1000 Subject: gnu: r-iranges: Update to 2.6.1. * gnu/packages/bioinformatics.scm (r-iranges): Update to 2.6.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8edaf3cdd8..226583447f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4565,13 +4565,13 @@ utilities for sequence data management under the ACNUC system.") (define-public r-iranges (package (name "r-iranges") - (version "2.6.0") + (version "2.6.1") (source (origin (method url-fetch) (uri (bioconductor-uri "IRanges" version)) (sha256 (base32 - "0dz7z0pk8hq79mcgylw920999s08h6j8xrl31rdxhssmi7l8v6vy")))) + "06pyam3bjjfw2m3l86rda503lsz2jcg645lcnhvrz6qi0nv359yg")))) (properties `((upstream-name . "IRanges"))) (build-system r-build-system) -- cgit v1.2.3 From ae32c58e2836f1c83609ebbb9eb9a632b63bae49 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 28 Jul 2016 21:17:32 +1000 Subject: gnu: r-bsgenome: Update to 1.40.1. * gnu/packages/bioinformatics.scm (r-bsgenome): Update to 1.40.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 226583447f..29fb3be0db 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5154,13 +5154,13 @@ dependencies between GO terms can be implemented and applied.") (define-public r-bsgenome (package (name "r-bsgenome") - (version "1.40.0") + (version "1.40.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BSgenome" version)) (sha256 (base32 - "08g3w47ysbmgj4hclb0x2wsn7pi9cnm3xkkfk4shgrka2g23qz44")))) + "0zmlzlcwairka59is5wmkh6knh6j4d328z9fsw3v91fx6gavjl2n")))) (properties `((upstream-name . "BSgenome"))) (build-system r-build-system) -- cgit v1.2.3 From c6b3dc69bd4e6cd6f3457e3cfb671ca4e588344b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 28 Jul 2016 13:55:03 +0200 Subject: gnu: vlc: Drop -ffast-math from the compilation flags. * gnu/packages/video.scm (vlc)[arguments]: Add "ac_cv_c_fast_math=no" to #:configure-flags. --- gnu/packages/video.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d5880c45e2..06f7496b71 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -623,6 +623,12 @@ audio/video codec library.") (arguments `(#:configure-flags `("--disable-a52" ; FIXME: reenable once available + + ;; Gross workaround for . + ;; In our case, this led to a test failure: + ;; test_libvlc_equalizer: libvlc/equalizer.c:122: test_equalizer: Assertion `isnan(libvlc_audio_equalizer_get_amp_at_index (equalizer, u_bands))' failed. + "ac_cv_c_fast_math=no" + ,(string-append "LDFLAGS=-Wl,-rpath -Wl," (assoc-ref %build-inputs "ffmpeg") "/lib")) ;needed for the tests -- cgit v1.2.3 From 212163f8d5d51f436490d47dc37afd5052560197 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 28 Jul 2016 14:18:59 +0200 Subject: gnu: dico: Patch 'idxgcide' bug. * gnu/packages/patches/dico-idxgcide-bug.patch: New file. * gnu/packages/dico.scm (dico)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/dico.scm | 5 +++-- gnu/packages/patches/dico-idxgcide-bug.patch | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/dico-idxgcide-bug.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1580bf189c..91e90706c2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -471,6 +471,7 @@ dist_patch_DATA = \ %D%/packages/patches/dealii-p4est-interface.patch \ %D%/packages/patches/devil-CVE-2009-3994.patch \ %D%/packages/patches/devil-fix-libpng.patch \ + %D%/packages/patches/dico-idxgcide-bug.patch \ %D%/packages/patches/dico-libtool-deterministic.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ diff --git a/gnu/packages/dico.scm b/gnu/packages/dico.scm index 780d8efcc7..87062f94dc 100644 --- a/gnu/packages/dico.scm +++ b/gnu/packages/dico.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ludovic Courtès +;;; Copyright © 2015, 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,7 +44,8 @@ (base32 "04pjks075x20d19l623mj50bw64g8i41s63z4kzzqcbg9qg96x64")) (patches (search-patches "cpio-gets-undeclared.patch" - "dico-libtool-deterministic.patch")))) + "dico-libtool-deterministic.patch" + "dico-idxgcide-bug.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--with-guile-site-dir=" %output diff --git a/gnu/packages/patches/dico-idxgcide-bug.patch b/gnu/packages/patches/dico-idxgcide-bug.patch new file mode 100644 index 0000000000..28cc8a6a08 --- /dev/null +++ b/gnu/packages/patches/dico-idxgcide-bug.patch @@ -0,0 +1,21 @@ +Reported at . +Patch the .c file to avoid depending on Flex. + +commit 4599abbda3b5979367138ea098e435c919fe93fc +Author: Sergey Poznyakoff +Date: Thu Jul 28 14:09:58 2016 +0300 + + Bugfix + + * modules/gcide/idxgcide.l (main): Initialize ipg_header. + +--- dico-2.2/modules/gcide/idxgcide.c 2016-07-28 14:15:07.823587004 +0200 ++++ dico-2.2/modules/gcide/idxgcide.c 2016-07-28 14:15:09.435600549 +0200 +@@ -2497,6 +2497,7 @@ main(int argc, char **argv) + dico_log(L_ERR, 0, _("not enough memory")); + exit(EX_UNAVAILABLE); + } ++ idx_page->ipg_header.hdr.phdr_numentries = 0; + idx_page->ipg_header.hdr.phdr_text_offset = idx_header.ihdr_pagesize / 2; + + idx_header.ihdr_maxpageref = idx_header.ihdr_pagesize / 2 / -- cgit v1.2.3 From 716753cb9768dde6494b4bd2895f2186c31c0e34 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 30 Jul 2016 01:07:50 +0200 Subject: tests: base: Correct invalid merge. Fixes a regression introduced by merge commit 7575655212ecfbcd1f04e429c8a7a41f8720d027. * gnu/tests/base.scm (run-basic-test)[test]: Fix list of 'use-modules' and 'test-begin' call. --- gnu/tests/base.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 479403e5c1..a6278b25d4 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -73,6 +73,8 @@ properties of running system to what's declared in OS, an ." (with-imported-modules '((gnu build marionette)) #~(begin (use-modules (gnu build marionette) + (srfi srfi-1) + (srfi srfi-26) (srfi srfi-64) (ice-9 match)) @@ -82,7 +84,7 @@ properties of running system to what's declared in OS, an ." (mkdir #$output) (chdir #$output) - (test-begin "mcron") + (test-begin "basic") (test-assert "uname" (match (marionette-eval '(uname) marionette) -- cgit v1.2.3 From c2c54ebd9153fd4a9609a3c58fb689aa9b242640 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 30 Jul 2016 13:14:36 +0200 Subject: gnu: Add glibc 2.22. * gnu/packages/base.scm (glibc-2.22): New variable. (glibc-2.21): Inherit from it; remove 'arguments' field. --- gnu/packages/base.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index ed1f84c470..3135108ac8 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -719,19 +719,19 @@ GLIBC/HURD for a Hurd host" (define-syntax glibc (identifier-syntax (glibc-for-target))) -(define-public glibc-2.21 +(define-public glibc-2.22 ;; The old libc, which we use mostly to build locale data in the old format ;; (which the new libc can cope with.) (package (inherit glibc) - (version "2.21") + (version "2.22") (source (origin (inherit (package-source glibc)) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "1f135546j34s9bfkydmx2nhh9vwxlx60jldi80zmsnln6wj3dsxf")) + "0j49682pm2nh4qbdw35bas82p1pgfnz4d2l7iwfyzvrvj0318wzb")) (patches (search-patches "glibc-ldd-x86_64.patch")))) (arguments (substitute-keyword-arguments (package-arguments glibc) @@ -743,6 +743,21 @@ GLIBC/HURD for a Hurd host" (substitute* "configure" (("/bin/pwd") "pwd")))))))))) +(define-public glibc-2.21 + ;; The old libc, which we use mostly to build locale data in the old format + ;; (which the new libc can cope with.) + (package + (inherit glibc-2.22) + (version "2.21") + (source (origin + (inherit (package-source glibc)) + (uri (string-append "mirror://gnu/glibc/glibc-" + version ".tar.xz")) + (sha256 + (base32 + "1f135546j34s9bfkydmx2nhh9vwxlx60jldi80zmsnln6wj3dsxf")) + (patches (search-patches "glibc-ldd-x86_64.patch")))))) + (define-public glibc-locales (package (inherit glibc) -- cgit v1.2.3 From 85860fdf82f75c2026d8b93aac14ad34feea3d87 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 31 Jul 2016 10:42:47 +0800 Subject: gnu: glibc-locales: Fix build. * gnu/packages/patches/glibc-locales.patch: Adjust to glibc-2.23. * gnu/packages/base.scm (glibc-locales)[arguments]: Pass 'lib_cv_complocaledir'. --- gnu/packages/base.scm | 2 +- gnu/packages/patches/glibc-locales.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3135108ac8..5edf3eb493 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -786,7 +786,7 @@ the 'share/locale' sub-directory of this package.") ((#:configure-flags flags) `(append ,flags ;; Use $(libdir)/locale/X.Y as is the case by default. - (list (string-append "libc_cv_localedir=" + (list (string-append "libc_cv_complocaledir=" (assoc-ref %outputs "out") "/lib/locale/" ,(package-version glibc)))))))))) diff --git a/gnu/packages/patches/glibc-locales.patch b/gnu/packages/patches/glibc-locales.patch index 1bcf12bf6f..3a125e845e 100644 --- a/gnu/packages/patches/glibc-locales.patch +++ b/gnu/packages/patches/glibc-locales.patch @@ -5,8 +5,8 @@ in a package separate from glibc. 2. Use '--no-archive' to avoid building the big locale archive, and because the already-built 'localedef' would want to write it to '/run/current-system/locale', which is not possible. - 3. Pass $(localedir)/$$locale to install files in the right place, and - because otherwise, 'localedef' fails with: + 3. Pass $(inst_complocaledir)/$$locale to install files in the right + place, and because otherwise, 'localedef' fails with: "cannot write output files to `(null)'". --- glibc-2.22/localedata/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -25,7 +25,7 @@ in a package separate from glibc. $(LOCALEDEF) --alias-file=../intl/locale.alias \ -i locales/$$input -c -f charmaps/$$charset \ - $(addprefix --prefix=,$(install_root)) $$locale \ -+ $(addprefix --prefix=,$(install_root)) $(localedir)/$$locale \ ++ $(addprefix --prefix=,$(install_root)) $(inst_complocaledir)/$$locale \ && echo ' done'; \ tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP -- cgit v1.2.3 From 33906d54c1a36216dce25b039b5dc5062e8856bb Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Jul 2016 09:54:13 +0200 Subject: gnu: perl-xml-libxml: Update to 2.0128. * gnu/packages/xml.scm (perl-xml-libxml): Update to 2.0128. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 6a8fff54cd..e97a0b01ea 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -207,7 +207,7 @@ module.") (define-public perl-xml-libxml (package (name "perl-xml-libxml") - (version "2.0125") + (version "2.0128") (source (origin (method url-fetch) @@ -215,7 +215,7 @@ module.") "XML-LibXML-" version ".tar.gz")) (sha256 (base32 - "1mvbv1pwpdqni9ia9b6brg8brnnvfxr8j5x872qsngc92gipyh01")))) + "0awgd2gjzy7kn38bqblsigikzl81xsi561phkz9f9b9v3x2vmrr6")))) (build-system perl-build-system) (propagated-inputs `(("perl-xml-namespacesupport" ,perl-xml-namespacesupport) -- cgit v1.2.3 From bb484529cc146c99ad4ee7c27674cff9a80572fe Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Jul 2016 11:18:53 +0200 Subject: gnu: python-alembic: Update to 0.8.7. * gnu/packages/python.scm (python-alembic): Update to 0.8.7. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3753f9a1bf..5ba92b2aa3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3672,14 +3672,14 @@ simple and Pythonic domain language.") (define-public python-alembic (package (name "python-alembic") - (version "0.8.4") + (version "0.8.7") (source (origin (method url-fetch) (uri (pypi-uri "alembic" version)) (sha256 (base32 - "0jk23a852l3ybv7gfz81xzslyrnqnpjds5x15zd234y9rh9gq1w5")))) + "0ias6fdzwr2s220fnjspkdgm9510bd0cnap0hx5y4zy4srba9f3z")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) -- cgit v1.2.3 From 7b995c7bcbd989a6d44bc69e1e912df3c8192692 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Jul 2016 12:11:05 +0200 Subject: gnu: wine: Update to 1.9.15. * gnu/packages/wine.scm (wine): Update to 1.9.15. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 54cb65503c..03a896b8e1 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -52,7 +52,7 @@ (define-public wine (package (name "wine") - (version "1.9.4") + (version "1.9.15") (source (origin (method url-fetch) (uri (string-append "https://dl.winehq.org/wine/source/" @@ -60,7 +60,7 @@ "/wine-" version ".tar.bz2")) (sha256 (base32 - "1f5v1gns0xs512a6ym785cn29j8dxdbnxnvkg8v0p1w0p6vfmhbm")))) + "1nmd65knzyh8b0yhxlqqvzai5rpnmhhm0c46n789zr5hj74jm6fg")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gnu-gettext) -- cgit v1.2.3 From 101e847294dc403d5a7ef222117ad9070223b86b Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Jul 2016 15:22:41 +0200 Subject: gnu: dealii: Update to 8.4.1. * gnu/packages/maths.scm (dealii): Update to 8.4.1. * gnu/packages/patches/dealii-p4est-interface.patch: Remove file. --- gnu/packages/maths.scm | 5 +- gnu/packages/patches/dealii-p4est-interface.patch | 62 ----------------------- 2 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 gnu/packages/patches/dealii-p4est-interface.patch (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 86643b3ae3..e57eaa0536 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2247,7 +2247,7 @@ revised simplex and the branch-and-bound methods.") (define-public dealii (package (name "dealii") - (version "8.2.1") + (version "8.4.1") (source (origin (method url-fetch) @@ -2255,8 +2255,7 @@ revised simplex and the branch-and-bound methods.") "download/v" version "/dealii-" version ".tar.gz")) (sha256 (base32 - "185jych0gdnpkjwxni7pd0dda149492zwq2457xdjg76bzj78mnp")) - (patches (search-patches "dealii-p4est-interface.patch")) + "1bdksvvyp1rj37df1ndh8j3x9nzpc3sazw8nd0hzvnlw0qnyk800")) (modules '((guix build utils))) (snippet ;; Remove bundled sources: UMFPACK, TBB, muParser, and boost diff --git a/gnu/packages/patches/dealii-p4est-interface.patch b/gnu/packages/patches/dealii-p4est-interface.patch deleted file mode 100644 index 4c4125d16c..0000000000 --- a/gnu/packages/patches/dealii-p4est-interface.patch +++ /dev/null @@ -1,62 +0,0 @@ -From upstream commit f764598c. - -The p4est_connectivity_load function used to take an unsigned long as argument, -but this has been changed to size_t in p4est 1.0. This makes no difference on -64 bit systems, but leads to compiler errors on 32 bit systems. Fix this. - ---- a/source/distributed/tria.cc -+++ b/source/distributed/tria.cc -@@ -204,7 +204,11 @@ namespace internal - static - int (&connectivity_is_valid) (types<2>::connectivity *connectivity); - --#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) -+#if DEAL_II_P4EST_VERSION_GTE(1,0,0,0) -+ static -+ types<2>::connectivity *(&connectivity_load) (const char *filename, -+ size_t *length); -+#elif DEAL_II_P4EST_VERSION_GTE(0,3,4,3) - static - types<2>::connectivity *(&connectivity_load) (const char *filename, - long unsigned *length); -@@ -384,7 +388,12 @@ namespace internal - *connectivity) - = p4est_connectivity_is_valid; - --#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) -+#if DEAL_II_P4EST_VERSION_GTE(1,0,0,0) -+ types<2>::connectivity * -+ (&functions<2>::connectivity_load) (const char *filename, -+ size_t *length) -+ = p4est_connectivity_load; -+#elif DEAL_II_P4EST_VERSION_GTE(0,3,4,3) - types<2>::connectivity * - (&functions<2>::connectivity_load) (const char *filename, - long unsigned *length) -@@ -564,7 +573,11 @@ namespace internal - static - int (&connectivity_is_valid) (types<3>::connectivity *connectivity); - --#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) -+#if DEAL_II_P4EST_VERSION_GTE(1,0,0,0) -+ static -+ types<3>::connectivity *(&connectivity_load) (const char *filename, -+ size_t *length); -+#elif DEAL_II_P4EST_VERSION_GTE(0,3,4,3) - static - types<3>::connectivity *(&connectivity_load) (const char *filename, - long unsigned *length); -@@ -747,7 +760,12 @@ namespace internal - *connectivity) - = p8est_connectivity_is_valid; - --#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) -+#if DEAL_II_P4EST_VERSION_GTE(1,0,0,0) -+ types<3>::connectivity * -+ (&functions<3>::connectivity_load) (const char *filename, -+ size_t *length) -+ = p8est_connectivity_load; -+#elif DEAL_II_P4EST_VERSION_GTE(0,3,4,3) - types<3>::connectivity * - (&functions<3>::connectivity_load) (const char *filename, - long unsigned *length) -- cgit v1.2.3 From 70a967209c6999c5755777afe974a0f8c43f9a04 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Jul 2016 16:37:39 +0200 Subject: gnu: dealii: Unregister deleted patch. * gnu/local.mk (dist_patch_DATA): Drop deleted patch. This is a follow-up to commit 101e847294dc403d5a7ef222117ad9070223b86b. --- gnu/local.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1417a3c7d5..0ee096ad8a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -470,7 +470,6 @@ dist_patch_DATA = \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ - %D%/packages/patches/dealii-p4est-interface.patch \ %D%/packages/patches/devil-CVE-2009-3994.patch \ %D%/packages/patches/devil-fix-libpng.patch \ %D%/packages/patches/dico-idxgcide-bug.patch \ -- cgit v1.2.3 From ce430bd6378e83495f33af7786d7cbb49972d7a6 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Jul 2016 16:50:12 +0200 Subject: gnu: tcc: Use "kernel-headers" instead of "linux-headers" to designate input. * gnu/packages/c.scm (tcc)[arguments]: Use "kernel-headers" as identifier for an input. This is a follow-up to commit 55de892b435657f82a25c6499174d09b4a680f15. --- gnu/packages/c.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index e8d1236eb1..6e16d1365b 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -52,7 +52,7 @@ (assoc-ref %build-inputs "libc") "/include:" (assoc-ref %build-inputs - "linux-headers") + "kernel-headers") "/include:{B}/include") (string-append "--libpaths=" (assoc-ref %build-inputs "libc") -- cgit v1.2.3 From dceba1c19b52e6ae9bc0d69207b0fd887914a3f4 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Jul 2016 17:05:36 +0200 Subject: gnu: zsh: Update to 5.2. * gnu/packages/zsh.scm (zsh): Update to 5.2. --- gnu/packages/zsh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/zsh.scm b/gnu/packages/zsh.scm index fba7bb19b8..64dd635755 100644 --- a/gnu/packages/zsh.scm +++ b/gnu/packages/zsh.scm @@ -29,7 +29,7 @@ (define-public zsh (package (name "zsh") - (version "5.1.1") + (version "5.2") (source (origin (method url-fetch) (uri (list (string-append @@ -40,7 +40,7 @@ ".tar.gz"))) (sha256 (base32 - "11shllzhq53fg8ngy3bgbmpf09fn2czifg7hsb41nxi3410mpvcl")))) + "0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") #:phases (alist-cons-before -- cgit v1.2.3 From acac969fa2b0714ed5b0d9aaed959328dfcf096c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Jul 2016 17:11:15 +0200 Subject: gnu: fastcap: Add input ghostscript. * gnu/packages/engineering.scm (fastcap)[native-inputs]: Add ghostscript. This is a follow-up to commit e83a13faa221fe65eb86dee224a3f2aab9e13c60. --- gnu/packages/engineering.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 7383b13ff9..f6c3d5fba6 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -233,6 +233,7 @@ optimizer; and it can produce photorealistic and design review images.") (build-system gnu-build-system) (native-inputs `(("texlive" ,texlive) + ("ghostscript" ,ghostscript) ("ghostscript" ,ghostscript-gs))) (arguments `(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all") -- cgit v1.2.3 From 42bf34298eec19b37e276e49074113f29c494aed Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Jul 2016 18:16:25 +0200 Subject: gnu: rapicorn: Add patch to handle isnan. * gnu/packages/patches/rapicorn-isnan.patch: New file. * gnu/packages/graphics.scm (rapicorn)[source]: Add patch. * gnu/local.mk (dist_patch_DATA): Register patch. --- gnu/local.mk | 1 + gnu/packages/graphics.scm | 4 +- gnu/packages/patches/rapicorn-isnan.patch | 87 +++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/rapicorn-isnan.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0ee096ad8a..b91a925def 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -749,6 +749,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/qt4-ldflags.patch \ + %D%/packages/patches/rapicorn-isnan.patch \ %D%/packages/patches/ratpoison-shell.patch \ %D%/packages/patches/readline-link-ncurses.patch \ %D%/packages/patches/ripperx-missing-file.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f6298ce394..d0df83072e 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 Andreas Enge ;;; ;;; This file is part of GNU Guix. ;;; @@ -300,7 +301,8 @@ visual effects work for film.") "rapicorn-" version ".tar.xz")) (sha256 (base32 - "1y51yjrpsihas1jy905m9p3r8iiyhq6bwi2690c564i5dnix1f9d")))) + "1y51yjrpsihas1jy905m9p3r8iiyhq6bwi2690c564i5dnix1f9d")) + (patches (search-patches "rapicorn-isnan.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/rapicorn-isnan.patch b/gnu/packages/patches/rapicorn-isnan.patch new file mode 100644 index 0000000000..b0e7819e64 --- /dev/null +++ b/gnu/packages/patches/rapicorn-isnan.patch @@ -0,0 +1,87 @@ +From e0c8341b3e4e13778bcde00d477e461ea8e94306 Mon Sep 17 00:00:00 2001 +From: Stefan Westerfeld +Date: Fri, 22 Apr 2016 18:03:37 +0200 +Subject: [PATCH 031/176] RCORE: compile fixes for KUbuntu 16.04/gcc + 5.3.1-14ubuntu2 + +Rapicorn uses isnan(...) and isinf(...) from cmath.h, however on KUbuntu 16.04 +it should use std::isnan(...) and std::isinf(...) instead. Patch below. + +Acked-by: Tim Janik +--- + rcore/strings.cc | 10 +++++----- + rcore/tests/benchrcore.cc | 4 ++-- + rcore/tests/strings.cc | 4 ++-- + 3 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/rcore/strings.cc b/rcore/strings.cc +index d5b0216..8b3bc3f 100644 +--- a/rcore/strings.cc ++++ b/rcore/strings.cc +@@ -437,7 +437,7 @@ static long double + libc_strtold (const char *nptr, char **endptr) + { + const long double result = strtold (nptr, endptr); +- if (isnan (result) && std::signbit (result) == 0) ++ if (std::isnan (result) && std::signbit (result) == 0) + { + const char *p = nptr; + while (isspace (*p)) +@@ -500,9 +500,9 @@ string_to_double (const char *dblstring, const char **endptr) + String + string_from_float (float value) + { +- if (isnan (value)) ++ if (std::isnan (value)) + return std::signbit (value) ? "-NaN" : "+NaN"; +- if (isinf (value)) ++ if (std::isinf (value)) + return std::signbit (value) ? "-Infinity" : "+Infinity"; + return string_format ("%.7g", value); + } +@@ -511,9 +511,9 @@ string_from_float (float value) + String + string_from_double (double value) + { +- if (isnan (value)) ++ if (std::isnan (value)) + return std::signbit (value) ? "-NaN" : "+NaN"; +- if (isinf (value)) ++ if (std::isinf (value)) + return std::signbit (value) ? "-Infinity" : "+Infinity"; + return string_format ("%.17g", value); + } +diff --git a/rcore/tests/benchrcore.cc b/rcore/tests/benchrcore.cc +index 3899a08..12fde16 100644 +--- a/rcore/tests/benchrcore.cc ++++ b/rcore/tests/benchrcore.cc +@@ -188,8 +188,8 @@ test_random_numbers() + const double rf = random_frange (989617512, 9876547656); + TASSERT (rf >= 989617512 && rf < 9876547656); + } +- TASSERT (isnan (random_frange (NAN, 1))); +- TASSERT (isnan (random_frange (0, NAN))); ++ TASSERT (std::isnan (random_frange (NAN, 1))); ++ TASSERT (std::isnan (random_frange (0, NAN))); + #if 0 // example penalty paid in random_int64() + size_t i, j = 0; + for (i = 0; i < 100; i++) +diff --git a/rcore/tests/strings.cc b/rcore/tests/strings.cc +index 468a6e6..dae3e3d 100644 +--- a/rcore/tests/strings.cc ++++ b/rcore/tests/strings.cc +@@ -311,9 +311,9 @@ string_conversions (void) + TCMP (string_to_double ("-0.5"), ==, -0.5); + double tfloat; + tfloat = string_to_double ("+NAN"); +- assert (isnan (tfloat) && std::signbit (tfloat) == 0); ++ assert (std::isnan (tfloat) && std::signbit (tfloat) == 0); + tfloat = string_to_double ("-NAN"); +- assert (isnan (tfloat) && std::signbit (tfloat) == 1); ++ assert (std::isnan (tfloat) && std::signbit (tfloat) == 1); + TCMP (string_capitalize ("fOO bar"), ==, "Foo Bar"); + TCMP (string_capitalize ("foo BAR BAZ", 2), ==, "Foo Bar BAZ"); + } +-- +2.9.1 + -- cgit v1.2.3 From 932b2ea2064ec8ab8e81b959bd92f6138974fd39 Mon Sep 17 00:00:00 2001 From: Andy Patterson Date: Sun, 31 Jul 2016 13:21:07 -0400 Subject: gnu: ecl: Use "kernel-headers" instead of "linux-headers" to designate input. * gnu/packages/lisp.scm (ecl)[arguments]: Use "kernel-headers" as the identifier for an input. This is a follow-up to commit 55de892b435657f82a25c6499174d09b4a680f15. Signed-off-by: Andreas Enge --- gnu/packages/lisp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 5c0df4e1ff..177278080d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -148,7 +148,7 @@ interface to the Tk widget system.") `("CPATH" suffix ,(map (lambda (lib) (input-path lib "/include")) - `("linux-headers" ,@libraries))) + `("kernel-headers" ,@libraries))) `("LIBRARY_PATH" suffix ,library-directories) `("LD_LIBRARY_PATH" suffix ,library-directories))))) (add-after 'wrap 'check (assoc-ref %standard-phases 'check))))) -- cgit v1.2.3 From 2be896dec1d3caff2896074e94d491a1b6b468f9 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 1 Aug 2016 10:24:07 +0200 Subject: gnu: unison: Add input ghostscript. * gnu/packages/ocaml.scm (unison)[native-inputs]: Add ghostscript. This is a follow-up to commit e83a13faa221fe65eb86dee224a3f2aab9e13c60. --- gnu/packages/ocaml.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 074f830358..c14d83c016 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -569,7 +569,8 @@ libpanel, librsvg and quartz.") (native-inputs `(("ocaml" ,ocaml) ;; For documentation - ("ghostscript" ,ghostscript-gs) + ("ghostscript-gs" ,ghostscript-gs) + ("ghostscript" ,ghostscript) ("texlive" ,texlive) ("hevea" ,hevea) ("lynx" ,lynx))) -- cgit v1.2.3 From a348af403dc082cdf3d9f96572eea90590bb86e6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Aug 2016 19:00:43 +0200 Subject: gnu: texlive-texmf: Mark as non-substitutable. * gnu/packages/tex.scm (texlive-texmf)[arguments]: Add #:substitutable?. --- gnu/packages/tex.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bbbaf43c82..8501792250 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -187,6 +187,11 @@ This package contains the binaries.") `(#:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-26)) + + ;; This package takes 4 GiB, which we can't afford to distribute from + ;; our servers. + #:substitutable? #f + #:phases (modify-phases (map (cut assq <> %standard-phases) '(set-paths unpack patch-source-shebangs)) @@ -301,7 +306,8 @@ This package contains the complete TeX Live distribution.") ;; texlive-texmf-minimal is a pruned, small version of the texlive tree, -;; in particular dropping documentation and fonts. +;; in particular dropping documentation and fonts. It weighs in at 470 MiB +;; instead of 4 GiB. (define texlive-texmf-minimal (package (inherit texlive-texmf) (name "texlive-texmf-minimal") -- cgit v1.2.3 From a8cb87abe98d57fb763d5b14524dc32c96bd31b5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Aug 2016 23:08:48 +0200 Subject: install: Add nvi to the image. * gnu/system/install.scm (installation-os)[packages]: Add NVI. * doc/guix.texi (Proceeding with the Installation): Mention it. --- doc/guix.texi | 5 +++-- gnu/system/install.scm | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index de996907fe..f1848a1c5d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6394,8 +6394,9 @@ builds to @file{/gnu/store} which, initially, is an in-memory file system. Next, you have to edit a file and provide the declaration of the operating system to be installed. To -that end, the installation system comes with two text editors: GNU nano -(@pxref{Top,,, nano, GNU nano Manual}), and GNU Zile, an Emacs clone. +that end, the installation system comes with three text editors: GNU nano +(@pxref{Top,,, nano, GNU nano Manual}), GNU Zile (an Emacs clone), and +nvi (a clone of the original BSD @command{vi} editor). We strongly recommend storing that file on the target root file system, say, as @file{/mnt/etc/config.scm}. Failing to do that, you will have lost your configuration file once you have rebooted into the newly-installed system. diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 734a361c37..5acfa2c65b 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages grub) #:use-module (gnu packages texinfo) #:use-module (gnu packages compression) + #:use-module (gnu packages nvi) #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (self-contained-tarball @@ -401,6 +402,7 @@ Use Alt-F2 for documentation. ;; space; furthermore util-linux's fdisk is already ;; available here, so we keep that. bash-completion + nvi ;:wq! %base-packages)))) ;; Return it here so 'guix system' can consume it directly. -- cgit v1.2.3