branch master updated (3b2fa47 -> 6df2740)
civodul pushed a change to branch master in repository guix. from 3b2fa47 gnu: dos2unix: Update to 7.4.0. new 49d3d1d gnu: shellcheck: Update to 0.4.6. new 6df2740 gnu: Add emacs-json-snatcher. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/emacs.scm | 20 gnu/packages/haskell.scm | 6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-)
01/02: gnu: shellcheck: Update to 0.4.6.
civodul pushed a commit to branch master in repository guix. commit 49d3d1d9379267f9b1e1f66a5b0bcbd144cb6fd1 Author: ng0Date: Fri Oct 20 10:24:24 2017 + gnu: shellcheck: Update to 0.4.6. * gnu/packages/haskell.scm (shellcheck): Update to 0.4.6. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7e879f4..6864b7d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Ludovic Courtès -;;; Copyright © 2016 ng0 +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016, 2017 David Craven @@ -8601,7 +8601,7 @@ JSON (JavaScript Object Notation) is a lightweight data-interchange format.") (define-public shellcheck (package (name "shellcheck") -(version "0.4.5") +(version "0.4.6") (source (origin (method url-fetch) @@ -8609,7 +8609,7 @@ JSON (JavaScript Object Notation) is a lightweight data-interchange format.") "v" version ".tar.gz")) (sha256 (base32 - "14r84fcn28rin339avlvca5g0kz832f01x8dpmwb5ql8mbc4rlxr")) + "1qkd69lc34n3l23ss9rq1azvx49bfq4hi4bmaj76rgxybscxhg0w")) (file-name (string-append name "-" version ".tar.gz" (build-system haskell-build-system) (inputs
02/02: gnu: Add emacs-json-snatcher.
civodul pushed a commit to branch master in repository guix. commit 6df274073a15f33fcced306c068af9e84b96b8b9 Author: Oleg PykhalovDate: Sat Oct 14 13:29:14 2017 +0300 gnu: Add emacs-json-snatcher. * gnu/packages/emacs.scm (emacs-json-snatcher): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 20 1 file changed, 20 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6d9ea41..bc80389 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5667,6 +5667,26 @@ pair of minor modes which suppress all mouse events by intercepting them and running a customisable handler command (@code{ignore} by default). ") (license license:gpl3+))) +(define-public emacs-json-snatcher + (package +(name "emacs-json-snatcher") +(version "1.0.0") +(source + (origin + (method url-fetch) + (uri (string-append "https://github.com/Sterlingg/json-snatcher/archive/; + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 +(base32 + "1nfiwsifpdiz0lbrqa77nl0crnfrv5h85ans9b0g5rggnmyshcfb" +(build-system emacs-build-system) +(home-page "https://github.com/sterlingg/json-snatcher;) +(synopsis "Grabs the path to JSON values in a JSON file") +(description "@code{emacs-json-snatcher} grabs the path to JSON values in +a @url{http://json.org/, JSON} file.") +(license license:gpl3+))) + (define-public emacs-restclient (let ((commit "07a3888bb36d0e29608142ebe743b4362b800f40") (revision "1")) ;Guix package revision,
03/03: gnu: libvirt: Fix CVE-2017-1000256.
lfam pushed a commit to branch master in repository guix. commit 7827032a7cf7f68922de99b044969f1f823869fd Author: Leo FamulariDate: Fri Oct 20 13:02:54 2017 -0400 gnu: libvirt: Fix CVE-2017-1000256. * gnu/packages/patches/libvirt-CVE-2017-1000256.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/virtualization.scm (libvirt)[source]: Use it. --- gnu/local.mk | 1 + .../patches/libvirt-CVE-2017-1000256.patch | 84 ++ gnu/packages/virtualization.scm| 1 + 3 files changed, 86 insertions(+) diff --git a/gnu/local.mk b/gnu/local.mk index fd4f1be..a4e3426 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -815,6 +815,7 @@ dist_patch_DATA = \ %D%/packages/patches/libunistring-gnulib-multi-core.patch\ %D%/packages/patches/libusb-0.1-disable-tests.patch \ %D%/packages/patches/libusb-for-axoloti.patch\ + %D%/packages/patches/libvirt-CVE-2017-1000256.patch \ %D%/packages/patches/libvisio-fix-tests.patch\ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libxcb-python-3.5-compat.patch \ diff --git a/gnu/packages/patches/libvirt-CVE-2017-1000256.patch b/gnu/packages/patches/libvirt-CVE-2017-1000256.patch new file mode 100644 index 000..d577e1e --- /dev/null +++ b/gnu/packages/patches/libvirt-CVE-2017-1000256.patch @@ -0,0 +1,84 @@ +Fix CVE-2017-1000256: + +https://security.libvirt.org/2017/0002.html +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-1000256 + +Patch copied from upstream source repository: + +https://libvirt.org/git/?p=libvirt.git;a=commit;h=dc6c41798d1eb5c52c75365ffa22f7672709dfa7 + +From dc6c41798d1eb5c52c75365ffa22f7672709dfa7 Mon Sep 17 00:00:00 2001 +From: Daniel P. Berrange +Date: Thu, 5 Oct 2017 17:54:28 +0100 +Subject: [PATCH] qemu: ensure TLS clients always verify the server certificate + +The default_tls_x509_verify (and related) parameters in qemu.conf +control whether the QEMU TLS servers request & verify certificates +from clients. This works as a simple access control system for +servers by requiring the CA to issue certs to permitted clients. +This use of client certificates is disabled by default, since it +requires extra work to issue client certificates. + +Unfortunately the code was using this configuration parameter when +setting up both TLS clients and servers in QEMU. The result was that +TLS clients for character devices and disk devices had verification +turned off, meaning they would ignore errors while validating the +server certificate. + +This allows for trivial MITM attacks between client and server, +as any certificate returned by the attacker will be accepted by +the client. + +This is assigned CVE-2017-1000256 / LSN-2017-0002 + +Reviewed-by: Eric Blake +Signed-off-by: Daniel P. Berrange +(cherry picked from commit 441d3eb6d1be940a67ce45a286602a967601b157) +--- + src/qemu/qemu_command.c|2 +- + .../qemuxml2argv-serial-tcp-tlsx509-chardev.args |2 +- + ...xml2argv-serial-tcp-tlsx509-secret-chardev.args |2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index 9a27987..ae78cd1 100644 +--- a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +@@ -718,7 +718,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath, + if (virJSONValueObjectCreate(propsret, + "s:dir", path, + "s:endpoint", (isListen ? "server": "client"), +- "b:verify-peer", verifypeer, ++ "b:verify-peer", (isListen ? verifypeer : true), + NULL) < 0) + goto cleanup; + +diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args +index 5aff773..ab5f7e2 100644 +--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args +@@ -26,7 +26,7 @@ server,nowait \ + localport= \ + -device isa-serial,chardev=charserial0,id=serial0 \ + -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\ +-endpoint=client,verify-peer=no \ ++endpoint=client,verify-peer=yes \ + -chardev socket,id=charserial1,host=127.0.0.1,port=,\ + tls-creds=objcharserial1_tls0 \ + -device isa-serial,chardev=charserial1,id=serial1 \ +diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args +index 91f1fe0..2567abb 100644 +---
02/03: gnu: mysql: Update to 5.7.20.
lfam pushed a commit to branch master in repository guix. commit 48f8b0708234ac5516860639c8650488454a8fab Author: Leo FamulariDate: Fri Oct 20 12:56:49 2017 -0400 gnu: mysql: Update to 5.7.20. * gnu/packages/databases.scm (mysql): Update to 5.7.20. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8a3b23c..30b1661 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -453,7 +453,7 @@ RDBMS systems (which are deep in functionality).") (define-public mysql (package (name "mysql") -(version "5.7.19") +(version "5.7.20") (source (origin (method url-fetch) (uri (list (string-append @@ -465,7 +465,7 @@ RDBMS systems (which are deep in functionality).") name "-" version ".tar.gz"))) (sha256 (base32 - "1c8y54yk756179nx4dgg79dijmjdq5n8l057cnqsg70pjdpyfl9y" + "11v4g3igigv3zvknv67qml8in6fjrbs2vnr3q6bg6f62nydm95sk" (build-system cmake-build-system) (arguments `(#:configure-flags
01/03: gnu: webkitgtk: Update to 2.18.1.
lfam pushed a commit to branch master in repository guix. commit 3890df58005f20a2c61fb83227df160b5d069a91 Author: Leo FamulariDate: Thu Oct 19 00:19:08 2017 -0400 gnu: webkitgtk: Update to 2.18.1. * gnu/packages/webkit.scm (webkitgtk): Update to 2.18.1. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 7b4b306..59188ac 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -54,14 +54,14 @@ (define-public webkitgtk (package (name "webkitgtk") -(version "2.18.0") +(version "2.18.1") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/; name "-" version ".tar.xz")) (sha256 (base32 -"1383wlv98l8fwmhzy0fad82a44h5svm89c1kpa03wsp37mmf90xm" +"15fp7szmkpannx7avsynf0nv3y343qwq0fvq3rz2m2mw5wq7pnww" (build-system cmake-build-system) (arguments '(#:tests? #f ; no tests
branch master updated (a6e70e1 -> 7827032)
lfam pushed a change to branch master in repository guix. from a6e70e1 gnu: youtube-dl: Update to 2017.10.20. new 3890df5 gnu: webkitgtk: Update to 2.18.1. new 48f8b07 gnu: mysql: Update to 5.7.20. new 7827032 gnu: libvirt: Fix CVE-2017-1000256. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 1 + gnu/packages/databases.scm | 4 +- .../patches/libvirt-CVE-2017-1000256.patch | 84 ++ gnu/packages/virtualization.scm| 1 + gnu/packages/webkit.scm| 4 +- 5 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/libvirt-CVE-2017-1000256.patch
branch master updated (7827032 -> fd75eb6)
civodul pushed a change to branch master in repository guix. from 7827032 gnu: libvirt: Fix CVE-2017-1000256. new fd75eb6 gnu: Fix the hashes of mutated GitHub archives. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/audio.scm | 2 +- gnu/packages/engineering.scm | 2 +- gnu/packages/erlang.scm | 2 +- gnu/packages/fonts.scm | 2 +- gnu/packages/graphics.scm| 2 +- gnu/packages/java.scm| 4 ++-- gnu/packages/serialization.scm | 2 +- gnu/packages/version-control.scm | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-)
01/01: gnu: python@3.6: Fix building on aarch64.
efraim pushed a commit to branch python-updates in repository guix. commit 49c620e0685a0bbe40ff69159a9ca562ba02ca7f Author: Efraim FlashnerDate: Fri Oct 20 10:37:32 2017 +0300 gnu: python@3.6: Fix building on aarch64. * gnu/packages/python.scm (python@3.6)[source]: Remove another test. --- gnu/packages/python.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c81bc8f..96dd5f0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -348,8 +348,9 @@ data types.") (snippet '(begin (for-each delete-file -'("Lib/ctypes/test/test_win32.py" ; fails on aarch64 - "Lib/test/test_fcntl.py")) +'("Lib/ctypes/test/test_structures.py" ; fails on aarch64 + "Lib/ctypes/test/test_win32.py" ; fails on aarch64 + "Lib/test/test_fcntl.py")) ; fails on aarch64 #t (arguments (substitute-keyword-arguments (package-arguments python-2) ((#:tests? _) #t)))
branch python-updates updated (71d9f56 -> 49c620e)
efraim pushed a change to branch python-updates in repository guix. from 71d9f56 gnu: python-coverage: Update to 4.4.1. new 49c620e gnu: python@3.6: Fix building on aarch64. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/python.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
branch master updated (6df2740 -> f71ce28)
efraim pushed a change to branch master in repository guix. from 6df2740 gnu: Add emacs-json-snatcher. new f71ce28 gnu: speexdsp: Fix building on aarch64-linux. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/xiph.scm | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-)
01/01: gnu: speexdsp: Fix building on aarch64-linux.
efraim pushed a commit to branch master in repository guix. commit f71ce2824d8838109c7ad812f4284de16a3b0afc Author: Efraim FlashnerDate: Fri Oct 20 16:23:10 2017 +0300 gnu: speexdsp: Fix building on aarch64-linux. * gnu/packages/xiph.scm (speexdsp)[arguments]: On aarch64-linux, disable neon optimisations. --- gnu/packages/xiph.scm | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 5565cb5..9277f57 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014 Sree Harsha Totakura ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2015, 2016 Efraim Flashner +;;; Copyright © 2015, 2016, 2017 Efraim Flashner ;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -167,6 +167,11 @@ stereo encoding, and voice activity detection.") (base32 "1wcjyrnwlkayb20zdhp48y260rfyzg925qpjpljd5x9r01h8irja" (build-system gnu-build-system) +(arguments + `(#:configure-flags '(,@(if (string=? "aarch64-linux" + (%current-system)) + '("--enable-neon=no") ; neon defaults to armv7-a + '() (home-page "https://speex.org/;) (synopsis "Speex processing library") (description
01/01: bayfront: Use Debian binary kernel.
andreas pushed a commit to branch wip-bayfront in repository maintenance. commit 9e342a8f0bd751ba7430fc5ea43adf70a87f216c Author: Andreas EngeDate: Fri Oct 20 16:28:21 2017 +0200 bayfront: Use Debian binary kernel. * hydra/bayfront.scm (linux-debian): New variable. (return value): Use new variable as kernel. --- hydra/bayfront.scm | 44 ++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm index fbf945f..44fbad1 100644 --- a/hydra/bayfront.scm +++ b/hydra/bayfront.scm @@ -1,8 +1,47 @@ ;; OS configuration for bayfront, the frontend of the compile farm. -(use-modules (gnu) (guix) (sysadmin people)) +(use-modules (gnu) (guix) (sysadmin people) (guix build-system trivial)) (use-service-modules base networking admin mcron shepherd ssh web cuirass) -(use-package-modules admin linux ssh tls vim package-management web wget ci) +(use-package-modules admin linux ssh tls vim package-management web wget ci compression base) + + +(define-public linux-debian + (package +(name "linux-debian") +(version "4.9.30") +(source (origin + (method url-fetch) + (uri "http://security.debian.org/debian-security/pool/updates/main/l/linux/linux-image-4.9.0-3-amd64_4.9.30-2+deb9u5_amd64.deb;) + (sha256 + (base32 +"1j0c5vyxqgadz4axk6gi3rypr94ks1mj4h64rg6li0l5q4rr0bh8" +(build-system trivial-build-system) +(arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((out (string-append (assoc-ref %outputs "out"))) + (ar (string-append (assoc-ref %build-inputs "binutils") "/bin/ar")) + (xz (string-append (assoc-ref %build-inputs "xz") "/bin/xz")) + (tar (string-append (assoc-ref %build-inputs "tar") "/bin/tar"))) + (mkdir-p out) + (system* ar "x" (assoc-ref %build-inputs "source")) + (system* xz "--decompress" "data.tar.xz") + (system* tar "xvf" "data.tar") + (copy-recursively "lib" (string-append out "/lib")) + (copy-file "boot/vmlinuz-4.9.0-3-amd64" (string-append out "/bzImage")) + (copy-file "boot/System.map-4.9.0-3-amd64" (string-append out "/System.map")) + #t +(inputs + `(("binutils" ,binutils) + ("tar" ,tar) + ("xz" ,xz))) +(synopsis "Binary kernel from Debian; DO NOT USE!") +(description + "Kernel package from Debian for testing on bayfront") +(home-page "") +(license #f))) (define %sysadmins ;; The sysadmins. @@ -186,6 +225,7 @@ Happy hacking!\n")) (dependencies mapped-devices)) %base-file-systems)) + (kernel linux-debian) ;; Add a kernel module for RAID-10. (initrd (lambda (file-systems . rest) (apply base-initrd file-systems
branch wip-bayfront created (now 9e342a8)
andreas pushed a change to branch wip-bayfront in repository maintenance. at 9e342a8 bayfront: Use Debian binary kernel. This branch includes the following new commits: new 9e342a8 bayfront: Use Debian binary kernel. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
01/01: bayfront: Use Debian binary kernel.
andreas pushed a commit to branch wip-bayfront in repository maintenance. commit 40dd911bf30e2894152b96537eddca16121565c4 Author: Andreas EngeDate: Fri Oct 20 16:28:21 2017 +0200 bayfront: Use Debian binary kernel. * hydra/bayfront.scm (linux-debian): New variable. (return value): Use new variable as kernel. --- hydra/bayfront.scm | 44 ++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm index fbf945f..44fbad1 100644 --- a/hydra/bayfront.scm +++ b/hydra/bayfront.scm @@ -1,8 +1,47 @@ ;; OS configuration for bayfront, the frontend of the compile farm. -(use-modules (gnu) (guix) (sysadmin people)) +(use-modules (gnu) (guix) (sysadmin people) (guix build-system trivial)) (use-service-modules base networking admin mcron shepherd ssh web cuirass) -(use-package-modules admin linux ssh tls vim package-management web wget ci) +(use-package-modules admin linux ssh tls vim package-management web wget ci compression base) + + +(define-public linux-debian + (package +(name "linux-debian") +(version "4.9.30") +(source (origin + (method url-fetch) + (uri "http://security.debian.org/debian-security/pool/updates/main/l/linux/linux-image-4.9.0-3-amd64_4.9.30-2+deb9u5_amd64.deb;) + (sha256 + (base32 +"1j0c5vyxqgadz4axk6gi3rypr94ks1mj4h64rg6li0l5q4rr0bh8" +(build-system trivial-build-system) +(arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((out (string-append (assoc-ref %outputs "out"))) + (ar (string-append (assoc-ref %build-inputs "binutils") "/bin/ar")) + (xz (string-append (assoc-ref %build-inputs "xz") "/bin/xz")) + (tar (string-append (assoc-ref %build-inputs "tar") "/bin/tar"))) + (mkdir-p out) + (system* ar "x" (assoc-ref %build-inputs "source")) + (system* xz "--decompress" "data.tar.xz") + (system* tar "xvf" "data.tar") + (copy-recursively "lib" (string-append out "/lib")) + (copy-file "boot/vmlinuz-4.9.0-3-amd64" (string-append out "/bzImage")) + (copy-file "boot/System.map-4.9.0-3-amd64" (string-append out "/System.map")) + #t +(inputs + `(("binutils" ,binutils) + ("tar" ,tar) + ("xz" ,xz))) +(synopsis "Binary kernel from Debian; DO NOT USE!") +(description + "Kernel package from Debian for testing on bayfront") +(home-page "") +(license #f))) (define %sysadmins ;; The sysadmins. @@ -186,6 +225,7 @@ Happy hacking!\n")) (dependencies mapped-devices)) %base-file-systems)) + (kernel linux-debian) ;; Add a kernel module for RAID-10. (initrd (lambda (file-systems . rest) (apply base-initrd file-systems
branch wip-bayfront created (now 40dd911)
andreas pushed a change to branch wip-bayfront in repository maintenance. at 40dd911 bayfront: Use Debian binary kernel. This branch includes the following new commits: new 40dd911 bayfront: Use Debian binary kernel. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
01/01: system: Drop module not present in the binary Debian kernel, used for tests on bayfront.
andreas pushed a commit to branch wip-bayfront in repository guix. commit b0b64380d16706c8e28e1d5a363a3f462f07597e Author: Andreas EngeDate: Fri Oct 20 16:24:44 2017 +0200 system: Drop module not present in the binary Debian kernel, used for tests on bayfront. * gnu/system/linux-initrd.scm (base-initrd): Drop pata_acpi kernel module, which is not packaged with the Debian binary kernel. --- gnu/system/linux-initrd.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 948c543..ff6018c 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -289,7 +289,7 @@ loaded at boot time in the order in which they appear." "nvme" ;for new SSD NVMe devices "nls_iso8859-1";for `mkfs.fat`, et.al ,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system)) -'("pata_acpi" "pata_atiixp";for ATA controllers +'("pata_atiixp";for ATA controllers "isci") ;for SAS controllers like Intel C602 '()) ,@(if (or virtio? qemu-networking?)
branch wip-bayfront created (now b0b6438)
andreas pushed a change to branch wip-bayfront in repository guix. at b0b6438 system: Drop module not present in the binary Debian kernel, used for tests on bayfront. This branch includes the following new commits: new b0b6438 system: Drop module not present in the binary Debian kernel, used for tests on bayfront. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
branch wip-bayfront deleted (was 9e342a8)
andreas pushed a change to branch wip-bayfront in repository maintenance. was 9e342a8 bayfront: Use Debian binary kernel. This change permanently discards the following revisions: discards 9e342a8 bayfront: Use Debian binary kernel.
02/04: gnu: ola: Build with protobuf@2.
nckx pushed a commit to branch master in repository guix. commit fa9ac83ec4098ba89c8cc3c9671144fe853fbc06 Author: Tobias Geerinckx-RiceDate: Fri Oct 20 17:45:12 2017 +0200 gnu: ola: Build with protobuf@2. This follows up commit dd12d4aad02fc83e00e7b09d676aa78bcb7dd476. * gnu/packages/protobuf.scm (protobuf-2): New variable. * gnu/packages/lighting.scm (ola)[propagated-inputs]: Use it. --- gnu/packages/lighting.scm | 5 - gnu/packages/protobuf.scm | 14 ++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lighting.scm b/gnu/packages/lighting.scm index 7f01cdb..ab7069b 100644 --- a/gnu/packages/lighting.scm +++ b/gnu/packages/lighting.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John J. Foerch +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,7 +60,9 @@ ("libuuid" ,util-linux) ("zlib" ,zlib))) (propagated-inputs - `(("protobuf" ,protobuf))) ;; for pkg-config --libs libola + ;; Ola 0.10.5 only supports protobuf 2.x, and building it with 3.x breaks. + ;; XXX Remove protobuf-2 when it is no longer needed. + `(("protobuf" ,protobuf-2))) ;; for pkg-config --libs libola (arguments `(;; G++ >= 4.8 macro expansion tracking requires lots of memory, causing ;; build to fail on low memory systems. We disable that with the diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 5495582..2e681ca 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Daniel Pimentel ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,19 @@ yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats.") (license bsd-3))) +;; XXX Remove this old version when no other packages depend on it. +(define-public protobuf-2 + (package (inherit protobuf) +(version "2.6.1") +(source (origin + (method url-fetch) + (uri (string-append "https://github.com/google/protobuf/releases/; + "download/v" version "/protobuf-" + version ".tar.bz2")) + (sha256 + (base32 +"040rcs9fpv4bslhiy43v7dcrzakz4vwwpyqg4jp8bn24sl95ci7f")) + (define-public protobuf-c (package (name "protobuf-c")
03/04: gnu: dovecot: Update to 2.2.33.2.
nckx pushed a commit to branch master in repository guix. commit 5a740d06b681368acf8727d61059f7d8023e2d01 Author: Tobias Geerinckx-RiceDate: Fri Oct 20 18:50:49 2017 +0200 gnu: dovecot: Update to 2.2.33.2. * gnu/packages/mail.scm (dovecot): Update to 2.2.33.2. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 574bb3f..acbb68b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1108,7 +1108,7 @@ facilities for checking incoming mail.") (define-public dovecot (package (name "dovecot") -(version "2.2.33.1") +(version "2.2.33.2") (source (origin (method url-fetch) @@ -1116,7 +1116,7 @@ facilities for checking incoming mail.") (version-major+minor version) "/" name "-" version ".tar.gz")) (sha256 (base32 -"02w932hq8v9889k709gbg94jl983lzwd3nh51vkxq041821a3ng4" +"117f9i62liz2pm96zi2lpldzlj2knzj7g410zhifwmlsc1w3n7py" (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config)))
02/02: gnu: Add aegisub.
roptat pushed a commit to branch master in repository guix. commit c812f46058ad7f4baedd521ad4f0933737d82ae9 Author: Julien LepillerDate: Fri Oct 20 18:46:15 2017 +0200 gnu: Add aegisub. * gnu/packages/video.scm (aegisub): New variable. --- gnu/packages/video.scm | 57 ++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0605c14..43e4fc2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -85,6 +85,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages m4) @@ -2415,3 +2416,59 @@ programmers to access a standard API to open and decompress media files.") ;; sources are distributed under a different license that the binary. ;; see https://github.com/FFMS/ffms2/blob/master/COPYING (license license:gpl2+))); inherits from ffmpeg + +(define-public aegisub + (package +(name "aegisub") +(version "3.2.2") +(source (origin + (method url-fetch) + (uri (string-append + "http://ftp.aegisub.org/pub/archives/releases/source/; + name "-" version ".tar.xz")) + (sha256 + (base32 +"11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5" +(build-system gnu-build-system) +(arguments + `(#:configure-flags + (list "--disable-update-checker" + "--without-portaudio" + "--without-openal" + "--without-oss") + ;; tests require busted, a lua package we don't have yet + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-ldflags + (lambda _ + (setenv "LDFLAGS" "-pthread")) +(inputs + `(("boost" ,boost) + ("desktop-file-utils" ,desktop-file-utils) + ("ffms2" ,ffms2) + ("fftw" ,fftw) + ("hunspell" ,hunspell) + ("mesa" ,mesa) + ("libass" ,libass) + ("alsa-lib" ,alsa-lib) + ("pulseaudio" ,pulseaudio) + ("libx11" ,libx11) + ("freetype" ,freetype) + ("wxwidgets-gtk2" ,wxwidgets-gtk2))) +(native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) +(home-page "http://www.aegisub.org/;) +(synopsis "Subtitle engine") +(description + "Aegisub is a tool for creating and modifying subtitles. Aegisub makes +it quick and easy to time subtitles to audio, and features many powerful +tools for styling them, including a built-in real-time video preview.") +(license (list license:bsd-3 ; the package is licensed under the bsd-3, except + license:mpl1.1 ; for vendor/universalchardet under the mpl1.1 + license:expat ; and src/gl that is under a license similar + ; the the Expat license, with a rewording (Software -> Materials). (called MIT + ; by upstream). See https://github.com/Aegisub/Aegisub/blob/master/LICENCE + ; src/MatroskaParser.(c|h) is under bsd-3 with permission from the author +
01/02: gnu: Add ffms2.
roptat pushed a commit to branch master in repository guix. commit 6779ae27e62ab390b970944c74fb910028a40530 Author: Julien LepillerDate: Fri Oct 20 18:42:15 2017 +0200 gnu: Add ffms2. * gnu/packages/video.scm (aegisub): New variable. --- gnu/packages/video.scm | 30 ++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c1856b6..0605c14 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2385,3 +2385,33 @@ tables") generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818s and ITU-T H.222.0.") (license license:lgpl2.1))) + +(define-public ffms2 + (package +(name "ffms2") +(version "2.23") +(home-page "https://github.com/FFMS/ffms2/;) +(source (origin + (method url-fetch) + (uri (string-append home-page "archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 +"1vbkab8vrplxz5xgag8ggzkwp4f7nf285pd0l2a7zy66n6i2m6xh" +(build-system gnu-build-system) +(arguments + '(#:configure-flags + (list "--enable-avresample"))) +(inputs + `(("zlib" ,zlib))) +(propagated-inputs + `(("ffmpeg" ,ffmpeg))) +(native-inputs + `(("pkg-config" ,pkg-config))) +(synopsis "Cross-platform wrapper around ffmpeg/libav") +(description + "FFMpegSource is a wrapper library around ffmpeg/libav that allows +programmers to access a standard API to open and decompress media files.") +;; sources are distributed under a different license that the binary. +;; see https://github.com/FFMS/ffms2/blob/master/COPYING +(license license:gpl2+))); inherits from ffmpeg
branch master updated (f71ce28 -> c812f46)
roptat pushed a change to branch master in repository guix. from f71ce28 gnu: speexdsp: Fix building on aarch64-linux. new 6779ae2 gnu: Add ffms2. new c812f46 gnu: Add aegisub. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/video.scm | 87 ++ 1 file changed, 87 insertions(+)
branch master updated (c812f46 -> a6e70e1)
nckx pushed a change to branch master in repository guix. from c812f46 gnu: Add aegisub. new 77aa706 gnu: font-hack: Update to 3.000. new fa9ac83 gnu: ola: Build with protobuf@2. new 5a740d0 gnu: dovecot: Update to 2.2.33.2. new a6e70e1 gnu: youtube-dl: Update to 2017.10.20. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/fonts.scm| 19 ++- gnu/packages/lighting.scm | 5 - gnu/packages/mail.scm | 4 ++-- gnu/packages/protobuf.scm | 14 ++ gnu/packages/video.scm| 4 ++-- 5 files changed, 32 insertions(+), 14 deletions(-)
04/04: gnu: youtube-dl: Update to 2017.10.20.
nckx pushed a commit to branch master in repository guix. commit a6e70e1169f0ee71d9c7bc04a78cc9e84b198b25 Author: Tobias Geerinckx-RiceDate: Fri Oct 20 19:23:15 2017 +0200 gnu: youtube-dl: Update to 2017.10.20. * gnu/packages/video.scm (youtube-dl): Update to 2017.10.20. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 43e4fc2..63824f6 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1116,7 +1116,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") -(version "2017.10.15.1") +(version "2017.10.20") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/; @@ -1124,7 +1124,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 -"0zr9sx0nxk36si8xbvhlnazb69xzlygrhsxcyiydm0dy5y5ycsns" +"0npr8b1xg1dylz717kfllw433h1y16251npzch48lchq69bhm4iy" (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion
01/04: gnu: font-hack: Update to 3.000.
nckx pushed a commit to branch master in repository guix. commit 77aa706ab6695f24abae88f091aa357546eff5d3 Author: Tobias Geerinckx-RiceDate: Fri Oct 20 16:16:12 2017 +0200 gnu: font-hack: Update to 3.000. * gnu/packages/fonts.scm (font-hack): Update to 3.000. [source]: Download from new account. [license]: Explicitly list all licences. --- gnu/packages/fonts.scm | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index b65d3a9..07c1b6f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -764,17 +764,15 @@ glyph designs, not just an added slant.") (define-public font-hack (package (name "font-hack") -(version "2.020") +(version "3.000") (source (origin (method url-fetch/zipbomb) (uri (string-append -"https://github.com/chrissimpkins/Hack/releases/download/v; -version "/Hack-v" -(string-replace-substring version "." "_") -"-ttf.zip")) + "https://github.com/source-foundry/Hack/releases/download/v; +version "/Hack-v" version "-ttf.zip")) (sha256 (base32 -"16kkmc3psckw1b7k07ccn1gi5ymhlg9djh43nqjzg065g6p6d184" +"0h6slqg25a6cq57k6rh5hmnk8dxbprmf8shs4iyj1pc83sw6b1r3" (build-system font-build-system) (home-page "https://sourcefoundry.org/hack/;) (synopsis "Typeface designed for source code") @@ -782,9 +780,12 @@ glyph designs, not just an added slant.") "Hack is designed to be a workhorse typeface for code. It expands upon the Bitstream Vera & DejaVu projects, provides 1561 glyphs, and includes Powerline support.") -(license (license:x11-style - "https://github.com/chrissimpkins/Hack/blob/master/LICENSE.md; - "Hack Open Font License v2.0" +(license + ;; See https://github.com/source-foundry/Hack/issues/271 for details. + (list license:expat; the Hack modifications to... + license:public-domain; ...the DejaVu modifications to... + (license:x11-style ; ...the Bitstream Vera typeface +"file://LICENSE.md" "Bitstream Vera License") (define-public font-adobe-source-code-pro (package