branch master updated: Update grunewald key.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new 4ce201c Update grunewald key. 4ce201c is described below commit 4ce201ccca54344ef777074e40af24bba8a07e5a Author: Marius Bakke AuthorDate: Mon Dec 26 13:07:16 2022 +0100 Update grunewald key. * hydra/keys/guix/berlin/grunewald.rekado.pub: Use the current signing key on the node. --- hydra/keys/guix/berlin/grunewald.rekado.pub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hydra/keys/guix/berlin/grunewald.rekado.pub b/hydra/keys/guix/berlin/grunewald.rekado.pub index b2d788a..dadd594 100644 --- a/hydra/keys/guix/berlin/grunewald.rekado.pub +++ b/hydra/keys/guix/berlin/grunewald.rekado.pub @@ -1,6 +1,6 @@ (public-key (ecc (curve Ed25519) - (q #5C3B0196310FA54D212C8D70020D9D1C0AEDBBB5CBE7EEBC97958D66BA55EB94#) + (q #370A0165E60213CA122E026402EE3DEA61FE4E4EE27D16DA44044AA49714D481#) ) )
branch master updated: berlin: nginx: Add .well-known nginx location for monitor.guix.gnu.org.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new 506c3bf berlin: nginx: Add .well-known nginx location for monitor.guix.gnu.org. 506c3bf is described below commit 506c3bffecb2876a167a369ae065aad5eff87e1b Author: Marius Bakke AuthorDate: Thu Dec 8 18:45:30 2022 +0100 berlin: nginx: Add .well-known nginx location for monitor.guix.gnu.org. * hydra/nginx/berlin.scm (%zabbix-nginx-server)[locations]: Add /.well-known. --- hydra/nginx/berlin.scm | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm index d1249a3..a3ff107 100644 --- a/hydra/nginx/berlin.scm +++ b/hydra/nginx/berlin.scm @@ -535,7 +535,10 @@ PUBLISH-URL." "ssl_verify_client on;"))) (locations (let ((php-location (nginx-php-location))) - (list (nginx-location-configuration + (list (nginx-location-configuration ;certbot + (uri "/.well-known") + (body (list "root /var/www;"))) +(nginx-location-configuration (inherit php-location) (body (cons "if ($ssl_client_verify != SUCCESS) { return 403; }" (append (nginx-location-configuration-body php-location)
branch master updated: website: gnu-guix-1.3.0-released: Correct Linux-Libre version.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new f804673 website: gnu-guix-1.3.0-released: Correct Linux-Libre version. f804673 is described below commit f804673e80efd6700c3ba6cd635914c345775de7 Author: Marius Bakke AuthorDate: Wed May 12 13:34:40 2021 +0200 website: gnu-guix-1.3.0-released: Correct Linux-Libre version. * website/posts/gnu-guix-1.3.0-released.md: Mention the actual Linux-Libre version contained within the 1.3.0 release. --- website/posts/gnu-guix-1.3.0-released.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/posts/gnu-guix-1.3.0-released.md b/website/posts/gnu-guix-1.3.0-released.md index 961141f..52fc214 100644 --- a/website/posts/gnu-guix-1.3.0-released.md +++ b/website/posts/gnu-guix-1.3.0-released.md @@ -246,7 +246,7 @@ from your experience! 2,000 packages were added, for a total of [more than 17K packages](https://guix.gnu.org/en/packages); 3,100 were updated. The distribution comes with GNU libc 2.31, GCC 10.3, Xfce 4.16.0, -Linux-libre 5.9.3, LibreOffice 6.4.7.2, and Emacs 27.2, to name a few. +Linux-libre 5.11.15, LibreOffice 6.4.7.2, and Emacs 27.2, to name a few. Among the many packaging changes, one that stands out is the [new OCaml bootstrap](https://www.freelists.org/post/bootstrappable/Announcing-the-bootstrap-of-OCaml): the OCaml package is now built entirely from source _via_
branch master updated: hydra: build-machines: GC more.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new 6465fd6 hydra: build-machines: GC more. 6465fd6 is described below commit 6465fd6d530a5ca7f4a87059b016537d1a2ee231 Author: Marius Bakke AuthorDate: Wed Nov 11 00:42:03 2020 +0100 hydra: build-machines: GC more. Recently many machines runs out of disk space regularly. * hydra/modules/sysadmin/build-machines.scm (berlin-new-build-machine-os): Free 150GiB instead of 90 GiB. --- hydra/modules/sysadmin/build-machines.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hydra/modules/sysadmin/build-machines.scm b/hydra/modules/sysadmin/build-machines.scm index f1a6548..c7b1a78 100644 --- a/hydra/modules/sysadmin/build-machines.scm +++ b/hydra/modules/sysadmin/build-machines.scm @@ -98,7 +98,7 @@ EMULATED-ARCHITECTURES, unless it's empty." (define gc-job ;; Run 'guix gc' at 3AM and 3PM every day. #~(job '(next-hour '(3 15)) - "guix gc -F 90G")) + "guix gc -F 150G")) (define childhurd-gc-job ;; Run 'guix gc' at 2AM and 2PM every day.
branch master updated: hydra: berlin: Conditionally set max-cores on build nodes.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new 4e8aee7 hydra: berlin: Conditionally set max-cores on build nodes. 4e8aee7 is described below commit 4e8aee736424be83fb50d7cdc31a0c2e2f7f Author: Marius Bakke AuthorDate: Sun Oct 18 23:07:44 2020 +0200 hydra: berlin: Conditionally set max-cores on build nodes. * hydra/berlin-nodes.scm (machine): Set MAX-CORES depending on memory size. --- hydra/berlin-nodes.scm | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hydra/berlin-nodes.scm b/hydra/berlin-nodes.scm index 37f1b6c..c575b3f 100644 --- a/hydra/berlin-nodes.scm +++ b/hydra/berlin-nodes.scm @@ -136,7 +136,11 @@ #:emulated-architectures '("arm" "aarch64") #:childhurd? (childhurd-ip? ip) -#:max-jobs 20)) +#:max-jobs 4 +;; The big-memory machines have 96 +;; logical cores, the others 64. +#:max-cores (if (> memory 128) +24 16))) (environment managed-host-environment-type) (configuration (machine-ssh-configuration (system "x86_64-linux")
branch master updated (cfc7858 -> b48b10a)
mbakke pushed a change to branch master in repository maintenance. from cfc7858 hydra: berlin: Increase number of build users. new 7f2a7d0 hydra: berlin: Increase max-cores on build nodes. new b48b10a hydra: berlin: Reduce parallel-builds on x86_64 offloading targets. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: hydra/machines-for-berlin.scm | 4 ++-- hydra/modules/sysadmin/build-machines.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
02/02: hydra: berlin: Reduce parallel-builds on x86_64 offloading targets.
mbakke pushed a commit to branch master in repository maintenance. commit b48b10a4c18b671e9bb1c2da7a8c15ae09f0e2aa Author: Marius Bakke AuthorDate: Sun Oct 18 22:54:03 2020 +0200 hydra: berlin: Reduce parallel-builds on x86_64 offloading targets. * hydra/machines-for-berlin.scm (template-x86_64): Set PARALLEL-BUILDS to match the nodes' max-jobs setting. --- hydra/machines-for-berlin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm index ff5ffeb..53e1d83 100644 --- a/hydra/machines-for-berlin.scm +++ b/hydra/machines-for-berlin.scm @@ -138,7 +138,7 @@ (compression "no") (speed 3) ;don't increase it too much ;or everything goes there - (parallel-builds 16))) + (parallel-builds 4))) ((name key 192) (build-machine (name name) @@ -148,7 +148,7 @@ (compression "no") (speed 3) ;don't increase it too much ;or everything goes there - (parallel-builds 16))) + (parallel-builds 4))) ((ip key ram) (build-machine (name ip)
01/02: hydra: berlin: Increase max-cores on build nodes.
mbakke pushed a commit to branch master in repository maintenance. commit 7f2a7d0110846e37db38f136e8f4b58f4cd0c4fc Author: Marius Bakke AuthorDate: Sun Oct 18 22:48:28 2020 +0200 hydra: berlin: Increase max-cores on build nodes. * hydra/modules/sysadmin/build-machines.scm (berlin-new-build-machine-os): Reduce MAX-JOBS from 5 to 4, and increase MAX-CORES from 4 to 16. --- hydra/modules/sysadmin/build-machines.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hydra/modules/sysadmin/build-machines.scm b/hydra/modules/sysadmin/build-machines.scm index f948aea..f1a6548 100644 --- a/hydra/modules/sysadmin/build-machines.scm +++ b/hydra/modules/sysadmin/build-machines.scm @@ -87,8 +87,8 @@ nodes." (authorized-guix-keys '()) (emulated-architectures '()) childhurd? - (max-jobs 5) - (max-cores 4) + (max-jobs 4) + (max-cores 16) (build-accounts-to-max-jobs-ratio 4)) "Return the declaration for a build machine for berlin.guixsd.org with integer ID, with the given
branch master updated: website: ganeti-on-guix: Tweak and publish.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new 74551fd website: ganeti-on-guix: Tweak and publish. 74551fd is described below commit 74551fd90b6fdc143d33580f94e72db1f34c0447 Author: Marius Bakke AuthorDate: Fri Jul 17 14:48:50 2020 +0200 website: ganeti-on-guix: Tweak and publish. * website/drafts/ganeti-on-guix.md: Do some final adjustments and move from here ... * website/posts/ganeti-on-guix.md: ... to here. --- website/{drafts => posts}/ganeti-on-guix.md | 33 - 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/website/drafts/ganeti-on-guix.md b/website/posts/ganeti-on-guix.md similarity index 94% rename from website/drafts/ganeti-on-guix.md rename to website/posts/ganeti-on-guix.md index 89f175d..6218c2f 100644 --- a/website/drafts/ganeti-on-guix.md +++ b/website/posts/ganeti-on-guix.md @@ -1,12 +1,13 @@ title: Running a Ganeti cluster on Guix -date: 2020-07-17 12:00 +date: 2020-07-17 15:00 author: Marius Bakke tags: Virtualization, Ganeti --- -The latest addition to Guix's ever-growing list of services is a little-known -virtualization toolkit called [Ganeti](http://www.ganeti.org/). Ganeti is -designed to keep virtual machines running on a cluster of servers even in the -event of hardware failures, and to make maintenance and recovery tasks easy. +The [latest addition](https://guix.gnu.org/manual/devel/en/guix.html#index-ganeti) +to Guix's ever-growing list of services is a little-known virtualization toolkit +called [Ganeti](http://www.ganeti.org/). Ganeti is designed to keep virtual +machines running on a cluster of servers even in the event of hardware failures, +and to make maintenance and recovery tasks easy. It is comparable to tools such as [Proxmox](https://www.proxmox.com/en/proxmox-ve) or @@ -39,7 +40,7 @@ nodes are on different power distribution lines. (Note: if you are looking for a way to run just a few virtual machines on your local computer, you are probably better off using [libvirt](https://guix.gnu.org/manual/en/guix.html#index-libvirt) or even a -[Childhurd](https://guix.gnu.org/manual/devel/en/guix.html#index-hurd_002dvm_002dservice_002dtype), +[Childhurd](https://guix.gnu.org/manual/devel/en/guix.html#index-hurd-1) as Ganeti is fairly heavyweight and requires a complicated networking setup.) @@ -127,8 +128,8 @@ system. We also create an `ifup` service that can bring network interfaces up and down. By themselves these variables do nothing, we also have to add them to our `operating-system` configuration below. -Such a configuration might be suitable for a small home network. In most -"real world" deployments you would use tagged VLANs, and maybe a traditional +Such a configuration might be suitable for a small home network. In a +datacenter deployment you would likely use tagged VLANs, and maybe a traditional Linux bridge instead of Open vSwitch. You can also forego bridging altogether with a `routed` networking setup, or do any combination of the three. @@ -209,12 +210,12 @@ that we will use for the Ganeti servers: %base-services))) ``` -Here we declare two OS "variants" for the debootstrap provider. Debootstrap +Here we declare two OS "variants" for the debootstrap OS provider. Debootstrap variants rely on a set of scripts (known as "hooks") in the installation process to do things like configure networking, install bootloader, create users, etc. In the example above, the "buster" variant uses the default hooks provided by Guix which configures network and GRUB, whereas the "testing+contrib+paravirtualized" -variant uses a local directory next to the configuration file named "paravirt-hooks" +variant use a local directory next to the configuration file named "paravirt-hooks" (it is copied into the final system closure). We also declare a default `guix-os` variant provided by Guix's Ganeti service. @@ -388,7 +389,7 @@ By default Ganeti assumes that the new instance is already configured in DNS, so we need `--no-name-check` and `--no-ip-check` to bypass some sanity tests. Try adding another instance, now using the Guix OS provider with the 'plain' -(LVM, not redundant) disk backend: +(LVM) disk backend: ``` gnt-instance add --no-name-check --no-ip-check -o guix+default \ @@ -430,10 +431,12 @@ If you wish to start over for any reason, you can use `gnt-cluster destroy`. The declarative nature of Guix maps well to Ganetis OS API. OS variants can be composed and inherit from each other, something that is not easily achieved with -traditional configuration management tools. This convenience does however make -me wish other parts of Ganeti could be made declarative, such as
branch master updated: website: Add draft of a Ganeti cluster post.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new 6a477cd website: Add draft of a Ganeti cluster post. 6a477cd is described below commit 6a477cd9529560df25a21a67433be5b2bf6a7470 Author: Marius Bakke AuthorDate: Wed Jul 8 11:48:17 2020 +0200 website: Add draft of a Ganeti cluster post. * website/drafts/ganeti-on-guix.md: New file. --- website/drafts/ganeti-on-guix.md | 469 +++ 1 file changed, 469 insertions(+) diff --git a/website/drafts/ganeti-on-guix.md b/website/drafts/ganeti-on-guix.md new file mode 100644 index 000..89f175d --- /dev/null +++ b/website/drafts/ganeti-on-guix.md @@ -0,0 +1,469 @@ +title: Running a Ganeti cluster on Guix +date: 2020-07-17 12:00 +author: Marius Bakke +tags: Virtualization, Ganeti +--- +The latest addition to Guix's ever-growing list of services is a little-known +virtualization toolkit called [Ganeti](http://www.ganeti.org/). Ganeti is +designed to keep virtual machines running on a cluster of servers even in the +event of hardware failures, and to make maintenance and recovery tasks easy. + +It is comparable to tools such as +[Proxmox](https://www.proxmox.com/en/proxmox-ve) or +[oVirt](https://www.ovirt.org/), but has some distinctive features. One is +that there is no GUI: [third](https://github.com/osuosl/ganeti_webmgr) +[party](https://github.com/grnet/ganetimgr) +[ones](https://github.com/sipgate/ganeti-control-center) exist, but are not +currently packaged in Guix, so you are left with a rich command-line client +and a fully featured +[remote API](http://docs.ganeti.org/ganeti/master/html/rapi.html). + +Another interesting feature is that installing Ganeti on its own leaves you +no way to actually deploy any virtual machines. That probably sounds crazy, +but stems from the fact that Ganeti is designed to be API-driven and automated, +thus it comes with a +[OS API](http://docs.ganeti.org/ganeti/master/html/man-ganeti-os-interface.html) +and users need to install one or more *OS providers* in addition to Ganeti. +OS providers offer a declarative way to deploy virtual machine variants and +should feel natural to Guix users. At the time of writing, the providers +available in Guix are [debootstrap](https://github.com/ganeti/instance-debootstrap) +for provisioning Debian- and Ubuntu-based VMs, and of course a +[Guix](https://github.com/mbakke/ganeti-instance-guix) provider. + +Finally Ganeti comes with a sophisticated _instance allocation framework_ that +efficiently packs virtual machines across a cluster while maintaining N+1 +redundancy in case of a failover scenario. It can also make informed scheduling +decisions based on various cluster tags, such as ensuring primary and secondary +nodes are on different power distribution lines. + +(Note: if you are looking for a way to run just a few virtual machines on +your local computer, you are probably better off using +[libvirt](https://guix.gnu.org/manual/en/guix.html#index-libvirt) or even a +[Childhurd](https://guix.gnu.org/manual/devel/en/guix.html#index-hurd_002dvm_002dservice_002dtype), +as Ganeti is fairly heavyweight and requires a complicated networking setup.) + + +# Preparing the configuration + +With introductions out of the way, let's see how we can deploy a Ganeti +cluster using Guix. For this tutorial we will create a two-node cluster +and connect instances to the local network using an +[Open vSwitch](https://www.openvswitch.org/) bridge with no VLANs. We assume +that each node has a single network interface named `eth0` connected to the +same network, and that a dedicated partition `/dev/sdz3` is available for +virtual machine storage. It is possible to store VMs on a number of other +storage backends, but a dedicated drive (or rather LVM volume group) is +necessary to use the [DRBD](https://www.linbit.com/drbd/) integration to +replicate VM disks. + +We'll start off by defining a few helper services to create the Open vSwitch +bridge and ensure the physical network interface is in the "up" state. Since +Open vSwich stores the configuration in a database, you might as well run the +equivalent `ovs-vsctl` commands on the host once and be done with it, but we +do it through the configuration system to ensure we don't forget it in the +future when adding or reinstalling nodes. + +``` +(use-modules (gnu) + (gnu packages linux) + (gnu packages networking) + (gnu services shepherd)) + +(define (start-interface if) + #~(let ((ip #$(file-append iproute "/sbin/ip"))) + (invoke/quiet ip "link" "set" #$if "up"))) + +(define (stop-interface if) + #~(let ((ip #$(file-append iproute "/sbin/ip"))) + (invoke/quiet ip "link" "set" #$if "down"
branch master updated: hydra: berlin: Add the reinstalled guix-x15.sjd.se.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new b5f9cee hydra: berlin: Add the reinstalled guix-x15.sjd.se. b5f9cee is described below commit b5f9cee4a55dc6ce68edd4a04ade5d96ea5dde00 Author: Marius Bakke AuthorDate: Tue May 5 23:12:00 2020 +0200 hydra: berlin: Add the reinstalled guix-x15.sjd.se. Also remove tunnels as the MDC firewall has been updated. * hydra/machines-for-berlin.scm (armv7): Provide new host key for guix-x15.sjd.se; remove tunnels for guix-x15*. --- hydra/machines-for-berlin.scm | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm index b8517c8..6b10a04 100644 --- a/hydra/machines-for-berlin.scm +++ b/hydra/machines-for-berlin.scm @@ -230,15 +230,14 @@ (define armv7 (list ;; BeagleBoard (2 cores) kindly hosted by Simon Josefsson. - ;; Temporarily tunneled while waiting for firewall update. (build-machine -(name "localhost") (port 2224) ;guix-x15.sjd.se +(name "guix-x15.sjd.se") (user "hydra") (system "armhf-linux") -(host-key "ssh-ed25519 C3NzaC1lZDI1NTE5IFZRvfeaRc7wEIiEoaWA5789+zcZ2Ht/OdFYOt7YAhgn root@beaglebone")) +(host-key "ssh-ed25519 C3NzaC1lZDI1NTE5IOfXjwCAFWeGiUoOVXEgtIeXxbtymjOTg7ph1ObMAcJ0 root@beaglebone")) (build-machine -(name "localhost") (port 2225) ;guix-15b.sjd.se +(name "guix-x15b.sjd.se") (user "hydra") (system "armhf-linux") (host-key "ssh-ed25519 C3NzaC1lZDI1NTE5IJEbCOTTg9Tl0E23Mnc0UA4Ib2W5oDqTukk6mT98tOph root@beaglebone"))
branch master updated: website: Update sjd.se servers.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new 1c026de website: Update sjd.se servers. 1c026de is described below commit 1c026de23cb4646ddf0ce8ead7a0f3b05b1240bc Author: Simon Josefsson AuthorDate: Tue Apr 28 23:24:47 2020 +0200 website: Update sjd.se servers. * website/apps/base/templates/donate.scm (donate-t): Remove guix.sjd.se; add guix-x15 and guix-x15b and update home page. Signed-off-by: Marius Bakke --- website/apps/base/templates/donate.scm | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/website/apps/base/templates/donate.scm b/website/apps/base/templates/donate.scm index 217eb64..7483454 100644 --- a/website/apps/base/templates/donate.scm +++ b/website/apps/base/templates/donate.scm @@ -125,18 +125,11 @@ i686-linux, and dedicated storage") (a (@ (href ,(guix-url "blog/2016/growing-our-build-farm/"))) "Igalia") (tr - (td "guix.sjd.se") - (td "x86_64-linux, i686-linux") - (td - (ul - (li (a (@ (href "http://josefsson.org;)) - "Simon Josefsson") -(tr - (td "x15.sjd.se") + (td "guix-x15.sjd.se, guix-x15b.sjd.se") (td "armhf-linux") (td (ul - (li (a (@ (href "http://josefsson.org;)) + (li (a (@ (href "https://blog.josefsson.org/;)) "Simon Josefsson") (tr (td "hydra-slave1")
branch master updated: hydra: Add guix-x15{,b}.sjd.se.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new ebc5f4a hydra: Add guix-x15{,b}.sjd.se. ebc5f4a is described below commit ebc5f4ada2ab8f9c8cea51739a281a6c1291761d Author: Marius Bakke AuthorDate: Wed Apr 29 22:21:16 2020 +0200 hydra: Add guix-x15{,b}.sjd.se. Thanks Simon! * hydra/machines-for-berlin.scm (armv7): Add two new nodes. --- hydra/machines-for-berlin.scm | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm index 7bf62b7..b8517c8 100644 --- a/hydra/machines-for-berlin.scm +++ b/hydra/machines-for-berlin.scm @@ -230,11 +230,18 @@ (define armv7 (list ;; BeagleBoard (2 cores) kindly hosted by Simon Josefsson. - #;(build-machine -(name "x15.sjd.se") + ;; Temporarily tunneled while waiting for firewall update. + (build-machine +(name "localhost") (port 2224) ;guix-x15.sjd.se +(user "hydra") +(system "armhf-linux") +(host-key "ssh-ed25519 C3NzaC1lZDI1NTE5IFZRvfeaRc7wEIiEoaWA5789+zcZ2Ht/OdFYOt7YAhgn root@beaglebone")) + + (build-machine +(name "localhost") (port 2225) ;guix-15b.sjd.se (user "hydra") (system "armhf-linux") -(host-key "ssh-ed25519 C3NzaC1lZDI1NTE5ILvy4tWBLfuBGB2Q8S5q0CeKLaD9w4hAG5PU/+nTD6e2 root@BeagleBoard-X15")) +(host-key "ssh-ed25519 C3NzaC1lZDI1NTE5IJEbCOTTg9Tl0E23Mnc0UA4Ib2W5oDqTukk6mT98tOph root@beaglebone")) #;(build-machine (name "hydra-slave1.netris.org")
branch master updated: drafts: guix-1.1.0-release-announcement: Monospace "copy-build-system".
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new e09a082 drafts: guix-1.1.0-release-announcement: Monospace "copy-build-system". e09a082 is described below commit e09a082e1024afd6edd5dd56929197451bb0ace9 Author: Marius Bakke AuthorDate: Wed Apr 15 13:00:38 2020 +0200 drafts: guix-1.1.0-release-announcement: Monospace "copy-build-system". * website/drafts/guix-1.1.0-released.md (distro): Make 'copy-build-system' a code block. --- website/drafts/guix-1.1.0-released.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/drafts/guix-1.1.0-released.md b/website/drafts/guix-1.1.0-released.md index 00ce6c5..26e9f53 100644 --- a/website/drafts/guix-1.1.0-released.md +++ b/website/drafts/guix-1.1.0-released.md @@ -100,7 +100,7 @@ On the distro side: running Singularity containers, and many others. - Build systems for Node, Julia, and Qt were added, making it easier to write package definitions for these ecosystems. In addition there is a -new "copy-build-system" that does what you might expect. +new `copy-build-system` that does what you might expect. At the programming interface level and under the hood, many things changed as well, notably:
branch master updated: drafts: guix-1.1.0-release-announcement: Fill in package additions and updates.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new 288b16a drafts: guix-1.1.0-release-announcement: Fill in package additions and updates. 288b16a is described below commit 288b16ac17c833a8dc419f1df7ba4f0c43395917 Author: Marius Bakke AuthorDate: Wed Apr 15 12:51:56 2020 +0200 drafts: guix-1.1.0-release-announcement: Fill in package additions and updates. * website/drafts/guix-1.1.0-released.md (distro): Add number of new and updated packages. --- website/drafts/guix-1.1.0-released.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/drafts/guix-1.1.0-released.md b/website/drafts/guix-1.1.0-released.md index cf7b21c..00ce6c5 100644 --- a/website/drafts/guix-1.1.0-released.md +++ b/website/drafts/guix-1.1.0-released.md @@ -91,8 +91,8 @@ On the distro side: integration runs automated tests of the installer for different configurations (encrypted root, non-encrypted root, with or without a desktop environment, etc.). - - More than XXX packages were added, for a total of [almost 13K -packages](https://guix.gnu.org/packages). XXX packages were + - 3514 packages were added, for a total of [more than 13K +packages](https://guix.gnu.org/packages). 3368 packages were upgraded. The distribution comes with GNU libc 2.29, Linux-libre 5.4.28, and LibreOffice 6.4.2.2 among others. - 19 new services were added, providing support for running NFS servers,
branch master updated: drafts: guix-1.1.0-release-announcement: Mention cookbook and new build systems.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new 08c4e02 drafts: guix-1.1.0-release-announcement: Mention cookbook and new build systems. 08c4e02 is described below commit 08c4e0258f0caf73a5c6e01d13343dc599fdffb6 Author: Marius Bakke AuthorDate: Wed Apr 15 12:42:43 2020 +0200 drafts: guix-1.1.0-release-announcement: Mention cookbook and new build systems. * website/drafts/guix-1.1.0-released.md (highlights): Mention the cookbook. (distro): Mention the new build systems. --- website/drafts/guix-1.1.0-released.md | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/website/drafts/guix-1.1.0-released.md b/website/drafts/guix-1.1.0-released.md index 8e2b55e..cf7b21c 100644 --- a/website/drafts/guix-1.1.0-released.md +++ b/website/drafts/guix-1.1.0-released.md @@ -71,6 +71,9 @@ highlights as far as tooling is concerned: - Guix now [runs on Guile 3](https://guix.gnu.org/blog/2020/guile-3-and-guix/), which improves performance. + - The manual now includes a +"[cookbook](https://guix.gnu.org/cookbook/en/html_node/index.html)" that +contains tutorials and explorations of topics not covered by the manual alone. On the distro side: @@ -95,7 +98,10 @@ On the distro side: - 19 new services were added, providing support for running NFS servers, loading out-of-tree kernel modules, configuring the nftables firewall, running Singularity containers, and many others. - + - Build systems for Node, Julia, and Qt were added, making it easier to +write package definitions for these ecosystems. In addition there is a +new "copy-build-system" that does what you might expect. + At the programming interface level and under the hood, many things changed as well, notably:
branch master updated: drafts: guix-1.1.0-release-announcement: Fix typo.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new 8299c8d drafts: guix-1.1.0-release-announcement: Fix typo. 8299c8d is described below commit 8299c8d7933f5e70d4f821a822d7714d1da3e0fa Author: Marius Bakke AuthorDate: Wed Apr 15 12:12:54 2020 +0200 drafts: guix-1.1.0-release-announcement: Fix typo. * website/drafts/guix-1.1.0-released.md: s/1.0.0/1.1.0/ --- website/drafts/guix-1.1.0-released.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/drafts/guix-1.1.0-released.md b/website/drafts/guix-1.1.0-released.md index b44c36f..8e2b55e 100644 --- a/website/drafts/guix-1.1.0-released.md +++ b/website/drafts/guix-1.1.0-released.md @@ -4,7 +4,7 @@ author: Ludovic Courtès slug: gnu-guix-1.1.0-released tags: Releases, System tests --- -We are pleased to announce the release of GNU Guix version 1.0.0! +We are pleased to announce the release of GNU Guix version 1.1.0! The release comes with [ISO-9660 installation images](https://guix.gnu.org/manual/en/html_node/System-Installation.html),
branch master updated (fc9f3a8 -> c5eac51)
mbakke pushed a change to branch master in repository guix-artwork. from fc9f3a8 website: hello-hurd: Update VCS references. new c5c7a36 drafts: guix-1.1.0-release-announcement: Fix typo. new c5eac51 drafts: guix-1.1.0-release-announcement: Mention new services. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: website/drafts/guix-1.1.0-released.md | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
02/02: drafts: guix-1.1.0-release-announcement: Mention new services.
mbakke pushed a commit to branch master in repository guix-artwork. commit c5eac51e9349515a70ce672eec354b152910ffa7 Author: Marius Bakke AuthorDate: Mon Apr 13 14:55:29 2020 +0200 drafts: guix-1.1.0-release-announcement: Mention new services. * website/drafts/guix-1.1.0-released.md (distro): Mention 19 new services, highlight a few. --- website/drafts/guix-1.1.0-released.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/drafts/guix-1.1.0-released.md b/website/drafts/guix-1.1.0-released.md index 489b5d0..b44c36f 100644 --- a/website/drafts/guix-1.1.0-released.md +++ b/website/drafts/guix-1.1.0-released.md @@ -92,7 +92,9 @@ On the distro side: packages](https://guix.gnu.org/packages). XXX packages were upgraded. The distribution comes with GNU libc 2.29, Linux-libre 5.4.28, and LibreOffice 6.4.2.2 among others. - - XXX what else? + - 19 new services were added, providing support for running NFS servers, +loading out-of-tree kernel modules, configuring the nftables firewall, +running Singularity containers, and many others. At the programming interface level and under the hood, many things changed as well, notably:
01/02: drafts: guix-1.1.0-release-announcement: Fix typo.
mbakke pushed a commit to branch master in repository guix-artwork. commit c5c7a36130f1b06bb2da3b31582745a703799877 Author: Marius Bakke AuthorDate: Mon Apr 13 14:36:35 2020 +0200 drafts: guix-1.1.0-release-announcement: Fix typo. * website/drafts/guix-1.1.0-released.md (highlights): s/run on/runs on/ --- website/drafts/guix-1.1.0-released.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/drafts/guix-1.1.0-released.md b/website/drafts/guix-1.1.0-released.md index 5dc..489b5d0 100644 --- a/website/drafts/guix-1.1.0-released.md +++ b/website/drafts/guix-1.1.0-released.md @@ -68,7 +68,7 @@ highlights as far as tooling is concerned: supports a `--target` option providing some support for the cross-compilation of complete systems. More on that in [this FOSDEM talk](https://fosdem.org/2020/schedule/event/ggaaattyp/). - - Guix now [run on + - Guix now [runs on Guile 3](https://guix.gnu.org/blog/2020/guile-3-and-guix/), which improves performance.
branch master updated: hydra: Decrease priority of x86_64->armhf build machines.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new 5477e87 hydra: Decrease priority of x86_64->armhf build machines. 5477e87 is described below commit 5477e875d11afe80d048b6e3312977f190b0ee29 Author: Marius Bakke AuthorDate: Fri Apr 10 20:25:03 2020 +0200 hydra: Decrease priority of x86_64->armhf build machines. * hydra/machines-for-berlin.scm (x86_64->qemu-armhf): Set SPEED to .8 instead of .9. --- hydra/machines-for-berlin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm index ade63dd..7bf62b7 100644 --- a/hydra/machines-for-berlin.scm +++ b/hydra/machines-for-berlin.scm @@ -157,7 +157,7 @@ (build-machine (inherit machine) (system "armhf-linux") - (speed .9) + (speed .8) ;prefer the "native" AArch64 machines (parallel-builds 1))) (define (x86_64->qemu-aarch64 machine)
branch master updated: hydra: Comment out defunct ARMv7 node.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new 258cce7 hydra: Comment out defunct ARMv7 node. 258cce7 is described below commit 258cce73967d17ab558c6321ba69b52003cd436d Author: Marius Bakke AuthorDate: Wed Mar 4 11:36:09 2020 +0100 hydra: Comment out defunct ARMv7 node. * hydra/machines-for-berlin.scm (armv7): Disable 'hydra-slave1.netris.org'. --- hydra/machines-for-berlin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm index 8c412d8..a0460e0 100644 --- a/hydra/machines-for-berlin.scm +++ b/hydra/machines-for-berlin.scm @@ -233,7 +233,7 @@ (system "armhf-linux") (host-key "ssh-ed25519 C3NzaC1lZDI1NTE5ILvy4tWBLfuBGB2Q8S5q0CeKLaD9w4hAG5PU/+nTD6e2 root@BeagleBoard-X15")) - (build-machine + #;(build-machine (name "hydra-slave1.netris.org") (port 7275) (user "hydra")
branch master updated: hydra: Comment out defunct build servers.
This is an automated email from the git hooks/post-receive script. mbakke pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new 857e953 hydra: Comment out defunct build servers. 857e953 is described below commit 857e9538e82260d37e210126c48242f79caec648 Author: Marius Bakke AuthorDate: Thu Feb 27 19:05:01 2020 +0100 hydra: Comment out defunct build servers. * hydra/machines-for-berlin.scm (armv7): Drop x15.sjd.se and hydra-slave{2,3}. --- hydra/machines-for-berlin.scm | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm index 5957a28..8c412d8 100644 --- a/hydra/machines-for-berlin.scm +++ b/hydra/machines-for-berlin.scm @@ -227,7 +227,7 @@ (define armv7 (list ;; BeagleBoard (2 cores) kindly hosted by Simon Josefsson. - (build-machine + #;(build-machine (name "x15.sjd.se") (user "hydra") (system "armhf-linux") @@ -242,7 +242,8 @@ (speed 1.0) (parallel-builds 2)) - (build-machine + ;; I/O errors as of 2020-02-27 + #;(build-machine (name "hydra-slave2.netris.org") (port 7276) (user "hydra") @@ -251,7 +252,8 @@ (speed 1.0) (parallel-builds 2)) - (build-machine + ;; Not responding as of 2020-02-27 + #;(build-machine (name "hydra-slave3.netris.org") (port 7274) (user "hydra")
branch master updated (7965644 -> c9b7a13)
mbakke pushed a change to branch master in repository guix-artwork. from 7965644 website: guix-xfce-desktop-on-foreign-distribution: Small improvements. new c9b7a13 website: guix-xfce-desktop-on-foreign-distribution: Add backticks around 'root'. 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/guix-xfce-desktop-on-foreign-distribution.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
01/01: website: guix-xfce-desktop-on-foreign-distribution: Add backticks around 'root'.
mbakke pushed a commit to branch master in repository guix-artwork. commit c9b7a1363407489aa8dad45359a0c381b0a12042 Author: Marius Bakke Date: Mon Nov 18 13:22:20 2019 +0100 website: guix-xfce-desktop-on-foreign-distribution: Add backticks around 'root'. * website/posts/guix-xfce-desktop-on-foreign-distribution.md: Highlight 'root' the same way as 'alice'. --- website/posts/guix-xfce-desktop-on-foreign-distribution.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/posts/guix-xfce-desktop-on-foreign-distribution.md b/website/posts/guix-xfce-desktop-on-foreign-distribution.md index b82be99..485f9e6 100644 --- a/website/posts/guix-xfce-desktop-on-foreign-distribution.md +++ b/website/posts/guix-xfce-desktop-on-foreign-distribution.md @@ -21,7 +21,7 @@ If Guix is not already installed, go grab the and run it as `sudo bash guix-install.sh`. The script creates `/gnu/store/` and `/var/guix/` and configures a system service -for `guix-daemon`. By default the daemon runs from the 'root' users Guix; we +for `guix-daemon`. By default the daemon runs from the `root` users Guix; we won't be using the root account in this guide, so let's start by making the guix-daemon service refer to our local user `alice` instead.
branch master updated (eed6f3f -> 7965644)
mbakke pushed a change to branch master in repository guix-artwork. from eed6f3f website: Add post about installing XFCE on a foreign distribution. new 7965644 website: guix-xfce-desktop-on-foreign-distribution: Small improvements. 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: .../guix-xfce-desktop-on-foreign-distribution.md | 54 -- 1 file changed, 29 insertions(+), 25 deletions(-)
01/01: website: guix-xfce-desktop-on-foreign-distribution: Small improvements.
mbakke pushed a commit to branch master in repository guix-artwork. commit 7965644be27f6ec71b8d3833a9681824a962631e Author: Marius Bakke Date: Mon Nov 18 12:46:31 2019 +0100 website: guix-xfce-desktop-on-foreign-distribution: Small improvements. * website/posts/guix-xfce-desktop-on-foreign-distribution.md: Capitalize tags. s/XFCE/Xfce/. Add more context on some examples. Add relevant links in Qt section. --- .../guix-xfce-desktop-on-foreign-distribution.md | 54 -- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/website/posts/guix-xfce-desktop-on-foreign-distribution.md b/website/posts/guix-xfce-desktop-on-foreign-distribution.md index 6036e96..b82be99 100644 --- a/website/posts/guix-xfce-desktop-on-foreign-distribution.md +++ b/website/posts/guix-xfce-desktop-on-foreign-distribution.md @@ -1,20 +1,20 @@ -title: Running a Guix XFCE Desktop on CentOS 7 +title: Running a Guix Xfce Desktop on CentOS 7 date: 2019-11-17 19:00 author: Marius Bakke -tags: XFCE, foreign distribution +tags: Xfce, Foreign distribution --- -This tutorial will show how to run a fully fledged XFCE desktop environment +This tutorial will show how to run a fully fledged Xfce desktop environment installed with Guix on top of an existing GNU/Linux distribution. This guide uses CentOS 7 as the base operating system and assumes that Xorg is already configured and running on VT2 under a different user account. -We will borrow Xorg and `xinit` from the host distribution and run Guix XFCE on -virtual terminal 4 as user 'alice'. No system-wide configuration files need to +We will borrow Xorg and `xinit` from the host distribution and run Guix Xfce on +virtual terminal 4 as user `alice`. No system-wide configuration files need to be touched (apart from the Guix install), but we do make a couple of changes for convenience. - From scratch to XFCE + From scratch to Xfce If Guix is not already installed, go grab the [installation script](https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh) @@ -23,7 +23,7 @@ and run it as `sudo bash guix-install.sh`. The script creates `/gnu/store/` and `/var/guix/` and configures a system service for `guix-daemon`. By default the daemon runs from the 'root' users Guix; we won't be using the root account in this guide, so let's start by making the -guix-daemon service refer to our local user 'alice' instead. +guix-daemon service refer to our local user `alice` instead. ```sh sudo sed -i 's/root/alice/' /etc/systemd/system/guix-daemon.service @@ -35,6 +35,7 @@ installed Guix just now, make sure to run `guix pull` before proceeding further. Next we'll add some lines to Alices `.bash_profile` to set up PATH and related variables: +`~/.bash_profile`: ```sh GUIX_PROFILE="${HOME}/.guix-profile" [[ -L "${GUIX_PROFILE}" ]] && . "${GUIX_PROFILE}/etc/profile" @@ -48,11 +49,11 @@ export XDG_DATA_DIRS="${HOME}/.desktop-profile/share:${HOME}/.guix-profile/share ``` This will look familiar if you have used Guix on a foreign distribution before. -The `XDG_` variables tell XFCE where to look for installed programs and things -like autostart files: we want minimal interference from the host system, so we -"hard code" them to refer to just our Guix profiles. +The `XDG_` variables tell desktop environments where to look for installed +programs and things like autostart files: we want minimal interference from the +host system, so we "hard code" them to refer to just our Guix profiles. -We will install XFCE and related programs to a +We will install Xfce and related programs to a [separate Guix profile](https://guix.gnu.org/cookbook/en/html_node/Guix-Profiles-in-Practice.html) that can be updated and rolled back independently of the main user profile. That allows us to distinguish between "stable desktop environment" and "end user @@ -87,10 +88,10 @@ That installs a union of all packages listed in the manifest to To update this profile, simply invoke the same command again after running `guix pull` or modifying the manifest. -Before XFCE can be started, we need to create a configuration file for the X +Before Xfce can be started, we need to create a configuration file for the X server to ensure the host executable is used, and we will tell it to to stay on virtual terminal 4. We also create a `.xinitrc` script that automatically -starts XFCE every time `xinit` is invoked. +starts Xfce every time `xinit` is invoked. `~/.xserverrc`: ```sh @@ -123,7 +124,7 @@ source ~/.desktop-profile/etc/profile xinit -- :1 ``` -Cool, we're in XFCE! Let's open a terminal and install a browser & some fonts: +Cool, we're in Xfce! Let's open a terminal and install a browser & some fonts: ```sh guix install icecat font-liberation font-dejavu @@ -155,16 +156,16 @@ for profile in "${GUIX_PROFILES[@]}&quo
branch master updated (66e376b -> eed6f3f)
mbakke pushed a change to branch master in repository guix-artwork. from 66e376b website: Add post about 'guix pull --news'. new eed6f3f website: Add post about installing XFCE on a foreign distribution. 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: .../guix-xfce-desktop-on-foreign-distribution.md | 304 + 1 file changed, 304 insertions(+) create mode 100644 website/posts/guix-xfce-desktop-on-foreign-distribution.md
01/01: website: Add post about installing XFCE on a foreign distribution.
mbakke pushed a commit to branch master in repository guix-artwork. commit eed6f3fc58ea90f25f5a3e13ac58943813b387e7 Author: Marius Bakke Date: Sun Nov 17 18:48:59 2019 +0100 website: Add post about installing XFCE on a foreign distribution. * website/posts/guix-xfce-desktop-on-foreign-distribution.md: New file. --- .../guix-xfce-desktop-on-foreign-distribution.md | 304 + 1 file changed, 304 insertions(+) diff --git a/website/posts/guix-xfce-desktop-on-foreign-distribution.md b/website/posts/guix-xfce-desktop-on-foreign-distribution.md new file mode 100644 index 000..6036e96 --- /dev/null +++ b/website/posts/guix-xfce-desktop-on-foreign-distribution.md @@ -0,0 +1,304 @@ +title: Running a Guix XFCE Desktop on CentOS 7 +date: 2019-11-17 19:00 +author: Marius Bakke +tags: XFCE, foreign distribution +--- + +This tutorial will show how to run a fully fledged XFCE desktop environment +installed with Guix on top of an existing GNU/Linux distribution. This guide +uses CentOS 7 as the base operating system and assumes that Xorg is already +configured and running on VT2 under a different user account. + +We will borrow Xorg and `xinit` from the host distribution and run Guix XFCE on +virtual terminal 4 as user 'alice'. No system-wide configuration files need to +be touched (apart from the Guix install), but we do make a couple of changes +for convenience. + + From scratch to XFCE + +If Guix is not already installed, go grab the +[installation script](https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh) +and run it as `sudo bash guix-install.sh`. + +The script creates `/gnu/store/` and `/var/guix/` and configures a system service +for `guix-daemon`. By default the daemon runs from the 'root' users Guix; we +won't be using the root account in this guide, so let's start by making the +guix-daemon service refer to our local user 'alice' instead. + +```sh +sudo sed -i 's/root/alice/' /etc/systemd/system/guix-daemon.service +``` + +Now every time Alice runs 'guix pull', the daemon gets updated too. If you +installed Guix just now, make sure to run `guix pull` before proceeding further. + +Next we'll add some lines to Alices `.bash_profile` to set up PATH and related +variables: + +```sh +GUIX_PROFILE="${HOME}/.guix-profile" +[[ -L "${GUIX_PROFILE}" ]] && . "${GUIX_PROFILE}/etc/profile" + +export PATH="${HOME}/.config/guix/current/bin:${PATH}" +export INFOPATH="${HOME}/.config/guix/current/share/info:${INFOPATH}" +export MANPATH="${HOME}/.guix-profile/share/man:/usr/share/man" + +export XDG_CONFIG_DIRS="${HOME}/.desktop-profile/etc/xdg:${HOME}/.guix-profile/etc/xdg" +export XDG_DATA_DIRS="${HOME}/.desktop-profile/share:${HOME}/.guix-profile/share" +``` + +This will look familiar if you have used Guix on a foreign distribution before. +The `XDG_` variables tell XFCE where to look for installed programs and things +like autostart files: we want minimal interference from the host system, so we +"hard code" them to refer to just our Guix profiles. + +We will install XFCE and related programs to a +[separate Guix profile](https://guix.gnu.org/cookbook/en/html_node/Guix-Profiles-in-Practice.html) +that can be updated and rolled back independently of the main user profile. +That allows us to distinguish between "stable desktop environment" and "end user +packages". To keep things manageable, we create a _manifest_ for the desktop +profile that can be kept in version control, and which allows us to reproduce +the exact same environment in the future (even on a different computer!). + +`~/desktop-manifest.scm`: +```scheme +(specifications->manifest + '("xfce" "xfce4-session" "xfconf" "xfce4-battery-plugin" + "pulseaudio" "xfce4-volumed-pulse" "xfce4-notifyd" + ;; Helpful graphical programs. + "mousepad" "orage" + ;; System configuration utilities. + "xbacklight" "pavucontrol" "stow" + ;; For HTTPS access. + "nss-certs" + ;; These utilities are provided by the host, but we want the Guix versions + ;; because they are likely better integrated and up to date. + "fontconfig" "bash-completion" "gnupg" "man-db" "git")) +``` + +Create the initial profile generation: + +```sh +guix package -p ~/.desktop-profile -m ~/desktop-manifest.scm +``` + +That installs a union of all packages listed in the manifest to +`~/.desktop-profile`, and creates a script we will use to "activate" it later. +To update this profile, simply invoke the same command again after running +`guix pull` or modifying the manifest. + +Before XFCE can be started, we need to create a configuration file for the X +server to ensure the host executable is used
branch master updated (a9bf0d3 -> aefecca)
mbakke pushed a change to branch master in repository maintenance. from a9bf0d3 hydra: dns: Update serial. new aefecca hydra: berlin: Add self to sysadmins. 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: hydra/berlin.scm | 5 - hydra/keys/ssh/mbakke.pub | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 hydra/keys/ssh/mbakke.pub
01/01: hydra: berlin: Add self to sysadmins.
mbakke pushed a commit to branch master in repository maintenance. commit aefeccaae06027e0d03563b24fd1f9ac6855edaf Author: Marius Bakke Date: Fri Jun 7 11:50:32 2019 +0200 hydra: berlin: Add self to sysadmins. * hydra/berlin.scm (%sysadmins): New entry for "mbakke". * hydra/keys/ssh/mbakke.pub: New file. --- hydra/berlin.scm | 5 - hydra/keys/ssh/mbakke.pub | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hydra/berlin.scm b/hydra/berlin.scm index 8e6551d..a490d43 100644 --- a/hydra/berlin.scm +++ b/hydra/berlin.scm @@ -17,7 +17,10 @@ (ssh-public-key (local-file "keys/ssh/rekado.pub"))) (sysadmin (name "andreas") (full-name "Andreas Enge") - (ssh-public-key (local-file "keys/ssh/andreas.pub") + (ssh-public-key (local-file "keys/ssh/andreas.pub"))) + (sysadmin (name "mbakke") + (full-name "Marius Bakke") + (ssh-public-key (local-file "keys/ssh/mbakke.pub") ;; TODO: We don't use this any more. (define %nginx-config diff --git a/hydra/keys/ssh/mbakke.pub b/hydra/keys/ssh/mbakke.pub new file mode 100644 index 000..6552356 --- /dev/null +++ b/hydra/keys/ssh/mbakke.pub @@ -0,0 +1 @@ +ssh-ed25519 C3NzaC1lZDI1NTE5IKNlGskfWZgdL4mj0v15u8NrLFW1cffjNW7/j2YEsaRL
branch master updated (9acfe27 -> 975b796)
mbakke pushed a change to branch master in repository guix. from 9acfe27 gnu: Add missing patch to local.mk. new 975b796 .gitignore: Re-add 'authenticate' script. 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: .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
01/01: .gitignore: Re-add 'authenticate' script.
mbakke pushed a commit to branch master in repository guix. commit 975b7966f592993bce04e3c153f52f2ece402f21 Author: Marius Bakke Date: Tue Nov 20 01:42:43 2018 +0100 .gitignore: Re-add 'authenticate' script. This is a follow-up to commit 0fe1fba4af41f267c4bb2c006fb37f42422ab703. * .gitignore: s/guix-authenticate/authenticate/ --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 35d50b3..2ffb438 100644 --- a/.gitignore +++ b/.gitignore @@ -90,7 +90,7 @@ /nix/config.h.in /nix/nix-daemon/nix-daemon.cc /nix/nix-setuid-helper/nix-setuid-helper.cc -/nix/scripts/guix-authenticate +/nix/scripts/authenticate /nix/scripts/list-runtime-roots /nix/scripts/offload /nix/scripts/substitute
01/01: Merge branch 'master' into core-updates
mbakke pushed a commit to branch core-updates in repository guix. commit 4f70db97a040b35f125484ce8885766ca5807dd4 Merge: 2d54685 9acfe27 Author: Marius Bakke Date: Tue Nov 20 01:14:12 2018 +0100 Merge branch 'master' into core-updates Makefile.am|2 + config-daemon.ac |4 +- doc/contributing.texi |3 +- doc/guix.texi | 81 +- gnu/bootloader/extlinux.scm|6 +- gnu/bootloader/grub.scm| 104 +- gnu/bootloader/u-boot.scm |5 - gnu/build/activation.scm | 17 +- gnu/local.mk |6 + gnu/packages/algebra.scm | 36 +- gnu/packages/antivirus.scm | 156 ++ gnu/packages/audio.scm | 122 +- gnu/packages/bioinformatics.scm| 111 +- gnu/packages/bootloaders.scm |6 +- gnu/packages/cran.scm | 24 +- gnu/packages/emacs.scm |6 +- gnu/packages/game-development.scm |4 +- gnu/packages/games.scm |4 +- gnu/packages/gl.scm|3 +- gnu/packages/guile.scm |6 +- gnu/packages/image.scm |4 +- gnu/packages/java.scm | 145 -- gnu/packages/linux.scm | 16 +- gnu/packages/lisp.scm | 276 ++- gnu/packages/llvm.scm | 35 +- gnu/packages/machine-learning.scm |5 +- gnu/packages/man.scm | 14 +- gnu/packages/maths.scm | 127 +- gnu/packages/mpi.scm | 42 + gnu/packages/multiprecision.scm| 66 + gnu/packages/ocaml.scm | 2328 ++-- gnu/packages/package-management.scm|7 +- gnu/packages/patches/clamav-config-llvm-libs.patch | 14 + .../patches/clamav-system-tomsfastmath.patch | 102 + .../patches/emacs-realgud-fix-configure-ac.patch | 27 + ...ml-bisect-fix-camlp4-in-another-directory.patch | 246 ++- gnu/packages/patches/tomsfastmath-constness.patch | 76 + gnu/packages/python.scm| 73 +- gnu/packages/simulation.scm| 490 +++- gnu/packages/statistics.scm|8 +- gnu/packages/version-control.scm | 52 + gnu/packages/web.scm |4 +- gnu/system.scm | 166 +- gnu/system/linux-initrd.scm| 13 +- gnu/system/vm.scm | 210 +- gnu/tests/base.scm | 11 +- guix/build-system/clojure.scm | 195 ++ guix/build-system/ocaml.scm| 24 +- guix/build/clojure-build-system.scm| 110 + guix/build/clojure-utils.scm | 265 +++ guix/build/ocaml-build-system.scm | 45 +- guix/download.scm | 35 +- guix/progress.scm | 28 +- guix/scripts/system.scm| 115 +- nix/libstore/local-store.cc| 17 +- nix/local.mk |7 +- nix/nix-daemon/guix-daemon.cc | 12 - .../{guix-authenticate.in => authenticate.in} |0 58 files changed, 4688 insertions(+), 1428 deletions(-) diff --cc gnu/local.mk index 447f08d,d2f085e..3582227 --- a/gnu/local.mk +++ b/gnu/local.mk @@@ -608,14 -610,14 +610,16 @@@ dist_patch_DATA = %D%/packages/patches/catdoc-CVE-2017-0.patch\ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch\ + %D%/packages/patches/ceph-detect-rocksdb.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ - %D%/packages/patches/ceph-rocksdb-compat.patch \ %D%/packages/patches/ceph-skip-collect-sys-info-test.patch \ %D%/packages/patches/ceph-skip-unittest_blockdev.patch \ + %D%/packages/patches/ceph-volume-respect-PATH.patch \ %D%/packages/patches/chmlib-inttypes.patch \ + %D%/packages/patches/clamav-config-llvm-libs.patch \ + %D%/packages/patches/clamav-system-tomsfastmath.patch \ %D%/packages/patches/clang-3.5-libc-search-path.patch \ + %D%/packages/patc
branch core-updates updated (2d54685 -> 4f70db9)
mbakke pushed a change to branch core-updates in repository guix. from 2d54685 gnu: hurd: Build against glibc 2.28. adds ee2cfdf download: Add Software Heritage as a content-addressed mirror. adds 89f1fee download: Access content-addressed mirrors over HTTPS. adds 7a54b22 gnu: guix-daemon: Install 'guix-authenticate'. adds 0fe1fba daemon: Install 'authenticate' script under LIBEXECDIR/guix. adds 54fcd54 gnu: Add python-mpi4py. adds 90ff287 gnu: Add python-petsc4py. adds 6b5687d gnu: Add python-slepc4py. adds f7a4757 gnu: Add python-fenics-dijitso. adds 3941cf5 gnu: Add python-fenics-ufl. adds 0fc4998 gnu: Add python-fenics-fiat. adds 6b7f1f8 gnu: Add python-fenics-ffc. adds 0ace6c0 gnu: Add fenics-dolfin. adds ae0f1dd gnu: Add fenics. adds 6a1cff7 gnu: linux-libre@4.9: Update to 4.9.137. adds 24ba798 gnu: linux-libre@4.14: Update to 4.14.81. adds 7413c31 gnu: linux-libre: Update to 4.19.2. adds 2d86eaf gnu: sambamba: Update to 0.6.8. adds c61f36f doc: Fix typo in connman config. adds 30f0d21 gnu: Add nanopolish. adds 03592a6 gnu: emacs-realgud: Patch configure.ac to repair the build. adds 44ff80f gnu: gp2c: Update to 0.0.11pl1. adds eea7cd7 gnu: Add cmh. adds 2aee2a9 guile: newt: Update revision to 2. adds 0289dc1 progress: Fix crash because of division by zero. adds d827fd3 progress: Do not display the last 0B transfer when size is unknown. adds a7b7d48 gnu: tiled: Update to 1.2.1. adds 54ca1a3 doc: Recommend pool.sks-keyservers.net. adds 7a44e87 gnu: Add caps-plugins-lv2. adds 243bdcc gnu: Add git-when-merged. adds bca6396 doc: Mention that ./pre-inst-env is generated. adds 0c7707d gnu: u-boot: Update to 2018.11. adds fc9dbf4 llvm: Build with RTTI by default. adds 7ed018e gnu: Add TomsFastMath. adds 0a41123 gnu: Add ClamAV. adds f8cba3f gnu: mesa: Stay on RTTI-less LLVM. adds d22ba64 gnu: ccl: Include x86-headers and remove missing "contrib" folder. adds 1472d19 gnu: maxima: Fix tests on i686 and x86_64. adds 5a0affb build-system/ocaml: Use invoke and return #t. adds 564cf93 gnu: ocaml: Update to 4.7.0. adds b297934 activation: Aways pass '-d HOME' to 'useradd'. adds 46c296d bootloader: De-monadify configuration file generators. adds a7ef45d system: Simplify kernel argument handling. adds e34ae75 linux-initrd: Return file-like objects instead of monadic values. adds 35b4468 system: De-monadify 'operating-system-boot-parameters'. adds 5ece56d system: Please Emacs. adds 9782c82 system: De-monadify 'operating-system-bootcfg'. adds 8bff7dc vm: Remove explicit calls to 'operating-system-derivation'. adds 6e47628 guix system: Simplify bootloader package handling. adds 52ee447 guix system: De-monadify bootloader installation script. adds ab6caf4 guix system: Clarify 'perform-action'. adds 5c40a69 gnu: Add libfdk 'FDK AAC' library. adds 1d6669a guix system: Fix 'init'. adds c39f3e1 gnu: diffoscope: Update to 105. adds 1372754 gnu: fuse-exfat: Update to 1.3.0. adds 5e9ce98 gnu: help2man: Add 1.47.8. adds f4ee41c gnu: python-kivy: Update to 1.10.1 adds 28e32b1 gnu: clojure: Move from java to lisp. adds df0a180 gnu: clojure: Remove 'remove-archives' snippet. adds 8da9187 gnu: clojure: Refactor to ensure there's a single list of libraries. adds d0ad971 gnu: clojure: Use (guix build java-utils) to simplify build phases. adds 53f316a guix: Add clojure-utils. adds df730f6 build-system: Add 'clojure-build-system'. adds d2a659e gnu: Add clojure-instaparse. adds c784ffa gnu: Add clojure-core-match. adds eea5530 gnu: Add clojure-algo-generic. adds 2cab1d4 gnu: Add clojure-tools-macro. adds 5497214 gnu: Add clojure-algo-monads. adds 4535a7b gnu: r-genomeinfodb: Update to 1.18.1. adds e038819 gnu: r-msnbase: Update to 2.8.1. adds c2e26dc gnu: r-ensembldb: Update to 2.6.2. adds e21659c gnu: r-dimred: Update to 0.2.2. adds e396b37 gnu: r-recipes: Update to 0.1.4. adds 1659c5d gnu: r-ggpubr: Update to 0.2. adds fba7dbe gnu: r-sjstats: Update to 0.17.2. adds 278e0f6 gnu: r-ggeffects: Update to 0.7.0. adds 749872a gnu: r-biocmanager: Update to 1.30.4. adds 185663e gnu: r-openssl: Update to 1.1. adds 0adf04a gnu: r-mclust: Update to 5.4.2. adds 4db7184 gnu: r-shinyfiles: Update to 0.7.2. adds 887437e gnu: git-when-merged: Fix license. adds c3276db gnu: Add autotalent. adds cc661cb gnu:
branch master updated (30f0fef -> 9acfe27)
mbakke pushed a change to branch master in repository guix. from 30f0fef gnu: libwebp: Update to 1.0.1. new 9acfe27 gnu: Add missing patch to local.mk. 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 + 1 file changed, 1 insertion(+)
01/01: gnu: Add missing patch to local.mk.
mbakke pushed a commit to branch master in repository guix. commit 9acfe275adf1bc27483ba58c6d86a84ba20aa08f Author: Marius Bakke Date: Tue Nov 20 01:11:26 2018 +0100 gnu: Add missing patch to local.mk. This line was removed by accident in 0a41123f01d5d2466d6f533be3644ac8c9a2bdf9. * gnu/local.mk (dist_patch_DATA): Add "clang-3.5-libc-search-path.patch". --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/local.mk b/gnu/local.mk index 7073416..d2f085e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -617,6 +617,7 @@ dist_patch_DATA = \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ %D%/packages/patches/clamav-system-tomsfastmath.patch\ + %D%/packages/patches/clang-3.5-libc-search-path.patch\ %D%/packages/patches/clang-3.8-libc-search-path.patch\ %D%/packages/patches/clang-6.0-libc-search-path.patch\ %D%/packages/patches/clang-runtime-asan-build-fixes.patch\
05/07: gnu: python-joblib: Update home page.
mbakke pushed a commit to branch master in repository guix. commit 352401efb80f036177ed8de026748bd981a76574 Author: Marius Bakke Date: Sun Nov 18 03:30:23 2018 +0100 gnu: python-joblib: Update home page. * gnu/packages/python.scm (python-joblib)[home-page]: Update to current. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c7ec791..4ae9707 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2416,7 +2416,7 @@ logic-free templating system Mustache.") (lambda _ (invoke "pytest" "-v" "joblib")) (native-inputs `(("python-pytest" ,python-pytest))) -(home-page "http://pythonhosted.org/joblib/;) +(home-page "https://joblib.readthedocs.io/;) (synopsis "Using Python functions as pipeline jobs") (description "Joblib is a set of tools to provide lightweight pipelining in Python.
04/07: gnu: python-joblib: Update to 0.13.0.
mbakke pushed a commit to branch master in repository guix. commit ff43d95807887030cd1d3538da614545116dfe25 Author: Marius Bakke Date: Sun Nov 18 03:26:36 2018 +0100 gnu: python-joblib: Update to 0.13.0. * gnu/packages/python.scm (python-joblib): Update to 0.13.0. [source](snippet): Remove. [arguments]: Remove 'disable-failing-tests' phase. Add custom check phase. [native-inputs]: Remove PYTHON-NOSE, PYTHON-SPHINX, PYTHON-DOCUTILS and PYTHON-NUMPYDOC. Add PYTHON-PYTEST. --- gnu/packages/python.scm | 36 +--- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 463a325..c7ec791 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2401,47 +2401,21 @@ logic-free templating system Mustache.") (define-public python-joblib (package (name "python-joblib") -(version "0.10.3") +(version "0.13.0") (source (origin (method url-fetch) (uri (pypi-uri "joblib" version)) (sha256 (base32 -"0787k919zlfmgymprz5bzv0v1df5bbirlf3awrghmjgvkrd9dci9")) - (modules '((guix build utils))) - (snippet -'(begin - ;; Remove pre-compiled .pyc files from source. - (for-each delete-file-recursively - (find-files "." "__pycache__" #:directories? #t)) - (for-each delete-file (find-files "." "\\.pyc$")) - #t +"0612nazad8dxmn3xghfrmjax6456l4xy6hn9cngs7vydi14ds7v5" (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'disable-failing-tests - (lambda _ - ;; This numpydoc tests fails for unknown reasons - (delete-file "doc/sphinxext/numpydoc/tests/test_docscrape.py") - ;; This numpydoc test depends on matplotlib, which is not a - ;; required input. - (delete-file "doc/sphinxext/numpydoc/tests/test_plot_directive.py") - ;; These tests fail to execute sys.executable - (substitute* "joblib/test/test_parallel.py" - (("import nose" line) -(string-append "from nose.plugins.skip import SkipTest\n" line)) - (("def test_nested_parallel_warnings" line) -(string-append "@SkipTest\n" line)) - (("def test_parallel_with_interactively_defined_functions" line) -(string-append "@SkipTest\n" line))) - #t) -;; Provide nose to enable tests command + (replace 'check + (lambda _ (invoke "pytest" "-v" "joblib")) (native-inputs - `(("python-nose" ,python-nose) - ("python-sphinx" ,python-sphinx) - ("python-docutils" ,python-docutils) - ("python-numpydoc" ,python-numpydoc))) + `(("python-pytest" ,python-pytest))) (home-page "http://pythonhosted.org/joblib/;) (synopsis "Using Python functions as pipeline jobs") (description
07/07: gnu: libwebp: Update to 1.0.1.
mbakke pushed a commit to branch master in repository guix. commit 30f0feff1964aea0524747b50180d021591956f6 Author: Marius Bakke Date: Mon Nov 19 20:25:45 2018 +0100 gnu: libwebp: Update to 1.0.1. * gnu/packages/image.scm (libwebp): Update to 1.0.1. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 9bf9bd7..e88609a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -919,7 +919,7 @@ language bindings to VIGRA.") (define-public libwebp (package (name "libwebp") -(version "1.0.0") +(version "1.0.1") (source (origin ;; No tarballs are provided for >0.6.1. @@ -930,7 +930,7 @@ language bindings to VIGRA.") (file-name (git-file-name name version)) (sha256 (base32 - "1w8jzdbr1s4238ygyrlxryycss3f2z6d9amxdq8m82nl3l6skar4" + "09l4pq4k2acglkmwr96arn79rssl54sv7vrdrgsxqlg7v8c882zh" (build-system gnu-build-system) (inputs `(("freeglut" ,freeglut)
02/07: gnu: z3: Update to 4.8.1.
mbakke pushed a commit to branch master in repository guix. commit 4a4f3e771b74601b0696a25ef8d82dd1081caea9 Author: Marius Bakke Date: Sat Nov 17 21:20:27 2018 +0100 gnu: z3: Update to 4.8.1. * gnu/packages/maths.scm (z3): Update to 4.8.1. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 22451c3..cc4635b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3946,7 +3946,7 @@ as equations, scalars, vectors, and matrices.") (define-public z3 (package (name "z3") -(version "4.5.0") +(version "4.8.1") (home-page "https://github.com/Z3Prover/z3;) (source (origin (method git-fetch) @@ -3954,7 +3954,7 @@ as equations, scalars, vectors, and matrices.") (commit (string-append "z3-" version (sha256 (base32 -"0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp" +"1vr57bwx40sd5riijyrhy70i2wnv9xrdihf6y5zdz56yq88rl48f" (build-system cmake-build-system) (arguments `(#:configure-flags
06/07: gnu: fluidsynth: Update to 2.0.2.
mbakke pushed a commit to branch master in repository guix. commit 7882cc55bcc262ebd7122f662677a81ed22175db Author: Marius Bakke Date: Mon Nov 19 20:25:26 2018 +0100 gnu: fluidsynth: Update to 2.0.2. * gnu/packages/audio.scm (fluidsynth): Update to 2.0.2. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 1f83c49..d8a3c3c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1126,7 +1126,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") -(version "2.0.1") +(version "2.0.2") (source (origin (method git-fetch) (uri (git-reference @@ -1135,7 +1135,7 @@ follower.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 -"1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7" +"02vs5sfsyh1dl7wlcvgs4w3x0qcmsl7vi000qgp99ynwh3wjb274" (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target
01/07: gnu: z3: Fetch source using git.
mbakke pushed a commit to branch master in repository guix. commit fb525bfd83ac1721e138420a01e7075c25b137c4 Author: Marius Bakke Date: Sat Nov 17 21:18:43 2018 +0100 gnu: z3: Fetch source using git. * gnu/packages/maths.scm (z3)[source]: Change to GIT-FETCH. --- gnu/packages/maths.scm | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 82abc22..22451c3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3947,14 +3947,14 @@ as equations, scalars, vectors, and matrices.") (package (name "z3") (version "4.5.0") +(home-page "https://github.com/Z3Prover/z3;) (source (origin - (method url-fetch) - (uri (string-append -"https://github.com/Z3Prover/z3/archive/z3-; -version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "z3-" version (sha256 (base32 -"032a5lvji2liwmc25jv52bdrhimqflvqbpg77ccaq1jykhiivbmf" +"0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp" (build-system cmake-build-system) (arguments `(#:configure-flags @@ -3983,7 +3983,6 @@ as equations, scalars, vectors, and matrices.") (synopsis "Theorem prover") (description "Z3 is a theorem prover and @dfn{satisfiability modulo theories} (SMT) solver. It provides a C/C++ API, as well as Python bindings.") -(home-page "https://github.com/Z3Prover/z3;) (license license:expat))) (define-public cubicle
branch master updated (cc661cb -> 30f0fef)
mbakke pushed a change to branch master in repository guix. from cc661cb gnu: xonotic: Symlink to xonotic data instead of copying into xonotic. new fb525bf gnu: z3: Fetch source using git. new 4a4f3e7 gnu: z3: Update to 4.8.1. new 89d88b8 gnu: python-natsort: Update to 5.4.1. new ff43d95 gnu: python-joblib: Update to 0.13.0. new 352401e gnu: python-joblib: Update home page. new 7882cc5 gnu: fluidsynth: Update to 2.0.2. new 30f0fef gnu: libwebp: Update to 1.0.1. The 7 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 | 4 +-- gnu/packages/image.scm | 4 +-- gnu/packages/maths.scm | 13 +- gnu/packages/python.scm | 69 - 4 files changed, 38 insertions(+), 52 deletions(-)
03/07: gnu: python-natsort: Update to 5.4.1.
mbakke pushed a commit to branch master in repository guix. commit 89d88b8530d1cdaa6be785a289aed65ba087d546 Author: Marius Bakke Date: Sun Nov 18 03:14:01 2018 +0100 gnu: python-natsort: Update to 5.4.1. * gnu/packages/python.scm (python-natsort): Update to 5.4.1. [arguments]: Add #:modules. Replace 'check' phase with custom pytest invokation. [native-inputs]: Remove PYTHON-PYTEST-CACHE, PYTHON-PYTEST-FLAKES and PYTHON-PYTEST-PEP8. Add PYTHON-PYTEST and PYTHON-PYTEST-MOCK. (python2-natsort)[native-inputs]: Remove PYTHON2-ENUM34 and PYTHON2-MOCK. --- gnu/packages/python.scm | 31 ++- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2b7482a..463a325 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10193,26 +10193,41 @@ Python to manipulate OpenDocument 1.2 files.") (define-public python-natsort (package (name "python-natsort") -(version "5.0.2") +(version "5.4.1") (source (origin (method url-fetch) (uri (pypi-uri "natsort" version)) (sha256 (base32 -"0bh6j0l8iapjnsgg3bs6q075cnzjl6zw1vlgqyv3qrygm2cxypkn" +"0i732amg6yzkx4g4c9j09jmqq39q377x9cl2nbkm5hax2c2v0wxf" (build-system python-build-system) (arguments - `(#:phases + `(#:modules ((guix build utils) + (guix build python-build-system) + (srfi srfi-1) + (srfi srfi-26) + (ice-9 ftw)) + #:phases (modify-phases %standard-phases (add-before 'check 'set-cachedir ;; Tests require write access to $HOME by default - (lambda _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t) + (lambda _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t)) + (replace 'check + (lambda _ + (let ((cwd (getcwd))) + (setenv "PYTHONPATH" + (string-append +cwd "/build/" +(find (cut string-prefix? "lib" <>) + (scandir (string-append cwd "/build"))) +":" +(getenv "PYTHONPATH"))) + (invoke "pytest" "-v"))) (native-inputs `(("python-hypothesis" ,python-hypothesis) - ("python-pytest-cache" ,python-pytest-cache) ("python-pytest-cov" ,python-pytest-cov) - ("python-pytest-flakes" ,python-pytest-flakes) - ("python-pytest-pep8" ,python-pytest-pep8))) + ("python-pytest-mock" ,python-pytest-mock) + ("python-pytest" ,python-pytest))) (propagated-inputs ; TODO: Add python-fastnumbers. `(("python-pyicu" ,python-pyicu))) (home-page "https://github.com/SethMMorton/natsort;) @@ -10234,8 +10249,6 @@ functionality in the command line.") (package (inherit base) (native-inputs `(("python2-pathlib" ,python2-pathlib) -("python2-mock" ,python2-mock) -("python2-enum34" ,python2-enum34) ,@(package-native-inputs base)) (define-public python-glances
branch master updated (0a41123 -> f8cba3f)
mbakke pushed a change to branch master in repository guix. from 0a41123 gnu: Add ClamAV. new f8cba3f gnu: mesa: Stay on RTTI-less LLVM. 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/gl.scm | 3 ++- gnu/packages/llvm.scm | 20 2 files changed, 22 insertions(+), 1 deletion(-)
01/01: gnu: mesa: Stay on RTTI-less LLVM.
mbakke pushed a commit to branch master in repository guix. commit f8cba3ff4fc6aed0c539700aa47b6e8f4c25c34d Author: Marius Bakke Date: Sat Nov 17 22:54:03 2018 +0100 gnu: mesa: Stay on RTTI-less LLVM. * gnu/packages/llvm.scm (llvm-without-rtti): New public variable. * gnu/packages/gl.scm (mesa)[inputs]: Use that instead of LLVM. --- gnu/packages/gl.scm | 3 ++- gnu/packages/llvm.scm | 20 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b88fab4..11c89b3 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -259,7 +259,8 @@ also known as DXTn or DXTC) for Mesa.") ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `(("llvm" ,llvm))) + ;; FIXME: Change to 'llvm' in the next rebuild cycle. + `(("llvm" ,llvm-without-rtti))) (_ `())) ("makedepend" ,makedepend) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index beca926..d237a05 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -91,6 +91,26 @@ languages is in development. The compiler infrastructure includes mirror sets of programming tools as well as libraries with equivalent functionality.") (license license:ncsa))) +;; FIXME: This package is here to prevent many rebuilds on x86_64 and i686 +;; from commit fc9dbf41311d99d0fd8befc789ea7c0e35911890. Update users of +;; this in the next rebuild cycle. +(define-public llvm-without-rtti + (package +(inherit llvm) +(arguments + `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" + "-DBUILD_SHARED_LIBS:BOOL=TRUE" + "-DLLVM_ENABLE_FFI:BOOL=TRUE" + "-DLLVM_INSTALL_UTILS=ON") + #:build-type "Release" + #:phases (modify-phases %standard-phases + (add-before 'build 'shared-lib-workaround +(lambda _ + (setenv "LD_LIBRARY_PATH" + (string-append (getcwd) "/lib")) + #t))) + (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package
01/01: Merge branch 'master' into core-updates
mbakke pushed a commit to branch core-updates in repository guix. commit 79ee97a144890be0724aaf796e2a771179d7 Merge: 7d9d521 e921993 Author: Marius Bakke Date: Wed Nov 14 21:20:46 2018 +0100 Merge branch 'master' into core-updates doc/guix.texi | 47 +- gnu/local.mk | 2 +- gnu/packages/admin.scm| 4 +- gnu/packages/audio.scm| 192 +++--- gnu/packages/backup.scm | 19 +- gnu/packages/bioconductor.scm | 61 ++ gnu/packages/bioinformatics.scm | 127 +++- gnu/packages/compression.scm | 27 +- gnu/packages/cran.scm | 451 +- gnu/packages/crypto.scm | 53 +- gnu/packages/databases.scm| 21 +- gnu/packages/datastructures.scm | 24 + gnu/packages/emacs.scm| 32 +- gnu/packages/embedded.scm | 13 +- gnu/packages/game-development.scm | 11 +- gnu/packages/geo.scm | 4 +- gnu/packages/gnustep.scm | 19 +- gnu/packages/gnuzilla.scm | 78 +-- gnu/packages/golang.scm | 49 +- gnu/packages/gtk.scm | 8 +- gnu/packages/guile.scm| 74 ++- gnu/packages/ibus.scm | 683 +- gnu/packages/image-viewers.scm| 4 +- gnu/packages/imagemagick.scm | 5 +- gnu/packages/linux.scm| 49 +- gnu/packages/llvm.scm | 23 +- gnu/packages/lxde.scm | 9 +- gnu/packages/mail.scm | 52 +- gnu/packages/messaging.scm| 62 +- gnu/packages/mtools.scm | 6 +- gnu/packages/music.scm| 126 ++-- gnu/packages/nano.scm | 4 +- gnu/packages/package-management.scm | 6 +- gnu/packages/patches/icecat-CVE-2018-12383.patch | 103 gnu/packages/patches/poppler-CVE-2018-19149.patch | 80 +++ gnu/packages/pdf.scm | 34 +- gnu/packages/php.scm | 9 +- gnu/packages/python.scm | 19 + gnu/packages/rdf.scm | 20 +- gnu/packages/samba.scm| 5 +- gnu/packages/serialization.scm| 8 - gnu/packages/shells.scm | 7 +- gnu/packages/shellutils.scm | 5 +- gnu/packages/spice.scm| 2 +- gnu/packages/ssh.scm | 8 +- gnu/packages/statistics.scm | 50 +- gnu/packages/syncthing.scm| 31 +- gnu/packages/telephony.scm| 21 +- gnu/packages/textutils.scm| 51 +- gnu/packages/tls.scm | 6 +- gnu/packages/tor.scm | 9 +- gnu/packages/video.scm| 4 +- gnu/packages/vim.scm | 4 +- gnu/packages/web.scm | 6 +- gnu/packages/webkit.scm | 46 +- gnu/packages/wine.scm | 6 +- gnu/packages/xdisorg.scm | 16 +- gnu/packages/xorg.scm | 4 +- gnu/services/base.scm | 54 +- gnu/services/mail.scm | 51 +- gnu/services/mcron.scm| 2 +- gnu/tests/base.scm| 14 + guix/build/go-build-system.scm| 3 + guix/ci.scm | 74 ++- guix/gexp.scm | 7 +- guix/gnu-maintenance.scm | 115 +++- guix/grafts.scm | 8 +- guix/nar.scm | 13 +- guix/scripts/package.scm | 10 +- guix/scripts/system.scm | 7 + guix/store.scm| 68 ++- guix/store/database.scm | 6 + guix/store/deduplication.scm | 12 +- guix/tests.scm| 34 ++ tests/challenge.scm | 8 - tests/debug-link.scm | 8 - tests/gexp.scm| 5 - tests/guix-package.sh | 4 + tests/nar.scm
branch core-updates updated (7d9d521 -> 79ee97a)
mbakke pushed a change to branch core-updates in repository guix. from 7d9d521 gnu: aide: Provide libpcre.a and libz.a. adds 8a587c8 gnu: Add r-savr. adds 3a4c628 gnu: Add r-aggregation. adds ff939ef gnu: Add r-h5. adds a961ae4 gnu: Add r-destiny. adds f338e48 gnu: Add r-rgl. adds 213e72a gnu: Add r-multicool. adds 4106e6a gnu: Add r-misc3d. adds da256af gnu: Add r-ks. adds cf383cf gnu: Add r-feature. adds 06bc7b8 gnu: Add r-arm. adds f87a18e gnu: r-rcpp: Update to 1.0.0. adds fccb245 gnu: r-jomo: Update to 2.6-5. adds 492ec49 gnu: r-tmb: Update to 1.7.15. adds 5174f06 gnu: r-rgooglemaps: Update to 1.4.3. adds 317f5a5 gnu: r-sn: Update to 1.5-3. adds 77bea84 gnu: r-biocviews: Update to 1.50.5. adds 88514b9 gnu: r-biostrings: Update to 2.50.1. adds 03a4153 gnu: r-ensembldb: Update to 2.6.1. adds 005ec8d gnu: f2fs-tools: Update to 1.11.0. adds 8d9bb4b services: dovecot: Allow to set 'client-limit'. adds be8dd4a services: dovecot: Allow to set 'process-limit'. adds a7553a7 services: dovecot: Set correct default value for the "auth" service. adds e8b9aaf mtd-utils: Update to 2.0.2. adds 95906ee gnu: guile-ics: Remove custom bootstrap phase. adds 7453785 gnu: Add guile-email. adds 2d900b0 gnu: Add guile-debbugs-next. adds e3a4703 gnu: Add mumi. adds 74c903e Add missing license import. adds 79b8341 gnu: emacs-circe: Update to 2.10. adds ca364e7 gnu: jalv-select: Fetch sources from git. adds 57906fa gnu: portmidi-for-extempore: Fetch sources from git. adds 78eff85 gnu: ams-lv2: Fetch sources from git. adds b255365 gnu: lvtk: Fetch sources from git. adds 917dc89 gnu: csound: Fetch sources from git. adds 2ae2395 gnu: swh-plugins-lv2: Fetch sources from git. adds 0b8db03 gnu: infamous-plugins: Fetch sources from git. adds eca7729 gnu: rtmidi: Fetch sources from git. adds 458baef gnu: rsound: Fetch sources from git. adds 8e5995e gnu: xjackfreak: Fetch sources from git. adds 4289a30 gnu: cuetools: Fetch sources from git. adds b249ff5 gnu: dcadec: Fetch sources from git. adds c2a2d36 gnu: cli-visualizer: Fetch sources from git. adds a7fde1a gnu: cava: Fetch sources from git. adds bed4eb3 gnu: gxtuner: Fetch sources from git. adds 37ebc19 gnu: msgpack: Remove custom bootstrap phase. adds bc1ff4a gnu-maintenance: ".sign" and ".asc" files no longer match 'release-file?'. adds 5230dce gnu-maintenance: Base kernel.org updater on HTML directory listings. adds 30288ae gnu: mdadm: Update to 4.1. adds a3b72a8 ci: Add procedures to access evaluations. adds 9d46648 gnu: Add marisa. adds 1a0363c gnu: Add opencc. adds 2f96876 gnu: ibus: Indent code properly. adds 78209a1 gnu: Add librime. adds 1329f09 gnu: Add rime-data. adds d5b23d2 gnu: Add ibus-rime. adds 78e3d55 gnu: Add emacs-ivy-rich. adds cdb4048 gnu: portaudio: Remove custom bootstrap phase. adds 7db147e gnu: rtmidi: Remove custom bootstrap phase. adds e17f867 gnu: wmbattery: Remove custom bootstrap phase. adds f116e1f gnu: wmclock: Remove custom bootstrap phase. adds 4cbbb16 gnu: nxbelld: Remove custom bootstrap phase. adds fc43d6d gnu: linux-libre@4.4: Update to 4.4.163. adds 62168a5 gnu: linux-libre@4.9: Update to 4.9.136. adds e22842f gnu: linux-libre@4.14: Update to 4.14.80. adds 3b14494 gnu: icecat: Update to 60.3.0-gnu1. adds 717d29e gnu: icecat: Add more fixes from mozilla-esr60. adds cab70d4 gnu: perl-autovivification: Update to 0.18. adds 8637428 gnu: librime: Fetch sources from git. adds 487e3f5 gnu: ibus-rime: Fetch sources from git. adds 1410e17 gnu: pianobar: Fetch sources from git. adds f626b71 gnu: mdbtools: Remove custom bootstrap phase. adds f1f1ceb gnu: mdbtools: Fetch sources from git. adds a49b532 gnu: lxsession: Remove custom bootstrap phase. adds 974056c gnu: opendht: Fetch sources from git. adds 5ad728e gnu: opendht: Remove custom bootstrap phase. adds 34da5c3 gnu: guile-dsv: Remove custom bootstrap phase. adds 2cabd29 gnu: guildhall: Remove custom bootstrap phase. adds d212ed2 gnu: lrdf: Fetch sources from git. adds a69cc70 gnu: lrdf: Replace bootstrap phase. adds 4cd6ab1 gnu: libjaylink: Remove custom bootstrap phase. adds 867d9de gnu: openocd: Use INVOKE. adds fab4558 gnu: libtoxcore: Remove custom bootstrap phase. adds d68a158 gnu: libgtextutils: Remove custom bootstrap phase. adds 7a52d0e
01/05: gnu: feh: Update to 3.0.
mbakke pushed a commit to branch master in repository guix. commit bac2974e8600c1a9b22f17d8b1cd75340731347f Author: Marius Bakke Date: Wed Nov 14 15:40:19 2018 +0100 gnu: feh: Update to 3.0. * gnu/packages/image-viewers.scm (feh): Update to 3.0. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 5184177..029d5b5 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -60,7 +60,7 @@ (define-public feh (package (name "feh") -(version "2.28.1") +(version "3.0") (home-page "https://feh.finalrewind.org/;) (source (origin (method url-fetch) @@ -68,7 +68,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 -"0wian0gnx0yfxf8x9b8wr57fjd6rnmi3y3xj83ni6x0xqrjnf1lp" +"00fwf8yz7k8vzd30ly5ndlj6ax9w85dkjzjnlk95vd0zdrf4wyxn" (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure))
05/05: gnu: xf86-video-r128: Update to 6.12.0.
mbakke pushed a commit to branch master in repository guix. commit e921993c25626541385f191f0463cad8e5e5c5c7 Author: Marius Bakke Date: Wed Nov 14 20:52:39 2018 +0100 gnu: xf86-video-r128: Update to 6.12.0. * gnu/packages/xorg.scm (xf86-video-r128): Update to 6.12.0. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 49baef5..19ec6f5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3174,14 +3174,14 @@ This driver is intended for the spice qxl virtio device.") (define-public xf86-video-r128 (package (name "xf86-video-r128") -(version "6.11.0") +(version "6.12.0") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/" name "-" version ".tar.bz2")) (sha256 (base32 -"0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav" +"0mz0v5mqmmbncr2drd5zvia1fb7frz2xqwflhhqbnaxx5j48c740" (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xorgproto" ,xorgproto)
branch core-updates updated (05a5721 -> 7d9d521)
mbakke pushed a change to branch core-updates in repository guix. from 05a5721 build-system/dub: Let all phases return #T unconditionally. new 7d9d521 gnu: aide: Provide libpcre.a and libz.a. 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/admin.scm | 2 ++ 1 file changed, 2 insertions(+)
branch master updated (ee66a13 -> e921993)
mbakke pushed a change to branch master in repository guix. from ee66a13 gnu: Add jamm. new bac2974 gnu: feh: Update to 3.0. new d63f588 gnu: sudo: Update to 1.8.26. new 7939387 gnu: nano: Update to 3.2. new 24dd6ec gnu: mtools: Update to 4.0.20. new e921993 gnu: xf86-video-r128: Update to 6.12.0. 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/packages/admin.scm | 4 ++-- gnu/packages/image-viewers.scm | 4 ++-- gnu/packages/mtools.scm| 6 +++--- gnu/packages/nano.scm | 4 ++-- gnu/packages/xorg.scm | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-)
01/01: gnu: aide: Provide libpcre.a and libz.a.
mbakke pushed a commit to branch core-updates in repository guix. commit 7d9d521fbcf1423f66d6f33208c03d5dacb7ba50 Author: Marius Bakke Date: Mon Nov 12 20:23:17 2018 +0100 gnu: aide: Provide libpcre.a and libz.a. * gnu/packages/admin.scm (aide)[inputs]: Add PCRE:STATIC and ZLIB:STATIC. --- gnu/packages/admin.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index fa60cad..3c65ce1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -125,7 +125,9 @@ `(("libgcrypt" ,libgcrypt) ("libgpg-error" ,libgpg-error) ("libmhash" ,libmhash) + ("pcre:static" ,pcre "static") ("pcre" ,pcre) + ("zlib:static" ,zlib "static") ("zlib" ,zlib))) (synopsis "File and directory integrity checker") (description
02/05: gnu: sudo: Update to 1.8.26.
mbakke pushed a commit to branch master in repository guix. commit d63f58848601cf45f60c88d9bb0f789ac1aa8438 Author: Marius Bakke Date: Wed Nov 14 19:32:41 2018 +0100 gnu: sudo: Update to 1.8.26. * gnu/packages/admin.scm (sudo): Update to 1.8.26. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index fa60cad..2247902 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -979,7 +979,7 @@ system administrator.") (define-public sudo (package (name "sudo") -(version "1.8.25p1") +(version "1.8.26") (source (origin (method url-fetch) (uri @@ -989,7 +989,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 -"0nqri46d4dpycj96zin2f2wszmhm7q9mr68hhj9sp81pgmx9rjcx")) +"1qpyyfga8rs02p3186sns8qvh2bzwa48ka845nrcqh83dyd23nj0")) (modules '((guix build utils))) (snippet '(begin
03/05: gnu: nano: Update to 3.2.
mbakke pushed a commit to branch master in repository guix. commit 7939387da83437918b87d00b06b19b7c987ed171 Author: Marius Bakke Date: Wed Nov 14 19:54:10 2018 +0100 gnu: nano: Update to 3.2. * gnu/packages/nano.scm (nano): Update to 3.2. --- gnu/packages/nano.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 8f96b60..057e8c3 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -30,7 +30,7 @@ (define-public nano (package (name "nano") -(version "3.1") +(version "3.2") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 -"17kinzyv6vwgyx2d0ym1kp65qbf7kxzwpyg21ic1rijv1aj2rh0l" +"0jb3zq0v84xb0chyynkcp2jhs9660wmpkic294p4p6c96npp69yi" (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal)
04/05: gnu: mtools: Update to 4.0.20.
mbakke pushed a commit to branch master in repository guix. commit 24dd6ec38ae6b54d4b9dc91fc2fe1119816a0a90 Author: Marius Bakke Date: Wed Nov 14 20:19:07 2018 +0100 gnu: mtools: Update to 4.0.20. * gnu/packages/mtools.scm (mtools): Update to 4.0.20. [source](uri): Change to 'bz2' compressed tarball. --- gnu/packages/mtools.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm index e4750f5..5e3c3dd 100644 --- a/gnu/packages/mtools.scm +++ b/gnu/packages/mtools.scm @@ -28,15 +28,15 @@ (define-public mtools (package (name "mtools") -(version "4.0.19") +(version "4.0.20") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mtools/mtools-" - version ".tar.gz")) + version ".tar.bz2")) (sha256 (base32 -"003qnj4rs22v2sih3is55scvav8xq9p1dp5b7gnyl67a60ky516r" +"1vcahr9s6zv1hnrx2bgjnzcas2y951q90r1jvvv4q9v5kwfd6qb0" (build-system gnu-build-system) (home-page "https://www.gnu.org/software/mtools/;) (synopsis "Access MS-DOS disks without mounting")
01/01: gnu: python-cffi: Fix test failure on i686.
mbakke pushed a commit to branch core-updates in repository guix. commit 8c5749f1b5255e37a6ef7b43e48fe0bbc57ce209 Author: Marius Bakke Date: Sun Nov 11 16:59:53 2018 +0100 gnu: python-cffi: Fix test failure on i686. * gnu/packages/patches/python-cffi-x87-stack-clean.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/libffi.scm (python-cffi)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/libffi.scm| 3 ++- .../patches/python-cffi-x87-stack-clean.patch | 29 ++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/gnu/local.mk b/gnu/local.mk index 31dafdd..3e355ac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,6 +1078,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch\ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ + %D%/packages/patches/python-cffi-x87-stack-clean.patch \ %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index d1b910b..01a5ea2 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -88,7 +88,8 @@ conversions for values passed between the two languages.") (method url-fetch) (uri (pypi-uri "cffi" version)) (sha256 - (base32 "1x3lrj928dcxx1k8k9gf3s4s3jwvzv8mc3kkyg1g7c3a1sc1f3z9" + (base32 "1x3lrj928dcxx1k8k9gf3s4s3jwvzv8mc3kkyg1g7c3a1sc1f3z9")) + (patches (search-patches "python-cffi-x87-stack-clean.patch" (build-system python-build-system) (outputs '("out" "doc")) (inputs diff --git a/gnu/packages/patches/python-cffi-x87-stack-clean.patch b/gnu/packages/patches/python-cffi-x87-stack-clean.patch new file mode 100644 index 000..5024350 --- /dev/null +++ b/gnu/packages/patches/python-cffi-x87-stack-clean.patch @@ -0,0 +1,29 @@ +Fix test that fails on i686: + +https://bitbucket.org/cffi/cffi/issues/382 + +This is a squashed version of these commits: +https://bitbucket.org/cffi/cffi/commits/ef09637b2314 +https://bitbucket.org/cffi/cffi/commits/7a76a3815340 + +diff -r 99940f1f5402 testing/cffi0/test_function.py +--- a/testing/cffi0/test_function.py Tue Feb 27 21:18:33 2018 +0100 b/testing/cffi0/test_function.py Sun Nov 11 16:26:23 2018 +0100 +@@ -45,14 +45,14 @@ + assert x != math.sin(1.23)# rounding effects + assert abs(x - math.sin(1.23)) < 1E-6 + +-def test_sin_no_return_value(self): ++def test_lround_no_return_value(self): + # check that 'void'-returning functions work too + ffi = FFI(backend=self.Backend()) + ffi.cdef(""" +-void sin(double x); ++void lround(double x); + """) + m = ffi.dlopen(lib_m) +-x = m.sin(1.23) ++x = m.lround(1.23) + assert x is None + + def test_dlopen_filename(self):
branch core-updates updated (2bdca67 -> 8c5749f)
mbakke pushed a change to branch core-updates in repository guix. from 2bdca67 gnu: python-yapf: Update to 0.24.0. new 8c5749f gnu: python-cffi: Fix test failure on i686. 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/libffi.scm| 3 ++- .../patches/python-cffi-x87-stack-clean.patch | 29 ++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-cffi-x87-stack-clean.patch
01/01: gnu: webkitgtk@2.22: Adjust to documentation output.
mbakke pushed a commit to branch master in repository guix. commit a509b180870cf7bffe65a1cd6099487469fae39f Author: Marius Bakke Date: Sun Nov 11 18:09:55 2018 +0100 gnu: webkitgtk@2.22: Adjust to documentation output. This is a follow-up to commit 0ead0b4d2c025ad1b4a293fb6cbb8a578b7dd87d. * gnu/packages/webkit.scm (webkitgtk)[arguments]: Remove hard coded file list. (webkitgtk-2.22)[arguments]: Inherit phases using SUBSTITUTE-KEYWORD-ARGUMENTS. --- gnu/packages/webkit.scm | 33 - 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index dfff53c..82f03c7 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -96,14 +96,12 @@ (modify-phases %standard-phases (add-after 'unpack 'patch-gtk-doc-scan (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/docs/webkitdomgtk-docs.sgml" - (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd;) -(string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/docbookx.dtd"))) - (substitute* "Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml" - (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd;) -(string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/docbookx.dtd"))) + (for-each (lambda (file) + (substitute* file + (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd;) +(string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/docbookx.dtd" + (find-files "Source" "\\.sgml$")) #t)) (add-after 'install 'move-doc-files (lambda* (#:key outputs #:allow-other-keys) @@ -182,12 +180,13 @@ HTML/CSS applications to full-fledged web browsers.") `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer ,@(package-native-inputs webkitgtk))) (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'configure 'work-around-gcc-7-include-path-issue -;; FIXME: Work around a problem with gcc-7 includes (see -;; <https://bugs.gnu.org/30756>). -(lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t))) - ,@(package-arguments webkitgtk) + (substitute-keyword-arguments (package-arguments webkitgtk) + ((#:phases phases) +`(modify-phases ,phases + (add-before 'configure 'work-around-gcc-7-include-path-issue + ;; FIXME: Work around a problem with gcc-7 includes (see + ;; <https://bugs.gnu.org/30756>). + (lambda _ + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") + #t
branch master updated (aaf0e47 -> a509b18)
mbakke pushed a change to branch master in repository guix. from aaf0e47 gnu: libtoxcore: Update to 0.0.0-2.bf69b54. new a509b18 gnu: webkitgtk@2.22: Adjust to documentation output. 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/webkit.scm | 33 - 1 file changed, 16 insertions(+), 17 deletions(-)
01/01: Merge branch 'master' into core-updates
mbakke pushed a commit to branch core-updates in repository guix. commit 64461ba20a07a0cf3197de3e97cb44e0f66cebdc Merge: 55174e6 cee9ab2 Author: Marius Bakke Date: Fri Nov 9 17:02:08 2018 +0100 Merge branch 'master' into core-updates doc/guix.texi | 6 + gnu/local.mk | 2 +- gnu/packages/bioinformatics.scm| 512 ++--- gnu/packages/c.scm | 5 +- gnu/packages/cups.scm | 6 +- gnu/packages/databases.scm | 4 +- gnu/packages/emacs.scm | 75 +++ gnu/packages/gtk.scm | 27 ++ gnu/packages/guile.scm | 6 +- gnu/packages/kodi.scm | 70 ++- gnu/packages/maths.scm | 10 +- gnu/packages/music.scm | 79 ++-- .../patches/hplip-remove-imageprocessor.patch | 232 ++ .../patches/vsearch-unbundle-cityhash.patch| 6 +- ...xmaxima-do-not-use-old-gnuplot-parameters.patch | 26 -- gnu/packages/python.scm| 29 +- gnu/packages/statistics.scm| 17 +- gnu/packages/xml.scm | 38 ++ gnu/services/desktop.scm | 8 +- guix/scripts/pull.scm | 2 +- 20 files changed, 781 insertions(+), 379 deletions(-)
branch core-updates updated (55174e6 -> 64461ba)
mbakke pushed a change to branch core-updates in repository guix. from 55174e6 Merge branch 'master' into core-updates adds 497fc04 gnu: mash: Fetch sources from git. adds 5c1f35e gnu: mash: Update to 2.1. adds b58d9e4 gnu: metabat: Fetch sources from git. adds 9d94ca0 gnu: minced: Fetch sources from git. adds 6052264 gnu: minced: Update to 0.3.2. adds a2b9d6a gnu: pplacer: Fetch sources from git. adds 1a20bca gnu: r-seqgl: Fetch sources from git. adds 4257c10 gnu: kentutils: Fetch sources from git. adds 55698df gnu: libgff: Fetch sources from git. adds 2b773a9 gnu: sra-tools: Fetch sources from git. adds ea68b3f pull: Add missing monadic 'return'. adds b44b1f0 gnu: hplip: Remove bundled non-free blobs. adds 5e242b0 gnu: pyicoteo: Fetch sources from git. adds 4715d4a gnu: raxml: Fetch sources from git. adds d9ba126 gnu: python2-biom-format: Fix build. adds b9d0c35 gnu: raxml: Update to 8.2.12. adds 019fcdf gnu: seqtk: Fetch sources from git. adds 63f3255 gnu: seqtk: Update to 1.3. adds 37e285b gnu: preseq: Fetch sources from git. adds 67caa4b gnu: preseq: Update to 2.0.3. adds 273df99 gnu: vsearch: Fetch source from git. adds 6236524 gnu: sortmerna: Fetch sources from git. adds e0a8fc8 gnu: snap-aligner: Fetch sources from git. adds 7145f4e gnu: ritornello: Fetch sources from git. adds 3b88806 gnu: ritornello: Update to 2.0.1. adds f3f34b1 gnu: filevercmp: Fetch sources from git. adds e2f3638 gnu: Add spread-sheet-widget. adds ed33049 gnu: pspp: Update to 1.2.0. adds e0f1aa2 gnu: tadbit: Fetch sources from git. adds 3398dfb gnu: ncbi-vdb: Fetch sources from git. adds 6a7d9ee gnu: ncbi-vdb: Use INVOKE and end phases on #T. adds 4031e7f gnu: ngs-sdk: Fetch sources from git. adds c098c49 gnu: sailfish: Fetch sources from git. adds e438c96 gnu: fraggenescan: Use INVOKE. adds c527d36 gnu: java-picard-1.113: Use INVOKE. adds 31c41a8 gnu: vsearch: Remove custom autogen phase. adds e35dce0 gnu: mash: Remove custom autoconf phase. adds 0881d62 gnu: newick-utils: Remove custom autoconf phase. adds 1794164 gnu: muscle: Use INVOKE. adds 2e2d885 gnu: sra-tools: Use INVOKE. adds 8b685c4 gnu: taxtastic: Use INVOKE. adds e78e54d gnu: emboss: Use INVOKE. adds 3da3ced gnu: ngs-sdk: Use INVOKE. adds 8d3eaa9 gnu: ngs-sdk: Update to 2.9.3. adds 8740885 gnu: ncbi-vdb: Update to 2.9.3. adds b173334 gnu: plink-ng: Fetch sources from git. adds 15c9609 gnu: sra-tools: Update to 2.9.3. adds 86c6928 gnu: vsearch: Update to 2.9.1. adds 9f527c9 gnu: sailfish: Use INVOKE. adds a954293 gnu: seek: Use INVOKE. adds ce49fdc gnu: roary: Use INVOKE. adds a1e83a9 gnu: pplacer-scripts: Use INVOKE. adds 9c30cba gnu: pcc: Use INVOKE. adds ec618c2 gnu: cmus: Use INVOKE. adds 4e82946 gnu: cmus: Fetch sources from git. adds 9ab90ea gnu: pd: Remove custom autoconf phase. adds 69cb939 gnu: libmusicbrainz: Use INVOKE. adds 195e081 gnu: Add python-pyelftools. adds 9870b9f gnu: python-ilinkedlist: Update to 0.3.1. adds ec86863 services: elogind: Fix spelling errors of left value fields in elogind config file. adds 8fa9ace doc: Add index entries. adds 988b78b gnu: Add fstrcmp. adds e340725 gnu: kodi: Update to 18.0b5. adds 2705780 gnu: Add emacs-clang-format. adds 41d2b7f gnu: PostgreSQL 9: Update to 9.6.11 [fixes CVE-2018-16850]. adds e4b62e2 gnu: wxmaxima: Update to 18.10.1. adds b1b82ae gnu: powertabeditor: Use INVOKE. adds 1b12b57 gnu: powertabeditor: Fetch sources from git. adds 97f33b0 gnu: guile-newt: Update to revision 1. adds 2cce23b gnu: Add xmlrpc-c. adds ddd925f gnu: Add emacs-gtk-look. adds 2eaaadb gnu: r-with-tests: Use INVOKE. adds cee9ab2 gnu: r-with-tests: Update to 3.5.1. new 64461ba Merge branch 'master' into core-updates 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: doc/guix.texi | 6 + gnu/local.mk | 2 +- gnu/packages/bioinformatics.scm| 512 ++--- gnu/packages/c.scm | 5 +- gnu/packages/cups.scm | 6 +- gnu/packages/databases.scm | 4 +-
branch core-updates updated (1badc85 -> 55174e6)
mbakke pushed a change to branch core-updates in repository guix. from 1badc85 gnu: ceph: Update to 13.2.2. adds 7082873 bash completion: Restore completion of available packages for 'guix build'. adds 5f7dd09 pull: Make '--dry-run' behave as expected. adds cbe7387 self: Remove extra paren in manual version string. adds aa919fb maint: Move substitute public keys to etc/substitutes. adds 8d3beb3 self: Install substitute keys. adds 2e4d833 ssh: Honor the SOCKET-NAME argument of connect-to-remote-daemon. adds 7f860a8 gnu: services: dns: Fix 'ddclient-activation'. adds b588adc gnu: c-ares: Update to 1.15.0. adds 730e5fb Revert "gnu: c-ares: Update to 1.15.0." adds c58f3eb gnu: ffmpeg: Update to 4.1. adds 418dd6a gnu: jq: Update to 1.6. adds c3b8300 gnu: jq: Don't use NAME in source URI. adds b1eeeb8 gnu: terraform-docs: Update to 0.5.0. adds fe4fb27 gnu: youtube-dl: Update to 2018.11.03. adds cddc030 gnu: Add r-weights. adds 3527f60 gnu: guile-sqlite3: Update home page. adds 6cf502d self: Rename 'sub-directory' to 'file-append*'. adds a2f9920 nls: Update 'de' translation. adds e374477 self: Install shell completion files. adds 158c02d gnu: Add xcb-util-errors. adds 4cceb14 gnu: libgit2: Work around test failures on 32-bit platforms. adds f256142 gnu: Syncthing: Update to 0.14.52. adds 9da4848 guix: Update to Bioconductor 3.8. adds c6b05ba gnu: nginx: Update to 1.14.1 [security fixes]. adds ec4c81f pack: Move store database creation to a separate derivation. adds b27ef1d pack: Import (guix store database) only when '--localstatedir' is passed. adds c5ce2db install: Add 'install-database-and-gc-roots'. adds f5a2fb1 pack: Docker backend now honors '--localstatedir'. adds 598a6b8 pack: Squashfs backend now honors '--localstatedir'. adds 1ff5378 pack: Add test for 'self-contained-tarball' with localstatedir. adds 72dc64f store-copy: Canonicalize the mtime and permissions of the store copy. adds b07014f pack: Add test for '--relocatable'. adds b20aef9 gnu: GnuPG: Update to 2.2.11. adds 02e2133 gnu: LibreOffice: Update to 6.1.3.2. adds cbb5d2e gnu: kodi: Fix typo. adds 581720b gnu: Add guile-newt. adds f4e8bc5 services: kmscon: Do not switch to vt at start. adds 2d9dace services: kmscon: Add an auto-login option. adds a7903ca gnu: terminals: Change libtsm and kmscon repositories. adds 8243f4e gnu: slang: Use a correct location for terminfo dirs. adds bfa5662 gnu: Add r-rcppannoy. adds b58940c gnu: Add r-ncdf4. adds 1e605c0 gnu: Add r-biocmanager. adds 61686921 gnu: r-hpar: Update to 1.24.0. adds 9865256 gnu: r-diffbind: Update to 2.10.0. adds f1c606c gnu: r-marray: Update to 1.60.0. adds 46cdcee gnu: r-cghbase: Update to 1.42.0. adds 9add093 gnu: r-cghcall: Update to 2.44.0. adds a92f523 gnu: r-qdnaseq: Update to 1.18.0. adds 95ee4a4 gnu: r-multtest: Update to 2.38.0. adds 14520b6 gnu: r-graph: Update to 1.60.0. adds 57d2fcd gnu: r-chippeakanno: Update to 3.16.0. adds 4728e27 gnu: r-bayseq: Update to 2.16.0. adds aa802ea gnu: r-chipcomp: Update to 1.12.0. adds e9427b2 gnu: r-ripseeker: Update to 1.22.0. adds e22e462 gnu: r-riboprofiling: Update to 1.12.0. adds c4fed65 gnu: r-riboseqr: Update to 1.16.0. adds bbc4787 gnu: r-interactionset: Update to 1.10.0. adds 5f2d0e6 gnu: r-genomicinteractions: Update to 1.16.0. adds b858338 gnu: r-ctc: Update to 1.56.0. adds 6ea9ae9 gnu: r-goseq: Update to 1.34.0. adds 016afac gnu: r-glimma: Update to 1.10.0. adds c348cfe gnu: r-rots: Update to 1.10.0. adds 6f1e1d0 gnu: r-inspect: Update to 1.12.0. adds 318bcbc gnu: r-dnabarcodes: Update to 1.12.0. adds 286157d gnu: Add r-biocneighbors. adds ed35d7c gnu: r-ruvseq: Update to 1.16.0. adds d639d88 gnu: r-regioner: Update to 1.14.0. adds bb47aca gnu: Add hdf5-1.10. adds 269182b gnu: r-rgraphviz: Update to 2.26.0. adds 0dd84df gnu: r-ps: Update to 1.2.1. adds 65dd0e6 gnu: r-pkgload: Update to 1.0.2. adds ec0ee08 gnu: r-ffbase: Update to 0.12.7. adds 56af171 gnu: r-ipred: Update to 0.9-8. adds 5d986a3 gnu: r-psych: Update to 1.8.10. adds cea8a60 gnu: r-xts: Update to 0.11-2. adds 84d0d86 gnu: r-sjmisc: Update to 2.7.6. adds 244a5c4 gnu: r-flextable: Update to 0.4.6. adds 3d6fa1a gnu: r-sessioninfo: Update to 1.1.1. adds fc532b4 gnu: r-remotes: Update to 2.0.2. adds 7466c3b gnu: r-rcmdcheck: Update to
01/01: Merge branch 'master' into core-updates
mbakke pushed a commit to branch core-updates in repository guix. commit 55174e668f2985d1c4efda4fbf58f4061dde0db2 Merge: 1badc85 b31e156 Author: Marius Bakke Date: Wed Nov 7 21:09:57 2018 +0100 Merge branch 'master' into core-updates Makefile.am| 5 +- doc/guix.texi | 22 +- etc/completion/bash/guix | 4 +- .../substitutes/berlin.guixsd.org.pub | 0 .../substitutes/hydra.gnu.org.pub | 0 gnu/build/install.scm | 77 +-- gnu/build/linux-initrd.scm | 8 +- gnu/build/vm.scm | 19 +- gnu/local.mk | 3 +- gnu/packages/benchmark.scm | 6 +- gnu/packages/bioconductor.scm | 134 ++-- gnu/packages/bioinformatics.scm| 761 +++-- gnu/packages/ci.scm| 6 +- gnu/packages/cran.scm | 156 - gnu/packages/gnupg.scm | 4 +- gnu/packages/graph.scm | 4 +- gnu/packages/guile.scm | 40 +- gnu/packages/kodi.scm | 4 +- gnu/packages/libreoffice.scm | 4 +- gnu/packages/maths.scm | 19 + gnu/packages/music.scm | 2 +- gnu/packages/patches/gemma-intel-compat.patch | 44 -- gnu/packages/patches/jq-CVE-2015-8863.patch| 45 -- gnu/packages/patches/libgit2-oom-test.patch| 62 ++ gnu/packages/slang.scm | 14 +- gnu/packages/statistics.scm| 39 +- gnu/packages/syncthing.scm | 4 +- gnu/packages/terminals.scm | 178 ++--- gnu/packages/terraform.scm | 11 +- gnu/packages/version-control.scm | 3 +- gnu/packages/video.scm | 8 +- gnu/packages/web.scm | 18 +- gnu/packages/xorg.scm | 52 ++ gnu/services/base.scm | 11 +- gnu/services/cuirass.scm | 6 +- gnu/services/dns.scm | 4 +- guix/build-system/r.scm| 2 +- guix/build/store-copy.scm | 28 + guix/docker.scm| 16 +- guix/import/cran.scm | 4 +- guix/scripts/pack.scm | 415 ++- guix/scripts/pull.scm | 17 +- guix/self.scm | 47 +- guix/ssh.scm | 2 +- po/guix/de.po | 20 +- tests/guix-pack-relocatable.sh | 61 ++ tests/guix-pack.sh | 28 +- tests/pack.scm | 156 - 48 files changed, 1594 insertions(+), 979 deletions(-) diff --cc gnu/local.mk index 86f081f,9a8330a..90dbe94 --- a/gnu/local.mk +++ b/gnu/local.mk @@@ -836,9 -830,9 +835,8 @@@ dist_patch_DATA = %D%/packages/patches/java-xerces-bootclasspath.patch\ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ - %D%/packages/patches/jemalloc-arm-address-bits.patch\ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ %D%/packages/patches/json-glib-fix-tests-32bit.patch\ - %D%/packages/patches/jq-CVE-2015-8863.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/khmer-use-libraries.patch\ %D%/packages/patches/libziparchive-add-includes.patch \ @@@ -880,8 -874,8 +878,9 @@@ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch\ %D%/packages/patches/libexif-CVE-2017-7544.patch\ + %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch\ %D%/packages/patches/libgit2-mtime-0.patch \ + %D%/packages/patches/libgit2-oom-test.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch\ %D%/packages/patches/libgnome-encoding.patch\
01/01: gnu: fio: Update to 3.11.
mbakke pushed a commit to branch master in repository guix. commit b31e1561611ebe4916890183b24e6e13cb83bf59 Author: Marius Bakke Date: Wed Nov 7 16:10:58 2018 +0100 gnu: fio: Update to 3.11. * gnu/packages/benchmark.scm (fio): Update to 3.11. [source]: Use bz2 compressed tarball. --- gnu/packages/benchmark.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index be36627..9d79202 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -35,14 +35,14 @@ (define-public fio (package (name "fio") -(version "3.7") +(version "3.11") (source (origin (method url-fetch) (uri (string-append "http://brick.kernel.dk/snaps/; - "fio-" version ".tar.gz")) + "fio-" version ".tar.bz2")) (sha256 (base32 -"0rw9jf2ikm19lq4jizavdvvp3vfvlm3annq7jsxl2y5nf1pi2qr7" +"0s8m0wcz5j6sa1hblj80wk3syy5b4shg7y3gabvm9xa3wj0lzasa" (build-system gnu-build-system) (arguments '(#:test-target "test"
branch master updated (2dc2839 -> b31e156)
mbakke pushed a change to branch master in repository guix. from 2dc2839 gnu: kaiju: Update to 1.6.3. new b31e156 gnu: fio: Update to 3.11. 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/benchmark.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
03/03: gnu: ceph: Update to 13.2.2.
mbakke pushed a commit to branch core-updates in repository guix. commit 1badc85068ee0be2a028c1b94a3dd285901bc391 Author: Marius Bakke Date: Thu Sep 27 18:41:50 2018 +0200 gnu: ceph: Update to 13.2.2. * gnu/packages/patches/ceph-skip-unittest_blockdev.patch: Adjust for 13.2.2. * gnu/packages/patches/ceph-rocksdb-compat.patch: Delete file. * gnu/packages/patches/ceph-detect-rocksdb.patch, gnu/packages/patches/ceph-volume-respect-PATH.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/storage.scm (ceph): Update to 13.2.2. [source]: Don't remove src/dpdk, which has been moved to src/spdk/dpdk and is purged elsewhere. Drop bundled rapidjson. Adjust patch list. [arguments]: Add "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" and "-DWITH_SPDK=OFF" to #:configure-flags. Drop obsolete "-DWITH_EMBEDDED". Add workaround for <https://bugs.gnu.org/30756>. Remove obsolete test substitution. Rework 'wrap-python-script' to be less verbose and wrap more scripts. [native-inputs]: Add GCC-7. [inputs]: Add OATH-TOOLKIT, RAPIDJSON and PYTHON2-SIX. --- gnu/local.mk | 3 +- gnu/packages/patches/ceph-detect-rocksdb.patch | 24 + gnu/packages/patches/ceph-rocksdb-compat.patch | 63 -- .../patches/ceph-skip-unittest_blockdev.patch | 20 +++ .../patches/ceph-volume-respect-PATH.patch | 22 gnu/packages/storage.scm | 43 +-- 6 files changed, 82 insertions(+), 93 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 93bf44a..86f081f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -608,10 +608,11 @@ dist_patch_DATA = \ %D%/packages/patches/catdoc-CVE-2017-0.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ + %D%/packages/patches/ceph-detect-rocksdb.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch\ - %D%/packages/patches/ceph-rocksdb-compat.patch \ %D%/packages/patches/ceph-skip-collect-sys-info-test.patch \ %D%/packages/patches/ceph-skip-unittest_blockdev.patch \ + %D%/packages/patches/ceph-volume-respect-PATH.patch \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/clang-3.5-libc-search-path.patch\ %D%/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch \ diff --git a/gnu/packages/patches/ceph-detect-rocksdb.patch b/gnu/packages/patches/ceph-detect-rocksdb.patch new file mode 100644 index 000..badad6d --- /dev/null +++ b/gnu/packages/patches/ceph-detect-rocksdb.patch @@ -0,0 +1,24 @@ +Help the build system find system RocksDB. + +Taken from this upstream commit: +https://github.com/ceph/ceph/commit/2ac26bd0e01fd6c82bd59936cf25c25173f7775a + +diff --git a/cmake/modules/Findrocksdb.cmake b/cmake/modules/Findrocksdb.cmake +index f8369f73fc..5926647348 100644 +--- a/cmake/modules/Findrocksdb.cmake b/cmake/modules/Findrocksdb.cmake +@@ -15,11 +15,11 @@ find_library(ROCKSDB_LIBRARIES rocksdb) + + if(ROCKSDB_INCLUDE_DIR AND EXISTS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h") + foreach(ver "MAJOR" "MINOR" "PATCH") +-file(STRINGS "${ROCKSDB_INCLUDE_DIR}/version.h" ROCKSDB_VER_${ver}_LINE ++file(STRINGS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h" ROCKSDB_VER_${ver}_LINE + REGEX "^#define[ \t]+ROCKSDB_${ver}[ \t]+[0-9]+$") + string(REGEX REPLACE "^#define[ \t]+ROCKSDB_${ver}[ \t]+([0-9]+)$" +- "\\1" ROCKSDB_VERSION_${ver} "${ROCKDB_VER_${ver}_LINE}") +-unset(${ROCKDB_VER_${ver}_LINE}) ++ "\\1" ROCKSDB_VERSION_${ver} "${ROCKSDB_VER_${ver}_LINE}") ++unset(${ROCKSDB_VER_${ver}_LINE}) + endforeach() + set(ROCKSDB_VERSION_STRING + "${ROCKSDB_VERSION_MAJOR}.${ROCKSDB_VERSION_MINOR}.${ROCKSDB_VERSION_PATCH}") diff --git a/gnu/packages/patches/ceph-rocksdb-compat.patch b/gnu/packages/patches/ceph-rocksdb-compat.patch deleted file mode 100644 index 1a3c6b0..000 --- a/gnu/packages/patches/ceph-rocksdb-compat.patch +++ /dev/null @@ -1,63 +0,0 @@ -Fix compatibility with newer versions of RocksDB. - -Adapted from this upstream patch, with some additional changes for 12.2: -https://github.com/ceph/ceph/commit/9d73a7121fdb1ae87cb1aa6f7d9d7a13f329ae68 - -diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc -index 8660afe1886d..bc0de79e23cb 100644 a/src/kv/RocksDBStore.cc -+++ b/src/kv/RocksDBStore.cc -@@ -505,7 +505,7 @@ - // considering performance overhead, default is disabled - if (g_conf->rocksdb_perf) { - rocksdb::SetPerfLevel(rocksdb::PerfLevel::kEnableTimeExceptFo
02/03: gnu: rocksdb: Update to 5.15.10.
mbakke pushed a commit to branch core-updates in repository guix. commit e2568df74e46b6ab5b9d63a78dd805f8018848ab Author: Marius Bakke Date: Thu Sep 27 17:27:31 2018 +0200 gnu: rocksdb: Update to 5.15.10. * gnu/packages/databases.scm (rocksdb): Update to 5.15.10. --- 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 1a3781b..5fc3607 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -988,7 +988,7 @@ types are supported, as is encryption.") (define-public rocksdb (package (name "rocksdb") -(version "5.12.4") +(version "5.15.10") (source (origin (method git-fetch) (uri (git-reference @@ -997,7 +997,7 @@ types are supported, as is encryption.") (file-name (git-file-name name version)) (sha256 (base32 -"0islyg33hr52gqhcgvv58gmgzxw12w3175mhf2mli5w60lx8f8hi")) +"0q26frbj9pykarcfa0yxgwncxlvsqhjkby0jrbfs1a8srja688r4")) (modules '((guix build utils))) (snippet '(begin
branch core-updates updated (3bd83e6 -> 1badc85)
mbakke pushed a change to branch core-updates in repository guix. from 3bd83e6 gnu: qtbase: Remove obsolete patch. new 8dd3665 gnu: rocksdb: Don't use unstable tarball. new e2568df gnu: rocksdb: Update to 5.15.10. new 1badc85 gnu: ceph: Update to 13.2.2. 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 | 3 +- gnu/packages/databases.scm | 13 ++--- gnu/packages/patches/ceph-detect-rocksdb.patch | 24 + gnu/packages/patches/ceph-rocksdb-compat.patch | 63 -- .../patches/ceph-skip-unittest_blockdev.patch | 20 +++ .../patches/ceph-volume-respect-PATH.patch | 22 gnu/packages/storage.scm | 43 +-- 7 files changed, 89 insertions(+), 99 deletions(-) create mode 100644 gnu/packages/patches/ceph-detect-rocksdb.patch delete mode 100644 gnu/packages/patches/ceph-rocksdb-compat.patch create mode 100644 gnu/packages/patches/ceph-volume-respect-PATH.patch
01/03: gnu: rocksdb: Don't use unstable tarball.
mbakke pushed a commit to branch core-updates in repository guix. commit 8dd36658832b405ee8c04d29b96381519920ed91 Author: Marius Bakke Date: Thu Sep 27 17:24:33 2018 +0200 gnu: rocksdb: Don't use unstable tarball. * gnu/packages/databases.scm (rocksdb)[source]: Use GIT-FETCH. --- gnu/packages/databases.scm | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e1fa6b7..1a3781b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -990,13 +990,14 @@ types are supported, as is encryption.") (name "rocksdb") (version "5.12.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/facebook/rocksdb; - "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference +(url "https://github.com/facebook/rocksdb;) +(commit (string-append "v" version + (file-name (git-file-name name version)) (sha256 (base32 -"1jcwgsjhk4hdfr2wf549blkgb89vwcdb5i2ahhqs6zf3mm20i3bf")) +"0islyg33hr52gqhcgvv58gmgzxw12w3175mhf2mli5w60lx8f8hi")) (modules '((guix build utils))) (snippet '(begin
01/01: gnu: nginx: Update to 1.14.1 [security fixes].
mbakke pushed a commit to branch master in repository guix. commit c6b05bacc08dc423db74ae24d442fd43f1ba8893 Author: Marius Bakke Date: Tue Nov 6 21:34:30 2018 +0100 gnu: nginx: Update to 1.14.1 [security fixes]. This fixes CVE-2018-16843, CVE-2018-16844, and CVE-2018-16845. * gnu/packages/web.scm (nginx): Update to 1.14.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3203b25..b0ab4ad 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -195,14 +195,14 @@ Interface} specification.") (name "nginx") ;; Consider updating the nginx-documentation package if the nginx package is ;; updated. -(version "1.14.0") +(version "1.14.1") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-; version ".tar.gz")) (sha256 (base32 -"1d9c0avfpbwvzyg53b59ks8shpnrxnbnshcd7ziizflsyv5vw5ax" +"19542jxcjf4dvrqvgb5vr36mhbzcjrxc3v0xh451rm60610rf2dz" (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre)
branch master updated (9da4848 -> c6b05ba)
mbakke pushed a change to branch master in repository guix. from 9da4848 guix: Update to Bioconductor 3.8. new c6b05ba gnu: nginx: Update to 1.14.1 [security fixes]. 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/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
branch core-updates updated (16b89ec -> 3bd83e6)
mbakke pushed a change to branch core-updates in repository guix. from 16b89ec gnu: Add openjdk10. adds 62a14bd scripts: Suggest running 'guix gc' when we're short on disk space. adds 2820e31 gnu: zstd: Update to 1.3.7. adds 3891c38 gnu: bs1770gain: Update to 0.5.1. adds ee5c835 gnu: cppcheck: Update to 1.85. adds 661da25 gnu: Remove duplicate import from (gnu packages messaging). adds d6a9c4e gnu: unbound: Update to 1.8.1. adds ce08d54 gnu: Add libopusenc. adds 844b327 gnu: opusfile: Propagate dependencies required in pkg-config. adds d0ff383 gnu: opus-tools: Update to 0.2. adds a640492 gnu: Opus: Update to 1.3. adds a89f731 gnu: Xiph: Use HTTPS URLs. adds f0ac761 gnu: grammalecte: Update home page. adds 70c488f gnu: lxqt-session: Update to 0.13.0. adds 088096a gnu: lxqt-build-tools: Update download URL and home page URL. adds d58aefd gnu: lxqt.scm: Sort packages alphabetically. adds 64fac50 gnu: Add libdbusmenu-qt. adds bf076d8 gnu: Add libstatgrab. adds d89872f gnu: sbcl-parse-float: Remove comment about license. adds b55697f gnu: Add r-aspi. adds 1299585 gnu: libssh: Fetch the source code more efficiently. adds b4237a6 gnu: emacs-nov-el: Update to 0.2.6. adds d78587e gnu: icecat: Add fixes from mozilla-esr60 [security fixes]. adds 0ba0ab8 gnu: Add wavemon. adds 50f5aa4 gnu: xmlsec: Update to 1.2.27. adds 94617bd gnu: libbytesize: Update to 1.4. adds d9bcdfc gnu: mongodb: Use INVOKE. adds ce7ceef gnu: linux-libre: Update to 4.19. adds d0d3ed6 gnu: tinc: Update to 1.0.35 [fixes CVE-2018-{16737,16738,16758}]. adds e5d7577 gnu: loksh: Don't use unstable tarball. adds 716cd19 gnu: loksh: Update to 6.4. adds 569adff gnu: pcsc-lite: Update to 1.8.24. adds 5787e15 gnu: Move go-github-com-gogo-protobuf* from syncthing.scm to golang.scm adds 830dc25 gnu: Move go-golang-org-x-crypto-union from syncthing.scm to golang.scm adds 7eb0ad3 gnu: Add go-golang-org-x-crypto-ed25519. adds a9010ea gnu: Add go-golang-org-x-crypto-ripemd160. adds 6fa257c gnu: Add go-golang-org-x-crypto-blake2s. adds 19789c8 gnu: Add go-golang-org-x-crypto-sha3. adds 48a279e gnu: go-golang-org-x-crypto-union: Wrap all crypto packages. adds 386bd7b gnu: Add go-github-com-libp2p-go-flow-metrics. adds 6a95e3a gnu: Add go-github-com-davecgh-go-spew. adds 171c325 gnu: Add go-github-com-btcsuite-btclog. adds d5599af gnu: Add go-github-com-btcsuite-btcd-btcec. adds ff2d11c gnu: Add go-github-com-minio-sha256-simd. adds 71f3680 gnu: Add go-github-com-libp2p-go-libp2p-crypto. adds 15272a5 gnu: Add go-github-com-mr-tron-base58. adds 27d59d8 gnu: Add go-github-com-gxed-hashland-keccakpg. adds 90f2a84 gnu: Add go-github-com-minio-blake2b-simd. adds 9a7f157 gnu: Add go-github-com-spaolacci-murmur3. adds 2e42e58 gnu: Add go-github-com-multiformats-go-multihash. adds 1db1e3c gnu: Add go-github-com-libp2p-go-libp2p-peer. adds 43a5c17 gnu: Add go-github-com-libp2p-go-libp2p-protocol. adds 77d8a91 gnu: Add go-github-com-libp2p-go-libp2p-metrics. adds 8cb9128 gnu: Add go-github-com-mitchellh-go-homedir. adds e53121b gnu: Add go-github-com-multiformats-go-multiaddr. adds 66fb6e2 gnu: Add go-github-com-multiformats-go-multiaddr-net. adds 38d346d gnu: Add go-github-com-whyrusleeping-tar-utils. adds ad8d463 gnu: Add go-github-com-cheekybits-is. adds 20f48e4 gnu: Add go-github-com-sabhiram-go-gitignore. adds b5bb0b5 gnu: Add go-github-com-urfave-cli. adds 7bd9020 gnu: Add go-github-com-whyrusleeping-json-filter. adds 38566e9 gnu: Add go-github-com-whyrusleeping-progmeter. adds 56eb7bd gnu: Add go-github-com-whyrusleeping-stump. adds 247b1bd gnu: Add go-github-com-ipfs-go-ipfs-cmdkit-files. adds 566f13f gnu: Add go-github-com-ipfs-go-ipfs-api. adds 202c1b9 gnu: Add gx. adds 96bdf90 gnu: dotherside: Update home-page. adds 5b6c3ad gnu: Add go-github-com-kr-fs. adds e82ae67 gnu: Add go-github-com-whyrusleeping-gx-util. adds 96b4977 gnu: Add gx-go. adds fab3484 gnu: Add lxqt-globalkeys. adds fbe645e gnu: Add libsysstat. adds af291d1 gnu: Add lxqt-panel. adds cc7f417 gnu: Add lxqt-runner. adds dbb4f7d gnu: Add lxqt-sudo. adds 79f9e4e gnu: Add libfm-qt. adds d6fd4a7 gnu: Add pcmanfm-qt. adds 2bdab26 gnu: Add lxqt-about. adds 34e08de gnu: Add lxqt-admin. adds a6b941d gnu: lxqt.scm: Add prefix to licenses imports. adds c1144c7 gnu: Add libkscreen.
02/02: gnu: qtbase: Remove obsolete patch.
mbakke pushed a commit to branch core-updates in repository guix. commit 3bd83e6db2982d0b419945dd6ea4174d1a880c6d Author: Marius Bakke Date: Mon Nov 5 23:24:19 2018 +0100 gnu: qtbase: Remove obsolete patch. This patch is no longer needed since 7930cfc98923eda64ec4a37d56b19f96f86f5f59 was merged to core-updates. * gnu/packages/patches/qtbase-glibc-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/qt.scm (qtbase)[source](patches): Drop it. --- gnu/local.mk | 1 - gnu/packages/patches/qtbase-glibc-compat.patch | 50 -- gnu/packages/qt.scm| 3 +- 3 files changed, 1 insertion(+), 53 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 4f1d630..93bf44a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1097,7 +1097,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qt4-ldflags.patch \ - %D%/packages/patches/qtbase-glibc-compat.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch\ %D%/packages/patches/quagga-reproducible-build.patch \ diff --git a/gnu/packages/patches/qtbase-glibc-compat.patch b/gnu/packages/patches/qtbase-glibc-compat.patch deleted file mode 100644 index 15a2540..000 --- a/gnu/packages/patches/qtbase-glibc-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -Fix qmake build with glibc 2.28. - -Taken from upstream: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=25feee4e061b99edab79503d81f5bd045c6c8e3d - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index 3469ebe5e6..c5585ea32a 100644 a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -98,10 +98,18 @@ - #define QT_NO_QOBJECT - #define QT_FEATURE_process -1 - #define QT_FEATURE_regularexpression -1 --#define QT_FEATURE_renameat2 -1 -+#ifdef __GLIBC_PREREQ -+# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+#else -+# define QT_FEATURE_renameat2 -1 -+#endif - #define QT_FEATURE_sharedmemory -1 - #define QT_FEATURE_slog2 -1 --#define QT_FEATURE_statx -1 -+#ifdef __GLIBC_PREREQ -+# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+#else -+# define QT_FEATURE_statx -1 -+#endif - #define QT_FEATURE_syslog -1 - #define QT_NO_SYSTEMLOCALE - #define QT_FEATURE_systemsemaphore -1 -diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index 0c9cdb8667..deb4a9f220 100644 a/src/corelib/io/qfilesystemengine_unix.cpp -+++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -91,7 +91,6 @@ extern "C" NSString *NSTemporaryDirectory(); - # include - # include - # include --# include - - // in case linux/fs.h is too old and doesn't define it: - #ifndef FICLONE -@@ -112,6 +111,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp - #endif - - #if !QT_CONFIG(statx) && defined(SYS_statx) -+# include - static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf) - { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); } - #elif !QT_CONFIG(statx) && !defined(SYS_statx) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1dd2110..cffebc7 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -508,8 +508,7 @@ system, and the core design of Django is reused in Grantlee.") (base32 "01q1rn5rp9biq3z38953z2hgm4nirvp2jfv8wg7isnld8v1yg0b3")) ;; Use TZDIR to avoid depending on package "tzdata". - (patches (search-patches "qtbase-use-TZDIR.patch" - "qtbase-glibc-compat.patch")) + (patches (search-patches "qtbase-use-TZDIR.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3
01/02: Merge branch 'master' into core-updates
mbakke pushed a commit to branch core-updates in repository guix. commit f4a5faa9dcadc698383e15743ac5f974ee0e3c8b Merge: 16b89ec adde151 Author: Marius Bakke Date: Mon Nov 5 23:56:22 2018 +0100 Merge branch 'master' into core-updates Makefile.am|10 +- doc/contributing.de.texi | 537 + doc/{guix.texi => guix.de.texi}| 16925 doc/guix.texi | 120 +- doc/local.mk | 5 +- gnu/artwork.scm| 4 +- gnu/build/install.scm |26 +- gnu/local.mk | 8 +- gnu/packages/audio.scm | 4 +- .../linux-libre/{4.18-arm.conf => 4.19-arm.conf} | 1141 +- .../{4.18-arm64.conf => 4.19-arm64.conf} | 3562 +- .../linux-libre/{4.18-i686.conf => 4.19-i686.conf} | 15836 .../{4.18-x86_64.conf => 4.19-x86_64.conf} | 2706 +- gnu/packages/bioconductor.scm | 4 +- gnu/packages/bioinformatics.scm|56 +- gnu/packages/c.scm | 8 +- gnu/packages/calcurse.scm | 4 +- gnu/packages/check.scm | 4 +- gnu/packages/code.scm |10 +- gnu/packages/compression.scm | 8 +- gnu/packages/cran.scm | 1121 +- gnu/packages/cups.scm | 8 +- gnu/packages/curl.scm |14 + gnu/packages/databases.scm |17 +- gnu/packages/debian.scm|16 +- gnu/packages/dictionaries.scm | 2 +- gnu/packages/dns.scm | 8 +- gnu/packages/electronics.scm |48 +- gnu/packages/emacs.scm |52 +- gnu/packages/emulators.scm |15 +- gnu/packages/file-systems.scm | 6 +- gnu/packages/fpga.scm |13 +- gnu/packages/game-development.scm |13 +- gnu/packages/games.scm |65 +- gnu/packages/gnome.scm | 8 +- gnu/packages/gnuzilla.scm |48 +- gnu/packages/golang.scm| 1026 +- gnu/packages/gps.scm | 4 +- gnu/packages/hardware.scm |44 + gnu/packages/image-viewers.scm | 4 +- gnu/packages/image.scm |29 + gnu/packages/ipfs.scm | 212 + gnu/packages/javascript.scm|16 +- gnu/packages/julia.scm | 4 +- gnu/packages/kde.scm |40 + gnu/packages/libreoffice.scm | 5 + gnu/packages/libusb.scm| 4 +- gnu/packages/linux.scm |34 +- gnu/packages/lisp.scm |21 +- gnu/packages/lua.scm | 3 + gnu/packages/lxqt.scm | 1143 +- gnu/packages/mail.scm |65 +- gnu/packages/maths.scm |16 +- gnu/packages/messaging.scm | 235 +- gnu/packages/monitoring.scm|26 + gnu/packages/mono.scm | 2 +- gnu/packages/mpd.scm |12 +- gnu/packages/networking.scm| 4 +- gnu/packages/package-management.scm| 4 +- gnu/packages/parallel.scm | 4 +- gnu/packages/password-utils.scm|26 +- .../patches/mailutils-uninitialized-memory.patch |87 - .../meandmyshadow-define-paths-earlier.patch |50 + gnu/packages/patches/myrepos-CVE-2018-7032.patch |69 - .../rust-1.25-accept-more-detailed-gdb-lines.patch |17 + ...roducible-builds-by-forcing-window.search.patch |25 + .../patches/telegram-purple-adjust-test.patch |14 + gnu/packages/patches/xapian-revert-5489fb2f8.patch |23 - .../zathura-pdf-mupdf-link-to-jpeg-libraries.patch |55 - gnu/packages/pdf.scm |84 +- gnu/packages/photo.scm | 8 +- gnu/packages/pretty-print.scm | 4 +- gnu/packages/python-crypto.scm | 4 +- gnu/packages/python-web.scm|38 + gnu/packages/python.scm|86 +- gnu/
01/01: gnu: xf86-video-intel: Update to commit 0932a6b37ba6d5c9e916a1cb6ab89c3205b81a0c.
mbakke pushed a commit to branch master in repository guix. commit adde15186da7529b85097fdafffc2a13b0e60bdf Author: Marius Bakke Date: Mon Nov 5 20:50:26 2018 +0100 gnu: xf86-video-intel: Update to commit 0932a6b37ba6d5c9e916a1cb6ab89c3205b81a0c. * gnu/packages/xorg.scm (xf86-video-intel): Update to 2.99.917-11.0932a6b. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a4909d4..68cfa7b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2905,8 +2905,8 @@ X server.") (define-public xf86-video-intel - (let ((commit "d7dfab62a9853b44bbcd67dac08391d8e5114c97") -(revision "10")) + (let ((commit "0932a6b37ba6d5c9e916a1cb6ab89c3205b81a0c") +(revision "11")) (package (name "xf86-video-intel") (version (git-version "2.99.917" revision commit)) @@ -2919,7 +2919,7 @@ X server.") (commit commit))) (sha256 (base32 - "1vcfal4xr9q6016p28lnlyg709da6d305dysyyrj3fjp9fj48sva")) + "10pqxp7n53ddiypd3l1i9gkbgzdpi6rz9vksbd16biq7pbijc2xf")) (file-name (git-file-name name version (build-system gnu-build-system) (inputs `(("mesa" ,mesa)
branch master updated (208e822 -> adde151)
mbakke pushed a change to branch master in repository guix. from 208e822 gnu: xapian: Update to 1.4.9. new adde151 gnu: xf86-video-intel: Update to commit 0932a6b37ba6d5c9e916a1cb6ab89c3205b81a0c. 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/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
06/13: gnu: glm: Update to 0.9.9.3.
mbakke pushed a commit to branch master in repository guix. commit 66044a36983f45832165dd22fc6e4a2c8c317a75 Author: Marius Bakke Date: Mon Nov 5 18:33:44 2018 +0100 gnu: glm: Update to 0.9.9.3. * gnu/packages/maths.scm (glm): Update to 0.9.9.3. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6a3a595..d14e61f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3292,7 +3292,7 @@ Failure to do so will result in a library with poor performance.") (define-public glm (package (name "glm") -(version "0.9.9.2") +(version "0.9.9.3") (source (origin (method url-fetch) @@ -3300,7 +3300,7 @@ Failure to do so will result in a library with poor performance.") version "/glm-" version ".zip")) (sha256 (base32 - "1m2gws1d7l6h4mdn0ap74pfnm3vva3kk8rybdqd5x4lksd1mk6r0" + "0yqk5r3qh60d4r2iab5q7wq0fryn8p3pz6s28y1i7amqj1aqavj9" (build-system cmake-build-system) (native-inputs `(("unzip" ,unzip)))
11/13: gnu: strace: Update to 4.25.
mbakke pushed a commit to branch master in repository guix. commit b5a887637c1ebc9c97cab0ba4ed25a5b05f2a2d7 Author: Marius Bakke Date: Mon Nov 5 19:23:49 2018 +0100 gnu: strace: Update to 4.25. * gnu/packages/linux.scm (strace): Update to 4.25. --- 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 875e7b6..e52c35f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -936,7 +936,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") (define-public strace (package (name "strace") -(version "4.24") +(version "4.25") (home-page "https://strace.io;) (source (origin (method url-fetch) @@ -944,7 +944,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") "/strace-" version ".tar.xz")) (sha256 (base32 - "0d061cdzk6a1822ds4wpqxg10ny27mi4i9zjmnsbz8nz3vy5jkhz" + "00f7zagfh3np5gwi0z7hi7zjd7s5nixcaq7z78n87dvhakkgi1fn" (build-system gnu-build-system) (arguments '(#:phases
12/13: gnu: libssh: Update to 0.7.7.
mbakke pushed a commit to branch master in repository guix. commit d79c8148ccf4c28f99b62fb19234da58e16138c9 Author: Marius Bakke Date: Mon Nov 5 19:32:39 2018 +0100 gnu: libssh: Update to 0.7.7. * gnu/packages/ssh.scm (libssh): Update to 0.7.7. --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index b93cb03..80564a9 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -67,7 +67,7 @@ (define-public libssh (package (name "libssh") -(version "0.7.6") +(version "0.7.7") (source (origin (method git-fetch) (uri (git-reference @@ -82,7 +82,7 @@ (patches (search-patches "libssh-hostname-parser-bug.patch")) (sha256 (base32 -"0slwqa36mhyb6brdv2jvb9fxp7rvsv3ziv67kaxx615jxn52l5pa")) +"07adxvhmnaq2l7sq7sn4sjlikbm1zdicq8lavq5yfila6jbx9z1y")) (file-name (git-file-name name version (build-system cmake-build-system) (outputs '("out" "debug"))
03/13: gnu: feh: Update to 2.28.1.
mbakke pushed a commit to branch master in repository guix. commit 196653145ab8714e7663fc9c94ea46edd5a2c92e Author: Marius Bakke Date: Mon Nov 5 18:24:18 2018 +0100 gnu: feh: Update to 2.28.1. * gnu/packages/image-viewers.scm (feh): Update to 2.28.1. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 512795c..5184177 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -60,7 +60,7 @@ (define-public feh (package (name "feh") -(version "2.28") +(version "2.28.1") (home-page "https://feh.finalrewind.org/;) (source (origin (method url-fetch) @@ -68,7 +68,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 -"1nfka7w6pzj2bbwx8vydr2wwm7z8mrbqiy1xrq97c1g5bxy2vlhk" +"0wian0gnx0yfxf8x9b8wr57fjd6rnmi3y3xj83ni6x0xqrjnf1lp" (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure))
13/13: gnu: xapian: Update to 1.4.9.
mbakke pushed a commit to branch master in repository guix. commit 208e82297cb5d67eea8fd9b1fbb06e9505b4607b Author: Marius Bakke Date: Mon Nov 5 19:45:01 2018 +0100 gnu: xapian: Update to 1.4.9. * gnu/packages/patches/xapian-revert-5489fb2f8.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/search.scm (xapian): Update to 1.4.9. [source](patches): Remove. (python-xapian-bindings): Update to 1.4.9. --- gnu/local.mk | 1 - gnu/packages/patches/xapian-revert-5489fb2f8.patch | 23 -- gnu/packages/search.scm| 7 +++ 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 3207cec..1f9f6b3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1230,7 +1230,6 @@ dist_patch_DATA = \ %D%/packages/patches/wpa-supplicant-krack-followups.patch\ %D%/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch \ %D%/packages/patches/x265-detect512-all-arches.patch \ - %D%/packages/patches/xapian-revert-5489fb2f8.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch\ %D%/packages/patches/xf86-video-geode-glibc-2.20.patch \ diff --git a/gnu/packages/patches/xapian-revert-5489fb2f8.patch b/gnu/packages/patches/xapian-revert-5489fb2f8.patch deleted file mode 100644 index 7b78e2a..000 --- a/gnu/packages/patches/xapian-revert-5489fb2f8.patch +++ /dev/null @@ -1,23 +0,0 @@ -Revert this upstream commit which breaks a test case in "notmuch": - -https://git.xapian.org/?p=xapian;a=commitdiff;h=5489fb2f838c0f0b0a593b4c17df282a93a1fe5a - -See the notmuch FAQ entry: - -https://notmuchmail.org/faq/#index12h2 - -This should be fixed for later releases. - -diff --git a/backends/glass/glass_postlist.cc b/xapian-core/backends/glass/glass_postlist.cc -index 80e578b85..a47f14a68 100644 a/backends/glass/glass_postlist.cc -+++ b/backends/glass/glass_postlist.cc -@@ -759,7 +759,7 @@ GlassPostList::open_nearby_postlist(const std::string & term_, - (void)need_pos; - if (term_.empty()) - RETURN(NULL); --if (!this_db.get() || this_db->postlist_table.is_modified()) -+if (!this_db.get() || this_db->postlist_table.is_writable()) - RETURN(NULL); - RETURN(new GlassPostList(this_db, term_, cursor->clone())); - } diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 284771a..8237d51 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -46,15 +46,14 @@ (define-public xapian (package (name "xapian") -(version "1.4.7") +(version "1.4.9") ;; Note: When updating Xapian, remember to update xapian-bindings below. (source (origin (method url-fetch) (uri (string-append "https://oligarchy.co.uk/xapian/; version "/xapian-core-" version ".tar.xz")) - (patches (search-patches "xapian-revert-5489fb2f8.patch")) (sha256 - (base32 "1lxmlds3v5s1gng9nk1rvmln1zcksrw5ds509y0glylwch5qmw0k" + (base32 "1k7m7m9jld96k16ansfw2w3c354pvd8ibhnrb6dw012g06fw7sfd" (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("util-linux" ,util-linux))) @@ -92,7 +91,7 @@ rich set of boolean query operators.") "/xapian-bindings-" version ".tar.xz")) (sha256 (base32 -"0sjf9ck3a6p7xnd84w09l6s0xn2g03k9a9417f4mjnywfq9pa6a5" +"0ll3z3418r7bzxs4kyini2cbci5xl8i5scl3wyx88s2v4ak56bcz" (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-python3")
02/13: gnu: libsoup: Update to 2.64.2.
mbakke pushed a commit to branch master in repository guix. commit 00815eea388b13a38ad0bef4dd9582da1b3208eb Author: Marius Bakke Date: Tue Oct 23 22:44:45 2018 +0200 gnu: libsoup: Update to 2.64.2. * gnu/packages/gnome.scm (libsoup): Update to 2.64.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 75551d0..4a118fe 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2459,7 +2459,7 @@ libxml to ease remote use of the RESTful API.") (define-public libsoup (package (name "libsoup") -(version "2.64.0") +(version "2.64.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -2467,7 +2467,7 @@ libxml to ease remote use of the RESTful API.") name "-" version ".tar.xz")) (sha256 (base32 -"09z7g3spww3f84y8jmicdd6lqp360mbggpg5h1fq1v4p5ihcjnyr" +"1il6lyrmfi0hfh3ysw8w1qzc1rdz0igkb7dv6d8g5mmilnac3pbm" (build-system gnu-build-system) (outputs '("out" "doc")) (arguments
branch master updated (288d248 -> 208e822)
mbakke pushed a change to branch master in repository guix. from 288d248 gnu: ruby-rack: Update to 2.0.6 [fixes CVE-2018-{16470,16471}]. new 0a56ffd gnu: mono: Update home page. new 00815ee gnu: libsoup: Update to 2.64.2. new 1966531 gnu: feh: Update to 2.28.1. new c5e5711 gnu: ffmpeg@3.4: Update to 3.4.5. new 64b60f3 gnu: ffmpeg: Update to 4.0.3. new 66044a3 gnu: glm: Update to 0.9.9.3. new 9c415f9 gnu: libgphoto2: Update to 2.5.20. new c98a7e6 gnu: i3-wm: Update to 4.16. new 039241b gnu: libgit2: Update to 0.26.8. new 876428d gnu: libmtp: Update to 1.1.16. new b5a8876 gnu: strace: Update to 4.25. new d79c814 gnu: libssh: Update to 0.7.7. new 208e822 gnu: xapian: Update to 1.4.9. The 13 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/gnome.scm | 4 ++-- gnu/packages/image-viewers.scm | 4 ++-- gnu/packages/libusb.scm| 4 ++-- gnu/packages/linux.scm | 4 ++-- gnu/packages/maths.scm | 4 ++-- gnu/packages/mono.scm | 2 +- gnu/packages/patches/xapian-revert-5489fb2f8.patch | 23 -- gnu/packages/photo.scm | 4 ++-- gnu/packages/search.scm| 7 +++ gnu/packages/ssh.scm | 4 ++-- gnu/packages/version-control.scm | 4 ++-- gnu/packages/video.scm | 8 gnu/packages/wm.scm| 4 ++-- 14 files changed, 26 insertions(+), 51 deletions(-) delete mode 100644 gnu/packages/patches/xapian-revert-5489fb2f8.patch
08/13: gnu: i3-wm: Update to 4.16.
mbakke pushed a commit to branch master in repository guix. commit c98a7e6b9167102e61646a102f6ee19ea58bd390 Author: Marius Bakke Date: Mon Nov 5 18:36:06 2018 +0100 gnu: i3-wm: Update to 4.16. * gnu/packages/wm.scm (i3-wm): Update to 4.16. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 68d497e..8322a62 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -180,14 +180,14 @@ commands would.") (define-public i3-wm (package (name "i3-wm") -(version "4.15") +(version "4.16") (source (origin (method url-fetch) (uri (string-append "https://i3wm.org/downloads/i3-; version ".tar.bz2")) (sha256 (base32 -"09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91" +"1d2mnryn7m9c6d69awd7lwzadliapd0ahi5n8d0ppqy533ssaq6c" (build-system gnu-build-system) (arguments `(#:make-flags
09/13: gnu: libgit2: Update to 0.26.8.
mbakke pushed a commit to branch master in repository guix. commit 039241bc96e92ecf79728bf351a2d84bb4152d4d Author: Marius Bakke Date: Mon Nov 5 19:18:42 2018 +0100 gnu: libgit2: Update to 0.26.8. * gnu/packages/version-control.scm (libgit2): Update to 0.26.8. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 632a43f..b9a2ff2 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -460,7 +460,7 @@ everything from small to very large projects with speed and efficiency.") (define-public libgit2 (package (name "libgit2") -(version "0.26.7") +(version "0.26.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/libgit2/libgit2/; @@ -468,7 +468,7 @@ everything from small to very large projects with speed and efficiency.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 -"1vy4dnbvhcq3pw8n8zz6clnsv2xnkrichl8k96w3lb6yyk0lln35")) +"15kp4sq72kh762bm7dgspyrk0a6siarvll3k7nrhs0xy77idf80g")) (patches (search-patches "libgit2-mtime-0.patch")) ;; Remove bundled software.
05/13: gnu: ffmpeg: Update to 4.0.3.
mbakke pushed a commit to branch master in repository guix. commit 64b60f38e720cf1c40a786e1d6991d6ae3a0ed04 Author: Marius Bakke Date: Mon Nov 5 18:28:51 2018 +0100 gnu: ffmpeg: Update to 4.0.3. * gnu/packages/video.scm (ffmpeg): Update to 4.0.3. --- 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 a2192cf..fee2cb7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -614,14 +614,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") -(version "4.0.2") +(version "4.0.3") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-; version ".tar.xz")) (sha256 (base32 - "15rgzcmdccy4flajs63gkz4n3k24wkkg50r13l1r83lrxg4hqp59" + "1vg229mxcrm415cq6q1nfm891hm4x56mb5p4cqjnlqnky7ikfg15" (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig)
10/13: gnu: libmtp: Update to 1.1.16.
mbakke pushed a commit to branch master in repository guix. commit 876428dd9806e2aba68ed7e299d004fb7ff964d7 Author: Marius Bakke Date: Mon Nov 5 19:23:27 2018 +0100 gnu: libmtp: Update to 1.1.16. * gnu/packages/libusb.scm (libmtp): Update to 1.1.16. --- gnu/packages/libusb.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index bcdc091..c43d0f9 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -303,14 +303,14 @@ wrapper for accessing libusb-1.0.") (define-public libmtp (package (name "libmtp") -(version "1.1.15") +(version "1.1.16") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libmtp/libmtp/" version "/libmtp-" version ".tar.gz")) (sha256 (base32 - "089h79nkz7wcr3lbqi7025l8p75hbp0aigxk3wdk2zkm8q5r0h6h" + "185vh9bds6dcy00ycggg69g4v7m3api40zv8vrcfb3fk3vfzjs2v" (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config)))
07/13: gnu: libgphoto2: Update to 2.5.20.
mbakke pushed a commit to branch master in repository guix. commit 9c415f96ec6bd3077e836da919708f9e04dc1569 Author: Marius Bakke Date: Mon Nov 5 18:34:05 2018 +0100 gnu: libgphoto2: Update to 2.5.20. * gnu/packages/photo.scm (libgphoto2): Update to 2.5.20. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5526c4f..1cd789b 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -131,14 +131,14 @@ data as produced by digital cameras.") (define-public libgphoto2 (package (name "libgphoto2") -(version "2.5.19") +(version "2.5.20") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 -"0qrcc6kajbfb237paxrl904vvwl7hd8mnqvjw00j6m5qwd93wlk2" +"03wbwsb4v7yay8g5ni7pzmkbrh7qnqx977bddjpxsp9f1qag03z1" (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs
04/13: gnu: ffmpeg@3.4: Update to 3.4.5.
mbakke pushed a commit to branch master in repository guix. commit c5e571100206fdd00db195acef723db7c721e1a6 Author: Marius Bakke Date: Mon Nov 5 18:28:29 2018 +0100 gnu: ffmpeg@3.4: Update to 3.4.5. * gnu/packages/video.scm (ffmpeg-3.4): Update to 3.4.5. --- 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 34af248..a2192cf 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -790,14 +790,14 @@ audio/video codec library.") (define-public ffmpeg-3.4 (package (inherit ffmpeg) -(version "3.4.4") +(version "3.4.5") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-; version ".tar.xz")) (sha256 (base32 - "1iizgnhjbhar9y1ykqlj1czqanlv24knkfq5vvfnppv5x00pcvrq")) + "0b59qk5wpc5ksiha76jbhb859g5gxa4w0k6afh3kgvgajiivs73l")) (define-public ffmpeg-2.8 (package
01/13: gnu: mono: Update home page.
mbakke pushed a commit to branch master in repository guix. commit 0a56ffdf1fd7a9169ed855c88a3d5907fa71447a Author: Marius Bakke Date: Tue Oct 23 01:20:18 2018 +0200 gnu: mono: Update home page. * gnu/packages/mono.scm (mono)[home-page]: Use HTTPS. --- gnu/packages/mono.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mono.scm b/gnu/packages/mono.scm index 343cebc..16c4f71 100644 --- a/gnu/packages/mono.scm +++ b/gnu/packages/mono.scm @@ -105,5 +105,5 @@ (description "Mono is a compiler, vm, debugger and set of libraries for C#, a C-style programming language from Microsoft that is very similar to Java.") -(home-page "http://mono-project.com/;) +(home-page "https://www.mono-project.com/;) (license license:x11)))
01/01: gnu: python-flake8: Update to 3.6.0.
mbakke pushed a commit to branch core-updates in repository guix. commit 545da9fd5f6c5b55f1bdc1f735ebdf6ba71495a5 Author: Marius Bakke Date: Wed Oct 24 16:34:23 2018 +0200 gnu: python-flake8: Update to 3.6.0. * gnu/packages/check.scm (python-hypothesis)[native-inputs]: Change PYTHON-FLAKE8 to PYTHON-FLAKE8-3.5. * gnu/packages/python.scm (python-flake8, python2-flake8): Rename to ... (python-flake8-3.5, python2-flake8-3.5): ... this. (python-flake8, python2-flake8): New public variables. --- gnu/packages/check.scm | 3 ++- gnu/packages/python.scm | 38 ++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 1ae6355..fc45c05 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1425,7 +1425,8 @@ normally the case.") "1rshs1japfmwgar98yrkq4hg4z2q76hlnq7w2n3lfbjnscn1jd9b" (build-system python-build-system) (native-inputs - `(("python-flake8" ,python-flake8) + `(;; FIXME: Change to python-flake8 in the next rebuild cycle. + ("python-flake8" ,python-flake8-3.5) ("python-pytest" ,python-pytest-bootstrap))) (propagated-inputs `(("python-attrs" ,python-attrs-bootstrap) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 59ef5c2..a0c4669 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5826,7 +5826,9 @@ complexity of Python source code.") (define-public python2-pyflakes-0.8.1 (package-with-python2 python-pyflakes-0.8.1)) -(define-public python-flake8 +;; This package is used by hypothesis which has thousands of dependent packages. +;; FIXME: Consolidate this with "python-flake8" below in the next rebuild cycle. +(define-public python-flake8-3.5 (package (name "python-flake8") (version "3.5.0") @@ -5872,17 +5874,45 @@ PEP8_PLUGIN('break_before_binary_operator'),")) "The modular source code checker: pep8, pyflakes and co") (description "Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.") -(properties `((python2-variant . ,(delay python2-flake8 +(properties `((python2-variant . ,(delay python2-flake8-3.5 (license license:expat))) -(define-public python2-flake8 - (let ((base (package-with-python2 (strip-python2-variant python-flake8 +(define-public python2-flake8-3.5 + (let ((base (package-with-python2 (strip-python2-variant python-flake8-3.5 (package (inherit base) (propagated-inputs `(("python2-configparser" ,python2-configparser) ("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs base)) +;; Version 3.5.0 has compatibility issues with Pyflakes 2.0, so we need +;; this newer version. Keep it as a separate variable for now to avoid +;; rebuilding "python-hypothesis"; this should be removed in the next +;; rebuild cycle. +(define-public python-flake8 + (package +(inherit python-flake8-3.5) +(version "3.6.0") +(source (origin + (method url-fetch) + (uri (pypi-uri "flake8" version)) + (sha256 + (base32 +"0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba" +(arguments + (substitute-keyword-arguments (package-arguments python-flake8-3.5) + ((#:phases phases) +`(modify-phases ,phases + (delete 'delete-broken-test) + (delete 'fix-problem-with-pycodestyle) +(properties `((python2-variant . ,(delay python2-flake8)) + +(define-public python2-flake8 + (let ((base (package-with-python2 (strip-python2-variant python-flake8 +(package (inherit base) + (propagated-inputs + (package-propagated-inputs python2-flake8-3.5) + ;; python-hacking requires flake8 <2.6.0. (define-public python-flake8-2.5 (package
branch core-updates updated (0c8e255 -> 545da9f)
mbakke pushed a change to branch core-updates in repository guix. from 0c8e255 gnu: python-attrs: Update to 18.2.0. new 545da9f gnu: python-flake8: Update to 3.6.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/check.scm | 3 ++- gnu/packages/python.scm | 38 ++ 2 files changed, 36 insertions(+), 5 deletions(-)
05/05: gnu: python-attrs: Update to 18.2.0.
mbakke pushed a commit to branch core-updates in repository guix. commit 0c8e255549760e83c4acf08747047449ec952113 Author: Marius Bakke Date: Tue Oct 23 16:56:57 2018 +0200 gnu: python-attrs: Update to 18.2.0. * gnu/packages/python.scm (python-attrs): Update to 18.2.0. [arguments]: New field. [native-inputs]: Add PYTHON-PYMPLER. (python-attrs-bootstrap): Stay on version 17.4.0. --- gnu/packages/python.scm | 32 ++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 42097b8..59ef5c2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11122,17 +11122,36 @@ and bit flag values.") (define-public python-attrs (package (name "python-attrs") -(version "17.4.0") +(version "18.2.0") (source (origin (method url-fetch) (uri (pypi-uri "attrs" version)) (sha256 (base32 -"1jafnn1kzd6qhxgprhx6y6ik1r5m2rilx25syzcmq03azp660y8w" +"0s9ydh058wmmf5v391pym877x4ahxg45dw6a0w4c7s5wgpigdjqh" (build-system python-build-system) +(arguments + `(#:modules ((guix build utils) + (guix build python-build-system) + (ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26)) + #:phases (modify-phases %standard-phases + (replace 'check +(lambda _ + (let ((cwd (getcwd))) +(setenv "PYTHONPATH" +(string-append + cwd "/build/" + (find (cut string-prefix? "lib" <>) + (scandir (string-append cwd "/build"))) + ":" + (getenv "PYTHONPATH"))) +(invoke "python" "-m" "pytest"))) (native-inputs `(("python-coverage" ,python-coverage) ("python-hypothesis" ,python-hypothesis) + ("python-pympler" ,python-pympler) ("python-pytest" ,python-pytest) ("python-six" ,python-six) ("python-sphinx" ,python-sphinx) @@ -11151,6 +11170,15 @@ protocols.") (package (inherit python-attrs) (name "python-attrs-bootstrap") +;; Keep this on a fixed version so python-attrs can be updated without +;; triggering a mass-rebuild. FIXME: Update this in the next rebuild cycle. +(version "17.4.0") +(source (origin + (method url-fetch) + (uri (pypi-uri "attrs" version)) + (sha256 + (base32 +"1jafnn1kzd6qhxgprhx6y6ik1r5m2rilx25syzcmq03azp660y8w" (native-inputs `()) (arguments `(#:tests? #f
04/05: gnu: Add python-pympler.
mbakke pushed a commit to branch core-updates in repository guix. commit 5176795d22860c18015e36b7a9d3b8729b6729f1 Author: Marius Bakke Date: Tue Jul 24 13:56:42 2018 +0200 gnu: Add python-pympler. * gnu/packages/python.scm (python-pympler, python2-pympler): New public variables. --- gnu/packages/python.scm | 36 1 file changed, 36 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 66d587c..42097b8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2177,6 +2177,42 @@ easier to build concurrent applications.") (define-public python2-pykka (package-with-python2 python-pykka)) +(define-public python-pympler + (package +(name "python-pympler") +(home-page "https://pythonhosted.org/Pympler/;) +(version "0.5") +(source (origin + (method url-fetch) + (uri (pypi-uri "Pympler" version)) + (sha256 + (base32 +"03qwsbilqgvnbl3a1jmpgixbr2kq6m3fvdlzyr3wdp01bwlc85kx" +(build-system python-build-system) +(arguments + `(#:phases (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'check +(lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "python" "setup.py" "test")) +(synopsis "Measure, monitor and analyze memory behavior") +(description + "Pympler is a development tool to measure, monitor and analyze +the memory behavior of Python objects in a running Python application. + +By pympling a Python application, detailed insight in the size and the +lifetime of Python objects can be obtained. Undesirable or unexpected +runtime behavior like memory bloat and other @samp{pymples} can easily +be identified. + +A web profiling frontend exposes process statistics, garbage +visualisation and class tracker statistics.") +(license license:asl2.0))) + +(define-public python2-pympler + (package-with-python2 python-pympler)) + (define-public python-itsdangerous (package (name "python-itsdangerous")
02/05: gnu: ganv: Use python2 for building.
mbakke pushed a commit to branch core-updates in repository guix. commit 22ce8b56f25b90b40ded1d29ea488d2f1336f24c Author: Marius Bakke Date: Tue Oct 23 01:32:47 2018 +0200 gnu: ganv: Use python2 for building. * gnu/packages/gtk.scm (ganv)[arguments]: Set #:python. --- gnu/packages/gtk.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cec1050..b553fa1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -304,6 +304,7 @@ functions which were removed.") (string-append "-Wl,-rpath=" (assoc-ref outputs "out") "/lib")) #t))) + #:python ,python-2 ;XXX: The bundled waf fails with Python 3.7.0. #:tests? #f)) ; no check target (inputs `(("gtk" ,gtk+-2)
03/05: gnu: suil: Use python2 for building.
mbakke pushed a commit to branch core-updates in repository guix. commit 78da6977c738824d730803cb918137d5fe6cbbce Author: Marius Bakke Date: Tue Oct 23 01:35:34 2018 +0200 gnu: suil: Use python2 for building. * gnu/packages/audio.scm (suil)[arguments]: Set #:python. --- gnu/packages/audio.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b664712..4185923 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2360,6 +2360,7 @@ the Turtle syntax.") (build-system waf-build-system) (arguments `(#:tests? #f ; no check target + #:python ,python-2 ;XXX: The bundled waf does not work with Python 3.7.0. #:configure-flags '("CXXFLAGS=-std=gnu++11"))) (inputs
branch core-updates updated (3a23036 -> 0c8e255)
mbakke pushed a change to branch core-updates in repository guix. from 3a23036 gnu: python-datrie: Fix FTBFS with Python 3.7. new 4cdbffd gnu: python-stem: Update to 1.7.0. new 22ce8b5 gnu: ganv: Use python2 for building. new 78da697 gnu: suil: Use python2 for building. new 5176795 gnu: Add python-pympler. new 0c8e255 gnu: python-attrs: Update to 18.2.0. 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/packages/audio.scm | 1 + gnu/packages/gtk.scm| 1 + gnu/packages/python.scm | 81 + 3 files changed, 71 insertions(+), 12 deletions(-)
01/05: gnu: python-stem: Update to 1.7.0.
mbakke pushed a commit to branch core-updates in repository guix. commit 4cdbffdc2fa5f90b7c0231d7d68de8f2d4a4dbed Author: Marius Bakke Date: Sun Oct 21 19:37:01 2018 +0200 gnu: python-stem: Update to 1.7.0. * gnu/packages/python.scm (python-stem): Update to 1.7.0. [arguments]: Remove obsolete phase. [native-inputs]: Change PYTHON-PEP8 to PYTHON-PYCODESTYLE. --- gnu/packages/python.scm | 13 +++-- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a1718c7..66d587c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9763,32 +9763,25 @@ etc.") (define-public python-stem (package (name "python-stem") -(version "1.6.0") +(version "1.7.0") (source (origin (method url-fetch) (uri (pypi-uri "stem" version)) (sha256 (base32 - "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp" + "1awiglfiajnx2hva9aqpj3fmdvdb4qg7cwnlfyih827m68y3cq8v" (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'fix-test-environment - (lambda _ - ;; Fixes: FileNotFoundError: [Errno 2] No such file or directory: - ;; '/tmp/guix-build-python-stem-1.6.0.drv-0/stem-1.6.0/.gitignore'. - (with-output-to-file ".gitignore" - (lambda _ (format #t "%"))) - #t)) (replace 'check (lambda _ (invoke "./run_tests.py" "--unit") #t) (native-inputs `(("python-mock" ,python-mock) - ("python-pep8" ,python-pep8) + ("python-pycodestyle" ,python-pycodestyle) ("python-pyflakes" ,python-pyflakes))) (home-page "https://stem.torproject.org/;) (synopsis