04/05: vm: Call iso9660-image with #:register-closures? as #t.
cbaines pushed a commit to branch master in repository guix. commit b069111f7a5d2c4596b9bc796fd0f56b77eb4c4e Author: Christopher Baines Date: Sun Sep 3 11:48:27 2017 +0100 vm: Call iso9660-image with #:register-closures? as #t. * gnu/system/vm.scm (system-disk-image): Call iso9660-image with #:register-closures? as #t. --- gnu/system/vm.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index f7a711a..b106dff 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -399,6 +399,7 @@ to USB sticks meant to be read-only." #:file-system-label root-label #:file-system-uuid #f #:os-drv os-drv + #:register-closures? #t #:bootcfg-drv bootcfg #:bootloader (bootloader-configuration-bootloader (operating-system-bootloader os))
05/05: tests: Add test for installing from an ISO Image.
cbaines pushed a commit to branch master
in repository guix.
commit fbc7b1f12561159e0ec3f6459d336f95cf2ce503
Author: Christopher Baines
Date: Sun Sep 3 11:48:36 2017 +0100
tests: Add test for installing from an ISO Image.
* gnu/tests/install.scm (%test-iso-image-installer): New variable.
(run-install): Add #:installation-disk-image-file-system-type as a keyword
argument.
---
gnu/tests/install.scm | 110 +-
1 file changed, 99 insertions(+), 11 deletions(-)
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 866bf88..93c8a89 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -37,6 +37,7 @@
#:use-module (guix utils)
#:export (%test-installed-os
%test-installed-extlinux-os
+%test-iso-image-installer
%test-separate-store-os
%test-separate-home-os
%test-raid-root-os
@@ -196,6 +197,7 @@ reboot\n")
(kernel-arguments '("console=ttyS0")))
#:imported-modules '((gnu services herd)
(guix combinators
+ (installation-disk-image-file-system-type "ext4")
(target-size (* 1200 MiB)))
"Run SCRIPT (a shell script following the GuixSD installation procedure) in
OS to install TARGET-OS. Return a VM image of TARGET-SIZE bytes containing
@@ -213,7 +215,9 @@ packages defined in installation-os."
(image (system-disk-image
(operating-system-with-gc-roots
os (list target))
-#:disk-image-size (* 1500 MiB
+#:disk-image-size (* 1500 MiB)
+#:file-system-type
+installation-disk-image-file-system-type)))
(define install
(with-imported-modules '((guix build utils)
(gnu build marionette))
@@ -229,16 +233,25 @@ packages defined in installation-os."
(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")
-'())
+ `(,(which #$(qemu-command system))
+ "-no-reboot"
+ "-m" "800"
+ #$@(cond
+ ((string=? "ext4"
installation-disk-image-file-system-type)
+ `("-drive"
+,(file-append "file=" image
+ ",if=virtio,readonly")))
+ ((string=? "iso9660"
installation-disk-image-file-system-type)
+ `("-cdrom" ,image))
+ (else
+ (error
+ "unsupported installation-disk-image-file-system-type:"
+ installation-disk-image-file-system-type)))
+ "-drive"
+ ,(string-append "file=" #$output ",if=virtio")
+ ,@(if (file-exists? "/dev/kvm")
+ '("-enable-kvm")
+ '()
(pk 'uname (marionette-eval '(uname) marionette))
@@ -314,6 +327,81 @@ per %test-installed-os, this test is expensive in terms of
CPU and storage.")
;;;
+;;; Installation through an ISO image.
+;;;
+
+(define-os-with-source (%minimal-os-on-vda %minimal-os-on-vda-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 (target "/dev/vda")))
+(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
+ (marionette-configuration
+ (imported-modules '((gnu services
02/05: vm: Create /mnt in the generated ISO image in make-iso9660-image.
cbaines pushed a commit to branch master in repository guix. commit 309b8fe7e65c39e04b7a5f89adb5a0a72867cdff Author: Christopher Baines Date: Sun Sep 3 11:48:11 2017 +0100 vm: Create /mnt in the generated ISO image in make-iso9660-image. This is used in the installation process, as the mountpoint for the target filesystem. * gnu/build/vm.scm (make-iso9660-image): Create /mnt within the generated ISO image. --- gnu/build/vm.scm | 5 + 1 file changed, 5 insertions(+) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 606257d..f6228b4 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -374,6 +374,7 @@ GRUB configuration and OS-DRV as the stuff in it." (target-store (string-append "/tmp/root" (%store-directory (mkdir-p "/tmp/root/var/run") (mkdir-p "/tmp/root/run") +(mkdir-p "/tmp/root/mnt") (mkdir-p target-store) (mount (%store-directory) target-store "" MS_BIND) @@ -393,6 +394,10 @@ GRUB configuration and OS-DRV as the stuff in it." ,(string-append "gnu/store=" os-drv "/..") "var=/tmp/root/var" "run=/tmp/root/run" +;; /mnt is used as part of the installation +;; process, as the mount point for the target +;; filesystem, so create it. +"mnt=/tmp/root/mnt" "--" ;; Store two copies of the headers. ;; The resulting ISO-9660 image has a DOS MBR and
01/05: vm: Add support for registering closures to make-iso9660-image.
cbaines pushed a commit to branch master in repository guix. commit 22bbdb5f794c9fe2f350f4295b8dcf93438ad011 Author: Christopher Baines Date: Sun Sep 3 11:47:58 2017 +0100 vm: Add support for registering closures to make-iso9660-image. This mimics the functionality in the root-partition-initializer used in creating the QEMU image. This helps when trying to run guix system init from the generated ISO image. * gnu/build/vm.scm (make-iso9660-image): Add support for registering closures. --- gnu/build/vm.scm | 19 +-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 727494a..606257d 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -366,12 +366,27 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation." (error "failed to create GRUB EFI image" (define* (make-iso9660-image grub config-file os-drv target - #:key (volume-id "GuixSD_image") (volume-uuid #f)) + #:key (volume-id "GuixSD_image") (volume-uuid #f) + register-closures? (closures '())) "Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as GRUB configuration and OS-DRV as the stuff in it." - (let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue"))) + (let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue")) +(target-store (string-append "/tmp/root" (%store-directory (mkdir-p "/tmp/root/var/run") (mkdir-p "/tmp/root/run") + +(mkdir-p target-store) +(mount (%store-directory) target-store "" MS_BIND) + +(when register-closures? + (display "registering closures...\n") + (for-each (lambda (closure) + (register-closure + "/tmp/root" + (string-append "/xchg/" closure) + #:deduplicate? #f)) +closures)) + (unless (zero? (apply system* `(,grub-mkrescue "-o" ,target ,(string-append "boot/grub/grub.cfg=" config-file)
branch master updated (f159742 -> fbc7b1f)
cbaines pushed a change to branch master in repository guix. from f159742 gnu: file: Fix CVE-2017-1000249. new 22bbdb5 vm: Add support for registering closures to make-iso9660-image. new 309b8fe vm: Create /mnt in the generated ISO image in make-iso9660-image. new e375d3f vm: Add support for registering closures to iso9660-image. new b069111 vm: Call iso9660-image with #:register-closures? as #t. new fbc7b1f tests: Add test for installing from an ISO Image. The 5 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/build/vm.scm | 24 ++- gnu/system/vm.scm | 11 - gnu/tests/install.scm | 110 +- 3 files changed, 131 insertions(+), 14 deletions(-)
03/05: vm: Add support for registering closures to iso9660-image.
cbaines pushed a commit to branch master in repository guix. commit e375d3fab7a64246f9c1caa4b23a280f5b84ebc6 Author: Christopher Baines Date: Sun Sep 3 11:48:20 2017 +0100 vm: Add support for registering closures to iso9660-image. * gnu/system/vm.scm (iso9660-image): Add support for registering closures. --- gnu/system/vm.scm | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index b3da118..f7a711a 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -192,6 +192,7 @@ made available under the /xchg CIFS share." os-drv bootcfg-drv bootloader +register-closures? (inputs '())) "Return a bootable, stand-alone iso9660 image. @@ -207,8 +208,13 @@ INPUTS is a list of inputs (as for packages)." (let ((inputs '#$(append (list qemu parted e2fsprogs dosfstools xorriso) (map canonical-package -(list sed grep coreutils findutils gawk +(list sed grep coreutils findutils gawk)) + (if register-closures? (list guix) '( + + (graphs '#$(match inputs + (((names . _) ...) +names))) ;; This variable is unused but allows us to add INPUTS-TO-COPY ;; as inputs. (to-register @@ -222,6 +228,8 @@ INPUTS is a list of inputs (as for packages)." #$bootcfg-drv #$os-drv "/xchg/guixsd.iso" + #:register-closures? #$register-closures? + #:closures graphs #:volume-id #$file-system-label #:volume-uuid #$file-system-uuid) (reboot
03/06: gnu: polkit: Add missing input.
efraim pushed a commit to branch master
in repository guix.
commit 77c2476ae31959b13bdf11f0574323eaedfbd272
Author: Efraim Flashner
Date: Wed Sep 6 09:49:54 2017 +0300
gnu: polkit: Add missing input.
* gnu/packages/polkit.scm (polkit)[inputs]: Add libcap.
---
gnu/packages/polkit.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 0e38dd6..11c825e 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -81,6 +81,7 @@
(build-system gnu-build-system)
(inputs
`(("expat" ,expat)
+ ("libcap" ,libcap)
("linux-pam" ,linux-pam)
("elogind" ,elogind)
("mozjs" ,mozjs)
branch master updated (fbc7b1f -> 744e9d0)
efraim pushed a change to branch master in repository guix. from fbc7b1f tests: Add test for installing from an ISO Image. new 472c222 gnu: kmscon: Add missing input. new 124ac30 gnu: weston: Add missing input. new 77c2476 gnu: polkit: Add missing input. new 0cce140 gnu: gnome-session: Add missing input. new 50918af gnu: mutter: Only propagate glib once. new 744e9d0 gnu: mutter: Add missing input. The 6 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/freedesktop.scm | 1 + gnu/packages/gnome.scm | 3 ++- gnu/packages/polkit.scm | 1 + gnu/packages/terminals.scm | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-)
02/06: gnu: weston: Add missing input.
efraim pushed a commit to branch master
in repository guix.
commit 124ac301c1f11b7c217107c3abf91edbb1a1c3f8
Author: Efraim Flashner
Date: Wed Sep 6 09:49:17 2017 +0300
gnu: weston: Add missing input.
* gnu/packages/freedesktop.scm (weston)[inputs]: Add libcap.
---
gnu/packages/freedesktop.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 378a8f9..3c4ae3f 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -448,6 +448,7 @@ applications, X servers (rootless or fullscreen) or other
display servers.")
`(("cairo" ,cairo-xcb)
("dbus" ,dbus)
("elogind" ,elogind)
+ ("libcap" ,libcap)
("libinput" ,libinput-minimal)
("libunwind" ,libunwind)
("libxcursor" ,libxcursor)
05/06: gnu: mutter: Only propagate glib once.
efraim pushed a commit to branch master
in repository guix.
commit 50918af29bd4cb8b77a4518ca7f2748d389d41de
Author: Efraim Flashner
Date: Wed Sep 6 09:51:56 2017 +0300
gnu: mutter: Only propagate glib once.
* gnu/packages/gnome.scm (mutter)[propagated-inputs]: Remove duplicate
glib.
---
gnu/packages/gnome.scm | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e825329..5f0d068 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4720,7 +4720,6 @@ to display dialog boxes from the commandline and shell
scripts.")
("cairo" ,cairo)
("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib)
- ("glib" ,glib)
("gtk+" ,gtk+)
("json-glib" ,json-glib)
("libinput" ,libinput)
06/06: gnu: mutter: Add missing input.
efraim pushed a commit to branch master
in repository guix.
commit 744e9d0745a76a2f177452189baa0d2bc84ba144
Author: Efraim Flashner
Date: Wed Sep 6 09:52:23 2017 +0300
gnu: mutter: Add missing input.
* gnu/packages/gnome.scm (mutter)[inputs]: Add libcap.
---
gnu/packages/gnome.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5f0d068..d64bd9f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4738,6 +4738,7 @@ to display dialog boxes from the commandline and shell
scripts.")
`(("elogind" ,elogind)
("gnome-desktop" ,gnome-desktop)
("libcanberra-gtk" ,libcanberra)
+ ("libcap" ,libcap)
("libgudev" ,libgudev)
("libice" ,libice)
("libsm" ,libsm)
04/06: gnu: gnome-session: Add missing input.
efraim pushed a commit to branch master
in repository guix.
commit 0cce140dc2cf1f652e659ee1ca9f7308d16eda43
Author: Efraim Flashner
Date: Wed Sep 6 09:50:45 2017 +0300
gnu: gnome-session: Add missing input.
* gnu/packages/gnome.scm (gnome-settings)[inputs]: Add libcap.
---
gnu/packages/gnome.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 281f4bd..e825329 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4502,6 +4502,7 @@ such as gzip tarballs.")
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+)
("json-glib" ,json-glib)
+ ("libcap" ,libcap)
("libsm" ,libsm)
("libxcomposite" ,libxcomposite)
("libxtst" ,libxtst)
01/06: gnu: kmscon: Add missing input.
efraim pushed a commit to branch master
in repository guix.
commit 472c2223c09e5d692e885c28c84d34130c1e9123
Author: Efraim Flashner
Date: Wed Sep 6 09:48:40 2017 +0300
gnu: kmscon: Add missing input.
* gnu/packages/terminals.scm (kmscon)[inputs]: Add libcap.
---
gnu/packages/terminals.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index df093c2..db61915 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -239,7 +239,8 @@ compatibility to existing emulators like xterm,
gnome-terminal, konsole, etc.")
("libxml2" ,libxml2) ;for XML_CATALOG_FILES
("docbook-xsl" ,docbook-xsl)))
(inputs
- `(("libdrm" ,libdrm)
+ `(("libcap" ,libcap)
+ ("libdrm" ,libdrm)
("libtsm" ,libtsm)
("libxkbcommon" ,libxkbcommon)
("logind" ,elogind)
branch master updated (744e9d0 -> 21a656f)
cbaines pushed a change to branch master in repository guix. from 744e9d0 gnu: mutter: Add missing input. new 21a656f gnu: Add emacs-go-mode. 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/emacs.scm | 20 1 file changed, 20 insertions(+)
01/01: gnu: Add emacs-go-mode.
cbaines pushed a commit to branch master in repository guix. commit 21a656f590458652f4f2413ad5f2e3b1eda0a033 Author: Christopher Baines Date: Sat Sep 2 12:06:55 2017 +0100 gnu: Add emacs-go-mode. * gnu/packages/emacs.scm (emacs-go-mode): New variable. --- gnu/packages/emacs.scm | 20 1 file changed, 20 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5d9fd72..bc01d57 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1193,6 +1193,26 @@ Using emacs-direnv means that programs started from Emacs will use the environment set through Direnv.") (license license:gpl3+))) +(define-public emacs-go-mode + (package +(name "emacs-go-mode") +(version "1.5.0") +(source (origin + (method url-fetch) + (uri (string-append "https://github.com/dominikh/go-mode.el/"; + "archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 +"1adngbjyb8qnwg7n6r2y31djw9j6qf3b9fi63zd85035q7x4ljnm" +(build-system emacs-build-system) +(home-page "https://github.com/dominikh/go-mode.el";) +(synopsis "Go mode for Emacs") +(description + "This package provides go-mode, an Emacs mode for working with software +written in the Go programming language.") +(license license:bsd-3))) + (define-public emacs-google-maps (package (name "emacs-google-maps")
branch master updated (21a656f -> 026ebc1)
roelj pushed a change to branch master in repository guix. from 21a656f gnu: Add emacs-go-mode. new 2054b52 gnu: Update python-lxml to 3.8.0. new 13be557 gnu: Add python-html5-parser, python2-html5-parser. new 026ebc1 gnu: Update calibre to 3.6.0. 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/ebook.scm| 12 --- gnu/packages/patches/calibre-drop-unrar.patch | 49 --- gnu/packages/python.scm | 35 +-- 4 files changed, 40 insertions(+), 57 deletions(-) delete mode 100644 gnu/packages/patches/calibre-drop-unrar.patch
02/03: gnu: Add python-html5-parser, python2-html5-parser.
roelj pushed a commit to branch master
in repository guix.
commit 13be557d985ebc3770f28188f3ce45c2392c6c1d
Author: Roel Janssen
Date: Wed Sep 6 12:42:10 2017 +0200
gnu: Add python-html5-parser, python2-html5-parser.
* gnu/packages/python.scm (python-html5-parser): New variable.
(python2-html5-parser: New variable.
---
gnu/packages/python.scm | 31 +++
1 file changed, 31 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e650cdb..a190873 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -5976,6 +5976,37 @@ and written in Python.")
(define-public python2-html5lib-0.9
(package-with-python2 python-html5lib-0.9))
+(define-public python-html5-parser
+ (package
+(name "python-html5-parser")
+(version "0.4.4")
+(source (origin
+ (method url-fetch)
+ (uri (pypi-uri "html5-parser" version))
+ (sha256
+ (base32
+"1d8sxhl41ffh7qlk7wlsy17xw6slzx5v1yna9s72wx5qrpaa3wxr"
+(build-system python-build-system)
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(inputs
+ `(("libxml2" ,libxml2)))
+(propagated-inputs
+ `(("python-lxml" ,python-lxml)
+ ("python-beautifulsoup4" ,python-beautifulsoup4)))
+(home-page "https://html5-parser.readthedocs.io";)
+(synopsis "Fast C-based HTML5 parsing for Python")
+(description "This package provides a fast implementation of the HTML5
+parsing spec for Python. Parsing is done in C using a variant of the gumbo
+parser. The gumbo parse tree is then transformed into an lxml tree, also in
+C, yielding parse times that can be a thirtieth of the html5lib parse times.")
+;; src/as-python-tree.[c|h] are licensed GPL3. The other files
+;; indicate ASL2.0, including the LICENSE file for the whole project.
+(license (list license:asl2.0 license:gpl3
+
+(define-public python2-html5-parser
+ (package-with-python2 python-html5-parser))
+
(define-public python-webencodings
(package
(name "python-webencodings")
01/03: gnu: Update python-lxml to 3.8.0.
roelj pushed a commit to branch master
in repository guix.
commit 2054b5220180d5cf5c0cfa8b2509a3f66417a1df
Author: Roel Janssen
Date: Fri Aug 25 20:12:41 2017 +0200
gnu: Update python-lxml to 3.8.0.
* gnu/packages/python.scm (python-lxml): Update to 3.8.0.
---
gnu/packages/python.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 346faf4..e650cdb 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6225,14 +6225,14 @@ translate the complete SQLite API into Python.")
(define-public python-lxml
(package
(name "python-lxml")
-(version "3.6.0")
+(version "3.8.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "lxml" version))
(sha256
(base32
- "1pvbmiy2m7jwv493kilbghhj2pkh8wy1na3ji350vhzhlwlclx4w"
+ "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk"
(build-system python-build-system)
(inputs
`(("libxml2" ,libxml2)
03/03: gnu: Update calibre to 3.6.0.
roelj pushed a commit to branch master
in repository guix.
commit 026ebc141ff9eb6147c9538f004119193d4cfe49
Author: Roel Janssen
Date: Fri Aug 25 20:15:40 2017 +0200
gnu: Update calibre to 3.6.0.
* gnu/local.mk: Remove calibre-drop-unrar.patch
* gnu/packages/ebook.scm (calibre): Update to 3.6.0.
Add python-html5-parser input.
* gnu/packages/patches/calibre-drop-unrar.patch: Remove file.
---
gnu/local.mk | 1 -
gnu/packages/ebook.scm| 12 ---
gnu/packages/patches/calibre-drop-unrar.patch | 49 ---
3 files changed, 7 insertions(+), 55 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 445d126..73efaba 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -536,7 +536,6 @@ dist_patch_DATA =
\
%D%/packages/patches/blast+-fix-makefile.patch \
%D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/cairo-CVE-2016-9082.patch \
- %D%/packages/patches/calibre-drop-unrar.patch\
%D%/packages/patches/calibre-no-updates-dialog.patch \
%D%/packages/patches/calibre-use-packaged-feedparser.patch \
%D%/packages/patches/catdoc-CVE-2017-0.patch \
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 38abf47..4bcaa0a 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -72,7 +72,7 @@
(define-public calibre
(package
(name "calibre")
-(version "3.0.0")
+(version "3.6.0")
(source
(origin
(method url-fetch)
@@ -81,21 +81,19 @@
version ".tar.xz"))
(sha256
(base32
- "1zhk7bvgr973dd18x4wp48kzai29qqqi5qcy72sxc4wcbk2sbnkw"))
+ "0vp2nds4b5xbchsh1rpc1q7093gd26dnw7mgbnax97dcchvlc4sc"))
;; Remove non-free or doubtful code, see
;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "src/calibre/ebooks/markdown")
-(delete-file-recursively "src/unrar")
(delete-file "src/odf/thumbnail.py")
(delete-file-recursively "resources/fonts/liberation")
(substitute* (find-files "." "\\.py")
(("calibre\\.ebooks\\.markdown") "markdown"))
#t))
-(patches (search-patches "calibre-drop-unrar.patch"
- "calibre-use-packaged-feedparser.patch"
+(patches (search-patches "calibre-use-packaged-feedparser.patch"
"calibre-no-updates-dialog.patch"
(build-system python-build-system)
(native-inputs
@@ -129,6 +127,7 @@
("python2-dbus" ,python2-dbus)
("python2-dnspython" ,python2-dnspython)
("python2-feedparser" ,python2-feedparser)
+ ("python2-html5-parser" ,python2-html5-parser)
("python2-lxml" ,python2-lxml)
("python2-markdown" ,python2-markdown)
("python2-mechanize" ,python2-mechanize)
@@ -140,6 +139,9 @@
("python2-pyqt" ,python2-pyqt)
("python2-sip" ,python2-sip)
("python2-regex" ,python2-regex)
+ ;; python2-unrardll is needed for decompressing RAR files.
+ ;; A program called 'pdf2html' is needed for reading PDF books
+ ;; in the web interface.
("sqlite" ,sqlite)))
(arguments
`(#:python ,python-2
diff --git a/gnu/packages/patches/calibre-drop-unrar.patch
b/gnu/packages/patches/calibre-drop-unrar.patch
deleted file mode 100644
index adf977b..000
--- a/gnu/packages/patches/calibre-drop-unrar.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Recreated old debian patch on the latest calibre version
-
-From 6764e4c211e50d4f4633dbabfba7cbc3089c51dc Mon Sep 17 00:00:00 2001
-From: Brendan Tildesley
-Date: Sat, 13 May 2017 21:12:12 +1000
-Subject: [PATCH] Remove unrar extension
-
- setup/extensions.json | 11 ---
- src/calibre/ebooks/metadata/archive.py | 2 +-
- 2 files changed, 1 insertion(+), 12 deletions(-)
-
-diff --git a/setup/extensions.json b/setup/extensions.json
-index 1f6d1fb5fd..127390450f 100644
a/setup/extensions.json
-+++ b/setup/extensions.json
-@@ -211,16 +211,5 @@
- "sources": "calibre/devices/mtp/unix/devices.c
calibre/devices/mtp/unix/libmtp.c",
- "headers": "calibre/devices/mtp/unix/devices.h
calibre/devices/mtp/unix/upstream/music-players.h
calibre/devices/mtp/unix/upstream/device-flags.h",
- "libraries": "mtp"
--},
--{
--"name": "unrar",
--"sources": "unrar/rar.cpp unrar/strlist.cpp unrar/strfn.cpp
unrar/pathfn.cpp unrar/savepos.cpp unrar/smallfn.cpp unrar/global.cpp
unrar/file.cpp unrar/filefn.cpp unrar/filcreat.cpp unrar/archive.cpp
unrar/arcread.cpp unrar/unicode.cpp unrar/system.cpp unrar/isnt.cpp
unrar/crypt.cpp
branch master updated (026ebc1 -> f049e79)
ngz pushed a change to branch master in repository guix. from 026ebc1 gnu: Update calibre to 3.6.0. new f049e79 gnu: csound: Update to 6.09.1. 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/local.mk | 1 - gnu/packages/audio.scm| 16 +--- gnu/packages/patches/csound-header-ordering.patch | 20 3 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 gnu/packages/patches/csound-header-ordering.patch
01/01: gnu: csound: Update to 6.09.1.
ngz pushed a commit to branch master
in repository guix.
commit f049e79dc34c112fca244946256920a5ce2e9db0
Author: Nicolas Goaziou
Date: Wed Sep 6 12:51:59 2017 +0200
gnu: csound: Update to 6.09.1.
* gnu/packages/audio.scm (csound): Update to 6.09.1. Change source URI.
* gnu/packages/patches/csound-header-ordering.patch: Remove patch.
* gnu/local.mk (dist_patch_DATA): Remove reference to patch above.
---
gnu/local.mk | 1 -
gnu/packages/audio.scm| 16 +---
gnu/packages/patches/csound-header-ordering.patch | 20
3 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 73efaba..2975c02 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -566,7 +566,6 @@ dist_patch_DATA =
\
%D%/packages/patches/crawl-upgrade-saves.patch \
%D%/packages/patches/crda-optional-gcrypt.patch \
%D%/packages/patches/crossmap-allow-system-pysam.patch \
- %D%/packages/patches/csound-header-ordering.patch\
%D%/packages/patches/clucene-contribs-lib.patch \
%D%/packages/patches/curl-bounds-check.patch \
%D%/packages/patches/cursynth-wave-rand.patch\
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e27c13b..1b7950c 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -568,23 +568,17 @@ emulation (valve, tape), bit fiddling (decimator,
pointer-cast), etc.")
(define-public csound
(package
(name "csound")
-(version "6.05")
+(version "6.09.1")
(source (origin
(method url-fetch)
(uri (string-append
-"mirror://sourceforge/csound/csound6/Csound"
-version "/Csound" version ".tar.gz"))
+"https://github.com/csound/csound/archive/";
+version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
-"0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd"))
- (patches (search-patches "csound-header-ordering.patch"
+"0f67vyy3r29hn26qkkcwnizrnzzy8p7gmg3say5q3wjhxns3b5yl"
(build-system cmake-build-system)
-(arguments
- ;; Work around this error on x86_64 with libc 2.22+:
- ;;libmvec.so.1: error adding symbols: DSO missing from command line
- (if (string-prefix? "x86_64" (or (%current-target-system)
(%current-system)))
- '(#:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-lmvec"))
- '()))
(inputs
`(("alsa-lib" ,alsa-lib)
("boost" ,boost)
diff --git a/gnu/packages/patches/csound-header-ordering.patch
b/gnu/packages/patches/csound-header-ordering.patch
deleted file mode 100644
index 3640d12..000
--- a/gnu/packages/patches/csound-header-ordering.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Prevent compilation issues with boost-1.60.0.
-
-Reported upstream at https://github.com/csound/csound/issues/570
-
Csound6.05/Opcodes/chua/ChuaOscillator.cpp 2015-04-25 14:06:22.995646234
-0500
-+++ Csound6.05/Opcodes/chua/ChuaOscillator.cpp 2015-12-21 10:31:58.182362640
-0600
-@@ -117,11 +117,12 @@
- // d = sys_variables(12);
- // gnor = a*(x.^3) + b*(x.^2) + c*x + d;
-
--#include
- #include
- using namespace boost::numeric;
- #include
-
-+#include
-+
- #undef CS_KSMPS
- #define CS_KSMPS (opds.insdshead->ksmps)
-
01/02: gnu: openjpeg: Fix CVE-2017-14151, CVE-2017-14152.
efraim pushed a commit to branch master
in repository guix.
commit 3b7c606965656e95725e9cd5f1c7cfc4d0ea18cf
Author: Efraim Flashner
Date: Wed Sep 6 13:17:45 2017 +0300
gnu: openjpeg: Fix CVE-2017-14151, CVE-2017-14152.
* gnu/packages/image.scm (openjpeg)[source]: Add patches.
* gnu/packages/patches/openjpeg-CVE-2017-14151.patch,
gnu/packages/patches/openjpeg-CVE-2017-14152.patch: New files.
* gnu/local.mk (dist_patch_DATA): Register them.
---
gnu/local.mk | 2 +
gnu/packages/image.scm | 4 +-
gnu/packages/patches/openjpeg-CVE-2017-14151.patch | 46 ++
gnu/packages/patches/openjpeg-CVE-2017-14152.patch | 38 ++
4 files changed, 89 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 2975c02..19dfa13 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -888,6 +888,8 @@ dist_patch_DATA =
\
%D%/packages/patches/openjpeg-CVE-2017-12982.patch \
%D%/packages/patches/openjpeg-CVE-2017-14040.patch \
%D%/packages/patches/openjpeg-CVE-2017-14041.patch \
+ %D%/packages/patches/openjpeg-CVE-2017-14151.patch \
+ %D%/packages/patches/openjpeg-CVE-2017-14152.patch \
%D%/packages/patches/openldap-CVE-2017-9287.patch\
%D%/packages/patches/openocd-nrf52.patch \
%D%/packages/patches/openssl-runpath.patch \
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 5d062b1..3bb8de1 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -522,7 +522,9 @@ work.")
"0yvfghxwfm3dcqr9krkw63pcd76hzkknc3fh7bh11s8qlvjvrpbg"))
(patches (search-patches "openjpeg-CVE-2017-12982.patch"
"openjpeg-CVE-2017-14040.patch"
- "openjpeg-CVE-2017-14041.patch"
+ "openjpeg-CVE-2017-14041.patch"
+ "openjpeg-CVE-2017-14151.patch"
+ "openjpeg-CVE-2017-14152.patch"
(build-system cmake-build-system)
(arguments
;; Trying to run `$ make check' results in a no rule fault.
diff --git a/gnu/packages/patches/openjpeg-CVE-2017-14151.patch
b/gnu/packages/patches/openjpeg-CVE-2017-14151.patch
new file mode 100644
index 000..4fcf6af
--- /dev/null
+++ b/gnu/packages/patches/openjpeg-CVE-2017-14151.patch
@@ -0,0 +1,46 @@
+https://github.com/uclouvain/openjpeg/commit/afb308b9ccbe129608c9205cf3bb39bbefad90b9.patch
+http://openwall.com/lists/oss-security/2017/09/06/1
+
+From afb308b9ccbe129608c9205cf3bb39bbefad90b9 Mon Sep 17 00:00:00 2001
+From: Even Rouault
+Date: Mon, 14 Aug 2017 17:20:37 +0200
+Subject: [PATCH] Encoder: grow buffer size in
+ opj_tcd_code_block_enc_allocate_data() to avoid write heap buffer overflow in
+ opj_mqc_flush (#982)
+
+---
+ src/lib/openjp2/tcd.c | 7 +--
+ tests/nonregression/test_suite.ctest.in | 2 ++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
+index 301c7213e..53cdcf64d 100644
+--- a/src/lib/openjp2/tcd.c
b/src/lib/openjp2/tcd.c
+@@ -1187,8 +1187,11 @@ static OPJ_BOOL
opj_tcd_code_block_enc_allocate_data(opj_tcd_cblk_enc_t *
+ {
+ OPJ_UINT32 l_data_size;
+
+-/* The +1 is needed for https://github.com/uclouvain/openjpeg/issues/835
*/
+-l_data_size = 1 + (OPJ_UINT32)((p_code_block->x1 - p_code_block->x0) *
++/* +1 is needed for https://github.com/uclouvain/openjpeg/issues/835 */
++/* and actually +2 required for
https://github.com/uclouvain/openjpeg/issues/982 */
++/* TODO: is there a theoretical upper-bound for the compressed code */
++/* block size ? */
++l_data_size = 2 + (OPJ_UINT32)((p_code_block->x1 - p_code_block->x0) *
+(p_code_block->y1 - p_code_block->y0) *
(OPJ_INT32)sizeof(OPJ_UINT32));
+
+ if (l_data_size > p_code_block->data_size) {
+diff --git a/tests/nonregression/test_suite.ctest.in
b/tests/nonregression/test_suite.ctest.in
+index aaf40d7d0..ffd964c2a 100644
+--- a/tests/nonregression/test_suite.ctest.in
b/tests/nonregression/test_suite.ctest.in
+@@ -169,6 +169,8 @@ opj_compress -i @INPUT_NR_PATH@/Bretagne2.ppm -o
@TEMP_PATH@/Bretagne2_empty_ban
+ # Same rate as Bretagne2_4.j2k
+ opj_compress -i @INPUT_NR_PATH@/Bretagne2.ppm -o
@TEMP_PATH@/Bretagne2_empty_band_r800.j2k -t 2591,1943 -n 2 -r 800
+
++opj_compress -i @INPUT_NR_PATH@/issue982.bmp -o @TEMP_PATH@/issue982.j2k -n 1
++
+ # DECODER TEST SUITE
+ opj_decompress -i @INPUT_NR_PATH@/Bretagne2.j2k -o
@TEMP_PATH@/Bretagne2.j2k.pgx
+ opj_decompress -i @INPUT_NR_PATH@/_00042.j2k -o @TEMP_PATH@/_00042.j2k.pgx
diff --git a/gnu/packages/patches/openjpeg-CVE-2017-14152.patch
b/gnu/packages/patches/openjpeg-CVE-2017-14152.patch
new file mode 100644
index 000
02/02: gnu: libzip: Update to 1.3.0 (fixes CVE-2017-14107).
efraim pushed a commit to branch master
in repository guix.
commit 98df3a88b5e323087db6097094f119fa4663f6d3
Author: Efraim Flashner
Date: Wed Sep 6 14:19:50 2017 +0300
gnu: libzip: Update to 1.3.0 (fixes CVE-2017-14107).
* gnu/packages/compression.scm (libzip): Update to 1.3.0.
[source]: Remove patch.
[arguments]: Remove custom 'patch-perl phase.
* gnu/packages/patches/libzip-CVE-2017-12858.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
gnu/packages/compression.scm | 14 ++--
gnu/packages/patches/libzip-CVE-2017-12858.patch | 45
3 files changed, 3 insertions(+), 57 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 19dfa13..a38e4e2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -812,7 +812,6 @@ dist_patch_DATA =
\
%D%/packages/patches/libxslt-generated-ids.patch \
%D%/packages/patches/libxslt-CVE-2016-4738.patch \
%D%/packages/patches/libxt-guix-search-paths.patch \
- %D%/packages/patches/libzip-CVE-2017-12858.patch \
%D%/packages/patches/lierolibre-check-unaligned-access.patch \
%D%/packages/patches/lierolibre-is-free-software.patch \
%D%/packages/patches/lierolibre-newer-libconfig.patch\
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index a6758e9..499c13a 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1542,22 +1542,14 @@ manipulate, read, and write Zip archive files.")
(define-public libzip
(package
(name "libzip")
-(version "1.2.0")
+(version "1.3.0")
(source (origin
(method url-fetch)
(uri (string-append
-"https://nih.at/libzip/libzip-"; version ".tar.gz"))
- (patches (search-patches "libzip-CVE-2017-12858.patch"))
+"https://nih.at/libzip/libzip-"; version ".tar.xz"))
(sha256
(base32
-"17vxj2ffsxwh8lkc6801ppmwj15jp8q58rin76znxfbx88789ybc"
-(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'configure 'patch-perl
- (lambda _
- (substitute* "regress/runtest.in"
- (("/usr/bin/env perl") (which "perl"
+"0wykw0q9dwdzx0gssi2dpgckx9ggr2spzc1amjnff6wi6kz6x4xa"
(native-inputs
`(("perl" ,perl)))
(inputs
diff --git a/gnu/packages/patches/libzip-CVE-2017-12858.patch
b/gnu/packages/patches/libzip-CVE-2017-12858.patch
deleted file mode 100644
index 8125173..000
--- a/gnu/packages/patches/libzip-CVE-2017-12858.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix CVE-2017-12858:
-
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-12858
-
-Patch copied from upstream source repository:
-
-https://github.com/nih-at/libzip/commit/2217022b7d1142738656d891e00b3d2d9179b796
-
-From 2217022b7d1142738656d891e00b3d2d9179b796 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner
-Date: Mon, 14 Aug 2017 10:55:44 +0200
-Subject: [PATCH] Fix double free().
-
-Found by Brian 'geeknik' Carpenter using AFL.
- THANKS | 1 +
- lib/zip_dirent.c | 3 ---
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/THANKS b/THANKS
-index be0cca9..a80ee1d 100644
a/THANKS
-+++ b/THANKS
-@@ -12,6 +12,7 @@ BALATON Zoltan
- Benjamin Gilbert
- Boaz Stolk
- Bogdan
-+Brian 'geeknik' Carpenter
- Chris Nehren
- Coverity
- Dane Springmeyer
-diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c
-index a369900..e5a7cc9 100644
a/lib/zip_dirent.c
-+++ b/lib/zip_dirent.c
-@@ -579,9 +579,6 @@ _zip_dirent_read(zip_dirent_t *zde, zip_source_t *src,
zip_buffer_t *buffer, boo
- }
-
- if (!_zip_dirent_process_winzip_aes(zde, error)) {
-- if (!from_buffer) {
-- _zip_buffer_free(buffer);
-- }
- return -1;
- }
-
branch master updated (f049e79 -> 98df3a8)
efraim pushed a change to branch master in repository guix. from f049e79 gnu: csound: Update to 6.09.1. new 3b7c606 gnu: openjpeg: Fix CVE-2017-14151, CVE-2017-14152. new 98df3a8 gnu: libzip: Update to 1.3.0 (fixes CVE-2017-14107). 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/local.mk | 3 +- gnu/packages/compression.scm | 14 ++- gnu/packages/image.scm | 4 +- gnu/packages/patches/libzip-CVE-2017-12858.patch | 45 - gnu/packages/patches/openjpeg-CVE-2017-14151.patch | 46 ++ gnu/packages/patches/openjpeg-CVE-2017-14152.patch | 38 ++ 6 files changed, 92 insertions(+), 58 deletions(-) delete mode 100644 gnu/packages/patches/libzip-CVE-2017-12858.patch create mode 100644 gnu/packages/patches/openjpeg-CVE-2017-14151.patch create mode 100644 gnu/packages/patches/openjpeg-CVE-2017-14152.patch
branch master updated (98df3a8 -> e9ba22d)
ngz pushed a change to branch master in repository guix. from 98df3a8 gnu: libzip: Update to 1.3.0 (fixes CVE-2017-14107). new e9ba22d gnu: emacs-org: Update to 20170906. 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/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: emacs-org: Update to 20170906.
ngz pushed a commit to branch master in repository guix. commit e9ba22d6e197e449b98f187a9b74459c392d32d6 Author: Nicolas Goaziou Date: Wed Sep 6 14:45:08 2017 +0200 gnu: emacs-org: Update to 20170906. * gnu/packages/emacs.scm (emacs-org): Update to 20170906, a.k.a. Org 9.1. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index bc01d57..9c0f9bc 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3814,14 +3814,14 @@ passive voice.") (define-public emacs-org (package (name "emacs-org") -(version "20170828") +(version "20170906") (source (origin (method url-fetch) (uri (string-append "http://elpa.gnu.org/packages/org-"; version ".tar")) (sha256 (base32 -"0frjwgjyy7rwb7si57h6nd1p35a4gcd1dc0aka19kn8r59hbi08p" +"12i1h1ncbv0lhcg8w1b48psm69hhhb1f0phh1v3vfyn8xi82ppxz" (build-system emacs-build-system) (home-page "http://orgmode.org/";) (synopsis "Outline-based notes management and organizer")
01/01: website: guix-hpc: Add Utrecht URL.
civodul pushed a commit to branch master in repository guix-artwork. commit af41790846ca8c94e41a61e35e2bb9f10fb1eaec Author: Ludovic Courtès Date: Wed Sep 6 15:45:39 2017 +0200 website: guix-hpc: Add Utrecht URL. * website/posts/announcing-guix-hpc.md: Add UBC URL. --- website/posts/announcing-guix-hpc.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/posts/announcing-guix-hpc.md b/website/posts/announcing-guix-hpc.md index da75eae..681fae9 100644 --- a/website/posts/announcing-guix-hpc.md +++ b/website/posts/announcing-guix-hpc.md @@ -8,7 +8,8 @@ Today, Inria, the Max Delbrück Center for Molecular Medicine (MDC), and the Utrecht Bioinformatics Center (UBC) are [announcing](https://www.inria.fr/en/centre/bordeaux/news/towards-reproducible-software-environments-in-hpc-with-guix) -[a joint effort](https://www.mdc-berlin.de/47864296/en/news/2017/20170905-wissenschaftliches-rechnen-erfolgreich-reproduzieren) +[a joint](https://www.mdc-berlin.de/47864296/en/news/2017/20170905-wissenschaftliches-rechnen-erfolgreich-reproduzieren) +[effort](https://ubc.uu.nl/reproducible-software-environments-in-hpc-with-guix/) to consolidate GNU Guix for reproducible scientific workflows in high-performance computing (HPC). The three research institutes have
branch master updated (ab454b3 -> af41790)
civodul pushed a change to branch master in repository guix-artwork. from ab454b3 website: guix-hpc: Add link to MDC's article. new af41790 website: guix-hpc: Add Utrecht URL. 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: website/posts/announcing-guix-hpc.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
03/03: gnu: python-pyxb: Update to 1.2.6.
nckx pushed a commit to branch master in repository guix. commit 4ef6cfefaa4db9d44453b8adf192dd1dd0dfd829 Author: Tobias Geerinckx-Rice Date: Tue Sep 5 23:02:25 2017 +0200 gnu: python-pyxb: Update to 1.2.6. * gnu/packages/xml.scm (python-pyxb): Update to 1.2.6. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 96553c9..dd188d6 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -867,13 +867,13 @@ parsing/saving.") (define-public python-pyxb (package (name "python-pyxb") -(version "1.2.5") +(version "1.2.6") (source (origin (method url-fetch) (uri (pypi-uri "PyXB" version)) (sha256 (base32 -"0rzzwibfqa28gxgcxx4cybx1qcg0g6fand06ykj3gz7z5kp653sf" +"1d17pyixbfvjyi2lb0cfp0ch8wwdf44mmg3r5pwqhyyqs66z601a" (build-system python-build-system) (home-page "http://pyxb.sourceforge.net/";) (synopsis "Python XML Schema Bindings")
branch master updated (e9ba22d -> 4ef6cfe)
nckx pushed a change to branch master in repository guix. from e9ba22d gnu: emacs-org: Update to 20170906. new ddcac55 gnu: iproute: Update to 4.13.0. new 35a4fef gnu: iproute: Edit description. new 4ef6cfe gnu: python-pyxb: Update to 1.2.6. 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/packages/linux.scm | 23 +++ gnu/packages/xml.scm | 4 ++-- 2 files changed, 9 insertions(+), 18 deletions(-)
02/03: gnu: iproute: Edit description.
nckx pushed a commit to branch master
in repository guix.
commit 35a4fefc01faa963c0a3bd2da4419882851e1580
Author: Tobias Geerinckx-Rice
Date: Wed Sep 6 15:26:54 2017 +0200
gnu: iproute: Edit description.
* gnu/packages/linux.scm (iproute)[description]: Re-order, be concise, and
omit information that is obsolete, misleading, or irrelevant to Guix users.
---
gnu/packages/linux.scm | 19 +--
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8f240e6..ac7a7a4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1173,23 +1173,14 @@ that the Ethernet protocol is much simpler than the IP
protocol.")
(synopsis
"Utilities for controlling TCP/IP networking and traffic in Linux")
(description
- "Iproute2 is a collection of utilities for controlling TCP/IP
-networking and traffic with the Linux kernel.
+ "Iproute2 is a collection of utilities for controlling TCP/IP networking
+and traffic with the Linux kernel. The most important of these are
+@command{ip}, which configures IPv4 and IPv6, and @command{tc} for traffic
+control.
Most network configuration manuals still refer to ifconfig and route as the
primary network configuration tools, but ifconfig is known to behave
-inadequately in modern network environments. They should be deprecated, but
-most distros still include them. Most network configuration systems make use
-of ifconfig and thus provide a limited feature set. The /etc/net project aims
-to support most modern network technologies, as it doesn't use ifconfig and
-allows a system administrator to make use of all iproute2 features, including
-traffic control.
-
-iproute2 is usually shipped in a package called iproute or iproute2 and
-consists of several tools, of which the most important are @command{ip} and
-@command{tc}. @command{ip} controls IPv4 and IPv6 configuration and
-@command{tc} stands for traffic control. Both tools print detailed usage
-messages and are accompanied by a set of manpages.")
+inadequately in modern network environments, and both should be deprecated.")
(license license:gpl2+)))
;; There are two packages for net-tools. The first, net-tools, is more recent
01/03: gnu: iproute: Update to 4.13.0.
nckx pushed a commit to branch master in repository guix. commit ddcac5595e37f9d12cff71e9c925e08273f523c6 Author: Tobias Geerinckx-Rice Date: Wed Sep 6 15:16:11 2017 +0200 gnu: iproute: Update to 4.13.0. * gnu/packages/linux.scm (iproute): Update to 4.13.0. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 245b36f..8f240e6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1132,7 +1132,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") (define-public iproute (package (name "iproute2") -(version "4.12.0") +(version "4.13.0") (source (origin (method url-fetch) (uri (string-append @@ -1140,7 +1140,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") version ".tar.xz")) (sha256 (base32 -"0zdxdsxyaazl85xhwskvsmpyzwf5qp21cvjsi1lw3xnrc914q2if" +"0l2w84cwr54gaw3cbxijf614l76hx8mgcz57v81rwl68z3nq3yww" (build-system gnu-build-system) (arguments `(#:tests? #f; no test suite
branch master updated (4ef6cfe -> 1b97e92)
efraim pushed a change to branch master in repository guix. from 4ef6cfe gnu: python-pyxb: Update to 1.2.6. new 1f91945 gnu: udisks: Add missing input. new daae208 gnu: modem-manager: Add missing input. new 166bc1b gnu: network-manager: Add missing input. new 7e38ba6 gnu: accountsservice: Add missing input. new de0c89f gnu: colord: Add missing input. new 1b97e92 gnu: gdm: Add missing input. The 6 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/freedesktop.scm | 7 +-- gnu/packages/gnome.scm | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-)
05/06: gnu: colord: Add missing input.
efraim pushed a commit to branch master
in repository guix.
commit de0c89f181f6cff3d437d34099b3b6ba5d96e90f
Author: Peter Mikkelsen
Date: Wed Sep 6 13:22:38 2017 +0200
gnu: colord: Add missing input.
* gnu/packages/gnome.scm (colord)[inputs]: Add libcap.
---
gnu/packages/gnome.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0b8e0d8..d02baff 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2781,6 +2781,7 @@ keyboard shortcuts.")
("lcms" ,lcms)))
(inputs
`(("dbus-glib" ,dbus-glib)
+ ("libcap" ,libcap)
("libgudev" ,libgudev)
("libusb" ,libusb)
("sqlite" ,sqlite)
03/06: gnu: network-manager: Add missing input.
efraim pushed a commit to branch master
in repository guix.
commit 166bc1b259b53f278dc362fd62b55c2c7b8af522
Author: Peter Mikkelsen
Date: Wed Sep 6 13:11:13 2017 +0200
gnu: network-manager: Add missing input.
* gnu/packages/gnome.scm (network-manager)[inputs]: Add libcap.
---
gnu/packages/gnome.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d64bd9f..0b8e0d8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5022,6 +5022,7 @@ users.")
("iptables" ,iptables)
("isc-dhcp" ,isc-dhcp)
("jansson" ,jansson)
+ ("libcap" ,libcap)
("libgcrypt" ,libgcrypt)
("libgudev" ,libgudev)
("libndp" ,libndp)
06/06: gnu: gdm: Add missing input.
efraim pushed a commit to branch master
in repository guix.
commit 1b97e92613e777a67f2bac4f033f6386f11b1fa4
Author: Peter Mikkelsen
Date: Wed Sep 6 13:22:39 2017 +0200
gnu: gdm: Add missing input.
* gnu/packages/gnome.scm (gdm)[inputs]: Add libcap.
---
gnu/packages/gnome.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d02baff..339436f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5254,6 +5254,7 @@ libxml2.")
("gtk+" ,gtk+)
("iso-codes" ,iso-codes)
("libcanberra" ,libcanberra)
+ ("libcap" ,libcap)
("linux-pam" ,linux-pam)))
(synopsis "Display manager for GNOME")
(home-page "https://wiki.gnome.org/Projects/GDM/";)
04/06: gnu: accountsservice: Add missing input.
efraim pushed a commit to branch master
in repository guix.
commit 7e38ba654a12f3c82e647c8b92d968be938d0867
Author: Peter Mikkelsen
Date: Wed Sep 6 13:22:37 2017 +0200
gnu: accountsservice: Add missing input.
* gnu/packages/freedesktop.scm (accountsservice)[inputs]: Add libcap.
---
gnu/packages/freedesktop.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 9f4d433..b1d0910 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -681,7 +681,8 @@ message bus.")
("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
- `(("shadow" ,shadow)
+ `(("libcap" ,libcap)
+ ("shadow" ,shadow)
("polkit" ,polkit)))
(home-page "http://www.freedesktop.org/wiki/Software/AccountsService/";)
(synopsis "D-Bus interface for user account query and manipulation")
02/06: gnu: modem-manager: Add missing input.
efraim pushed a commit to branch master
in repository guix.
commit daae20894265958eb108f775befa390dbcaddd4a
Author: Peter Mikkelsen
Date: Wed Sep 6 13:06:41 2017 +0200
gnu: modem-manager: Add missing input.
* gnu/packages/freedesktop.scm (modem-manager)[inputs]: Add libcap.
---
gnu/packages/freedesktop.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 3649093..9f4d433 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -778,7 +778,8 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
(propagated-inputs
`(("glib" ,glib))) ; required by mm-glib.pc
(inputs
- `(("libgudev" ,libgudev)
+ `(("libcap" ,libcap)
+ ("libgudev" ,libgudev)
("libmbim" ,libmbim)
("libqmi" ,libqmi)
("polkit" ,polkit)))
01/06: gnu: udisks: Add missing input.
efraim pushed a commit to branch master
in repository guix.
commit 1f919459eba67da908cd7614b4fb2e66a0e2620b
Author: Peter Mikkelsen
Date: Wed Sep 6 13:00:46 2017 +0200
gnu: udisks: Add missing input.
* gnu/packages/freedesktop.scm (udisks)[inputs]: Add libcap.
---
gnu/packages/freedesktop.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 3c4ae3f..3649093 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -580,6 +580,7 @@ Analysis and Reporting Technology) functionality.")
`(("acl" ,acl)
("libatasmart" ,libatasmart)
("libgudev" ,libgudev)
+ ("libcap" ,libcap)
("polkit" ,polkit)
("util-linux" ,util-linux)))
(outputs '("out"
branch master updated (1b97e92 -> 18e565b)
efraim pushed a change to branch master in repository guix. from 1b97e92 gnu: gdm: Add missing input. new 18e565b gnu: terminology: Update to 1.1.1. 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/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: terminology: Update to 1.1.1.
efraim pushed a commit to branch master in repository guix. commit 18e565bf67145b739703da9f13197f93e34c5284 Author: Efraim Flashner Date: Wed Sep 6 22:06:42 2017 +0300 gnu: terminology: Update to 1.1.1. * gnu/packages/enlightenment.scm (terminology): Update to 1.1.1. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 9f2abb7..aa7b87c 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -165,7 +165,7 @@ removable devices or support for multimedia.") (define-public terminology (package (name "terminology") -(version "1.1.0") +(version "1.1.1") (source (origin (method url-fetch) (uri @@ -173,7 +173,7 @@ removable devices or support for multimedia.") "terminology/terminology-" version ".tar.xz")) (sha256 (base32 -"13rl1k22yf8qrpzdm5nh6ij641fibadr2ww1r7rnz7mbhzj3d4gb")) +"05ncxvzb9rzkyjvd95hzn8lswqdwr8cix6rd54nqn9559jibh4ns")) (modules '((guix build utils))) ;; Remove the bundled fonts. ;; TODO: Remove bundled lz4.
branch master updated (18e565b -> c98f9c5)
steap pushed a change to branch master in repository guix. from 18e565b gnu: terminology: Update to 1.1.1. new c98f9c5 gnu: python-tox: Update to 2.8.0. 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 | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-)
01/01: gnu: python-tox: Update to 2.8.0.
steap pushed a commit to branch master
in repository guix.
commit c98f9c52960735da672d5e9766bdfef5ff136a6e
Author: Cyril Roelandt
Date: Mon Sep 4 14:11:40 2017 +0200
gnu: python-tox: Update to 2.8.0.
* gnu/packages/python.scm (python-tox): Update to 2.8.0.
---
gnu/packages/python.scm | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a190873..c6f9f34 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9886,14 +9886,14 @@ Pytest but stripped of Pytest specific details.")
(define-public python-tox
(package
(name "python-tox")
- (version "2.3.1")
+ (version "2.8.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "tox" version))
(sha256
(base32
- "1vj73ar4rimq3fwy5r2z3jv4g9qbh8rmpmncsc00g0k310acqzxz"
+ "00lrql2cfzhb712v70inac6mrgdv8s8fmvz7qpggkk623hkm2pgc"
(build-system python-build-system)
(arguments
;; FIXME: Tests require pytest-timeout, which itself requires
@@ -9905,7 +9905,8 @@ Pytest but stripped of Pytest specific details.")
("python-virtualenv" ,python-virtualenv)))
(native-inputs
`(; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout)
- ("python-pytest" ,python-pytest))) ; >= 2.3.5
+ ("python-pytest" ,python-pytest) ; >= 2.3.5
+ ("python-setuptools-scm" ,python-setuptools-scm)))
(home-page "http://tox.testrun.org/";)
(synopsis "Virtualenv-based automation of test activities")
(description "Tox is a generic virtualenv management and test command line
