branch master updated: doc: Document Berlin's hard-reset procedure.
This is an automated email from the git hooks/post-receive script. nckx pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new c250626 doc: Document Berlin's hard-reset procedure. c250626 is described below commit c250626244f1f8a2aba36cb39440b26c67e01c53 Author: Tobias Geerinckx-Rice AuthorDate: Sun Nov 26 01:00:00 2023 +0100 doc: Document Berlin's hard-reset procedure. * doc/infra-handbook.org (Last resort: performing a hard reset of Berlin): New section. --- doc/infra-handbook.org | 8 1 file changed, 8 insertions(+) diff --git a/doc/infra-handbook.org b/doc/infra-handbook.org index a5e0a8f..b76275d 100644 --- a/doc/infra-handbook.org +++ b/doc/infra-handbook.org @@ -135,6 +135,14 @@ After having connected to the iDRAC interface, the serial console can be entered by typing the ~console com2~ command at the ~racadm>> ~ prompt. To exit, press ~C-\~. +** Last resort: performing a hard reset of Berlin + +If not even the serial console responds, it's time to use the same +~racadm>> ~ prompt to summon an invisible hand to press the reset +button for you, by typing ~serveraction hardreset~. + +Do this only if there is no other way to gracefully reboot the system. + ** Repairing a non-bootable Guix System via a PXE booted image One way to fix a non-bootable Guix System is to boot a different
branch master updated: website: posts: Add Dissecting Guix, Part 2: The Store Monad.
This is an automated email from the git hooks/post-receive script. nckx pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new a81137f website: posts: Add Dissecting Guix, Part 2: The Store Monad. a81137f is described below commit a81137f5c5eedc0c327e345285d40e84c68ed10b Author: ( via Guix-patches via AuthorDate: Thu Feb 16 17:00:15 2023 + website: posts: Add Dissecting Guix, Part 2: The Store Monad. * website/posts/dissecting-guix-2-store-monad.md: New blog post. Signed-off-by: Tobias Geerinckx-Rice --- website/posts/dissecting-guix-2-store-monad.md | 567 + 1 file changed, 567 insertions(+) diff --git a/website/posts/dissecting-guix-2-store-monad.md b/website/posts/dissecting-guix-2-store-monad.md new file mode 100644 index 000..cd48d3e --- /dev/null +++ b/website/posts/dissecting-guix-2-store-monad.md @@ -0,0 +1,567 @@ +title: Dissecting Guix, Part 2: The Store Monad +date: 2023-02-20 21:30 +author: ( +tags: Dissecting Guix, Functional package management, Programming interfaces, Scheme API +--- +Hello again! + +In [the last post](https://guix.gnu.org/en/blog/2023/dissecting-guix-part-1-derivations/), +we briefly mentioned the `with-store` and `run-with-store` macros. Today, we'll +be looking at those in further detail, along with the related monad library and +the [`%store-monad`](https://guix.gnu.org/manual/devel/en/html_node/The-Store-Monad.html)! + +Typically, we use monads to chain operations together, and the `%store-monad` is +no different; it's used to combine operations that work on the Guix store (for +instance, creating derivations, building derivations, or adding data files to +the store). + +However, monads are a little hard to explain, and from a distance, they seem to +be quite incomprehensible. So, I want you to erase them from your mind for now. +We'll come back to them later. And be aware that if you can't seem to get your +head around them, it's okay; you can understand most of the architecture of Guix +without understanding monads. + +# Yes, No, Maybe So + +Let's instead implement another M of functional programming, _`maybe`_ values, +representing a value that may or may not exist. For instance, there could be a +procedure that attempts to pop a stack, returning the result if there is one, or +`nothing` if the stack has no elements. + +`maybe` is a very common feature of statically-typed functional languages, and +you'll see it all over the place in Haskell and OCaml code. However, Guile is +dynamically typed, so we usually use ad-hoc `#f` values as the "null value" +instead of a proper "nothing" or "none". + +Just for fun, though, we'll implement a proper `maybe` in Guile. Fire up that +REPL once again, and let's import a bunch of modules that we'll need: + +```scheme +(use-modules (ice-9 match) + (srfi srfi-9)) +``` + +We'll implement `maybe` as a record with two fields, `is?` and `value`. If the +value contains something, `is?` will be `#t` and `value` will contain the thing +in question, and if it's empty, `is?`'ll be `#f`. + +```scheme +(define-record-type + (make-maybe is? value) + maybe? + (is? maybe-is?) + (value maybe-value)) +``` + +Now we'll define constructors for the two possible states: + +```scheme +(define (something value) + (make-maybe #t value)) + +(define (nothing) + (make-maybe #f #f)) ;the value here doesn't matter; we'll just use #f +``` + +And make some silly functions that return optional values: + +```scheme +(define (remove-a str) + (if (eq? (string-ref str 0) #\a) + (something (substring str 1)) + (nothing))) + +(define (remove-b str) + (if (eq? (string-ref str 0) #\b) + (something (substring str 1)) + (nothing))) + +(remove-a "ahh") +⇒ #< is?: #t value: "hh"> + +(remove-a "ooh") +⇒ #< is?: #f value: #f> + +(remove-b "bad") +⇒ #< is?: #t value: "ad"> +``` + +But what if we want to compose the results of these functions? + +# Keeping Your Composure + +As you might have guessed, this is not fun. Cosplaying as a compiler backend +typically isn't. + +```scheme +(let ((t1 (remove-a "abcd"))) + (if (maybe-is? t1) + (remove-b (maybe-value t1)) + (nothing))) +⇒ #< is?: #t value: "cd"> + +(let ((t1 (remove-a "bbcd"))) + (if (maybe-is? t1) + (remove-b (maybe-value t1)) + (nothing))) +⇒ #< is?: #f value: #f> +``` + +I can almost hear the heckling. Even worse, composing three: + +```scheme +(let* ((t1 (remove-a "abad")) + (t2 (if (maybe-is? t1) + (remove-b (maybe-value t1)) + (nothing + (if (maybe-is? t2) + (remove-a (maybe-value t2)) + (nothing))) +⇒ #< is?: #t value: "d"> +``` + +So, how do we go about making this more bear
branch master updated: website: Use ftpmirror.gnu.org.
This is an automated email from the git hooks/post-receive script. nckx pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new d93973e website: Use ftpmirror.gnu.org. d93973e is described below commit d93973e6689127feb9e1c364c747cbca54c9c6f9 Author: Tobias Geerinckx-Rice AuthorDate: Sun Dec 18 01:00:00 2022 +0100 website: Use ftpmirror.gnu.org. This is a nice and recommended way to reduce load on ftp.gnu.org. See <https://www.gnu.org/server/mirror.en.html>. Suggested by a dark stranger, to lechner in #guix. * website/apps/download/data.scm (system-downloads): Substitute ftpmirror.gnu.org for ftp.gnu.org. * website/apps/download/templates/download.scm (download-t): Likewise. * website/posts/gnu-guix-1.3.0-released.md (Try it!): Likewise. --- website/apps/download/data.scm | 8 website/apps/download/templates/download.scm | 4 ++-- website/apps/download/types.scm | 2 +- website/posts/gnu-guix-1.3.0-released.md | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/website/apps/download/data.scm b/website/apps/download/data.scm index 2e54bb4..0522b42 100644 --- a/website/apps/download/data.scm +++ b/website/apps/download/data.scm @@ -23,7 +23,7 @@ `(div ,(G_ `(p "USB/DVD ISO installer of the standalone Guix System."))) #:image (guix-url "static/base/img/GuixSD-package.png") -#:base-url (string-append "https://ftp.gnu.org/gnu/guix/guix-system-install-; +#:base-url (string-append "https://ftpmirror.gnu.org/gnu/guix/guix-system-install-; (latest-guix-version) ".") #:variants (list (variant "x86_64" "x86_64-linux.iso") (variant "i686" "i686-linux.iso")) @@ -39,7 +39,7 @@ `(div ,(G_ `(p "QCOW2 virtual machine (VM) image."))) #:image (guix-url "static/base/img/QEMU-package.png") -#:base-url (string-append "https://ftp.gnu.org/gnu/guix/guix-system-vm-image-; +#:base-url (string-append "https://ftpmirror.gnu.org/gnu/guix/guix-system-vm-image-; (latest-guix-version) ".") #:variants (list (variant "x86_64" "x86_64-linux.qcow2")) ;; TRANSLATORS: Running Guix in a VM is a section name in the @@ -56,7 +56,7 @@ "Self-contained tarball providing binaries for Guix and its dependencies, to be installed on top of your Linux-based system.")) #:image (guix-url "static/base/img/Guix-package.png") -#:base-url (string-append "https://ftp.gnu.org/gnu/guix/guix-binary-; +#:base-url (string-append "https://ftpmirror.gnu.org/gnu/guix/guix-binary-; (latest-guix-version) ".") #:variants (list (variant "x86_64" "x86_64-linux.tar.xz") (variant "i686" "i686-linux.tar.xz") @@ -73,7 +73,7 @@ (string-append "GNU Guix " (latest-guix-version) " Source")) #:description (G_ '(p "Source code distribution.")) #:image (guix-url "static/base/img/src-package.png") -#:base-url (string-append "https://ftp.gnu.org/gnu/guix/guix-; +#:base-url (string-append "https://ftpmirror.gnu.org/gnu/guix/guix-; (latest-guix-version) ".") #:variants (list (variant "tarball" "tar.gz")) ;; TRANSLATORS: Requirements is a section name in the English (en) diff --git a/website/apps/download/templates/download.scm b/website/apps/download/templates/download.scm index bcf3cd2..4ee8e3b 100644 --- a/website/apps/download/templates/download.scm +++ b/website/apps/download/templates/download.scm @@ -76,8 +76,8 @@ Package manager") #\|) (@ (class "centered-block limit-width")) "Source code and binaries for the Guix System distribution ISO image as well as GNU Guix can be found on the GNU servers at " - (a (@ (href "https://ftp.gnu.org/gnu/guix/;)) - "https://ftp.gnu.org/gnu/guix/;) + (a (@ (href "https://ftpmirror.gnu.org/gnu/guix/;)) + "https://ftpmirror.gnu.org/gnu/guix/;) ". Older releases can still be found on " (a (@ (href "https://alpha.gnu.org/gnu/guix/;)) "alpha.gnu.org") ".")) diff --git a/website/apps/download/types.scm b/website/apps/download/types.scm index 6d43a95..ba79b05 100644 --- a/website/apps/download/types.scm +++ b/website/apps/download/types.scm @@ -49,7 +49,7 @@ ;;; base-url (string) ;;; The base URL where all the variants of the download can be ;;; found. For
branch master updated: berlin: Disable Mumi mailer.
This is an automated email from the git hooks/post-receive script. nckx pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new ebb4773 berlin: Disable Mumi mailer. ebb4773 is described below commit ebb47732647b2661f95ee7bae70252a36071fbaa Author: Tobias Geerinckx-Rice AuthorDate: Sun Nov 27 01:00:00 2022 +0100 berlin: Disable Mumi mailer. * hydra/berlin.scm (operating-system): Disable the MAILER? of the MUMI-SERVICE-TYPE. --- hydra/berlin.scm | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hydra/berlin.scm b/hydra/berlin.scm index dd8a2eb..35b9c71 100644 --- a/hydra/berlin.scm +++ b/hydra/berlin.scm @@ -458,10 +458,10 @@ at MOUNT-POINT." (service mumi-service-type (mumi-configuration - ;; The mailer used to break: - ;; <https://issues.guix.gnu.org/49295>. This is - ;; solved, but do check once in a while. - (mailer? #t) + ;; The mailer is broken again. No pretty bug report + ;; like <https://issues.guix.gnu.org/49295>, but it's + ;; broken. + (mailer? #f) (sender "issues.guix.gnu@elephly.net") (smtp "sendmail:///var/mumi/mumi-mailer"))) ;; For the Mumi mailer queue
branch master updated: hydra: Add sjd-p9 signing key.
This is an automated email from the git hooks/post-receive script. nckx pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new 94aeb73 hydra: Add sjd-p9 signing key. 94aeb73 is described below commit 94aeb735c0c781e932ad8b6ec07f649747f6cdbd Author: Tobias Geerinckx-Rice AuthorDate: Sun Nov 13 01:00:00 2022 +0100 hydra: Add sjd-p9 signing key. * hydra/keys/guix/berlin/sjd-p9.sjd.se.pub: New file. --- hydra/keys/guix/berlin/sjd-p9.sjd.se.pub | 6 ++ 1 file changed, 6 insertions(+) diff --git a/hydra/keys/guix/berlin/sjd-p9.sjd.se.pub b/hydra/keys/guix/berlin/sjd-p9.sjd.se.pub new file mode 100644 index 000..1123bae --- /dev/null +++ b/hydra/keys/guix/berlin/sjd-p9.sjd.se.pub @@ -0,0 +1,6 @@ +(public-key + (ecc + (curve Ed25519) + (q #C22723CD90E7872D837D74352FF3AEC69157F93AF89C21BB2AE4E97FD22B6807#) + ) + ) \ No newline at end of file
[no subject]
branch: master
commit d0369fc72967110de1dfb925a781ccc1b14bdbce
Author: Tobias Geerinckx-Rice
AuthorDate: Sun Sep 25 02:00:00 2022 +0200
cuirass.js: Increase Dashboard colour contrast
---
src/static/js/cuirass.js | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/static/js/cuirass.js b/src/static/js/cuirass.js
index 0a4829c..f20a809 100644
--- a/src/static/js/cuirass.js
+++ b/src/static/js/cuirass.js
@@ -116,15 +116,17 @@ $(document).ready(function() {
return 5;
}
+ /* FIXME-someday: these should be CSS classes, so users can
+ feasibly customise them. */
function color(status) {
switch (status) {
case -3:
case -2:
-return 'gray';
+return 'transparent';
case -1:
return 'orange';
case 0:
-return 'green';
+return '#9f9'; /* high contrast with others */
case 1:
case 2:
case 3:
[no subject]
branch: master commit 4745c81875a86def20904ca2bd69732360d27b36 Author: Tobias Geerinckx-Rice AuthorDate: Sun Oct 23 02:00:00 2022 +0200 templates: Warn of the perils of stateful changes. * src/cuirass/templates.scm (specification-edit): Add a warning explaining that such changes might be overwritten. --- src/cuirass/templates.scm | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cuirass/templates.scm b/src/cuirass/templates.scm index f732a1e..6ec2f02 100644 --- a/src/cuirass/templates.scm +++ b/src/cuirass/templates.scm @@ -666,11 +666,13 @@ the existing SPEC otherwise." ,system))) %cuirass-supported-systems)) (div (@ (class "form-group row")) - (div (@ (class "col-sm-4")) + (div (@ (class "col-sm-2")) (button (@ (type "submit") (class "btn btn-primary")) - " Submit"))) + " Submit")) +(div (@ (class "col-sm-10 text-warning")) + "Declarative configuration updates may overwrite these settings!")) (define (build-details build dependencies products history) "Return HTML showing details for the BUILD."
master updated (f087aaf -> 4745c81)
nckx pushed a change to branch master. from f087aaf evaluate: Explicitly close inferiors no longer used. new d0369fc cuirass.js: Increase Dashboard colour contrast new 01c9398 Fix typo in cuirass-remote-worker.service's description. new 4745c81 templates: Warn of the perils of stateful changes. Summary of changes: etc/cuirass-remote-worker.service.in | 5 +++-- src/cuirass/templates.scm| 6 -- src/static/js/cuirass.js | 6 -- 3 files changed, 11 insertions(+), 6 deletions(-)
[no subject]
branch: master commit 01c93982253001f08687f00bf7457d46337a7a82 Author: Tobias Geerinckx-Rice AuthorDate: Sun Oct 23 02:00:00 2022 +0200 Fix typo in cuirass-remote-worker.service's description. …and add a note about customisation to the header comment. etc/cuirass-remote-worker.service.in (Description): ‘remmote’ → ‘remote’. --- etc/cuirass-remote-worker.service.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/cuirass-remote-worker.service.in b/etc/cuirass-remote-worker.service.in index 2c334d7..5962566 100644 --- a/etc/cuirass-remote-worker.service.in +++ b/etc/cuirass-remote-worker.service.in @@ -1,9 +1,10 @@ # This is a "service unit file" for the systemd init system to launch # 'cuirass remote-worker'. Drop it in /etc/systemd/system or similar -# to have 'cuirass remote-worker' automatically started. +# to have 'cuirass remote-worker' automatically started. Adjust the +# --workers= and --server= parameters to suit your set-up. [Unit] -Description=Continuous integration remmote worker for GNU Guix +Description=Continuous integration remote worker for GNU Guix [Service] ExecStart=@guix_localstatedir@/guix/profiles/per-user/root/guix-profile/bin/cuirass \
branch master updated: hydra: Add some more POWER.
This is an automated email from the git hooks/post-receive script.
nckx pushed a commit to branch master
in repository maintenance.
The following commit(s) were added to refs/heads/master by this push:
new 936ef08 hydra: Add some more POWER.
936ef08 is described below
commit 936ef08fd3f34be9feb2b22714a0eeb73cfd0210
Author: Tobias Geerinckx-Rice
AuthorDate: Tue Oct 25 12:34:37 2022 +0200
hydra: Add some more POWER.
This machine will show up as guix-ppc64le in /workers until the local
hostname is updated to match.
* doc/cuirass.org (External machines): Add sjd-p9.
* hydra/berlin.scm (services): Add it to wireguard-service-type.
* hydra/machines-for-berlin.scm (powerpc64le): Use it \o/.
---
doc/cuirass.org | 1 +
hydra/berlin.scm | 6 +-
hydra/machines-for-berlin.scm | 14 --
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/doc/cuirass.org b/doc/cuirass.org
index 8ef696e..af65c62 100644
--- a/doc/cuirass.org
+++ b/doc/cuirass.org
@@ -27,6 +27,7 @@ network. The next section describes how to add a new external
machine.
| grunewald | 10.0.0.10 | Ricardo Wurmus|
| bayfront | 10.0.0.11 | Andreas Enge |
| jade | 10.0.0.12 | Chris Marusich|
+| sjd-p9 | 10.0.0.13 | Simon Josefsson |
* Connect an external machine
diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 85cccf5..d36b270 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -490,7 +490,11 @@ at MOUNT-POINT."
(wireguard-peer
(name "jade")
(public-key
"FEFR3NX+DfkrsTHpgECvzW/M/0D8V4bVtCEEzQ5naww=")
- (allowed-ips '("10.0.0.12/32")))
+ (allowed-ips '("10.0.0.12/32")))
+(wireguard-peer
+ (name "sjd-p9")
+ (public-key
"JESZIT1RikNQ+xM1a18pXGvZQoZ3vmVkNA+w/qx1Bzs=")
+ (allowed-ips '("10.0.0.13/32")))
(append
(map anonip-service %anonip-log-files)
diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm
index a9b22ae..043a030 100644
--- a/hydra/machines-for-berlin.scm
+++ b/hydra/machines-for-berlin.scm
@@ -298,12 +298,22 @@
(define powerpc64le
(list
- ;; A VM donated/hosted by OSUOSL & administered by nckx.
+ ;; guixp9 - A VM donated/hosted by OSUOSL & administered by nckx.
+ ;; 8 POWER9 2.2 (pvr 004e 1202) cores, 16 GiB RAM, 160 GB storage.
(build-machine
(name "10.0.0.7")
(user "hydra")
(systems '("powerpc64le-linux"))
-(host-key "ssh-ed25519
C3NzaC1lZDI1NTE5IJEbRxJ6WqnNLYEMNDUKFcdMtyZ9V/6oEfBFSHY8xE6A nckx"
+(host-key "ssh-ed25519
C3NzaC1lZDI1NTE5IJEbRxJ6WqnNLYEMNDUKFcdMtyZ9V/6oEfBFSHY8xE6A nckx"))
+ ;; sjd-p9 - A VM donated/hosted by Simon Joseffson, but blame nckx for any
problems.
+ ;; 32 POWER9 2.3 (pvr 004e 1203) cores, 64 GiB RAM, 16 GB / + 256 GB /gnu
storage.
+ (build-machine
+(parallel-builds 16)
+(speed 4.0)
+(name "10.0.0.13")
+(user "hydra")
+(systems '("powerpc64le-linux"))
+(host-key "ssh-ed25519
C3NzaC1lZDI1NTE5IMUkktI2HAycb4nqWwVBn5OCe5dyF4pbjqvyPTICz/9A nckx"
(define build-machine-name
(@@ (guix scripts offload) build-machine-name))
03/04: goggles: Use a premade LINKIFY-REGEXP.
nckx pushed a commit to branch master
in repository maintenance.
commit 8af3dea7db1a29610edaec161c1b865e0bc45721
Author: Tobias Geerinckx-Rice
AuthorDate: Sun Sep 25 02:00:02 2022 +0200
goggles: Use a premade LINKIFY-REGEXP.
* hydra/goggles.scm (linkify-regexp): New variable.
(make-line-renderer): Use it.
---
hydra/goggles.scm | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hydra/goggles.scm b/hydra/goggles.scm
index 549782f..685b33a 100755
--- a/hydra/goggles.scm
+++ b/hydra/goggles.scm
@@ -300,6 +300,9 @@ ul {
(define (directory? filename)
(string=? filename (dirname filename)))
+(define linkify-regexp
+ (make-regexp "https?://.+" regexp/icase))
+
(define (make-line-renderer lines)
"Return a procedure that converts a line into an SXML
representation highlighting certain parts."
@@ -334,7 +337,7 @@ representation highlighting certain parts."
(span (@ (class "message"))
,@(reverse (fold (lambda (chunk acc)
(cond
- ((string-match "https?://.+" chunk)
+ ((regexp-exec linkify-regexp chunk)
(cons* " "
`(a (@ (rel "nofollow")
(href ,chunk)) ,chunk)
01/04: goggles: Set rel="nofollow" on links.
nckx pushed a commit to branch master in repository maintenance. commit ade94305e483bf1d1133670e9bc2a9ddb98e76b1 Author: Tobias Geerinckx-Rice AuthorDate: Sun Sep 25 02:00:02 2022 +0200 goggles: Set rel="nofollow" on links. * hydra/goggles.scm (make-line-renderer): Add rel="nofollow" to A elements. --- hydra/goggles.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hydra/goggles.scm b/hydra/goggles.scm index 5133506..dcc63eb 100755 --- a/hydra/goggles.scm +++ b/hydra/goggles.scm @@ -5,6 +5,7 @@ ;; Copyright © 2019, 2020, 2021 Ricardo Wurmus ;; Copyright © 2020 Ludovic Courtès ;; Copyright © 2020 Andreas Enge +;; Copyright © 2022 Tobias Geerinckx-Rice ;; Released under the GNU GPLv3 or any later version. (use-modules (web http) @@ -335,7 +336,8 @@ representation highlighting certain parts." (cond ((string-match "http.?://.+" chunk) (cons* " " - `(a (@ (href ,chunk)) ,chunk) + `(a (@ (rel "nofollow") + (href ,chunk)) ,chunk) " " acc)) (else
branch master updated (5372ed0 -> 2cae951)
nckx pushed a change to branch master in repository maintenance. from 5372ed0 hydra: bayfront: Allow clients to cache hpc.guix.info/static. new ade9430 goggles: Set rel="nofollow" on links. new 853f47e goggles: Tighten protocol regexp. new 8af3dea goggles: Use a premade LINKIFY-REGEXP. new 2cae951 goggles: Linkify only the matching URL substring. The 4 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/goggles.scm | 41 + 1 file changed, 29 insertions(+), 12 deletions(-)
02/04: goggles: Tighten protocol regexp.
nckx pushed a commit to branch master in repository maintenance. commit 853f47e678c39a3e680a77a87f04a0c81470b3b7 Author: Tobias Geerinckx-Rice AuthorDate: Sun Sep 25 02:00:00 2022 +0200 goggles: Tighten protocol regexp. Even if Goog^Wthe W3C decides to add ‘httpx:’ tomorrow, it's just if not more likely to be called XTTP. * hydra/goggles.scm (make-line-renderer): Match https? explicitly. --- hydra/goggles.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hydra/goggles.scm b/hydra/goggles.scm index dcc63eb..549782f 100755 --- a/hydra/goggles.scm +++ b/hydra/goggles.scm @@ -334,7 +334,7 @@ representation highlighting certain parts." (span (@ (class "message")) ,@(reverse (fold (lambda (chunk acc) (cond - ((string-match "http.?://.+" chunk) + ((string-match "https?://.+" chunk) (cons* " " `(a (@ (rel "nofollow") (href ,chunk)) ,chunk)
04/04: goggles: Linkify only the matching URL substring.
nckx pushed a commit to branch master
in repository maintenance.
commit 2cae951f3fd2fe7f4bb678781e7928428719cae7
Author: Tobias Geerinckx-Rice
AuthorDate: Sun Sep 25 02:00:01 2022 +0200
goggles: Linkify only the matching URL substring.
* hydra/goggles.scm (linkify-regexp): Exclude common ‘separators’.
(make-line-renderer): Render MATCH:PREFIX and MATCH:SUFFIX as plain text.
---
hydra/goggles.scm | 40 ++--
1 file changed, 26 insertions(+), 14 deletions(-)
diff --git a/hydra/goggles.scm b/hydra/goggles.scm
index 685b33a..502e8ff 100755
--- a/hydra/goggles.scm
+++ b/hydra/goggles.scm
@@ -301,7 +301,12 @@ ul {
(string=? filename (dirname filename)))
(define linkify-regexp
- (make-regexp "https?://.+" regexp/icase))
+ ;; Rather than attempt to write a ‘valid URL regexp’, the first few
+ ;; on-line examples of which looked suspect, exclude a few characters
+ ;; commonly observed in practice, e.g.:
+ ;; Guix is great! (source: <https://guix.gnu.org>)
+ ;; XXX This and the regexp-exec code below assume max. 1 URL per token. OK?
+ (make-regexp "https?://[^][><)('\",]+" regexp/icase))
(define (make-line-renderer lines)
"Return a procedure that converts a line into an SXML
@@ -336,19 +341,26 @@ representation highlighting certain parts."
,nick))
(span (@ (class "message"))
,@(reverse (fold (lambda (chunk acc)
- (cond
- ((regexp-exec linkify-regexp chunk)
-(cons* " "
- `(a (@ (rel "nofollow")
- (href ,chunk)) ,chunk)
- " "
- acc))
- (else
-(match acc
- (((? string? s) . rest)
- (cons (string-append s " " chunk)
(cdr acc)))
- (_ (cons chunk acc)) '()
- rest
+ (let* ((m (regexp-exec linkify-regexp
+ chunk)))
+(cond
+ ((regexp-match? m)
+ (let ((url (match:substring m)))
+(cons* " "
+ (match:suffix m)
+ `(a (@ (rel "nofollow")
+ (href ,url))
+ ,url)
+ (match:prefix m)
+ " "
+ acc)))
+ (else
+ (match acc
+(((? string? s) . rest)
+ (cons (string-append s " " chunk)
+ (cdr acc)))
+(_ (cons chunk acc)))
+'() rest
(define (render-log channel root path)
;; PATH is a list of path components
branch master updated: berlin: Migrate /var/cache to SAN storage.
This is an automated email from the git hooks/post-receive script. nckx pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new 4c0d474 berlin: Migrate /var/cache to SAN storage. 4c0d474 is described below commit 4c0d474645aa338dcf17da1060adb69ded526ffc Author: Tobias Geerinckx-Rice AuthorDate: Sun Aug 21 02:00:00 2022 +0200 berlin: Migrate /var/cache to SAN storage. * hydra/berlin.scm (file-systems): Mount the @cache subvolume from %btrfs-san-uuid instead of from %btrfs-ssd-uuid. --- hydra/berlin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hydra/berlin.scm b/hydra/berlin.scm index 1babce2..f9489cf 100644 --- a/hydra/berlin.scm +++ b/hydra/berlin.scm @@ -262,9 +262,9 @@ at MOUNT-POINT." (type "vfat")) (btrfs-subvolume-mount %btrfs-san-uuid "@root" "/") + (btrfs-subvolume-mount %btrfs-san-uuid "@cache" "/var/cache") (btrfs-subvolume-mount %btrfs-ssd-uuid "@home" "/home") - (btrfs-subvolume-mount %btrfs-ssd-uuid "@cache" "/var/cache") ;; For convenience. %btrfs-pool-san
branch master updated (df39e9c -> 4c7f2ce)
nckx pushed a change to branch master in repository guix-artwork. from df39e9c website: packages: Correctly deal with unusual origin patches. new 6a16799 website: cuirass: Avoid poor-practice ‘here’ link. new 4c7f2ce website: Replace legacy git:// links with https:// ones. 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/apps/base/templates/contribute.scm | 2 +- website/apps/base/templates/cuirass.scm| 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
02/02: website: Replace legacy git:// links with https:// ones.
nckx pushed a commit to branch master in repository guix-artwork. commit 4c7f2ce6428a63e202cd2a9474a06f68a946934d Author: Tobias Geerinckx-Rice AuthorDate: Sun Jul 17 02:00:00 2022 +0200 website: Replace legacy git:// links with https:// ones. * website/apps/base/templates/contribute.scm (contribute-t): Update cgit link text. * website/apps/base/templates/cuirass.scm (cuirass-t): Likewise. --- website/apps/base/templates/contribute.scm | 2 +- website/apps/base/templates/cuirass.scm| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/apps/base/templates/contribute.scm b/website/apps/base/templates/contribute.scm index f75c0c7..9b7987c 100644 --- a/website/apps/base/templates/contribute.scm +++ b/website/apps/base/templates/contribute.scm @@ -306,5 +306,5 @@ Translation|I18N|L10N|Artwork") #\|) auxiliary information useful to hackers and maintainers is available at " (a (@ (href "//git.savannah.gnu.org/cgit/guix/maintenance.git")) - "git://git.sv.gnu.org/guix/maintenance.git") + "https://git.sv.gnu.org/git/guix/maintenance.git;) ".")) diff --git a/website/apps/base/templates/cuirass.scm b/website/apps/base/templates/cuirass.scm index a5b8d4c..50ca348 100644 --- a/website/apps/base/templates/cuirass.scm +++ b/website/apps/base/templates/cuirass.scm @@ -85,6 +85,6 @@ to monitor the build results.")) ,(G_ `(h3 "Project repository")) ,(G_ `(p "Cuirass source code is hosted at " ,(G_ `(a (@ (href "//git.savannah.gnu.org/cgit/guix/guix-cuirass.git")) -"git://git.sv.gnu.org/guix/guix-cuirass.git")) +"https://git.sv.gnu.org/git/guix/guix-cuirass.git;)) "."))
01/02: website: cuirass: Avoid poor-practice ‘here’ link.
nckx pushed a commit to branch master in repository guix-artwork. commit 6a16799093b4752f25bf9d12f85e0e539542904b Author: Tobias Geerinckx-Rice AuthorDate: Sun Jul 17 02:00:00 2022 +0200 website: cuirass: Avoid poor-practice ‘here’ link. * website/apps/base/templates/cuirass.scm (cuirass-t): Provide a meaningful link text. --- website/apps/base/templates/cuirass.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/apps/base/templates/cuirass.scm b/website/apps/base/templates/cuirass.scm index 082c112..a5b8d4c 100644 --- a/website/apps/base/templates/cuirass.scm +++ b/website/apps/base/templates/cuirass.scm @@ -55,10 +55,10 @@ to monitor the build results.")) "Guile-Fibers")) " asynchronous library."))) ,(G_ `(h3 "Documentation")) - ,(G_ `(p "Cuirass documentation is accessible " + ,(G_ `(p "Learn more about Cuirass from the " ,(G_ `(a (@ (href ,(guix-url "cuirass/manual/" #:localize #f))) -"here")) +"Cuirass manual")) ".")) ,(G_ `(h3 "Releases")) (ul
branch master updated: badges: Add GNU Guix "Packaged".
This is an automated email from the git hooks/post-receive script. nckx pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new e53033e badges: Add GNU Guix "Packaged". e53033e is described below commit e53033ebdff0308eff0830760a70497527b10443 Author: Luis Felipe AuthorDate: Fri Jul 15 08:05:16 2022 -0500 badges: Add GNU Guix "Packaged". This is a badge people can use in their websites to indicate that their software is packaged for Guix. It is about the same size of common badges used in source management hubs, and it's designed to work on light and dark themes. * badges/gnu-guix-packaged.svg: New badge. Signed-off-by: Tobias Geerinckx-Rice --- badges/gnu-guix-packaged.svg | 257 +++ 1 file changed, 257 insertions(+) diff --git a/badges/gnu-guix-packaged.svg b/badges/gnu-guix-packaged.svg new file mode 100644 index 000..d216a05 --- /dev/null +++ b/badges/gnu-guix-packaged.svg @@ -0,0 +1,257 @@ + +http://www.inkscape.org/namespaces/inkscape; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:xlink="http://www.w3.org/1999/xlink; + xmlns="http://www.w3.org/2000/svg; + xmlns:svg="http://www.w3.org/2000/svg; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:cc="http://creativecommons.org/ns#; + xmlns:dc="http://purl.org/dc/elements/1.1/;> + GNU Guix Packaged Badge + + + + + + + + + + + + + + + + + + + + + + +GNU Guix Packaged Badge +http://creativecommons.org/licenses/by-sa/4.0/; /> + + +Luis Felipe López Acevedo + + +2022-07-14 + + http://creativecommons.org/licenses/by-sa/4.0/;> +http://creativecommons.org/ns#Reproduction; /> +http://creativecommons.org/ns#Distribution; /> +http://creativecommons.org/ns#Notice; /> +http://creativecommons.org/ns#Attribution; /> +http://creativecommons.org/ns#DerivativeWorks; /> +http://creativecommons.org/ns#ShareAlike; /> + + + + + 40% + + + + +GNU Guix + + +Packaged +Packaged +GNU Guix + + + +
02/02: talks: Add INRAE workshop 2022.
nckx pushed a commit to branch master in repository maintenance. commit 70d972ea83778990f1c0f1701d6a6dada242c2b7 Author: zimoun AuthorDate: Mon Jun 20 05:54:28 2022 +0200 talks: Add INRAE workshop 2022. * talks/fcc-inrae-2022: New directory. Signed-off-by: Tobias Geerinckx-Rice --- talks/fcc-inrae-2022/README| 12 + talks/fcc-inrae-2022/channels.scm |6 + talks/fcc-inrae-2022/do-pres.sh|6 + talks/fcc-inrae-2022/example/config-vm-1.scm | 22 + talks/fcc-inrae-2022/example/config-vm-2.scm | 13 + .../example/mock-define-pkg-source.scm |7 + talks/fcc-inrae-2022/example/mock-define-pkg.scm |7 + .../fcc-inrae-2022/example/mock-define-python.scm |9 + talks/fcc-inrae-2022/example/some-python-bis.scm | 11 + .../example/some-python-with-gcc7.scm | 13 + talks/fcc-inrae-2022/example/some-python.scm |6 + talks/fcc-inrae-2022/listings-scheme.tex | 97 + talks/fcc-inrae-2022/manifest.scm | 26 + talks/fcc-inrae-2022/pres.tex | 2048 talks/fcc-inrae-2022/static/Guix-white.pdf | Bin 0 -> 8483 bytes talks/fcc-inrae-2022/static/all-abs-hist.png | Bin 0 -> 95158 bytes talks/fcc-inrae-2022/static/cafe-guix.png | Bin 0 -> 17311 bytes talks/fcc-inrae-2022/static/graph-python.png | Bin 0 -> 479843 bytes talks/fcc-inrae-2022/static/graph.png | Bin 0 -> 106012 bytes .../static/guixhpc-logo-transparent-white.pdf | Bin 0 -> 8808 bytes talks/fcc-inrae-2022/static/u-paris.png| Bin 0 -> 7104 bytes talks/fcc-inrae-2022/talk.20220621.pdf | Bin 0 -> 1352403 bytes 22 files changed, 2283 insertions(+) diff --git a/talks/fcc-inrae-2022/README b/talks/fcc-inrae-2022/README new file mode 100644 index 000..c31e18e --- /dev/null +++ b/talks/fcc-inrae-2022/README @@ -0,0 +1,12 @@ +# -*- mode: org -*- + +Reprodutibilité, une solution avec Guix + +Git: https://gitlab.com/zimoun/fcc-inrae +SWH: https://archive.softwareheritage.org/swh:1:rev:984f0c79907d5cd25afac968d4fb377e03cb + +#+begin_src bash + guix time-machine -C channels.scm \ + -- shell -m manifest.scm \ + -- rubber --pdf pres.pdf +#+end_src diff --git a/talks/fcc-inrae-2022/channels.scm b/talks/fcc-inrae-2022/channels.scm new file mode 100644 index 000..7df15c6 --- /dev/null +++ b/talks/fcc-inrae-2022/channels.scm @@ -0,0 +1,6 @@ +(list (channel +(name 'guix) +(url "https://git.savannah.gnu.org/git/guix.git;) +(branch "master") +(commit + "791069737c8c51582cc021438dae32eb0fb7b8e0"))) diff --git a/talks/fcc-inrae-2022/do-pres.sh b/talks/fcc-inrae-2022/do-pres.sh new file mode 100755 index 000..abe824b --- /dev/null +++ b/talks/fcc-inrae-2022/do-pres.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + + +guix time-machine -C channels.scm \ + -- shell -m manifest.scm \ + -- rubber --pdf pres.tex diff --git a/talks/fcc-inrae-2022/example/config-vm-1.scm b/talks/fcc-inrae-2022/example/config-vm-1.scm new file mode 100644 index 000..0e0b8d3 --- /dev/null +++ b/talks/fcc-inrae-2022/example/config-vm-1.scm @@ -0,0 +1,22 @@ +(use-modules (gnu) (guix) (srfi srfi-1)) +(use-service-modules desktop mcron networking xorg) +(use-package-modules certs fonts xorg) + +(operating-system + (host-name "gnu") + (keyboard-layout (keyboard-layout "us" "altgr-intl")) + + (users (cons (user-account +(name "guest") +(password "") ;no password +(group "users")) + %base-user-accounts)) + + (packages (append (list font-bitstream-vera nss-certs) +%base-packages)) + + (services + (append (list (service xfce-desktop-service-type) + (simple-service 'cron-jobs mcron-service-type + (list auto-update-resolution-crutch)) + (service dhcp-client-service-type) diff --git a/talks/fcc-inrae-2022/example/config-vm-2.scm b/talks/fcc-inrae-2022/example/config-vm-2.scm new file mode 100644 index 000..68322b6 --- /dev/null +++ b/talks/fcc-inrae-2022/example/config-vm-2.scm @@ -0,0 +1,13 @@ +(use-modules (gnu) (guix) (srfi srfi-1)) +(use-service-modules desktop mcron networking xorg) +(use-package-modules certs fonts xorg) + +(operating-system + [...] + (packages (append (list font-bitstream-vera nss-certs) +%base-packages)) + (services + (append (list (service xfce-desktop-service-type) + (simple-service 'cron-jobs mcron-service-type +(list auto-update-resolution-crutch)) + (service dhcp-client-service-type) diff --git a/talks/fcc-inrae-2022/example/mock-define-pkg-source.scm b
01/02: talks: Add JRES 2022 tutorial.
nckx pushed a commit to branch master in repository maintenance. commit 298f1d5f5305b9c0c8f1de0c7c8d3c8d28ac90bc Author: zimoun AuthorDate: Mon Jun 20 05:51:32 2022 +0200 talks: Add JRES 2022 tutorial. * talks/jres-2022: New directory. Signed-off-by: Tobias Geerinckx-Rice --- talks/jres-2022/.gitlab-ci.yml | 52 + talks/jres-2022/README | 110 + talks/jres-2022/demo/commands.txt | 119 + .../jres-2022/demo/mp4/01-getting-started-1-2.txt |4 + talks/jres-2022/demo/mp4/02-getting-started-3.txt |6 + talks/jres-2022/demo/mp4/03-getting-started-4.txt |5 + talks/jres-2022/demo/mp4/04-getting-started-5.txt |5 + talks/jres-2022/demo/mp4/05-getting-started-6.txt |5 + talks/jres-2022/demo/mp4/06-profile.txt|9 + talks/jres-2022/demo/mp4/07-generations.txt|8 + talks/jres-2022/demo/mp4/08-multi-profiles-1.txt |7 + talks/jres-2022/demo/mp4/09-shell-ipython.txt | 14 + talks/jres-2022/demo/mp4/do-chapters.py| 73 + talks/jres-2022/demo/mp4/videos.txt|9 + talks/jres-2022/do-all.sh |4 + talks/jres-2022/do-clean.sh|6 + talks/jres-2022/do-pres.sh |8 + talks/jres-2022/do-supp.sh | 16 + talks/jres-2022/src/channels.scm |6 + talks/jres-2022/src/contenu.tex| 2413 talks/jres-2022/src/example/config-vm-1.scm| 22 + talks/jres-2022/src/example/config-vm-2.scm| 13 + talks/jres-2022/src/example/mock-define-python.scm |9 + talks/jres-2022/src/example/some-python-bis.scm| 11 + .../src/example/some-python-with-gcc7.scm | 13 + talks/jres-2022/src/example/some-python.scm|6 + talks/jres-2022/src/header.tex | 86 + talks/jres-2022/src/listings-scheme.tex| 97 + talks/jres-2022/src/manifest.scm | 26 + talks/jres-2022/src/presentation.tex | 70 + talks/jres-2022/src/static/Guix-white.pdf | Bin 0 -> 8483 bytes talks/jres-2022/src/static/LOGO-JRES-2022.png | Bin 0 -> 18956 bytes talks/jres-2022/src/static/cafe-guix.png | Bin 0 -> 17311 bytes talks/jres-2022/src/static/forest-symlinks.pdf | Bin 0 -> 16418 bytes talks/jres-2022/src/static/graph-python.png| Bin 0 -> 479843 bytes .../src/static/guixhpc-logo-transparent-white.pdf | Bin 0 -> 8808 bytes talks/jres-2022/src/static/u-paris.png | Bin 0 -> 7104 bytes talks/jres-2022/src/supplement.tex | 281 +++ .../jres-2022/src/support-notes-additionnelles.tex | 58 + .../support-notes-additionnelles.20220519.pdf | Bin 0 -> 3948392 bytes talks/jres-2022/talk.20220519.pdf | Bin 0 -> 1077431 bytes 41 files changed, 3571 insertions(+) diff --git a/talks/jres-2022/.gitlab-ci.yml b/talks/jres-2022/.gitlab-ci.yml new file mode 100644 index 000..6d7f55c --- /dev/null +++ b/talks/jres-2022/.gitlab-ci.yml @@ -0,0 +1,52 @@ +stages: + - tex2pdf + - deploy + +pdf: + image: +name: zimoun/jres + stage: tex2pdf + script: +- mkdir public && cd src +- rubber --pdf presentation.tex +- rubber --pdf support-notes-additionnelles.tex +- mv *.pdf ../public/ + artifacts: +paths: + - public + only: +- main + +pages: + image: +name: zimoun/jres + stage: deploy + script: +- | + cat > public/index.html < + http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;> + http://www.w3.org/1999/xhtml; lang="en" xml:lang="en"> + + Reproductibilité des environnements logiciels avec GNU Guix + + + + + Reproductibilité des environnements logiciels avec GNU Guix + + presentation.pdf + support-notes-additionnelles.pdf + + +Simon Tournier +JRES 2022 - Marseille + + + EOF + artifacts: +paths: + - public + only: +- main diff --git a/talks/jres-2022/README b/talks/jres-2022/README new file mode 100644 index 000..2785cb2 --- /dev/null +++ b/talks/jres-2022/README @@ -0,0 +1,110 @@ +# -*- mode:org -*- + +Original Git repo: https://gitlab.com/zimoun/jres22-tuto-guix +SWH archive: https://archive.softwareheritage.org/swh:1:rev:8a378f2f833dd28ea71d38e7fc45bac10fe122d5 + +Visible: https://zimoun.gitlab.io/jres22-tuto-guix/ +Web archive: https://web.archive.org/web/20220520150253/https://zimoun.gitlab.io/jres22-tuto-guix/ + +This repository contains the all material to run the tutorial about Guix +presented at [[https://www.jres.org/][JRES 2022]]. The language of the conference is French, thus this +material is initially written in French. + +The version of the presenta
branch master updated (ead77fe -> 70d972e)
nckx pushed a change to branch master in repository maintenance. from ead77fe hydra: Fix ‘…/manual’-style URLs without a trailing ‘/’. new 298f1d5 talks: Add JRES 2022 tutorial. new 70d972e talks: Add INRAE workshop 2022. 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: talks/fcc-inrae-2022/README| 12 + talks/fcc-inrae-2022/channels.scm |6 + talks/fcc-inrae-2022/do-pres.sh|6 + talks/fcc-inrae-2022/example/config-vm-1.scm | 22 + talks/fcc-inrae-2022/example/config-vm-2.scm | 13 + .../example/mock-define-pkg-source.scm |7 + talks/fcc-inrae-2022/example/mock-define-pkg.scm |7 + .../fcc-inrae-2022/example/mock-define-python.scm |9 + talks/fcc-inrae-2022/example/some-python-bis.scm | 11 + .../example/some-python-with-gcc7.scm | 13 + talks/fcc-inrae-2022/example/some-python.scm |6 + talks/fcc-inrae-2022/listings-scheme.tex | 97 + talks/fcc-inrae-2022/manifest.scm | 26 + talks/fcc-inrae-2022/pres.tex | 2048 + .../static}/Guix-white.pdf | Bin talks/fcc-inrae-2022/static/all-abs-hist.png | Bin 0 -> 95158 bytes talks/fcc-inrae-2022/static/cafe-guix.png | Bin 0 -> 17311 bytes talks/fcc-inrae-2022/static/graph-python.png | Bin 0 -> 479843 bytes talks/fcc-inrae-2022/static/graph.png | Bin 0 -> 106012 bytes .../static}/guixhpc-logo-transparent-white.pdf | Bin talks/fcc-inrae-2022/static/u-paris.png| Bin 0 -> 7104 bytes talks/fcc-inrae-2022/talk.20220621.pdf | Bin 0 -> 1352403 bytes talks/jres-2022/.gitlab-ci.yml | 52 + talks/jres-2022/README | 110 + talks/jres-2022/demo/commands.txt | 119 + .../jres-2022/demo/mp4/01-getting-started-1-2.txt |4 + talks/jres-2022/demo/mp4/02-getting-started-3.txt |6 + talks/jres-2022/demo/mp4/03-getting-started-4.txt |5 + talks/jres-2022/demo/mp4/04-getting-started-5.txt |5 + talks/jres-2022/demo/mp4/05-getting-started-6.txt |5 + talks/jres-2022/demo/mp4/06-profile.txt|9 + talks/jres-2022/demo/mp4/07-generations.txt|8 + talks/jres-2022/demo/mp4/08-multi-profiles-1.txt |7 + talks/jres-2022/demo/mp4/09-shell-ipython.txt | 14 + talks/jres-2022/demo/mp4/do-chapters.py| 73 + talks/jres-2022/demo/mp4/videos.txt|9 + talks/jres-2022/do-all.sh |4 + talks/jres-2022/do-clean.sh|6 + talks/jres-2022/do-pres.sh |8 + talks/jres-2022/do-supp.sh | 16 + talks/jres-2022/src/channels.scm |6 + talks/jres-2022/src/contenu.tex| 2413 talks/jres-2022/src/example/config-vm-1.scm| 22 + talks/jres-2022/src/example/config-vm-2.scm| 13 + talks/jres-2022/src/example/mock-define-python.scm |9 + talks/jres-2022/src/example/some-python-bis.scm| 11 + .../src/example/some-python-with-gcc7.scm | 13 + talks/jres-2022/src/example/some-python.scm|6 + talks/jres-2022/src/header.tex | 86 + talks/jres-2022/src/listings-scheme.tex| 97 + talks/jres-2022/src/manifest.scm | 26 + talks/jres-2022/src/presentation.tex | 70 + .../images => jres-2022/src/static}/Guix-white.pdf | Bin talks/jres-2022/src/static/LOGO-JRES-2022.png | Bin 0 -> 18956 bytes talks/jres-2022/src/static/cafe-guix.png | Bin 0 -> 17311 bytes talks/jres-2022/src/static/forest-symlinks.pdf | Bin 0 -> 16418 bytes talks/jres-2022/src/static/graph-python.png| Bin 0 -> 479843 bytes .../src/static}/guixhpc-logo-transparent-white.pdf | Bin talks/jres-2022/src/static/u-paris.png | Bin 0 -> 7104 bytes talks/jres-2022/src/supplement.tex | 281 +++ .../jres-2022/src/support-notes-additionnelles.tex | 58 + .../support-notes-additionnelles.20220519.pdf | Bin 0 -> 3948392 bytes talks/jres-2022/talk.20220519.pdf | Bin 0 -> 1077431 bytes 63 files changed, 5854 insertions(+) create mode 100644 talks/fcc-inrae-2022/README create mode 100644 talks/fcc-inrae-2022/channels.scm create mode 100755 talks/fcc-inrae-2022/do-pres.sh create mode 100644 talks/fcc-inrae-2022/example/config-vm-1.scm create mode 100644 talks/fcc-inrae-2022/example/config-vm-2.scm create mode 100644 talks/fcc-inrae-2022/example/mock-define-pkg-source.scm create mode 100644
branch master updated: hydra: Fix ‘…/manual’-style URLs without a trailing ‘/’.
This is an automated email from the git hooks/post-receive script. nckx pushed a commit to branch master in repository maintenance. The following commit(s) were added to refs/heads/master by this push: new ead77fe hydra: Fix ‘…/manual’-style URLs without a trailing ‘/’. ead77fe is described below commit ead77feb81338666d80c1b7e9ca2d4b90576ee9c Author: Tobias Geerinckx-Rice AuthorDate: Sun Jun 12 02:00:00 2022 +0200 hydra: Fix ‘…/manual’-style URLs without a trailing ‘/’. These are used in, e.g., Guix System's /etc/os-release and were embarrassingly broken. * hydra/modules/sysadmin/nginx.scm (guix.gnu.org-other-locations): Handle the absence of a trailing ‘/’ in manual & cookbook URLs. --- hydra/modules/sysadmin/nginx.scm | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hydra/modules/sysadmin/nginx.scm b/hydra/modules/sysadmin/nginx.scm index c582fac..1fa516e 100644 --- a/hydra/modules/sysadmin/nginx.scm +++ b/hydra/modules/sysadmin/nginx.scm @@ -667,17 +667,17 @@ synonymous IETF language tags that should be mapped to the same $lang." ;; These rules take precedence over the '.pdf' and '.html' rules below. (nginx-location-configuration -(uri "~ /manual/devel/(.*)$") +(uri "~ /manual/devel(|/.*)$") (body (list "expires 4h;" -"alias /srv/guix-manual-devel/$1;"))) +"alias /srv/guix-manual-devel$1;"))) (nginx-location-configuration -(uri "~ /manual/(.*)$") +(uri "~ /manual(|/.*)$") (body (list "expires 1d;" -"alias /srv/guix-manual/$1;"))) +"alias /srv/guix-manual$1;"))) (nginx-location-configuration -(uri "~ /cookbook/(.*)$") +(uri "~ /cookbook(|/.*)$") (body (list "expires 4h;" -"alias /srv/guix-cookbook/$1;"))) +"alias /srv/guix-cookbook$1;"))) (nginx-location-configuration (uri "~ \\.pdf$") ;*.pdf at the top level (body (list "root /srv/guix-pdfs;")))
branch master updated: website: online-guix-day-announcement-2: Update reference to Freenode.
This is an automated email from the git hooks/post-receive script. nckx pushed a commit to branch master in repository guix-artwork. The following commit(s) were added to refs/heads/master by this push: new c0a09db website: online-guix-day-announcement-2: Update reference to Freenode. c0a09db is described below commit c0a09dba8f3944dd64c6546c412989dbb003b7c9 Author: Tobias Geerinckx-Rice AuthorDate: Sat Jan 15 06:55:47 2022 + website: online-guix-day-announcement-2: Update reference to Freenode. * website/posts/online-guix-day-announcement-2.md: freenode.net → libera.chat. --- website/posts/online-guix-day-announcement-2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/posts/online-guix-day-announcement-2.md b/website/posts/online-guix-day-announcement-2.md index eec3439..42ebebb 100644 --- a/website/posts/online-guix-day-announcement-2.md +++ b/website/posts/online-guix-day-announcement-2.md @@ -57,7 +57,7 @@ last discussion may be longer depending on what you have to share. The main channel for the day will be the video chat and questions will be asked via the chat hosted there or––because we love it––via `#guix` on -[`irc.freenode.net`](https://guix.gnu.org/en/contact/irc/) then the floor +[`libera.chat`](https://guix.gnu.org/en/contact/irc/) then the floor might be shared, opening more mics. The discussions will not be recorded because we would like to keep them informal––where people are less impressed to share their point of views.
branch master updated: hydra: berlin: Redirect disarchive HTTP connections to HTTPS.
This is an automated email from the git hooks/post-receive script.
nckx pushed a commit to branch master
in repository maintenance.
The following commit(s) were added to refs/heads/master by this push:
new 5165754 hydra: berlin: Redirect disarchive HTTP connections to HTTPS.
5165754 is described below
commit 5165754b06571e5099bd4571ec876432465a1a3e
Author: Tobias Geerinckx-Rice
AuthorDate: Wed Jan 12 17:26:18 2022 +
hydra: berlin: Redirect disarchive HTTP connections to HTTPS.
* hydra/nginx/berlin.scm (%berlin-servers): Remove the port 80 listener
for disarchive.guix.gnu.org, to be handled by the catch-all HTTPS
redirector.
---
hydra/nginx/berlin.scm | 11 ---
1 file changed, 11 deletions(-)
diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm
index ecdbb13..9a67826 100644
--- a/hydra/nginx/berlin.scm
+++ b/hydra/nginx/berlin.scm
@@ -207,17 +207,6 @@ PUBLISH-URL."
(list
"access_log /var/log/nginx/bootstrappable.access.log;")))
- (nginx-server-configuration
-(listen '("80"))
-(server-name '("disarchive.guix.gnu.org"))
-(root "/gnu/disarchive")
-(raw-content
- ;; Tell nginx to always read 'FILE.gz' when asked for 'FILE', and to
- ;; gunzip it on the fly (because the client for this typically doesn't
- ;; properly support gzip encoding).
- (list "gzip_static always; gunzip on;\n"
- "access_log /var/log/nginx/disarchive.access.log;")))
-
(nginx-server-configuration
(listen '("80"))
(server-name '("guixwl.org"
master updated (39e3c89 -> 8c91c82)
nckx pushed a change to branch master. from 39e3c89 templates: Expand search input on focus. new 8c91c82 templates: Add link titles to evaluation badges. Summary of changes: src/cuirass/templates.scm | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-)
[no subject]
branch: master commit 8c91c82e3529a4a479864655a2ac76a90e7f12ad Author: Tobias Geerinckx-Rice Date: Wed Jun 19 16:23:43 2019 +0200 templates: Add link titles to evaluation badges. * src/cuirass/templates.scm (evaluation-badges): Add ‘title’ attributes. --- src/cuirass/templates.scm | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/cuirass/templates.scm b/src/cuirass/templates.scm index 9ebdd2e..342fd13 100644 --- a/src/cuirass/templates.scm +++ b/src/cuirass/templates.scm @@ -254,13 +254,16 @@ (aria-hidden "true")) "")) `((a (@ (href "/eval/" ,(assq-ref evaluation #:id) "?status=succeeded") -(class "badge badge-success")) +(class "badge badge-success") +(title "Succeeded")) ,succeeded) (a (@ (href "/eval/" ,(assq-ref evaluation #:id) "?status=failed") -(class "badge badge-danger")) +(class "badge badge-danger") +(title "Failed")) ,failed) (a (@ (href "/eval/" ,(assq-ref evaluation #:id) "?status=pending") -(class "badge badge-secondary")) +(class "badge badge-secondary") +(title "Scheduled")) ,scheduled '((em "In progress…"
04/04: gnu: youtube-dl: Update to 2018.11.03.
nckx pushed a commit to branch master in repository guix. commit fe4fb278b8754b7723a912ed605cd520f1f42457 Author: Tobias Geerinckx-Rice Date: Tue Nov 6 15:21:26 2018 +0100 gnu: youtube-dl: Update to 2018.11.03. * gnu/packages/video.scm (youtube-dl): Update to 2018.11.03. --- 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 f32604c..a482ef2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1269,7 +1269,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") -(version "2018.10.05") +(version "2018.11.03") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/; @@ -1277,7 +1277,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 -"1iq02kwxdgh07bf0w0fvbsjbdshs4kja35gy8m70ji9cj10l1mbw" +"11phhwhr1g050h4625d5jsgcsjnnv7jc6xcrbn7zdzd32f6gy2lj" (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion
02/04: gnu: jq: Don't use NAME in source URI.
nckx pushed a commit to branch master in repository guix. commit c3b8300af321bbc56c5743ae53890e2184b0aa45 Author: Tobias Geerinckx-Rice Date: Tue Nov 6 15:10:51 2018 +0100 gnu: jq: Don't use NAME in source URI. * gnu/packages/web.scm (jq)[source]: Code more hard. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 86e748f..3203b25 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4169,9 +4169,9 @@ It uses the uwsgi protocol for all the networking/interprocess communications.") (version "1.6") (source (origin (method url-fetch) - (uri (string-append "https://github.com/stedolan/; name - "/releases/download/" name "-" version - "/" name "-" version ".tar.gz")) + (uri (string-append "https://github.com/stedolan/jq; + "/releases/download/jq-" version + "/jq-" version ".tar.gz")) (sha256 (base32 "1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn"
01/04: gnu: jq: Update to 1.6.
nckx pushed a commit to branch master
in repository guix.
commit 418dd6adb5de1bc26ff9bac1cb0dc7822be52112
Author: Tobias Geerinckx-Rice
Date: Tue Nov 6 15:13:16 2018 +0100
gnu: jq: Update to 1.6.
* gnu/packages/web.scm (jq): Update to 1.6.
[source]: Remove upstreamed patch.
* gnu/packages/patches/jq-CVE-2015-8863.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk| 1 -
gnu/packages/patches/jq-CVE-2015-8863.patch | 45 -
gnu/packages/web.scm| 8 ++---
3 files changed, 2 insertions(+), 52 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 1f9f6b3..c2075f7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -834,7 +834,6 @@ dist_patch_DATA =
\
%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\
diff --git a/gnu/packages/patches/jq-CVE-2015-8863.patch
b/gnu/packages/patches/jq-CVE-2015-8863.patch
deleted file mode 100644
index 20b3bb3..000
--- a/gnu/packages/patches/jq-CVE-2015-8863.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix CVE-2015-8863 (Off-by-one error in the tokenadd function in
-jv_parse.c in jq allows remote attackers to cause a denial of service
-(crash) via a long JSON-encoded number, which triggers a heap-based
-buffer overflow):
-
-<https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-8863>
-
-Copied from upstream code repository:
-
-<https://github.com/stedolan/jq/commit/8eb1367ca44e772963e704a700ef72ae2e12babd>
-
-From 8eb1367ca44e772963e704a700ef72ae2e12babd Mon Sep 17 00:00:00 2001
-From: Nicolas Williams
-Date: Sat, 24 Oct 2015 17:24:57 -0500
-Subject: [PATCH] Heap buffer overflow in tokenadd() (fix #105)
-
-This was an off-by one: the NUL terminator byte was not allocated on
-resize. This was triggered by JSON-encoded numbers longer than 256
-bytes.
- jv_parse.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/jv_parse.c b/jv_parse.c
-index 3102ed4..84245b8 100644
a/jv_parse.c
-+++ b/jv_parse.c
-@@ -383,7 +383,7 @@ static pfunc stream_token(struct jv_parser* p, char ch) {
-
- static void tokenadd(struct jv_parser* p, char c) {
- assert(p->tokenpos <= p->tokenlen);
-- if (p->tokenpos == p->tokenlen) {
-+ if (p->tokenpos >= (p->tokenlen - 1)) {
- p->tokenlen = p->tokenlen*2 + 256;
- p->tokenbuf = jv_mem_realloc(p->tokenbuf, p->tokenlen);
- }
-@@ -485,7 +485,7 @@ static pfunc check_literal(struct jv_parser* p) {
- TRY(value(p, v));
- } else {
- // FIXME: better parser
--p->tokenbuf[p->tokenpos] = 0; // FIXME: invalid
-+p->tokenbuf[p->tokenpos] = 0;
- char* end = 0;
- double d = jvp_strtod(>dtoa, p->tokenbuf, );
- if (end == 0 || *end != 0)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 447a899..86e748f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4166,7 +4166,7 @@ It uses the uwsgi protocol for all the
networking/interprocess communications.")
(define-public jq
(package
(name "jq")
-(version "1.5")
+(version "1.6")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/stedolan/; name
@@ -4174,11 +4174,7 @@ It uses the uwsgi protocol for all the
networking/interprocess communications.")
"/" name "-" version ".tar.gz"))
(sha256
(base32
-"0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4"))
- ;; This patch has been pushed and the vulnerability will be
- ;; fixed in the next release after 1.5.
- ;; https://github.com/stedolan/jq/issues/995
- (patches (search-patches "jq-CVE-2015-8863.patch"
+"1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn"
(inputs
`(("oniguruma" ,oniguruma)))
(native-inputs
03/04: gnu: terraform-docs: Update to 0.5.0.
nckx pushed a commit to branch master
in repository guix.
commit b1eeeb8dd485009bc04005ad6345c84b8932dffa
Author: Tobias Geerinckx-Rice
Date: Tue Nov 6 15:05:30 2018 +0100
gnu: terraform-docs: Update to 0.5.0.
* gnu/packages/terraform.scm (terraform-docs): Update to 0.5.0.
[native-inputs]: Remove them all.
---
gnu/packages/terraform.scm | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/terraform.scm b/gnu/packages/terraform.scm
index 71b214e..f14b152 100644
--- a/gnu/packages/terraform.scm
+++ b/gnu/packages/terraform.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Christopher Baines
+;;; Copyright © 2018 Tobias Geerinckx-Rice
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,13 +22,12 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
- #:use-module (guix build-system go)
- #:use-module (gnu packages golang))
+ #:use-module (guix build-system go))
(define-public terraform-docs
(package
(name "terraform-docs")
-(version "0.3.0")
+(version "0.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -36,11 +36,8 @@
(file-name (git-file-name name version))
(sha256
(base32
-"0xchpik32ab8m89s6jv671vswg8xhprfvh6s5md0zd36482d2nmm"
+"12w2yr669hk5kxdb9rrzsn8hwvx8rzrc1rmn8hs9l8z1bkfhr4gg"
(build-system go-build-system)
-(native-inputs
- `(("go-github-com-hashicorp-hcl" ,go-github-com-hashicorp-hcl)
- ("go-github-com-tj-docopt" ,go-github-com-tj-docopt)))
(arguments
'(#:import-path "github.com/segmentio/terraform-docs"))
(synopsis "Generate documentation from Terraform modules")
branch master updated (c58f3eb -> fe4fb27)
nckx pushed a change to branch master in repository guix. from c58f3eb gnu: ffmpeg: Update to 4.1. new 418dd6a gnu: jq: Update to 1.6. new c3b8300 gnu: jq: Don't use NAME in source URI. new b1eeeb8 gnu: terraform-docs: Update to 0.5.0. new fe4fb27 gnu: youtube-dl: Update to 2018.11.03. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk| 1 - gnu/packages/patches/jq-CVE-2015-8863.patch | 45 - gnu/packages/terraform.scm | 11 +++ gnu/packages/video.scm | 4 +-- gnu/packages/web.scm| 14 - 5 files changed, 11 insertions(+), 64 deletions(-) delete mode 100644 gnu/packages/patches/jq-CVE-2015-8863.patch
01/01: gnu: tor: Update to 0.3.4.9.
nckx pushed a commit to branch master in repository guix. commit 3995e854620c993782e584471013ffe388cf7ced Author: Tobias Geerinckx-Rice Date: Fri Nov 2 19:47:54 2018 +0100 gnu: tor: Update to 0.3.4.9. * gnu/packages/tor.scm (tor): Update to 0.3.4.9. --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 7d46191..61b0c82 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -47,14 +47,14 @@ (define-public tor (package (name "tor") -(version "0.3.4.8") +(version "0.3.4.9") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-; version ".tar.gz")) (sha256 (base32 - "08qhzcmzxp5xr2l5721vagksqnnbrzzzy5hmz5y9r8lrq2r4qsl2" + "0jhnvnp08hsfrzgsvg5xnfxyaw3nzgg9h24cwbwnz6iby20i05qs" (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-gcc-hardening"
branch master updated (ff34941 -> 3995e85)
nckx pushed a change to branch master in repository guix. from ff34941 gnu: python-apache-libcloud: Update to 2.3.0. new 3995e85 gnu: tor: Update to 0.3.4.9. 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/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
09/10: gnu: highlight: Update to 3.47.
nckx pushed a commit to branch master in repository guix. commit 38fda1cc36f55bd2c99fdd534b269c8807fc5799 Author: Tobias Geerinckx-Rice Date: Thu Nov 1 04:14:15 2018 +0100 gnu: highlight: Update to 3.47. * gnu/packages/pretty-print.scm (highlight): Update to 3.47. --- gnu/packages/pretty-print.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index ad42985..bdb5dbb 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -244,7 +244,7 @@ seen in a terminal.") (define-public highlight (package (name "highlight") -(version "3.42") +(version "3.47") (source (origin (method url-fetch) @@ -252,7 +252,7 @@ seen in a terminal.") version ".tar.bz2")) (sha256 (base32 - "07iihzy8ckzdrxqd6bzbij4hy4mmlixibjnjviqfihd0hh1q30m5" + "0xidf8755lnx55x6p4ajgg4l145akjqswny41483fvg5lpa41i6f" (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests
10/10: gnu: whois: Update to 5.4.0.
nckx pushed a commit to branch master in repository guix. commit 66a2a47117af6625d3b6fab8d661bbe57ff648c1 Author: Tobias Geerinckx-Rice Date: Thu Nov 1 04:29:02 2018 +0100 gnu: whois: Update to 5.4.0. * gnu/packages/networking.scm (whois): Update to 5.4.0. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5a0c464..5504742 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -538,7 +538,7 @@ and up to 1 Mbit/s downstream.") (define-public whois (package (name "whois") -(version "5.3.2") +(version "5.4.0") (source (origin (method url-fetch) @@ -546,7 +546,7 @@ and up to 1 Mbit/s downstream.") name "_" version ".tar.xz")) (sha256 (base32 - "0m3352d5b0ragygbqjbaimghrbx4va2rixa34j5a1g3jj6l4nwbr" + "0y73b3z1akni620s1hlrijwdrk95ca1c8csjds48vpd6z86awx9p" (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite
07/10: gnu: python-pynacl: Update to 1.3.0.
nckx pushed a commit to branch master in repository guix. commit 60ed87871dcf2924ec9fd167478b1ad6b21343b5 Author: Tobias Geerinckx-Rice Date: Wed Oct 31 23:48:12 2018 +0100 gnu: python-pynacl: Update to 1.3.0. * gnu/packages/python-crypto.scm (python-pynacl): Update to 1.3.0. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index f71b8a3..1a70f94 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -637,7 +637,7 @@ PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.") (define-public python-pynacl (package (name "python-pynacl") -(version "1.2.1") +(version "1.3.0") (source (origin (method url-fetch) @@ -648,7 +648,7 @@ PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.") #t)) (sha256 (base32 - "1ada3qr83cliap6dk897vnvjkynij1kjqbwizdbgarazlyh8zlz0" + "0330wyvggm19xhmwmz9rrr97lzbv3siwfy50gmax3vvgs7nh0q8c" (build-system python-build-system) (arguments `(#:phases
01/10: gnu: julia: Update objconv input to 2018-10-07.
nckx pushed a commit to branch master
in repository guix.
commit 2930a39b165ce9e13e899fe66b82c03932e0e86b
Author: Tobias Geerinckx-Rice
Date: Wed Oct 31 15:54:38 2018 +0100
gnu: julia: Update objconv input to 2018-10-07.
* gnu/packages/julia.scm (julia)[input]: Update objconf to 2018-10-07.
---
gnu/packages/julia.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index fb9b0ee..856bbc0 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -357,10 +357,10 @@
(method url-fetch)
;; No versioned URL, see <https://www.agner.org/optimize/> for
updates.
(uri "https://www.agner.org/optimize/objconv.zip;)
- (file-name "objconv-2018-08-15.zip")
+ (file-name "objconv-2018-10-07.zip")
(sha256
(base32
- "09y4pwxfs6fl47cyingbf95i2rxx74wmycl9fd4ldcgvpx9bzdrx"
+ "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs"
("dsfmt"
,(origin
(method url-fetch)
06/10: gnu: oniguruma: Update to 6.9.0.
nckx pushed a commit to branch master in repository guix. commit 351a12b0a7e57c9aa95e2780e7e568597a425892 Author: Tobias Geerinckx-Rice Date: Wed Oct 31 22:49:49 2018 +0100 gnu: oniguruma: Update to 6.9.0. * gnu/packages/textutils.scm (oniguruma): Update to 6.9.0. --- gnu/packages/textutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 8780bb2..084017d 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -338,7 +338,7 @@ as existing hashing techniques, with provably negligible risk of collisions.") (define-public oniguruma (package (name "oniguruma") -(version "6.8.2") +(version "6.9.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/kkos/; @@ -346,7 +346,7 @@ as existing hashing techniques, with provably negligible risk of collisions.") "/onig-" version ".tar.gz")) (sha256 (base32 -"00s9gjgb3srn5sbmx4x9bssn52mi04d868ghizssdhjlddgxmsmd" +"1jg76i2ksf3s4bz4h3g2f9ac19q31lzxs11j900w7qqc0mgb5gwi" (build-system gnu-build-system) (home-page "https://github.com/kkos/oniguruma;) (synopsis "Regular expression library")
05/10: gnu: motion: Install translations.
nckx pushed a commit to branch master
in repository guix.
commit 33bddd309c398d3d2286a48f26e41b59350b7ef7
Author: Tobias Geerinckx-Rice
Date: Wed Oct 31 19:22:50 2018 +0100
gnu: motion: Install translations.
* gnu/packages/video.scm (motion)[native-inputs]: Add gettext-minimal.
---
gnu/packages/video.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 2eb79a8..34af248 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2927,6 +2927,7 @@ It counts more than 100 plugins.")
(native-inputs
`(("autoconf" ,autoconf-wrapper)
("automake" ,automake)
+ ("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(inputs
`(("libjpeg" ,libjpeg)
08/10: gnu: python-jsonrpclib-pelix: Update to 0.3.2.
nckx pushed a commit to branch master in repository guix. commit a72d337fbc1a1b619de7867315fc1435a54894c8 Author: Tobias Geerinckx-Rice Date: Thu Nov 1 03:21:00 2018 +0100 gnu: python-jsonrpclib-pelix: Update to 0.3.2. * gnu/packages/python.scm (python-jsonrpclib-pelix): Update to 0.3.2. [arguments]: Disable #:tests?. --- gnu/packages/python.scm | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 29b4a8e..a65573f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12824,15 +12824,17 @@ embeddable JavaScript engine.") (define-public python-jsonrpclib-pelix (package (name "python-jsonrpclib-pelix") -(version "0.3.1") +(version "0.3.2") (source (origin (method url-fetch) (uri (pypi-uri "jsonrpclib-pelix" version)) (sha256 (base32 - "1qs95vxplxwspbrqy8bvc195s58iy43qkf75yrjfql2sim8b25sl" + "0f83z5zi7w32vprhk1dyc94ir1bh4hdd57bjdbwkq9ykng8qilhl" (build-system python-build-system) +(arguments + `(#:tests? #f)); no tests in PyPI tarball (home-page "https://github.com/tcalmant/jsonrpclib/;) (synopsis "JSON-RPC 2.0 client library for Python") (description
03/10: Keep (gnu packages video) module imports in order.
nckx pushed a commit to branch master in repository guix. commit 4fbcfc148264b1ad97706d366dbd94ce4e02e56d Author: Tobias Geerinckx-Rice Date: Wed Oct 31 19:05:55 2018 +0100 Keep (gnu packages video) module imports in order. * gnu/packages/video.scm (define-module): Re-order module imports alphabetically. --- 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 fb8e4fe..900198a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -67,6 +67,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages assembly) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) @@ -140,8 +141,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg) - #:use-module (gnu packages assembly)) + #:use-module (gnu packages xorg)) (define-public aalib (package
02/10: gnu: motion: Update to 4.2.
nckx pushed a commit to branch master
in repository guix.
commit c3069cd183a5e00166c99da57668341e9767cab2
Author: Tobias Geerinckx-Rice
Date: Wed Oct 31 19:01:05 2018 +0100
gnu: motion: Update to 4.2.
* gnu/packages/video.scm (motion): Update to 4.2.
---
gnu/packages/video.scm | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 4fcd15e..fb8e4fe 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -96,6 +96,7 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages guile)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages gnunet)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
@@ -2911,7 +2912,7 @@ It counts more than 100 plugins.")
(define-public motion
(package
(name "motion")
-(version "4.1.1")
+(version "4.2")
(home-page "https://motion-project.github.io/;)
(source (origin
(method url-fetch)
@@ -2920,7 +2921,7 @@ It counts more than 100 plugins.")
"release-" version ".tar.gz"))
(sha256
(base32
-"1qm4i8zrqafl60sv2frhixvkd0wh0r5jfcrj5i6gha7yplsvjx10"))
+"1ad2zlz941lvb818g1nzlpcpbxgv0h05q164hafa805yqm7m1y3f"))
(file-name (string-append name "-" version ".tar.gz"
(build-system gnu-build-system)
(native-inputs
@@ -2930,6 +2931,7 @@ It counts more than 100 plugins.")
(inputs
`(("libjpeg" ,libjpeg)
("ffmpeg" ,ffmpeg-3.4)
+ ("libmicrohttpd" ,libmicrohttpd)
("sqlite" ,sqlite)))
(arguments
'(#:phases (modify-phases %standard-phases
branch master updated (c16913d -> 66a2a47)
nckx pushed a change to branch master in repository guix. from c16913d gnu: myrepos: Update to 1.20180726. new 2930a39 gnu: julia: Update objconv input to 2018-10-07. new c3069cd gnu: motion: Update to 4.2. new 4fbcfc1 Keep (gnu packages video) module imports in order. new 2ea678f gnu: motion: Don't use unstable tarball. new 33bddd3 gnu: motion: Install translations. new 351a12b gnu: oniguruma: Update to 6.9.0. new 60ed878 gnu: python-pynacl: Update to 1.3.0. new a72d337 gnu: python-jsonrpclib-pelix: Update to 0.3.2. new 38fda1c gnu: highlight: Update to 3.47. new 66a2a47 gnu: whois: Update to 5.4.0. The 10 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/julia.scm | 4 ++-- gnu/packages/networking.scm| 4 ++-- gnu/packages/pretty-print.scm | 4 ++-- gnu/packages/python-crypto.scm | 4 ++-- gnu/packages/python.scm| 6 -- gnu/packages/textutils.scm | 4 ++-- gnu/packages/video.scm | 21 - 7 files changed, 26 insertions(+), 21 deletions(-)
04/10: gnu: motion: Don't use unstable tarball.
nckx pushed a commit to branch master
in repository guix.
commit 2ea678fabfb57b05652fa8e0afe8fb6b1000473f
Author: Tobias Geerinckx-Rice
Date: Wed Oct 31 19:19:29 2018 +0100
gnu: motion: Don't use unstable tarball.
* gnu/packages/video.scm (motion)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
---
gnu/packages/video.scm | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 900198a..2eb79a8 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2915,14 +2915,14 @@ It counts more than 100 plugins.")
(version "4.2")
(home-page "https://motion-project.github.io/;)
(source (origin
- (method url-fetch)
- (uri (string-append
-"https://github.com/Motion-Project/motion/archive/;
-"release-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+(url "https://github.com/Motion-Project/motion.git;)
+(commit (string-append "release-" version
(sha256
(base32
-"1ad2zlz941lvb818g1nzlpcpbxgv0h05q164hafa805yqm7m1y3f"))
- (file-name (string-append name "-" version ".tar.gz"
+"0c0q6dl4v561m5y8bp0c0h4p3s52fjgcdnsrrf5ygdi288d3rfxv"))
+ (file-name (git-file-name name version
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf-wrapper)
01/02: gnu: meandmyshadow: Update to 0.5.
nckx pushed a commit to branch master
in repository guix.
commit 1d9a9d27ae4d7981a0df749708b683859ee5c58e
Author: Tobias Geerinckx-Rice
Date: Wed Oct 31 01:27:07 2018 +0100
gnu: meandmyshadow: Update to 0.5.
* gnu/packages/games.scm (meandmyshadow): Update to 0.5.
[source]: Add unreleased bugfix patch.
[arguments]: Remove obsolete ‘set-sdl'paths’ phase.
[inputs]: Switch to SDL 2. Add lua. Remove libx11, mesa, and glu.
* gnu/packages/patches/meandmyshadow-define-paths-earlier.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/local.mk | 1 +
gnu/packages/games.scm | 38 ++--
.../meandmyshadow-define-paths-earlier.patch | 50 ++
3 files changed, 63 insertions(+), 26 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5f72879..6075e47 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -951,6 +951,7 @@ dist_patch_DATA =
\
%D%/packages/patches/mcrypt-CVE-2012-4409.patch \
%D%/packages/patches/mcrypt-CVE-2012-4426.patch \
%D%/packages/patches/mcrypt-CVE-2012-4527.patch \
+ %D%/packages/patches/meandmyshadow-define-paths-earlier.patch\
%D%/packages/patches/mesa-skip-disk-cache-test.patch \
%D%/packages/patches/meson-for-build-rpath.patch \
%D%/packages/patches/metabat-fix-compilation.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e28dd9f..250f615 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -572,7 +572,7 @@ automata. The following features are available:
(define-public meandmyshadow
(package
(name "meandmyshadow")
-(version "0.4.1")
+(version "0.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/meandmyshadow/"
@@ -580,37 +580,23 @@ automata. The following features are available:
"-src.tar.gz"))
(sha256
(base32
-"0wl5dc75qy001s6043cx0vr2l5y2qfv1cldqnwill9sfygqj9p95"
+"1b6qf83vdfv8jwn2jq9ywmda2qn2f5914i7mwfy04m17wx593m3m"))
+ (patches (search-patches
+;; This will not be needed in the next release.
+"meandmyshadow-define-paths-earlier.patch"
(build-system cmake-build-system)
(arguments
- '(#:tests? #f ; there are no tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'set-sdl'paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "cmake/Modules/FindSDL_gfx.cmake"
- (("/usr/local/include/SDL")
-(string-append (assoc-ref inputs "sdl")
- "/include/SDL")))
- ;; Because SDL provides lib/libX11.so.6 we need to explicitly
- ;; link with libX11, even though we're using the GL backend.
- (substitute* "CMakeLists.txt"
- (("\\$\\{X11_LIBRARIES\\}") "-lX11"))
- #t)
+ `(#:tests? #f)); there are no tests
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
- `(("sdl" ,(sdl-union (list sdl
-sdl-image
-sdl-gfx
-sdl-mixer
-sdl-ttf)))
- ("libx11" ,libx11) ; needed by sdl's libX11
+ `(("curl" ,curl)
("libarchive" ,libarchive)
- ("openssl" ,openssl)
- ("mesa" ,mesa)
- ("glu" ,glu)
- ("curl" ,curl)))
+ ("lua" ,lua)
+ ("sdl" ,(sdl-union (list sdl2
+sdl2-image
+sdl2-mixer
+sdl2-ttf)
(home-page "http://meandmyshadow.sourceforge.net/;)
(synopsis "Puzzle/platform game")
(description "Me and My Shadow is a puzzle/platform game in which you try
diff --git a/gnu/packages/patches/meandmyshadow-define-paths-earlier.patch
b/gnu/packages/patches/meandmyshadow-define-paths-earlier.patch
new file mode 100644
index 000..505cbd2
--- /dev/null
+++ b/gnu/packages/patches/meandmyshadow-define-paths-earlier.patch
@@ -0,0 +1,50 @@
+From: Tobias Geerinckx-Rice
+Date: Wed, 31 Oct 2018 02:24:26 +0100
+Subject: [PATCH] gnu: meandmyshadow: Define paths earlier.
+
+The following patch was taken verbatim from the upstream repository[0]
+and will be included in the next release.
+
+[0]: https://github.com/
02/02: gnu: meandmyshadow: Update home page.
nckx pushed a commit to branch master in repository guix. commit b590951ff2a9f05993b952f9cae925254237b1d6 Author: Tobias Geerinckx-Rice Date: Wed Oct 31 01:27:42 2018 +0100 gnu: meandmyshadow: Update home page. * gnu/packages/games.scm (meandmyshadow)[home-page]: Follow permanent redirect. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 250f615..0467872 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -597,7 +597,7 @@ automata. The following features are available: sdl2-image sdl2-mixer sdl2-ttf) -(home-page "http://meandmyshadow.sourceforge.net/;) +(home-page "https://acmepjz.github.io/meandmyshadow/;) (synopsis "Puzzle/platform game") (description "Me and My Shadow is a puzzle/platform game in which you try to reach the exit by solving puzzles. Spikes, moving blocks, fragile blocks
branch master updated (4cae7e6 -> b590951)
nckx pushed a change to branch master in repository guix. from 4cae7e6 gnu: hyperrogue: Update to 10.4x. new 1d9a9d2 gnu: meandmyshadow: Update to 0.5. new b590951 gnu: meandmyshadow: Update home page. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 1 + gnu/packages/games.scm | 40 ++--- .../meandmyshadow-define-paths-earlier.patch | 50 ++ 3 files changed, 64 insertions(+), 27 deletions(-) create mode 100644 gnu/packages/patches/meandmyshadow-define-paths-earlier.patch
01/07: gnu: python-partd: Update to 0.3.9.
nckx pushed a commit to branch master
in repository guix.
commit 1204402a9036bd35e37699d4310275b79cc54083
Author: Tobias Geerinckx-Rice
Date: Tue Oct 30 00:11:12 2018 +0100
gnu: python-partd: Update to 0.3.9.
* gnu/packages/python.scm (python-partd): Update to 0.3.9.
---
gnu/packages/python.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index fbb2802..29b4a8e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14433,14 +14433,14 @@ This Python package wraps the Blosc library.")
(define-public python-partd
(package
(name "python-partd")
-(version "0.3.8")
+(version "0.3.9")
(source
(origin
(method url-fetch)
(uri (pypi-uri "partd" version))
(sha256
(base32
- "03s0i5qfgkx6y24bmfgyd5hnsjznkbbfafwb2khf7k9790f1yab7"
+ "0sz6rwlnl4fqq220pyz863cnv0gjdxl4m7lscl71ishl5z0xkmhz"
(build-system python-build-system)
(propagated-inputs
`(("python-blosc" ,python-blosc)
04/07: gnu: pulseview: Update to 0.4.1.
nckx pushed a commit to branch master
in repository guix.
commit 58cd3123ac4d6fb704a07c2ab8165805db03da9a
Author: Tobias Geerinckx-Rice
Date: Tue Oct 30 16:30:11 2018 +0100
gnu: pulseview: Update to 0.4.1.
* gnu/packages/electronics.scm (pulseview): Update to 0.4.1.
[arguments]: Remove CMAKE_CXX_FLAGS from #:configure-flags. (Keep)
build(ing) the unit tests. Add a ‘remove-empty-doc-directory’ phase.
---
gnu/packages/electronics.scm | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index ddee5ba..bc30e61 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -226,7 +226,7 @@ format support.")
(define-public pulseview
(package
(name "pulseview")
-(version "0.4.0")
+(version "0.4.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -234,9 +234,20 @@ format support.")
version ".tar.gz"))
(sha256
(base32
-"1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q"
+"0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy"
+(build-system cmake-build-system)
(arguments
- `(#:configure-flags '("-DCMAKE_CXX_FLAGS=-fext-numeric-literals")))
+ `(#:configure-flags '("-DENABLE_TESTS=y")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'remove-empty-doc-directory
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (with-directory-excursion (string-append out "/share")
+ ;; Use RMDIR to never risk silently deleting files.
+ (rmdir "doc/pulseview")
+ (rmdir "doc"))
+ #t))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
@@ -247,7 +258,6 @@ format support.")
("libsigrokdecode" ,libsigrokdecode)
("qtbase" ,qtbase)
("qtsvg" ,qtsvg)))
-(build-system cmake-build-system)
(home-page "https://www.sigrok.org/wiki/PulseView;)
(synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok")
(description "PulseView is a Qt based logic analyzer, oscilloscope and MSO
GUI
07/07: gnu: hyperrogue: Update to 10.4x.
nckx pushed a commit to branch master
in repository guix.
commit 4cae7e67f3164b0626a2a25215f5d94141a860da
Author: Tobias Geerinckx-Rice
Date: Tue Oct 30 23:21:21 2018 +0100
gnu: hyperrogue: Update to 10.4x.
* gnu/packages/games.scm (hyperrogue): Update to 10.4x.
---
gnu/packages/games.scm | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 53e7a79..e28dd9f 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3658,18 +3658,18 @@ throwing people around in pseudo-randomly generated
buildings.")
(define-public hyperrogue
(package
(name "hyperrogue")
-(version "10.4t")
+(version "10.4x")
;; When updating this package, be sure to update the "hyperrogue-data"
;; origin in native-inputs.
(source (origin
(method url-fetch)
(uri (string-append
-"http://www.roguetemple.com/z/hyper/;
+"https://www.roguetemple.com/z/hyper/;
name (string-join (string-split version #\.) "")
"-src.tgz"))
(sha256
(base32
-"0phqhmnzmc16a23qb4fkil0flzb86kibdckf1r35nc3l0k4193nn"
+"0khk7xqdw4aiw1wnf1xrhmd7fklnzmpdavd7ix4mkm510dr5wklm"
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
@@ -3741,12 +3741,12 @@ throwing people around in pseudo-randomly generated
buildings.")
(method url-fetch)
(uri
(string-append
- "http://www.roguetemple.com/z/hyper/; name
+ "https://www.roguetemple.com/z/hyper/; name
(string-join (string-split version #\.) "")
"-win.zip"))
(sha256
(base32
- "1xd9v8zzgi8m5ar8g4gy1xx5zqwidz3gn1knz0lwib3kbxx4drpg"
+ "1dv3kdv1n5imh3n9900b55rf0wwbjj7243lhsbk7lcjqsqxia39q"
("unzip" ,unzip)))
(inputs
`(("font-dejavu" ,font-dejavu)
@@ -3756,7 +3756,7 @@ throwing people around in pseudo-randomly generated
buildings.")
sdl-gfx
sdl-mixer
sdl-ttf)
-(home-page "http://www.roguetemple.com/z/hyper/;)
+(home-page "https://www.roguetemple.com/z/hyper/;)
(synopsis "Non-euclidean graphical rogue-like game")
(description
"HyperRogue is a game in which the player collects treasures and fights
06/07: gnu: yosys: Don't use unstable tarball.
nckx pushed a commit to branch master in repository guix. commit 21fc352bad21c786ad334edc78fadf74c9a9bb0f Author: Tobias Geerinckx-Rice Date: Tue Oct 30 23:06:28 2018 +0100 gnu: yosys: Don't use unstable tarball. * gnu/packages/fpga.scm (yosys)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/fpga.scm | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index c9454aa..9ab2e35 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -121,14 +121,15 @@ For synthesis, the compiler generates netlists in the desired format.") (name "yosys") (version "0.7") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/cliffordwolf/yosys/archive/; - name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference +(url "https://github.com/cliffordwolf/yosys.git;) +(commit (string-append "yosys-" version)) +(recursive? #t))) ; for the ‘iverilog’ submodule (sha256 (base32 - "0vkfdn4phvkjqlnpqlr6q5f97bgjc3312vj5jf0vf85zqv88dy9x")) - (file-name (string-append name "-" version "-checkout.tar.gz")) + "1ssrpgw0j9qlm52g1hsbb9fsww4vnwi0l7zvvky7a8w7wamddky0")) + (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet '(begin
03/07: gnu: sigrok-cli: Update to 0.7.1.
nckx pushed a commit to branch master
in repository guix.
commit 61c58b7827b336877758d824aafd0c5e4a50713f
Author: Tobias Geerinckx-Rice
Date: Tue Oct 30 15:54:20 2018 +0100
gnu: sigrok-cli: Update to 0.7.1.
* gnu/packages/electronics.scm (sigrok-cli): Update to 0.7.1.
---
gnu/packages/electronics.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 4aaf050..ddee5ba 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -202,7 +202,7 @@ format support.")
(define-public sigrok-cli
(package
(name "sigrok-cli")
-(version "0.7.0")
+(version "0.7.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -210,7 +210,7 @@ format support.")
version ".tar.gz"))
(sha256
(base32
-"072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan"
+"15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m"
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
02/07: gnu: cloc: Update to 1.80.
nckx pushed a commit to branch master
in repository guix.
commit 295fc4152ad92d13c92f85ca542779d11b09955c
Author: Tobias Geerinckx-Rice
Date: Tue Oct 30 15:51:41 2018 +0100
gnu: cloc: Update to 1.80.
* gnu/packages/code.scm (cloc): Update to 1.80.
---
gnu/packages/code.scm | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 98a86b7..7250325 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -211,16 +211,16 @@ COCOMO model or user-provided parameters.")
(define-public cloc
(package
(name "cloc")
-(version "1.78")
+(version "1.80")
(source
(origin
(method url-fetch)
(uri (string-append
- "https://github.com/AlDanial/cloc/releases/download/; version
+ "https://github.com/AlDanial/cloc/releases/download/v; version
"/cloc-" version ".tar.gz"))
(sha256
(base32
- "1j9lwy9xf43kpv1csqdxzch6y1hnsv881ddqd357f8v58dhr4s68"
+ "0rqxnaskg5b736asyzfda1113zvpkajyqjf49vl9wgzf1r9m6bq8"
(build-system gnu-build-system)
(inputs
`(("coreutils" ,coreutils)
@@ -231,8 +231,8 @@ COCOMO model or user-provided parameters.")
("perl-regexp-common" ,perl-regexp-common)))
(arguments
`(#:phases (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
+ (delete 'configure) ; nothing to configure
+ (delete 'build) ; nothing to build
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
branch master updated (fd649d1 -> 4cae7e6)
nckx pushed a change to branch master in repository guix. from fd649d1 gnu: Add r-r2glmm. new 1204402 gnu: python-partd: Update to 0.3.9. new 295fc41 gnu: cloc: Update to 1.80. new 61c58b7 gnu: sigrok-cli: Update to 0.7.1. new 58cd312 gnu: pulseview: Update to 0.4.1. new becee70 gnu: disorderfs: Update to 0.5.5. new 21fc352 gnu: yosys: Don't use unstable tarball. new 4cae7e6 gnu: hyperrogue: Update to 10.4x. 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/code.scm | 10 +- gnu/packages/electronics.scm | 22 -- gnu/packages/file-systems.scm | 6 +++--- gnu/packages/fpga.scm | 13 +++-- gnu/packages/games.scm| 12 ++-- gnu/packages/python.scm | 4 ++-- 6 files changed, 39 insertions(+), 28 deletions(-)
05/07: gnu: disorderfs: Update to 0.5.5.
nckx pushed a commit to branch master
in repository guix.
commit becee7029f843b23755e2cd884fafa563bc8f6b2
Author: Tobias Geerinckx-Rice
Date: Tue Oct 30 21:49:28 2018 +0100
gnu: disorderfs: Update to 0.5.5.
* gnu/packages/file-systems.scm (disorderfs): Update to 0.5.5.
---
gnu/packages/file-systems.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index b195019..f250719 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -107,7 +107,7 @@ single file can be mounted.")
(define-public disorderfs
(package
(name "disorderfs")
-(version "0.5.4")
+(version "0.5.5")
(source
(origin
(method git-fetch)
@@ -117,7 +117,7 @@ single file can be mounted.")
(file-name (git-file-name name version))
(sha256
(base32
- "1mw4ix9h17ikki8p2rxdvzp87rcm1c7by5lvfn5gxlxr7hlj9f8g"
+ "18c32qcdzbxrzg7srnqnw1ls9yqqxyk9b996yxr6w2znw6x6n8v4"
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -126,7 +126,7 @@ single file can be mounted.")
("attr" ,attr)))
(arguments
`(#:phases (modify-phases %standard-phases
- (delete 'configure))
+ (delete 'configure)) ; no configure script
#:make-flags (let ((out (assoc-ref %outputs "out")))
(list (string-append "PREFIX=" out)))
#:test-target "test"
02/06: gnu: perl-xml-xpath: Update to 1.44.
nckx pushed a commit to branch master
in repository guix.
commit fc82538c15392759955e0f1a2dedecf454a86860
Author: Tobias Geerinckx-Rice
Date: Sun Oct 28 00:03:41 2018 +0200
gnu: perl-xml-xpath: Update to 1.44.
* gnu/packages/xml.scm (perl-xml-xpath): Update to 1.44.
---
gnu/packages/xml.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 9aa2800..c1f14d7 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -809,14 +809,14 @@ RSS 0.91, RSS 1.0, RSS 2.0, Atom")
(define-public perl-xml-xpath
(package
(name "perl-xml-xpath")
-(version "1.42")
+(version "1.44")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/M/MA/MANWAR/"
"XML-XPath-" version ".tar.gz"))
(sha256
(base32
-"04mm91kxav598ax7nlg81dhnvanwvg6bkf30l0cgkmga5iyccsly"
+"03yxj7w5a43ibbpiqsvb3lswj2b71dydsx4rs2fw0p8n0l3i3j8w"
(build-system perl-build-system)
(native-inputs
`(("perl-path-tiny" ,perl-path-tiny)))
01/06: gnu: flatbuffers: Fix typo in description.
nckx pushed a commit to branch master
in repository guix.
commit a8b12397a1155d9e2cb278ffbfe66d042573d129
Author: Tobias Geerinckx-Rice
Date: Fri Oct 26 16:11:21 2018 +0200
gnu: flatbuffers: Fix typo in description.
* gnu/packages/serialization.scm (flatbuffers)[description]: Hyphenate.
---
gnu/packages/serialization.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index b34ea30..40b3d1b 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -455,7 +455,7 @@ to generate and parse. The two primary functions are
@code{cbor.loads} and
(assoc-ref %outputs "out") "/lib"
(home-page "https://google.github.io/flatbuffers/;)
(synopsis "Memory-efficient serialization library")
-(description "FlatBuffers is a cross platform serialization library for
C++,
+(description "FlatBuffers is a cross-platform serialization library for
C++,
C#, C, Go, Java, JavaScript, PHP, and Python. It was originally created for
game development and other performance-critical applications.")
(license license:asl2.0)))
branch master updated (f3dd10d -> 2b9b4b1)
nckx pushed a change to branch master
in repository guix.
from f3dd10d gnu: libmspack: Update to 0.8 [fixes
CVE-2018-{18584,18585,18586}].
new a8b1239 gnu: flatbuffers: Fix typo in description.
new fc82538 gnu: perl-xml-xpath: Update to 1.44.
new 6135735 gnu: perl-www-mechanize: Update to 1.89.
new 31b6195 gnu: fzy: Don't use unstable tarball.
new 2792d8a gnu: fzy: Update to 1.0.
new 2b9b4b1 gnu: hashcat-utils: Update to 1.9.
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
gnu/packages/password-utils.scm | 26 +++---
gnu/packages/serialization.scm | 2 +-
gnu/packages/shellutils.scm | 14 --
gnu/packages/web.scm| 4 ++--
gnu/packages/xml.scm| 4 ++--
5 files changed, 28 insertions(+), 22 deletions(-)
06/06: gnu: hashcat-utils: Update to 1.9.
nckx pushed a commit to branch master
in repository guix.
commit 2b9b4b1fe368fb1745c4150adbb8754948326c95
Author: Tobias Geerinckx-Rice
Date: Sun Oct 28 02:35:09 2018 +0200
gnu: hashcat-utils: Update to 1.9.
And trim lines to 80 characters.
* gnu/packages/password-utils.scm (hashcat-utils): Update to 1.9.
[source]: Parametrise.
---
gnu/packages/password-utils.scm | 26 +++---
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index e09bbea..357ef86 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -735,15 +735,15 @@ password cracking.")
(define-public hashcat-utils
(package
(name "hashcat-utils")
-(version "1.8")
+(version "1.9")
(source
(origin
(method url-fetch)
- (uri (string-append
"https://github.com/hashcat/hashcat-utils/releases/download/v;
- version "/hashcat-utils-1.8.7z"))
+ (uri (string-append "https://github.com/hashcat/hashcat-utils/releases/;
+ "download/v" version "/"
+ "hashcat-utils-" version ".7z"))
(sha256
-(base32
- "1x80rngjz7gkhwplhw1iqr0wzb6hjkrjfld2kz9kmgp5dr9nys1p"
+(base32 "0kq555kb338691qd7zjmi8vhq4km3apnsl2w63zh0igwzcjx6lx1"
(native-inputs
`(("p7zip" ,p7zip)))
(inputs
@@ -767,12 +767,16 @@ password cracking.")
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (string-append (assoc-ref outputs "out") "/bin")))
(mkdir-p out)
- (for-each (lambda (file)
- (copy-file file (string-append out "/" (basename
file ".bin"
- (find-files "." "\\.bin$"))
- (for-each (lambda (file)
- (copy-file file (string-append out "/" (basename
file ".pl"
- (find-files "../bin" "\\.pl$"))
+ (for-each
+(lambda (file)
+ (copy-file file (string-append out "/"
+ (basename file ".bin"
+(find-files "." "\\.bin$"))
+ (for-each
+(lambda (file)
+ (copy-file file (string-append out "/"
+ (basename file ".pl"
+(find-files "../bin" "\\.pl$"))
#t))
(home-page "https://github.com/hashcat/hashcat-utils/;)
(synopsis "Small utilities that are useful in advanced password cracking")
03/06: gnu: perl-www-mechanize: Update to 1.89.
nckx pushed a commit to branch master
in repository guix.
commit 6135735b52c7f328cdc1fe22ca5c288ef8f96165
Author: Tobias Geerinckx-Rice
Date: Sun Oct 28 00:46:05 2018 +0200
gnu: perl-www-mechanize: Update to 1.89.
* gnu/packages/web.scm (perl-www-mechanize): Update to 1.89.
---
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 c3b06b0..29d03f6 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3697,7 +3697,7 @@ library.")
(define-public perl-www-mechanize
(package
(name "perl-www-mechanize")
-(version "1.88")
+(version "1.89")
(source
(origin
(method url-fetch)
@@ -3705,7 +3705,7 @@ library.")
"WWW-Mechanize-" version ".tar.gz"))
(sha256
(base32
- "0yd8a1zsfpbv5wr79x3iqmik9gvcd10iam9dfrdan4dri9vpxn9n"
+ "1mxx362vqiniw8vi6k3j7v9b1s7012irhfcblcz1p6jz9cjqi7mh"
(build-system perl-build-system)
(native-inputs ;only for tests
`(("perl-cgi" ,perl-cgi)
05/06: gnu: fzy: Update to 1.0.
nckx pushed a commit to branch master in repository guix. commit 2792d8a8652bbc017ee0be17cff33ee5968c9d41 Author: Tobias Geerinckx-Rice Date: Sun Oct 28 00:53:42 2018 +0200 gnu: fzy: Update to 1.0. * gnu/packages/shellutils.scm (fzy): Update to 1.0. --- gnu/packages/shellutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index d4076da..3020fdd 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -134,7 +134,7 @@ environment variables of the current shell.") (define-public fzy (package (name "fzy") -(version "0.9") +(version "1.0") (source (origin (method git-fetch) @@ -144,7 +144,7 @@ environment variables of the current shell.") (file-name (git-file-name name version)) (sha256 (base32 - "1f1sh88ivdgnqaqha5ircfd9vb0xmss976qns022n0ddb91k5ka6" + "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k" (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc"
04/06: gnu: fzy: Don't use unstable tarball.
nckx pushed a commit to branch master in repository guix. commit 31b619566dfb01b0deb8b127c7b24ef347de8b87 Author: Tobias Geerinckx-Rice Date: Sun Oct 28 00:49:41 2018 +0200 gnu: fzy: Don't use unstable tarball. * gnu/packages/shellutils.scm (fzy)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/shellutils.scm | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 425713a..d4076da 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -28,6 +28,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (gnu packages autotools) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) @@ -136,13 +137,14 @@ environment variables of the current shell.") (version "0.9") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/jhawthorn/fzy/archive/; - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jhawthorn/fzy.git;) + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1xfgxqbkcpi2n4381kj3fq4026qs6by7xhl5gn0fgp3dh232c63j" + "1f1sh88ivdgnqaqha5ircfd9vb0xmss976qns022n0ddb91k5ka6" (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc"
05/07: gnu: parallel: Update to 20181022.
nckx pushed a commit to branch master in repository guix. commit 6d9a690927ac92e4c217d41d7e34e91457c5e1a7 Author: Tobias Geerinckx-Rice Date: Fri Oct 26 04:03:59 2018 +0200 gnu: parallel: Update to 20181022. * gnu/packages/parallel.scm (parallel): Update to 20181022. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 3dba2b8..1970eb1 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -48,7 +48,7 @@ (define-public parallel (package (name "parallel") -(version "20180922") +(version "20181022") (source (origin (method url-fetch) @@ -56,7 +56,7 @@ version ".tar.bz2")) (sha256 (base32 -"07q7lzway2qf8mx6fb4q45jmirsc8pw6rgv03ifrp32jw3q8w1za" +"1v6vrfnn6acjjlp8xiizvcrb3zzs94av5xcl6xm8zfvcapixx11f" (build-system gnu-build-system) (arguments `(#:phases
06/07: gnu: units: Update to 2.18.
nckx pushed a commit to branch master
in repository guix.
commit 4795e5e177e5aa7b79ce9d4b0965f81e058d594d
Author: Tobias Geerinckx-Rice
Date: Sat Oct 27 04:20:39 2018 +0200
gnu: units: Update to 2.18.
* gnu/packages/maths.scm (units): Update to 2.18.
---
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 48bfcba..437f367 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -286,13 +286,13 @@ programming language.")
(define-public units
(package
(name "units")
- (version "2.17")
+ (version "2.18")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/units/units-" version
".tar.gz"))
(sha256 (base32
- "1n2xzpnxfn475zkd8rzs5gg58xszjbr4bdbgvk6hryzimvwwj0qz"
+ "0y26kj349i048y4z3xrk90bvciw2j6ds3rka7r7yn3183hirr5b4"
(build-system gnu-build-system)
(inputs
`(("readline" ,readline)
02/07: gnu: perl-x11-xcb: Update to 0.18.
nckx pushed a commit to branch master in repository guix. commit b106b78cf8749c7077e01166a92b76c22ddd57a4 Author: Tobias Geerinckx-Rice Date: Fri Oct 26 17:02:48 2018 +0200 gnu: perl-x11-xcb: Update to 0.18. * gnu/packages/xorg.scm (perl-x11-xcb): Update to 0.18. --- 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 86b4470..852eef9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5778,7 +5778,7 @@ programs that cannot use the window system directly.") (define-public perl-x11-xcb (package (name "perl-x11-xcb") -(version "0.17") +(version "0.18") (source (origin (method url-fetch) (uri (string-append @@ -5786,7 +5786,7 @@ programs that cannot use the window system directly.") "X11-XCB-" version ".tar.gz")) (sha256 (base32 -"12qyf98s5hbybmh0mblpz50c00i68srq73w5rw31m2dhclj8n96q" +"1cjpghw7cnackw20lbd7yzm222kz5bnrwz52f8ay24d1f4pwrnxf" (build-system perl-build-system) (arguments '(;; Disable parallel build to prevent a race condition.
07/07: gnu: xmlsec-nss: Fix tests (and hence build).
nckx pushed a commit to branch master
in repository guix.
commit 3825b8e1ba60b16b4169bdab391755297cfb
Author: Tobias Geerinckx-Rice
Date: Sat Oct 27 04:43:33 2018 +0200
gnu: xmlsec-nss: Fix tests (and hence build).
* gnu/packages/xml.scm (xmlsec-nss)[native-inputs]: Add nss:bin to
provide the certutil command.
---
gnu/packages/xml.scm | 4
1 file changed, 4 insertions(+)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 4e4fa2d..9aa2800 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -952,6 +952,10 @@ Libxml2).")
(package
(inherit xmlsec)
(name "xmlsec-nss")
+(native-inputs
+ ;; For tests.
+ `(("nss:bin" ,nss "bin") ; for certutil
+ ,@(package-native-inputs xmlsec)))
(inputs
`(("nss" ,nss)
("libltdl" ,libltdl)))
branch master updated (829785c -> 3825b44)
nckx pushed a change to branch master in repository guix. from 829785c gnu: Add tnef. new 429a332 gnu: flatbuffers: Update to 1.10.0. new b106b78 gnu: perl-x11-xcb: Update to 0.18. new b2d2865 gnu: gama: Update to 2.01. new 574d877 gnu: gvpe: Update to 3.1. new 6d9a690 gnu: parallel: Update to 20181022. new 4795e5e gnu: units: Update to 2.18. new 3825b44 gnu: xmlsec-nss: Fix tests (and hence build). 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/gps.scm | 4 ++-- gnu/packages/maths.scm | 4 ++-- gnu/packages/parallel.scm | 4 ++-- gnu/packages/serialization.scm | 4 ++-- gnu/packages/vpn.scm | 16 +++- gnu/packages/xml.scm | 4 gnu/packages/xorg.scm | 4 ++-- 7 files changed, 17 insertions(+), 23 deletions(-)
04/07: gnu: gvpe: Update to 3.1.
nckx pushed a commit to branch master
in repository guix.
commit 574d877e40c293bf1f79fb2f5735b9ab24df4349
Author: Tobias Geerinckx-Rice
Date: Sat Oct 27 04:17:34 2018 +0200
gnu: gvpe: Update to 3.1.
* gnu/packages/vpn.scm (gvpe): Update to 3.1.
[source]: Remove obsolete snippet.
[native-inputs]: Add pkg-config.
---
gnu/packages/vpn.scm | 16 +++-
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index dcb1146..1edd1ac 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -48,27 +48,17 @@
(define-public gvpe
(package
(name "gvpe")
-(version "3.0")
+(version "3.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gvpe/gvpe-"
version ".tar.gz"))
(sha256
(base32
-"1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Remove the outdated bundled copy of glibc's getopt, which
- ;; provides a 'getopt' declaration that conflicts with that
- ;; of glibc 2.26.
- (substitute* "lib/Makefile.in"
-(("getopt1?\\.(c|h|\\$\\(OBJEXT\\))") ""))
- (for-each delete-file
-'("lib/getopt.h" "lib/getopt.c"))
- #t
+"1cz8n75ksl0l908zc5l3rnfm1hv7130s2w8710799fr5sxrdbszi"
(build-system gnu-build-system)
(home-page "http://software.schmorp.de/pkg/gvpe.html;)
+(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("openssl" ,openssl)
("zlib" ,zlib)))
(synopsis "Secure VPN among multiple nodes over an untrusted network")
03/07: gnu: gama: Update to 2.01.
nckx pushed a commit to branch master in repository guix. commit b2d286545da7a8c5364cd8fb307b80a9c08c1060 Author: Tobias Geerinckx-Rice Date: Sat Oct 27 04:12:03 2018 +0200 gnu: gama: Update to 2.01. * gnu/packages/gps.scm (gama): Update to 2.01. --- gnu/packages/gps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index cd639a4..0709a58 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -147,7 +147,7 @@ between two other data points.") (define-public gama (package (name "gama") -(version "2.00") +(version "2.01") (source (origin (method url-fetch) @@ -155,7 +155,7 @@ between two other data points.") version ".tar.gz")) (sha256 (base32 - "1p51jlzr6qqqvzx0sq8j7fxqfij62c3pjcsb53vgx0jx0qdqyjba" + "1z3n5p69qglxq15l9g13cg78kyb0l6v8mbzqgc1fqkfbdk1mis0k" (build-system gnu-build-system) (arguments '(#:parallel-tests? #f)) ; race condition (native-inputs
01/07: gnu: flatbuffers: Update to 1.10.0.
nckx pushed a commit to branch master
in repository guix.
commit 429a332b1c3c505331f30d04901bd8cb5d287bbe
Author: Tobias Geerinckx-Rice
Date: Fri Oct 26 16:04:52 2018 +0200
gnu: flatbuffers: Update to 1.10.0.
* gnu/packages/serialization.scm (flatbuffers): Update to 1.10.0.
---
gnu/packages/serialization.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 6b28463..b34ea30 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -438,7 +438,7 @@ to generate and parse. The two primary functions are
@code{cbor.loads} and
(define-public flatbuffers
(package
(name "flatbuffers")
-(version "1.9.0")
+(version "1.10.0")
(source
(origin
(method url-fetch)
@@ -446,7 +446,7 @@ to generate and parse. The two primary functions are
@code{cbor.loads} and
version ".tar.gz"))
(sha256
(base32
- "1qs7sa9q4q6hs12yp875lvrv6393178qcmqs1ziwmjk088g4k9aw"
+ "0z4swldxs0s31hnkqdhsbfmc8vx3p7zsvmqaw4l31r2iikdy651p"
(build-system cmake-build-system)
(arguments
'(#:build-type "Release"
02/05: gnu: dnsmasq: Update to 2.80 [security fixes].
nckx pushed a commit to branch master
in repository guix.
commit 0e8e29088f60569fe823e11ba5653f4b4f4d4b4c
Author: Tobias Geerinckx-Rice
Date: Fri Oct 26 01:53:59 2018 +0200
gnu: dnsmasq: Update to 2.80 [security fixes].
* gnu/packages/dns.scm (dnsmasq): Update to 2.80.
---
gnu/packages/dns.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index e738d3f..55147f8 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -65,7 +65,7 @@
(define-public dnsmasq
(package
(name "dnsmasq")
-(version "2.79")
+(version "2.80")
(source (origin
(method url-fetch)
(uri (string-append
@@ -73,7 +73,7 @@
version ".tar.xz"))
(sha256
(base32
-"07w6cw706yyahwvbvslhkrbjf2ynv567cgy9pal8bz8lrbsp9bbq"
+"1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd"
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
04/05: gnu: hplip: Update to 3.18.9.
nckx pushed a commit to branch master
in repository guix.
commit b17004f9f9541acbd07b45e35222e431427bfde0
Author: Tobias Geerinckx-Rice
Date: Fri Oct 26 01:49:37 2018 +0200
gnu: hplip: Update to 3.18.9.
* gnu/packages/cups.scm (hplip): Update to 3.18.9.
[arguments]: Add the resulting libraries to the build's RUNPATH.
---
gnu/packages/cups.scm | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 81e442e..8993087 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -396,14 +396,14 @@ device-specific programs to convert and print many types
of files.")
(define-public hplip
(package
(name "hplip")
-(version "3.18.6")
+(version "3.18.9")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
-"0zbv6cp9n3xypf2fg4j6fpz8zkvl0z08lyc1vq1gd04ln1l3xkqf"))
+"0g3q5mm2crjyc1z4z6gv4lam6sc5d3diz704djrnpqadk4q3h290"))
(modules '((guix build utils)))
(snippet
;; Fix type mismatch.
@@ -428,6 +428,8 @@ device-specific programs to convert and print many types of
files.")
`("--disable-network-build"
,(string-append "--prefix=" (assoc-ref %outputs "out"))
,(string-append "--sysconfdir=" (assoc-ref %outputs "out") "/etc")
+ ,(string-append "LDFLAGS=-Wl,-rpath="
+ (assoc-ref %outputs "out") "/lib")
;; Disable until mime.types merging works (FIXME).
"--disable-fax-build"
"--enable-hpcups-install"
05/05: gnu: hplip: Update home page.
nckx pushed a commit to branch master
in repository guix.
commit 21c51ebd66faa0b47f0be223d97c3a371346f54b
Author: Tobias Geerinckx-Rice
Date: Fri Oct 26 01:50:50 2018 +0200
gnu: hplip: Update home page.
* gnu/packages/cups.scm (hplip)[home-page]: Follow its permanent
redirection.
---
gnu/packages/cups.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 8993087..4259648 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -412,7 +412,7 @@ device-specific programs to convert and print many types of
files.")
(("boolean") "bool"))
#t
(build-system gnu-build-system)
-(home-page "http://hplipopensource.com/;)
+(home-page "https://developers.hp.com/hp-linux-imaging-and-printing;)
(synopsis "HP printer drivers")
(description
"Hewlett-Packard printer drivers and PostScript Printer Descriptions
branch master updated (dea0178 -> 21c51eb)
nckx pushed a change to branch master in repository guix. from dea0178 gnu: Mercurial: Update to 4.7.2. new e81dded gnu: tinc: Use HTTPS for sources and home page. new 0e8e290 gnu: dnsmasq: Update to 2.80 [security fixes]. new 2fba511 gnu: libsigrok: Update to 0.5.1. new b17004f gnu: hplip: Update to 3.18.9. new 21c51eb gnu: hplip: Update home page. 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/cups.scm| 8 +--- gnu/packages/dns.scm | 4 ++-- gnu/packages/electronics.scm | 26 -- gnu/packages/vpn.scm | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-)
01/05: gnu: tinc: Use HTTPS for sources and home page.
nckx pushed a commit to branch master
in repository guix.
commit e81ddedaef5b298e52e46783c8e53b6351596a7b
Author: Tobias Geerinckx-Rice
Date: Wed Oct 24 05:33:42 2018 +0200
gnu: tinc: Use HTTPS for sources and home page.
* gnu/packages/vpn.scm (tinc)[source, home-page]: Use HTTPS.
---
gnu/packages/vpn.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 44e736e..dcb1146 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -315,7 +315,7 @@ traversing network address translators (@dfn{NAT}s) and
firewalls.")
(version "1.0.35")
(source (origin
(method url-fetch)
- (uri (string-append "http://tinc-vpn.org/packages/;
+ (uri (string-append "https://tinc-vpn.org/packages/;
name "-" version ".tar.gz"))
(sha256
(base32
@@ -328,7 +328,7 @@ traversing network address translators (@dfn{NAT}s) and
firewalls.")
(inputs `(("zlib" ,zlib)
("lzo" ,lzo)
("openssl" ,openssl)))
-(home-page "http://tinc-vpn.org;)
+(home-page "https://tinc-vpn.org;)
(synopsis "Virtual Private Network (VPN) daemon")
(description
"Tinc is a VPN that uses tunnelling and encryption to create a secure
03/05: gnu: libsigrok: Update to 0.5.1.
nckx pushed a commit to branch master
in repository guix.
commit 2fba511e0fa2b39218101c2661864b6b570315c2
Author: Tobias Geerinckx-Rice
Date: Fri Oct 26 02:24:39 2018 +0200
gnu: libsigrok: Update to 0.5.1.
* gnu/packages/electronics.scm (libsigrok): Update to 0.5.1.
[arguments]: Adjust to split udev rules and clean up a little.
---
gnu/packages/electronics.scm | 26 --
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index d13f220..4aaf050 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -123,7 +123,7 @@ as simple logic analyzer and/or oscilloscope hardware.")
(define-public libsigrok
(package
(name "libsigrok")
-(version "0.5.0")
+(version "0.5.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -131,19 +131,17 @@ as simple logic analyzer and/or oscilloscope hardware.")
version ".tar.gz"))
(sha256
(base32
-"197kr5ip98lxn7rv10zs35d1w0j7265s0xvckx0mq2l8kdvqd32c"
+"171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"
(outputs '("out" "doc"))
(arguments
- `(#:tests? #f ; tests need usb access
+ `(#:tests? #f ; tests need USB access
#:phases
(modify-phases %standard-phases
(add-before 'configure 'change-udev-group
(lambda _
- (let ((file "contrib/z60_libsigrok.rules"))
- (substitute* file
- (("plugdev") "dialout"))
- (rename-file file "contrib/60-libsigrok.rules")
- #t)))
+ (substitute* (find-files "contrib" "\\.rules$")
+ (("plugdev") "dialout"))
+ #t))
(add-after 'build 'build-doc
(lambda _
(invoke "doxygen")))
@@ -155,11 +153,12 @@ as simple logic analyzer and/or oscilloscope hardware.")
#t))
(add-after 'install-doc 'install-udev-rules
(lambda* (#:key outputs #:allow-other-keys)
- (install-file "contrib/60-libsigrok.rules"
- (string-append
-(assoc-ref outputs "out")
-"/lib/udev/rules.d/"))
- #t))
+ (let* ((out (assoc-ref outputs "out"))
+(rules (string-append out "/lib/udev/rules.d/")))
+ (for-each (lambda (file)
+ (install-file file rules))
+ (find-files "contrib" "\\.rules$"))
+ #t)))
(add-after 'install-udev-rules 'install-fw
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((fx2lafw (assoc-ref inputs "sigrok-firmware-fx2lafw"))
@@ -167,7 +166,6 @@ as simple logic analyzer and/or oscilloscope hardware.")
(dir-suffix "/share/sigrok-firmware/")
(input-dir (string-append fx2lafw dir-suffix))
(output-dir (string-append out dir-suffix)))
- (mkdir-p output-dir)
(for-each
(lambda (file)
(install-file file output-dir))
branch master updated (e2ec95c -> 9ac59ad)
nckx pushed a change to branch master in repository guix. from e2ec95c gnu: Add pdfpc. new b865e7c gnu: cdogs-sdl: Update to 0.6.8. new 95f6ada gnu: sfml: Don't use unstable tarball. new 9ac59ad gnu: sfml: Update to 2.5.1. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/game-development.scm | 13 +++-- gnu/packages/games.scm| 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-)
03/03: gnu: sfml: Update to 2.5.1.
nckx pushed a commit to branch master in repository guix. commit 9ac59ad30a89f51254fa1f95d42ab290e0f6c3f7 Author: Tobias Geerinckx-Rice Date: Thu Oct 25 04:23:31 2018 +0200 gnu: sfml: Update to 2.5.1. * gnu/packages/game-development.scm (sfml): Update to 2.5.1. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 6ed1408..da16758 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -440,7 +440,7 @@ clone.") (define-public sfml (package (name "sfml") -(version "2.5.0") +(version "2.5.1") (source (origin (method git-fetch) ;; Do not fetch the archives from @@ -452,7 +452,7 @@ clone.") (file-name (git-file-name name version)) (sha256 (base32 -"1cmg7xgk2shi94h47w0p9g0wh4g00sgwlq0nwc1n6d6qy9wfrx1k")) +"0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay")) (modules '((guix build utils))) (snippet '(begin
01/03: gnu: cdogs-sdl: Update to 0.6.8.
nckx pushed a commit to branch master in repository guix. commit b865e7c254ac55002e86e3b8df7edeb73ffeac0d Author: Tobias Geerinckx-Rice Date: Thu Oct 25 04:15:02 2018 +0200 gnu: cdogs-sdl: Update to 0.6.8. * gnu/packages/games.scm (cdogs-sdl): Update to 0.6.8. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bb96bbe..53e7a79 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4018,7 +4018,7 @@ emerges from a sewer hole and pulls her below ground.") (define-public cdogs-sdl (package (name "cdogs-sdl") -(version "0.6.7") +(version "0.6.8") (source (origin (method git-fetch) (uri (git-reference @@ -4027,7 +4027,7 @@ emerges from a sewer hole and pulls her below ground.") (file-name (git-file-name name version)) (sha256 (base32 -"1frafzsj3f83xkmn4llr7g728c82lcqi424ini1hv3gv5zjgpa15" +"1v0adxm4xsix6r6j9hs7vmss7pxrb37azwfazr54p1dmfz4s6rp8" (build-system cmake-build-system) (arguments `(#:configure-flags
02/03: gnu: sfml: Don't use unstable tarball.
nckx pushed a commit to branch master in repository guix. commit 95f6adae34e81513b878ecd8c98c1b21c217a2b6 Author: Tobias Geerinckx-Rice Date: Thu Oct 25 04:20:27 2018 +0200 gnu: sfml: Don't use unstable tarball. * gnu/packages/game-development.scm (sfml)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/game-development.scm | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 6b7e71f..6ed1408 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -442,16 +442,17 @@ clone.") (name "sfml") (version "2.5.0") (source (origin - (method url-fetch) + (method git-fetch) ;; Do not fetch the archives from ;; http://mirror0.sfml-dev.org/files/ because files there seem ;; to be changed in place. - (uri (string-append "https://github.com/SFML/SFML/archive/; - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference +(url "https://github.com/SFML/SFML.git;) +(commit version))) + (file-name (git-file-name name version)) (sha256 (base32 -"1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab")) +"1cmg7xgk2shi94h47w0p9g0wh4g00sgwlq0nwc1n6d6qy9wfrx1k")) (modules '((guix build utils))) (snippet '(begin
05/07: gnu: Add python-reparser.
nckx pushed a commit to branch master
in repository guix.
commit 11d99192c76e36d6aeb9998749d3d50d1937561e
Author: Tobias Geerinckx-Rice
Date: Mon Oct 22 20:36:28 2018 +0200
gnu: Add python-reparser.
* gnu/packages/python.scm (python-reparser, python2-reparser):
New public variable.
---
gnu/packages/python.scm | 26 ++
1 file changed, 26 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d9f3ebf..fbb2802 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14551,3 +14551,29 @@ are not supported.")
(define-public python2-readlike
(package-with-python2 python-readlike))
+
+(define-public python-reparser
+ (package
+(name "python-reparser")
+(version "1.4.3")
+(source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "ReParser" version))
+ (sha256
+(base32 "0nniqb69xr0fv7ydlmrr877wyyjb61nlayka7xr08vlxl9caz776"
+(build-system python-build-system)
+(home-page "https://github.com/xmikos/reparser;)
+(synopsis "Simple lexer/parser for inline markup based on regular
expressions")
+(description
+ "This Python library provides a simple lexer/parser for inline markup
based
+on regular expressions.")
+(license license:expat)))
+
+(define-public python2-reparser
+ (let ((reparser (package-with-python2
+ (strip-python2-variant python-reparser
+(package (inherit reparser)
+ (propagated-inputs
+ `(("python2-enum34" ,python2-enum34)
+,@(package-propagated-inputs reparser))
03/07: gnu: minixml: Update to 2.12.
nckx pushed a commit to branch master in repository guix. commit 5b59c77585b41896eda1a40b24b1c3c4a536f080 Author: Tobias Geerinckx-Rice Date: Wed Oct 24 20:51:06 2018 +0200 gnu: minixml: Update to 2.12. * gnu/packages/xml.scm (minixml): Update to 2.12. [arguments]: Add the resulting libraries to the build's RUNPATH. --- gnu/packages/xml.scm | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 1173dc4..4e4fa2d 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -960,7 +960,7 @@ Libxml2).") (define-public minixml (package (name "minixml") -(version "2.11") +(version "2.12") (source (origin (method url-fetch/tarbomb) (uri (string-append "https://github.com/michaelrsweet/mxml/; @@ -968,10 +968,13 @@ Libxml2).") "/mxml-" version ".tar.gz")) (sha256 (base32 -"13xsw8vvkxd10vca42ccdyl9rs64lcvhbfz57aknpl3xcfn8mxma" +"1z8nqxa4pqdic8wpixkkgg1m2pak9wjikjjxnk3j5i0d29dbgmmg" (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags + (list (string-append "LDFLAGS=-Wl,-rpath=" +(assoc-ref %outputs "out") "/lib")) + #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-permissions ;; FIXME: url-fetch/tarbomb resets all permissions to 555/444.
branch master updated (c1144c7 -> f65fdd9)
nckx pushed a change to branch master in repository guix. from c1144c7 gnu: Add libkscreen. new f437e39 gnu: loksh: Use PREFIX. new ac9f481 gnu: iproute2: Update to 4.19.0. new 5b59c77 gnu: minixml: Update to 2.12. new d4eb8a2 gnu: Add python-readlike. new 11d9919 gnu: Add python-reparser. new 56a5ef4 gnu: Add python-mechanicalsoup. new f65fdd9 gnu: Add hangups. 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/linux.scm | 4 ++-- gnu/packages/messaging.scm | 44 + gnu/packages/python-web.scm | 38 gnu/packages/python.scm | 53 + gnu/packages/shells.scm | 9 gnu/packages/xml.scm| 9 +--- 6 files changed, 147 insertions(+), 10 deletions(-)
07/07: gnu: Add hangups.
nckx pushed a commit to branch master
in repository guix.
commit f65fdd95df71f829cbb21542a1bb2cb1de68554c
Author: Tobias Geerinckx-Rice
Date: Tue Oct 23 02:50:10 2018 +0200
gnu: Add hangups.
* gnu/packages/messaging.scm (hangups): New public variable.
---
gnu/packages/messaging.scm | 44
1 file changed, 44 insertions(+)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 3f05039..42fb373 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -71,8 +71,10 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-crypto)
+ #:use-module (gnu packages python-web)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages tcl)
@@ -1719,4 +1721,46 @@ QMatrixClient project.")
(license (list license:gpl3+ ; all source code
license:lgpl3+ ; icons/breeze
+(define-public hangups
+ (package
+(name "hangups")
+(version "0.4.6")
+(source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "hangups" version))
+ (sha256
+(base32 "0mvpfd5dc3zgcvwfidcd2qyn59xl5biv728mxifw0ls5rzkc9chs"
+(build-system python-build-system)
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'relax-dependencies
+ ;; Relax overly strict package version specifications.
+ (lambda _
+ (substitute* "setup.py"
+ (("==") ">="))
+ #t)
+(propagated-inputs
+ `(("python-aiohttp" ,python-aiohttp)
+ ("python-appdirs" ,python-appdirs)
+ ("python-async-timeout" ,python-async-timeout)
+ ("python-configargparse" ,python-configargparse)
+ ("python-mechanicalsoup" ,python-mechanicalsoup)
+ ("python-protobuf" ,python-protobuf)
+ ("python-readlike" ,python-readlike)
+ ("python-reparser" ,python-reparser)
+ ("python-requests" ,python-requests)
+ ("python-urwid" ,python-urwid)))
+(home-page "https://hangups.readthedocs.io/;)
+(synopsis "Instant messaging client for Google Hangouts")
+(description
+ "Hangups is an instant messaging client for Google Hangouts. It includes
+both a Python library and a reference client with a text-based user interface.
+
+Hangups is implements a reverse-engineered version of Hangouts' proprietary,
+non-interoperable protocol, which allows it to support features like group
+messaging that aren’t available to clients that connect over XMPP.")
+(license license:expat)))
+
;;; messaging.scm ends here
02/07: gnu: iproute2: Update to 4.19.0.
nckx pushed a commit to branch master in repository guix. commit ac9f4819795ee8e2118f9c043a1ef81f45cc6677 Author: Tobias Geerinckx-Rice Date: Wed Oct 24 15:47:16 2018 +0200 gnu: iproute2: Update to 4.19.0. * gnu/packages/linux.scm (iproute): Update to 4.19.0. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 589d373..84537b9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1222,7 +1222,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") (define-public iproute (package (name "iproute2") -(version "4.18.0") +(version "4.19.0") (source (origin (method url-fetch) (uri (string-append @@ -1230,7 +1230,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") version ".tar.xz")) (sha256 (base32 -"0ida5njr9nacg6ym3rjvl3cc9czw0hn4akhzbqf8f4zmjl6cgrm9" +"114rlb3bvrf7q6yr03mn1rj6gl7mrg0psvm2dx0qb2kxyjhmrv6r" (build-system gnu-build-system) (arguments `(#:tests? #f; no test suite
04/07: gnu: Add python-readlike.
nckx pushed a commit to branch master
in repository guix.
commit d4eb8a21a6bd5df9126290208d275c94d65c95e3
Author: Tobias Geerinckx-Rice
Date: Mon Oct 22 17:58:02 2018 +0200
gnu: Add python-readlike.
* gnu/packages/python.scm (python-readlike, python2-readlike):
New public variables.
---
gnu/packages/python.scm | 27 +++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index dee7d9a..d9f3ebf 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14524,3 +14524,30 @@ can be retrieved in constant time. Some of the
terminology is inspired by
LISP. It is possible to create an improper list by creating a @code{Pair}
with a non-list @code{cdr}.")
(license license:gpl3+)))
+
+(define-public python-readlike
+ (package
+(name "python-readlike")
+(version "0.1.3")
+(source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "readlike" version))
+ (sha256
+(base32 "027w8fvi50ksl57q0a7kb5zvmq8jxaawnviib1jdqw0p3igvm1j4"
+(build-system python-build-system)
+(home-page "https://github.com/jangler/readlike;)
+(synopsis "GNU Readline-like line editing module")
+(description
+ "This Python module provides line editing functions similar to the default
+Emacs-style ones of GNU Readline. Unlike the Python standard library's
+@code{readline} package, this one allows access to those capabilties in
settings
+outside of a standard command-line interface. It is especially well-suited to
+interfacing with Urwid, due to a shared syntax for describing key inputs.
+
+Currently, all stateless Readline commands are implemented. Yanking and
history
+are not supported.")
+(license license:expat)))
+
+(define-public python2-readlike
+ (package-with-python2 python-readlike))
01/07: gnu: loksh: Use PREFIX.
nckx pushed a commit to branch master
in repository guix.
commit f437e39aa2cd9214b03d5cf4f5bda22441834e04
Author: Tobias Geerinckx-Rice
Date: Wed Oct 24 05:54:35 2018 +0200
gnu: loksh: Use PREFIX.
* gnu/packages/shells.scm (loksh)[argumentss]: Substitute PREFIX for
DESTDIR #:make-flags.
---
gnu/packages/shells.scm | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 47efe5d..3e9d797 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -586,14 +586,13 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
- `(#:tests? #f ;No tests included
+ `(#:tests? #f ; no tests included
#:make-flags (list "CC=gcc" "HAVE_LIBBSD=1"
- (string-append "DESTDIR="
- (assoc-ref %outputs "out"))
- "PREFIX=")
+ (string-append "PREFIX="
+ (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
- (delete 'configure ;No configure script
+ (delete 'configure ; no configure script
(home-page "https://github.com/dimkr/loksh;)
(synopsis "Korn Shell from OpenBSD")
(description
06/07: gnu: Add python-mechanicalsoup.
nckx pushed a commit to branch master
in repository guix.
commit 56a5ef4cb2624de6e17a88f395da42b710795072
Author: Tobias Geerinckx-Rice
Date: Tue Oct 23 00:39:37 2018 +0200
gnu: Add python-mechanicalsoup.
* gnu/packages/python-web.scm (python-mechanicalsoup)
(python2-mechanicalsoup): New public variable.
---
gnu/packages/python-web.scm | 38 ++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index f805245..eda796e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -60,6 +60,7 @@
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages tls)
#:use-module (gnu packages time)
+ #:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (srfi srfi-1))
@@ -255,6 +256,43 @@ other HTTP libraries.")
(define-public python2-httplib2
(package-with-python2 python-httplib2))
+(define-public python-mechanicalsoup
+ (package
+(name "python-mechanicalsoup")
+(version "0.11.0")
+(source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "MechanicalSoup" version))
+ (sha256
+(base32 "0k59wwk75q7nz6i6gynvzhagy02ql0bv7py3qqcwgjw7607yq4i7"
+(build-system python-build-system)
+(arguments
+ ;; TODO: Enable tests when python-flake8@3.5 hits master.
+ `(#:tests? #f))
+(propagated-inputs
+ `(("python-beautifulsoup4" ,python-beautifulsoup4)
+ ("python-lxml" ,python-lxml)
+ ("python-requests" ,python-requests)
+ ("python-six" ,python-six)))
+;; (native-inputs
+;; ;; For tests.
+;; `(("python-pytest-flake8" ,python-pytest-flake8)
+;;("python-pytest-httpbin" ,python-pytest-httpbin)
+;;("python-pytest-mock" ,python-pytest-mock)
+;;("python-pytest-runner" ,python-pytest-runner)
+;;("python-requests-mock" ,python-requests-mock)))
+(home-page "https://mechanicalsoup.readthedocs.io/;)
+(synopsis "Python library for automating website interaction")
+(description
+ "MechanicalSoup is a Python library for automating interaction with
+websites. It automatically stores and sends cookies, follows redirects, and
can
+follow links and submit forms. It doesn’t do JavaScript.")
+(license license:expat)))
+
+(define-public python2-mechanicalsoup
+ (package-with-python2 python-mechanicalsoup))
+
(define-public python-sockjs-tornado
(package
(name "python-sockjs-tornado")
04/04: gnu: pcsc-lite: Update to 1.8.24.
nckx pushed a commit to branch master
in repository guix.
commit 569adffe4b595096da8d17c34b5df3aa5689d4f5
Author: Tobias Geerinckx-Rice
Date: Wed Oct 24 05:55:23 2018 +0200
gnu: pcsc-lite: Update to 1.8.24.
* gnu/packages/security-token.scm (pcsc-lite): Update to 1.8.24.
---
gnu/packages/security-token.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 4495069..400c053 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -160,7 +160,7 @@ the low-level development kit for the Yubico YubiKey
authentication device.")
(define-public pcsc-lite
(package
(name "pcsc-lite")
-(version "1.8.23")
+(version "1.8.24")
(source (origin
(method url-fetch)
(uri (string-append
@@ -168,7 +168,7 @@ the low-level development kit for the Yubico YubiKey
authentication device.")
name "-" version ".tar.bz2"))
(sha256
(base32
-"1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"
+"0s3mv6csbi9303vvis0hilm71xsmi6cqkbh2kiipdisydbx6865q"
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-usbdropdir=/var/lib/pcsc/drivers"
02/04: gnu: loksh: Don't use unstable tarball.
nckx pushed a commit to branch master
in repository guix.
commit e5d757709a05169e4f1d87baf17358aab0dd8bb1
Author: Tobias Geerinckx-Rice
Date: Wed Oct 24 05:43:00 2018 +0200
gnu: loksh: Don't use unstable tarball.
* gnu/packages/shells.scm (loksh)[source]: Use GIT-FETCH and GIT-FILE-NAME.
---
gnu/packages/shells.scm | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 8362d00..7a7f2ae 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -572,13 +572,13 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.")
(version "6.3")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/dimkr/loksh/archive/;
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dimkr/loksh.git;)
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
-(base32
- "0i1b60g1p19s5cnzz0nmjzjnxywm9szzyp1rcwfcx3gmzvrwr2sc"
+(base32 "0hx57y73g807x321wpa6sr0vvw6igwhaq88rrdryjjbw6p4k0vcc"
(build-system gnu-build-system)
(inputs
`(("libbsd" ,libbsd)))
03/04: gnu: loksh: Update to 6.4.
nckx pushed a commit to branch master
in repository guix.
commit 716cd19ad2357cb40f9236512656d5b198ea9806
Author: Tobias Geerinckx-Rice
Date: Wed Oct 24 05:52:54 2018 +0200
gnu: loksh: Update to 6.4.
* gnu/packages/shells.scm (loksh): Update to 6.4.
[inputs]: Add ncurses.
---
gnu/packages/shells.scm | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 7a7f2ae..47efe5d 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -569,7 +569,7 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.")
(define-public loksh
(package
(name "loksh")
-(version "6.3")
+(version "6.4")
(source
(origin
(method git-fetch)
@@ -578,10 +578,11 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.")
(commit version)))
(file-name (git-file-name name version))
(sha256
-(base32 "0hx57y73g807x321wpa6sr0vvw6igwhaq88rrdryjjbw6p4k0vcc"
+(base32 "1d92cf5iadj1vwg0wwksaq1691zaxjrd2y4qygj4sdd25zsahj6p"
(build-system gnu-build-system)
(inputs
- `(("libbsd" ,libbsd)))
+ `(("libbsd" ,libbsd)
+ ("ncurses" ,ncurses)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
branch master updated (ce7ceef -> 569adff)
nckx pushed a change to branch master
in repository guix.
from ce7ceef gnu: linux-libre: Update to 4.19.
new d0d3ed6 gnu: tinc: Update to 1.0.35 [fixes
CVE-2018-{16737,16738,16758}].
new e5d7577 gnu: loksh: Don't use unstable tarball.
new 716cd19 gnu: loksh: Update to 6.4.
new 569adff gnu: pcsc-lite: Update to 1.8.24.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
gnu/packages/security-token.scm | 4 ++--
gnu/packages/shells.scm | 17 +
gnu/packages/vpn.scm| 4 ++--
3 files changed, 13 insertions(+), 12 deletions(-)
01/04: gnu: tinc: Update to 1.0.35 [fixes CVE-2018-{16737, 16738, 16758}].
nckx pushed a commit to branch master
in repository guix.
commit d0d3ed6dfccb9934a90caf29861e4dac09faec2b
Author: Tobias Geerinckx-Rice
Date: Wed Oct 24 05:33:55 2018 +0200
gnu: tinc: Update to 1.0.35 [fixes CVE-2018-{16737,16738,16758}].
* gnu/packages/vpn.scm (tinc): Update to 1.0.35.
---
gnu/packages/vpn.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 9b1f26a..44e736e 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -312,14 +312,14 @@ traversing network address translators (@dfn{NAT}s) and
firewalls.")
(define-public tinc
(package
(name "tinc")
-(version "1.0.33")
+(version "1.0.35")
(source (origin
(method url-fetch)
(uri (string-append "http://tinc-vpn.org/packages/;
name "-" version ".tar.gz"))
(sha256
(base32
-"1x0hpfz13vn4pl6dcpnls6xq3rfcbdsg90awcfn53ijb8k35svvz"
+"0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q"
(build-system gnu-build-system)
(arguments
'(#:configure-flags
02/04: gnu: xmlsec: Update to 1.2.27.
nckx pushed a commit to branch master
in repository guix.
commit 50f5aa4b9e18345b3aa19e73014acad47a921137
Author: Tobias Geerinckx-Rice
Date: Wed Oct 24 01:40:40 2018 +0200
gnu: xmlsec: Update to 1.2.27.
* gnu/packages/xml.scm (xmlsec): Update to 1.2.27.
[source]: Don't rely on NAME.
---
gnu/packages/xml.scm | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 489541b..1173dc4 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -920,16 +920,16 @@ XSL-T processor. It also performs any necessary
post-processing.")
(define-public xmlsec
(package
(name "xmlsec")
-(version "1.2.26")
+(version "1.2.27")
(source (origin
- (method url-fetch)
- (uri (string-append "https://www.aleksey.com/xmlsec/download/;
- name "1-" version ".tar.gz"))
- (sha256
- (base32
- "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld"
+ (method url-fetch)
+ (uri (string-append "https://www.aleksey.com/xmlsec/download/;
+ "xmlsec1-" version ".tar.gz"))
+ (sha256
+ (base32
+"1dlf263mvxj9n4lnhhjawc2hv45agrwjf8kxk7k8h9g9v2x5dmwp"
(build-system gnu-build-system)
-(propagated-inputs ; according to xmlsec1.pc
+(propagated-inputs ; according to xmlsec1.pc
`(("libxml2" ,libxml2)
("libxslt" ,libxslt)))
(inputs
04/04: gnu: mongodb: Use INVOKE.
nckx pushed a commit to branch master
in repository guix.
commit d9bcdfce29b07235772657d58399e16be1022ee5
Author: Tobias Geerinckx-Rice
Date: Wed Oct 24 01:42:37 2018 +0200
gnu: mongodb: Use INVOKE.
* gnu/packages/databases.scm (mongodb)[arguments]: Substitute INVOKE for
SYSTEM*.
---
gnu/packages/databases.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 7b483a2..6ebbc28 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -503,10 +503,9 @@ applications.")
#t))
(replace 'build
(lambda _
- (zero? (apply system*
- `("scons"
+ (apply invoke `("scons"
,@common-options
- "mongod" "mongo" "mongos")
+ "mongod" "mongo" "mongos"
(replace 'check
(lambda* (#:key tests? inputs #:allow-other-keys)
(setenv "TZDIR"
03/04: gnu: libbytesize: Update to 1.4.
nckx pushed a commit to branch master
in repository guix.
commit 94617bddb01b9e295f82a59550ee983341d59288
Author: Tobias Geerinckx-Rice
Date: Tue Oct 23 16:30:49 2018 +0200
gnu: libbytesize: Update to 1.4.
* gnu/packages/c.scm (libbytesize): Update to 1.4.
[source]: Parametrise.
---
gnu/packages/c.scm | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index e6df1d2..83268e8 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -178,15 +178,15 @@ compiler while still keeping it small, simple, fast and
understandable.")
(define-public libbytesize
(package
(name "libbytesize")
-(version "1.3")
+(version "1.4")
(source (origin
(method url-fetch)
(uri (string-append
-
"https://github.com/storaged-project/libbytesize/releases/download/1.3/libbytesize-;
-version ".tar.gz"))
+"https://github.com/storaged-project/libbytesize/releases/;
+"download/" version "/libbytesize-" version ".tar.gz"))
(sha256
(base32
-"1l7mxm2vq2h6137fyfa46v9r4lydp9dvmsixkd64xr3ylqk1g6fi"
+"0bbqzln1nhjxl71aydq9k4jg3hvki9lqsb4w10s1i27jgibxqkdv"
(build-system gnu-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
branch master updated (d78587e -> d9bcdfc)
nckx pushed a change to branch master in repository guix. from d78587e gnu: icecat: Add fixes from mozilla-esr60 [security fixes]. new 0ba0ab8 gnu: Add wavemon. new 50f5aa4 gnu: xmlsec: Update to 1.2.27. new 94617bd gnu: libbytesize: Update to 1.4. new d9bcdfc gnu: mongodb: Use INVOKE. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/c.scm | 8 gnu/packages/databases.scm | 5 ++--- gnu/packages/hardware.scm | 44 gnu/packages/xml.scm | 16 4 files changed, 58 insertions(+), 15 deletions(-)
01/04: gnu: Add wavemon.
nckx pushed a commit to branch master
in repository guix.
commit 0ba0ab814ad12af964d0b7f6e8ef3c50e5815264
Author: Tobias Geerinckx-Rice
Date: Tue Oct 23 20:42:17 2018 +0200
gnu: Add wavemon.
* gnu/packages/hardware.scm (wavemon): New public variable.
---
gnu/packages/hardware.scm | 44
1 file changed, 44 insertions(+)
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 52bc3d0..0a2a7db 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -22,11 +22,13 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (guix build-system gnu)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages))
@@ -232,3 +234,45 @@ such as the Turbo Boost ratio and Thermal Design Power
(@dfn{TDP}) limits.
MSR addresses differ (greatly) between processors, and any such modification
can
be dangerous and may void your CPU or system board's warranty.")
(license license:gpl2))) ; cpuid.c is gpl2, {rd,wr}msr.c are gpl2+
+
+(define-public wavemon
+ (package
+(name "wavemon")
+(version "0.8.2")
+(source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/uoaerg/wavemon.git;)
+ (commit (string-append "v" version
+ (file-name (git-file-name name version))
+ (sha256
+(base32 "0rqpp7rhl9rlwnihsapaiy62v33h45fm3d0ia2nhdjw7fwkwcqvs"
+(build-system gnu-build-system)
+(arguments
+ `(#:make-flags
+ (list "CC=gcc"
+ ;; Makefile.in (ab)uses $(datadir) as $(docdir). Set it to Guix's
+ ;; standard --docdir since it's only used as such.
+ (string-append "datadir=" (assoc-ref %outputs "out")
+"/share/doc/" ,name "-" ,version))
+ #:tests? #f)); no tests
+(native-inputs
+ `(("pkg-config" ,pkg-config)))
+(inputs
+ `(("libcap" ,libcap)
+ ("libnl" ,libnl)
+ ("ncurses" ,ncurses)))
+(home-page "https://github.com/uoaerg/wavemon;)
+(synopsis "Wireless network device monitor")
+(description
+ "Wavemon is a wireless device monitor with an interactive ncurses terminal
+interface. It can display and plot signal and noise levels in real time. It
+also reports packet statistics, device configuration, network parameters, and
+access points and other wireless clients of your wireless network hardware.
+
+Wavemon should work (with varying levels of detail and features) with any
device
+supported by the Linux kernel.")
+;; Source file headers still say GPL2+, but the authorial intent
+;; (from COPYING and the F9 'about' screen) is clearly GPL3+.
+(license license:gpl3+)))
