From 7454078a7c2b6304e98741537419ae974aa1b618 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Nov 2019 18:53:01 +0100 Subject: gnu: python-lazy-object-proxy: Update to 1.4.3. * gnu/packages/python-xyz.scm (python-lazy-object-proxy): Update to 1.4.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3b28fbb27f..8d53a59c40 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10855,13 +10855,13 @@ (define-public poetry (define-public python-lazy-object-proxy (package (name "python-lazy-object-proxy") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) (uri (pypi-uri "lazy-object-proxy" version)) (sha256 (base32 - "1wgl0fmddi0ind78a74yyk2qrr9pb5llvj1892cdpp6z6n6mn4zx")))) + "1w1aaay424ciz8fz3fkzxb0pxzfxn184f2whpyn4fx72bn50x47k")))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm-3.3))) (build-system python-build-system) -- cgit v1.2.3 From b448e4085fc1e8e2a1f95dfa1d81c765ce57d163 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Nov 2019 16:35:58 +0100 Subject: gnu: ruby-command-line-reporter: Update to 4.0.1. * gnu/packages/ruby.scm (ruby-command-line-reporter): Update to 4.0.1. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4ad1b2d5a6..7b78382d52 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7568,13 +7568,13 @@ (define-public ruby-colorator (define-public ruby-command-line-reporter (package (name "ruby-command-line-reporter") - (version "4.0.0") + (version "4.0.1") (source (origin (method url-fetch) (uri (rubygems-uri "command_line_reporter" version)) (sha256 (base32 - "1qma35xrb772whxwy1rs9bicb9d6lvz0s2dd2dnn4fr6zcbcxc0a")))) + "1l0zxkh5n9dxfw46lpkg416ljpldlq1bgdhqh0d118dk338nz4ll")))) (build-system ruby-build-system) (arguments ;; No Rakefile -- cgit v1.2.3 From 8280676bd610860fdd51aa8e68cf1fc707c856c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Nov 2019 22:16:54 +0100 Subject: gnu: gthumb: Update to 3.8.2. * gnu/packages/gnome.scm (gthumb): Update to 3.8.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d8545eaa58..89dc7a3951 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8257,7 +8257,7 @@ (define-public evolution (define-public gthumb (package (name "gthumb") - (version "3.8.1") + (version "3.8.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gthumb/" @@ -8265,7 +8265,7 @@ (define-public gthumb "gthumb-" version ".tar.xz")) (sha256 (base32 - "184zn79w4s9y1zy42ar31p3jsg8rmkxy8k6iry51nz8aizbcs7jb")))) + "15wqks35ks5dm7zj046dfd45vvrilan2ayfy2sxiprv7q74cip2q")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 0645e72fdd5820dff8f1997d7be6dcf4c7943b5d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Nov 2019 22:25:13 +0100 Subject: gnu: r-rms: Update to 5.1-4. * gnu/packages/cran.scm (r-rms): Update to 5.1-4. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4bc94b990d..8b957ef01b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13124,14 +13124,13 @@ (define-public r-polspline (define-public r-rms (package (name "r-rms") - (version "5.1-3.1") + (version "5.1-4") (source (origin (method url-fetch) (uri (cran-uri "rms" version)) (sha256 - (base32 - "0drbr3g0x5pbxyzy50wnf92rbal8izizrcqslqhg0gsfg9adjih9")))) + (base32 "19knh1sw0icw6jh9wfb2hq5jf49i2qfvp9myvqm5paa495689x9q")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From 1d4f0019f926ce3429c9958330747df996aa709a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Nov 2019 00:20:21 +0100 Subject: gnu: ruby-prawn-manual-builder: Update to 0.3.1. * gnu/packages/ruby.scm (ruby-prawn-manual-builder): Update to 0.3.1. --- gnu/packages/ruby.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7b78382d52..dd796577f8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3801,18 +3801,16 @@ (define-public ruby-parser (define-public ruby-prawn-manual-builder (package (name "ruby-prawn-manual-builder") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (rubygems-uri "prawn-manual_builder" version)) (sha256 - (base32 - "0wbjnkqp55p5wmz85ldypcray223glckd209hmdxhnzk8s5pb3za")))) + (base32 "1vlg5w7wq43g2hgpgra2nrcxj1kb4ayqliz4gmja2rhs037j2vzs")))) (build-system ruby-build-system) (arguments - '(;; No included tests - #:tests? #f + '(#:tests? #f ; no included tests #:phases (modify-phases %standard-phases (add-after 'extract-gemspec 'patch-gemspec -- cgit v1.2.3 From ec2014d55682205bbe692b11f3d7c29a4428b19f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Nov 2019 16:36:50 +0100 Subject: gnu: r-sjstats: Update to 0.17.7. * gnu/packages/cran.scm (r-sjstats): Update to 0.17.7. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8b957ef01b..652593fbd0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8175,14 +8175,13 @@ (define-public r-tmb (define-public r-sjstats (package (name "r-sjstats") - (version "0.17.6") + (version "0.17.7") (source (origin (method url-fetch) (uri (cran-uri "sjstats" version)) (sha256 - (base32 - "11z1wfi0d74d1rld0320l3vmv6rl41wa0v9bjc44rk06yc90wld2")))) + (base32 "029rl05p88bp01favz300m980r1khcx2a2kn88yqbnbgkjjgqqc6")))) (build-system r-build-system) (propagated-inputs `(("r-bayestestr" ,r-bayestestr) -- cgit v1.2.3 From 2f6a158b45766180ed615448836037618e46d179 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Nov 2019 20:42:00 +0100 Subject: gnu: libpwquality: Don't use NAME in source URI. * gnu/packages/password-utils.scm (libpwquality)[source]: Hard-code NAME. --- gnu/packages/password-utils.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index b3195f8f6b..0e08775839 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -357,12 +357,12 @@ (define-public libpwquality (source (origin (method url-fetch) (uri (list - (string-append "https://github.com/" name "/" name - "/releases/download/" name "-" version - "/" name "-" version ".tar.bz2") + (string-append "https://github.com/libpwquality/libpwquality" + "/releases/download/libpwquality-" version + "/libpwquality-" version ".tar.bz2") (string-append "https://launchpad.net/libpwquality/trunk/" version "/+download/" - name "-" version ".tar.bz2"))) + "libpwquality-" version ".tar.bz2"))) (sha256 (base32 "0syyz8r54l8mqmbb0mw19qz4z2cx8gdgidicb8k2s5zjdh2gzrhx")))) -- cgit v1.2.3 From 6bd856d1b74a62c7644c4801f4d4bbf049c3bcca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Nov 2019 20:42:13 +0100 Subject: gnu: libpwquality: Update to 1.4.2. * gnu/packages/password-utils.scm (libpwquality): Update to 1.4.2. --- gnu/packages/password-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 0e08775839..e1555cc194 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -353,7 +353,7 @@ (define-public cracklib (define-public libpwquality (package (name "libpwquality") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (list @@ -365,7 +365,7 @@ (define-public libpwquality "libpwquality-" version ".tar.bz2"))) (sha256 (base32 - "0syyz8r54l8mqmbb0mw19qz4z2cx8gdgidicb8k2s5zjdh2gzrhx")))) + "13hw532fmzc5xjpy75d74rlfdlxf2a8ibb4hyy9c0s92wsgf0qsj")))) (build-system gnu-build-system) (arguments ;; XXX: have RUNPATH issue. -- cgit v1.2.3 From f64d79e8be913d8cd88c3eaf95e3a2b1198cebe4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Nov 2019 21:21:13 +0100 Subject: gnu: libplist: Update to 2.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libusb.scm (libplist): Update to 2.1.0. [source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Add ‘configure-later’ phase. [native-inputs]: Add autoconf, automake, and libtool. --- gnu/packages/libusb.scm | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index e6016d1049..878f9e58ed 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -305,25 +305,37 @@ (define-public python2-pyusb (define-public libplist (package (name "libplist") - (version "2.0.0") - (source (origin - (method url-fetch) - (uri (string-append "https://www.libimobiledevice.org/downloads/" - "libplist-" version ".tar.bz2")) - (sha256 - (base32 - "00pnh9zf3iwdji2faccns7vagbmbrwbj9a8zp9s53a6rqaa9czis")))) + (version "2.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libimobiledevice/libplist.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02vraf4j46bp746s0gz7vga2gv2dy3zd1v1bsy9x8algg9fpcb7n")))) (build-system gnu-build-system) (arguments - ;; Tests fail randomly when run in parallel because several of them write - ;; and read to/from the same file--e.g., "4.plist" is accessed by - ;; 'large.test' and 'largecmp.test'. - '(#:parallel-tests? #f)) + `(#:phases + (modify-phases %standard-phases + (add-before 'bootstrap 'configure-later + ;; Don't run ./configure during bootstrap. + (lambda _ + (setenv "NOCONFIGURE" "set") + #t))) + ;; Tests fail randomly when run in parallel because several of them write + ;; and read to/from the same file--e.g., "4.plist" is accessed by + ;; 'large.test' and 'largecmp.test'. + #:parallel-tests? #f)) (inputs `(("python" ,python))) (native-inputs - `(("pkg-config" ,pkg-config) - ("python-cython" ,python-cython))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("python-cython" ,python-cython))) ; to build Python bindings (home-page "https://www.libimobiledevice.org/") (synopsis "C library to handle Apple Property List files") (description "This package provides a small portable C library to handle -- cgit v1.2.3 From 2414997a3ca564a53daf4e4d8feb6cc093ee747e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Nov 2019 22:03:07 +0100 Subject: gnu: libbytesize: Update to 2.1. * gnu/packages/c.scm (libbytesize): Update to 2.1. [source, remove]: Remove msgmerge reproducibility work-around. [inputs]: Use pcre@2. --- gnu/packages/c.scm | 43 ++++--------------------------------------- 1 file changed, 4 insertions(+), 39 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 41946f4169..6e1d304dfc 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -183,7 +183,7 @@ (define-public pcc (define-public libbytesize (package (name "libbytesize") - (version "1.4") + (version "2.1") (source (origin (method url-fetch) (uri (string-append @@ -191,52 +191,17 @@ (define-public libbytesize "download/" version "/libbytesize-" version ".tar.gz")) (sha256 (base32 - "0bbqzln1nhjxl71aydq9k4jg3hvki9lqsb4w10s1i27jgibxqkdv")) - (modules '((guix build utils))) - (snippet - '(begin - ;; This Makefile hard-codes MSGMERGE et al. instead of - ;; honoring what 'configure' detected. Fix that. - (substitute* "po/Makefile.in" - (("^MSGMERGE = msgmerge") - "MSGMERGE = @MSGMERGE@\n")) - #t)))) + "1bpz9cpb8s47kqplkkiz6ryfahas2ma95g9rh2axnfjp6w1d9ixc")))) (build-system gnu-build-system) (arguments - ;; When running "make", the POT files are built with the build time as - ;; their "POT-Creation-Date". Later on, "make" notices that .pot - ;; files were updated and goes on to run "msgmerge"; as a result, the - ;; non-deterministic POT-Creation-Date finds its way into .po files, - ;; and then in .gmo files. To avoid that, simply make sure 'msgmerge' - ;; never runs. See . - '(#:configure-flags '("ac_cv_path_MSGMERGE=true") - - #:phases (modify-phases %standard-phases - (add-after 'configure 'create-merged-po-files - (lambda _ - ;; Create "merged PO" (.mpo) files so that 'msgmerge' - ;; doesn't need to run. - (for-each (lambda (po-file) - (let ((merged-po - (string-append (dirname po-file) "/" - (basename po-file - ".po") - ".mpo"))) - (copy-file po-file merged-po))) - (find-files "po" "\\.po$")) - #t))) - - ;; One test fails because busctl (systemd only?) and python2-pocketlint - ;; are missing. Should we fix it, we would need the "python-2" , - ;; "python2-polib" and "python2-six" native-inputs. - #:tests? #f)) + `(#:tests? #f)) (native-inputs `(("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config) ("python" ,python))) (inputs `(("mpfr" ,mpfr) - ("pcre" ,pcre))) + ("pcre2" ,pcre2))) (home-page "https://github.com/storaged-project/libbytesize") (synopsis "Tiny C library for working with arbitrary big sizes in bytes") (description -- cgit v1.2.3 From 4e2e84d85687e02725d156b40bdfd6b20dca0eed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Nov 2019 21:37:43 +0100 Subject: gnu: man-pages: Update to 5.04. * gnu/packages/man.scm (man-pages): Update to 5.04. --- gnu/packages/man.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index e7e14c54ae..f05efccece 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -162,7 +162,7 @@ (define-public man-db (define-public man-pages (package (name "man-pages") - (version "5.03") + (version "5.04") (source (origin (method url-fetch) @@ -172,7 +172,7 @@ (define-public man-pages (string-append "mirror://kernel.org/linux/docs/man-pages/Archive/" "man-pages-" version ".tar.xz"))) (sha256 - (base32 "082i9258rl9xxjgpxpz3v8jcwk96dsk704ki9h9lq7q8z7m3mqbz")))) + (base32 "1bx4ws24bjq6iyfyilg7aih5f0qrhy9l97ksrwcd4yxvjh8gn13x")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From 4f5234be0378368e6af25925db46612838d25e58 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 21 Nov 2019 20:36:20 +0100 Subject: substitute: Don't fetch /nix-cache-info. This avoids one GET request every time 'fetch-narinfos' is called. The file itself was essentially useless. * guix/scripts/substitute.scm (, download-cache-info): Remove. (%unreachable-hosts): New variable. (open-connection-for-uri/maybe): New procedure. (fetch-narinfos)[handle-narinfo-response]: Check whether NARINFO has its 'path' under (%store-prefix) and ignore it otherwise. Move 'update-progress!' call before 'if'. [do-fetch]: Remove 'port' parameter. Use 'open-connection-for-uri/maybe'. Remove call to 'download-cache-info'. --- guix/scripts/substitute.scm | 142 +++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 81 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index dba08edf50..992b21d505 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -227,58 +227,6 @@ (define* (fetch uri #:key (buffered? #t) (timeout? #t)) (leave (G_ "unsupported substitute URI scheme: ~a~%") (uri->string uri))))) -(define-record-type - (%make-cache-info url store-directory wants-mass-query?) - cache-info? - (url cache-info-url) - (store-directory cache-info-store-directory) - (wants-mass-query? cache-info-wants-mass-query?)) - -(define (download-cache-info url) - "Download the information for the cache at URL. On success, return a - object and a port on which to send further HTTP requests. On -failure, return #f and #f." - (define uri - (string->uri (string-append url "/nix-cache-info"))) - - (define (read-cache-info port) - (alist->record (fields->alist port) - (cut %make-cache-info url <...>) - '("StoreDir" "WantMassQuery"))) - - (catch #t - (lambda () - (case (uri-scheme uri) - ((file) - (values (call-with-input-file (uri-path uri) - read-cache-info) - #f)) - ((http https) - (let ((port (guix:open-connection-for-uri - uri - #:verify-certificate? #f - #:timeout %fetch-timeout))) - (guard (c ((http-get-error? c) - (warning (G_ "while fetching '~a': ~a (~s)~%") - (uri->string (http-get-error-uri c)) - (http-get-error-code c) - (http-get-error-reason c)) - (close-connection port) - (warning (G_ "ignoring substitute server at '~s'~%") url) - (values #f #f))) - (values (read-cache-info (http-fetch uri - #:verify-certificate? #f - #:port port - #:keep-alive? #t)) - port)))))) - (lambda (key . args) - (case key - ((getaddrinfo-error system-error) - ;; Silently ignore the error: probably due to lack of network access. - (values #f #f)) - (else - (apply throw key args)))))) - (define-record-type (%make-narinfo path uri-base uris compressions file-sizes file-hashes @@ -628,6 +576,41 @@ (define (narinfo-from-file file url) #f (apply throw args))))) +(define %unreachable-hosts + ;; Set of names of unreachable hosts. + (make-hash-table)) + +(define* (open-connection-for-uri/maybe uri + #:key + (verify-certificate? #f) + (time %fetch-timeout)) + "Open a connection to URI and return a port to it, or, if connection failed, +print a warning and return #f." + (define host + (uri-host uri)) + + (catch #t + (lambda () + (guix:open-connection-for-uri uri + #:verify-certificate? verify-certificate? + #:timeout time)) + (match-lambda* + (('getaddrinfo-error error) + (unless (hash-ref %unreachable-hosts host) + (hash-set! %unreachable-hosts host #t) ;warn only once + (warning (G_ "~a: host not found: ~a~%") + host (gai-strerror error))) + #f) + (('system-error . args) + (unless (hash-ref %unreachable-hosts host) + (hash-set! %unreachable-hosts host #t) + (warning (G_ "~a: connection failed: ~a~%") host + (strerror + (system-error-errno `(system-error ,@args))))) + #f) + (args + (apply throw args))))) + (define (fetch-narinfos url paths) "Retrieve all the narinfos for PATHS from the cache at URL and return them." (define update-progress! @@ -657,13 +640,18 @@ (define (handle-narinfo-response request response port result) (len (response-content-length response)) (cache (response-cache-control response)) (ttl (and cache (assoc-ref cache 'max-age)))) + (update-progress!) + ;; Make sure to read no more than LEN bytes since subsequent bytes may ;; belong to the next response. (if (= code 200) ; hit (let ((narinfo (read-narinfo port url #:size len))) - (cache-narinfo! url (narinfo-path narinfo) narinfo ttl) - (update-progress!) - (cons narinfo result)) + (if (string=? (dirname (narinfo-path narinfo)) + (%store-prefix)) + (begin + (cache-narinfo! url (narinfo-path narinfo) narinfo ttl) + (cons narinfo result)) + result)) (let* ((path (uri-path (request-uri request))) (hash-part (basename (string-drop-right path 8)))) ;drop ".narinfo" @@ -674,26 +662,28 @@ (define (handle-narinfo-response request response port result) (if (= 404 code) ttl %narinfo-transient-error-ttl)) - (update-progress!) result)))) - (define (do-fetch uri port) + (define (do-fetch uri) (case (and=> uri uri-scheme) ((http https) (let ((requests (map (cut narinfo-request url <>) paths))) - (update-progress!) - - ;; Note: Do not check HTTPS server certificates to avoid depending on - ;; the X.509 PKI. We can do it because we authenticate narinfos, - ;; which provides a much stronger guarantee. - (let ((result (http-multiple-get uri - handle-narinfo-response '() - requests - #:verify-certificate? #f - #:port port))) - (close-connection port) - (newline (current-error-port)) - result))) + (match (open-connection-for-uri/maybe uri) + (#f + '()) + (port + (update-progress!) + ;; Note: Do not check HTTPS server certificates to avoid depending + ;; on the X.509 PKI. We can do it because we authenticate + ;; narinfos, which provides a much stronger guarantee. + (let ((result (http-multiple-get uri + handle-narinfo-response '() + requests + #:verify-certificate? #f + #:port port))) + (close-port port) + (newline (current-error-port)) + result))))) ((file #f) (let* ((base (string-append (uri-path uri) "/")) (files (map (compose (cut string-append base <> ".narinfo") @@ -704,17 +694,7 @@ (define (do-fetch uri port) (leave (G_ "~s: unsupported server URI scheme~%") (if uri (uri-scheme uri) url))))) - (let-values (((cache-info port) - (download-cache-info url))) - (and cache-info - (if (string=? (cache-info-store-directory cache-info) - (%store-prefix)) - (do-fetch (string->uri url) port) ;reuse PORT - (begin - (warning (G_ "'~a' uses different store '~a'; ignoring it~%") - url (cache-info-store-directory cache-info)) - (close-connection port) - #f))))) + (do-fetch (string->uri url))) (define (lookup-narinfos cache paths) "Return the narinfos for PATHS, invoking the server at CACHE when no -- cgit v1.2.3 From 732c96f182386d1be00ebf47d332d8c81b878dcf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 22 Nov 2019 11:33:29 +0100 Subject: daemon: GC displays how much it has collected. * nix/libstore/gc.cc (LocalStore::deletePathRecursive): Display the percentage reached relative to 'maxFreed', or the total amount of data deleted when 'maxFreed' is ULLONG_MAX. --- nix/libstore/gc.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc index fe152da015..7976ff7d76 100644 --- a/nix/libstore/gc.cc +++ b/nix/libstore/gc.cc @@ -11,6 +11,7 @@ #include #include #include +#include namespace nix { @@ -417,7 +418,15 @@ void LocalStore::deletePathRecursive(GCState & state, const Path & path) throw SysError(format("getting status of %1%") % path); } - printMsg(lvlInfo, format("deleting `%1%'") % path); + if (state.options.maxFreed != ULLONG_MAX) { + double fraction = state.results.bytesFreed + size + / state.options.maxFreed; + unsigned int percentage = (fraction > 1. ? 1. : fraction) * 100.; + printMsg(lvlInfo, format("[%1%%%] deleting '%2%'") % percentage % path); + } else { + size_t total = (state.results.bytesFreed + size) / (1024 * 1024); + printMsg(lvlInfo, format("[%1% MiB] deleting '%2%'") % total % path); + } state.results.paths.insert(path); -- cgit v1.2.3 From c0e9d470e1eb3eba0d2c2da3c6ffdd5665c4638b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 22 Nov 2019 14:21:13 +0100 Subject: import: texlive: Handle multi-license packages. This fixes "guix import texlive translator". * guix/import/texlive.scm (sxml->package): Add clause for when 'license' is a list of licences, as is the case with the "translator" package. --- guix/import/texlive.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 791b514485..d528aace9a 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -140,7 +140,9 @@ (define (sxml-value path) (synopsis (sxml-value '(entry caption *text*))) (version (or (sxml-value '(entry version @ number *text*)) (sxml-value '(entry version @ date *text*)))) - (license (string->license (sxml-value '(entry license @ type *text*)))) + (license (match ((sxpath '(entry license @ type *text*)) sxml) + ((license) (string->license license)) + ((lst ...) (map string->license lst)))) (home-page (string-append "http://www.ctan.org/pkg/" id)) (ref (texlive-ref component id)) (checkout (download-svn-to-store store ref))) @@ -169,7 +171,9 @@ (define (sxml-value path) (sxml->string (or (sxml-value '(entry description)) '()))) #\newline))))) - (license ,license))))) + (license ,(match license + ((lst ...) `(list ,@lst)) + (license license))))))) (define texlive->guix-package (memoize -- cgit v1.2.3 From d76df98fa59166c0c9f71ca41d664857d93e136d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 20 Nov 2019 10:02:01 +0100 Subject: environment: Document that '--manifest' can be repeated. * tests/guix-environment.sh: Test 'guix environment' with two '-m' options. * doc/guix.texi (Invoking guix environment): Explain that '-m' can be passed multiple times. --- doc/guix.texi | 3 ++- tests/guix-environment.sh | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 1fec43a228..0dc49c3cda 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4802,7 +4802,8 @@ As an example, @var{file} might contain a definition like this @item --manifest=@var{file} @itemx -m @var{file} Create an environment for the packages contained in the manifest object -returned by the Scheme code in @var{file}. +returned by the Scheme code in @var{file}. This option can be repeated +several times, in which case the manifests are concatenated. This is similar to the same-named option in @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) and uses the same diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index fb1c1a022d..2faf38df06 100644 --- a/tests/guix-environment.sh +++ b/tests/guix-environment.sh @@ -84,6 +84,29 @@ echo "(use-modules (guix profiles) (gnu packages bootstrap)) guix environment --bootstrap --manifest=$tmpdir/manifest.scm --pure \ -- "$SHELL" -c 'test -f "$GUIX_ENVIRONMENT/bin/guile"' +# Make sure '--manifest' can be specified multiple times. +cat > "$tmpdir/manifest2.scm" <manifest + (list (package + (inherit %bootstrap-guile) + (name "eliug") + (build-system trivial-build-system) + (arguments + (quasiquote + (#:guile ,%bootstrap-guile + #:builder + (begin + (mkdir %output) + (mkdir (string-append %output "/eliug"))))))))) +EOF +guix environment --bootstrap -m "$tmpdir/manifest.scm" \ + -m "$tmpdir/manifest2.scm" --pure \ + -- "$SHELL" -c 'test -f "$GUIX_ENVIRONMENT/bin/guile" && test -d "$GUIX_ENVIRONMENT/eliug"' + # Make sure '-r' works as expected. rm -f "$gcroot" expected="`guix environment --bootstrap --ad-hoc guile-bootstrap \ -- cgit v1.2.3 From ce30a0eb7e21481815df379b4621aa48a13200bb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 20 Nov 2019 12:07:02 +0100 Subject: profiles: Add 'concatenate-manifests'. * guix/profiles.scm (concatenate-manifests): New procedure. * tests/profiles.scm ("concatenate-manifests"): New test. --- guix/profiles.scm | 5 +++++ tests/profiles.scm | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/guix/profiles.scm b/guix/profiles.scm index cd3b21e390..f5e5cc33d6 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -92,6 +92,7 @@ (define-module (guix profiles) manifest-pattern-version manifest-pattern-output + concatenate-manifests manifest-remove manifest-add manifest-lookup @@ -515,6 +516,10 @@ (define (read-manifest port) "Return the packages listed in MANIFEST." (sexp->manifest (read port))) +(define (concatenate-manifests lst) + "Concatenate the manifests listed in LST and return the resulting manifest." + (manifest (append-map manifest-entries lst))) + (define (entry-predicate pattern) "Return a procedure that returns #t when passed a manifest entry that matches NAME/OUTPUT/VERSION. OUTPUT and VERSION may be #f, in which case they diff --git a/tests/profiles.scm b/tests/profiles.scm index a4e28672b5..21c912a532 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -113,6 +113,11 @@ (define glibc (manifest-matching-entries m (list p)) #f))) +(test-equal "concatenate-manifests" + (manifest (list guile-2.0.9 glibc)) + (concatenate-manifests (list (manifest (list guile-2.0.9)) + (manifest (list glibc))))) + (test-assert "manifest-remove" (let* ((m0 (manifest (list guile-2.0.9 guile-2.0.9:debug))) (m1 (manifest-remove m0 -- cgit v1.2.3 From bf9206d8edb06cc4c62fe5559504cf1518c2de9e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 20 Nov 2019 12:08:56 +0100 Subject: package: Allow multiple '--manifest' options. * guix/scripts/package.scm (manifest-action): Remove. (%actions): Remove it. (load-manifest): New procedure. (process-actions): Handle 'manifest' options. Define 'files' from 'manifest' options. Define 'manifest' based on FILES. Define 'trans' to represent the final transaction. * tests/guix-package.sh: Test it. * doc/guix.texi (Invoking guix package): Mention --- doc/guix.texi | 3 ++- guix/scripts/package.scm | 50 +++++++++++++++++++++++++----------------------- tests/guix-package.sh | 13 +++++++++++++ 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 0dc49c3cda..7ef77015cc 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2830,7 +2830,8 @@ $ guix package --upgrade . --do-not-upgrade emacs @cindex profile declaration @cindex profile manifest Create a new generation of the profile from the manifest object -returned by the Scheme code in @var{file}. +returned by the Scheme code in @var{file}. This option can be repeated +several times, in which case the manifests are concatenated. This allows you to @emph{declare} the profile's contents rather than constructing it through a sequence of @code{--install} and similar diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index bcd03a1df9..eb578f7642 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -832,32 +832,17 @@ (define* (delete-generations-action store profile pattern opts (unless dry-run? (delete-matching-generations store profile pattern))) -(define* (manifest-action store profile file opts - #:key dry-run?) - "Change PROFILE to contain the packages specified in FILE." - (let* ((user-module (make-user-module '((guix profiles) (gnu)))) - (manifest (load* file user-module)) - (bootstrap? (assoc-ref opts 'bootstrap?)) - (substitutes? (assoc-ref opts 'substitutes?)) - (allow-collisions? (assoc-ref opts 'allow-collisions?))) - (if dry-run? - (format #t (G_ "would install new manifest from '~a' with ~d entries~%") - file (length (manifest-entries manifest))) - (format #t (G_ "installing new manifest from '~a' with ~d entries~%") - file (length (manifest-entries manifest)))) - (build-and-use-profile store profile manifest - #:allow-collisions? allow-collisions? - #:bootstrap? bootstrap? - #:use-substitutes? substitutes? - #:dry-run? dry-run?))) +(define (load-manifest file) + "Load the user-profile manifest (Scheme code) from FILE and return it." + (let ((user-module (make-user-module '((guix profiles) (gnu))))) + (load* file user-module))) (define %actions ;; List of actions that may be processed. The car of each pair is the ;; action's symbol in the option list; the cdr is the action's procedure. `((roll-back? . ,roll-back-action) (switch-generation . ,switch-generation-action) - (delete-generations . ,delete-generations-action) - (manifest . ,manifest-action))) + (delete-generations . ,delete-generations-action))) (define (process-actions store opts) "Process any install/remove/upgrade action from OPTS." @@ -896,7 +881,13 @@ (define (transform-entry entry) opts) ;; Then, process normal package removal/installation/upgrade. - (let* ((manifest (profile-manifest profile)) + (let* ((files (filter-map (match-lambda + (('manifest . file) file) + (_ #f)) + opts)) + (manifest (match files + (() (profile-manifest profile)) + (_ (concatenate-manifests (map load-manifest files))))) (step1 (options->removable opts manifest (manifest-transaction))) (step2 (options->installable opts manifest step1)) @@ -904,12 +895,23 @@ (define (transform-entry entry) (inherit step2) (install (map transform-entry (manifest-transaction-install step2))))) - (new (manifest-perform-transaction manifest step3))) + (new (manifest-perform-transaction manifest step3)) + (trans (if (null? files) + step3 + (fold manifest-transaction-install-entry + step3 + (manifest-entries manifest))))) (warn-about-old-distro) - (unless (manifest-transaction-null? step3) - (show-manifest-transaction store manifest step3 + (unless (manifest-transaction-null? trans) + ;; When '--manifest' is used, display information about TRANS as if we + ;; were starting from an empty profile. + (show-manifest-transaction store + (if (null? files) + manifest + (make-manifest '())) + trans #:dry-run? dry-run?) (build-and-use-profile store profile new #:allow-collisions? allow-collisions? diff --git a/tests/guix-package.sh b/tests/guix-package.sh index 7ad0699380..6d081d58be 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -394,6 +394,19 @@ guix package -I | grep guile test `guix package -I | wc -l` -eq 1 guix package --rollback --bootstrap +# Applying two manifests. +cat > "$module_dir/manifest2.scm"<manifest (list p)) +EOF +guix package --bootstrap \ + -m "$module_dir/manifest.scm" -m "$module_dir/manifest2.scm" +guix package -I | grep guile +guix package -I | grep eliug +test `guix package -I | wc -l` -eq 2 +guix package --rollback --bootstrap + # Applying a manifest file with inferior packages. cat > "$module_dir/manifest.scm"< Date: Wed, 20 Nov 2019 12:13:32 +0100 Subject: pack: Allow multiple '--manifest' options. * guix/scripts/pack.scm (guix-pack): Collect 'manifest' options, and concatenate the resulting manifests. * tests/guix-pack.sh: Test it. * doc/guix.texi (Invoking guix pack): Document it. --- doc/guix.texi | 3 ++- guix/scripts/pack.scm | 17 ++++++++++++----- tests/guix-pack.sh | 11 +++++++++++ 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7ef77015cc..7a004d2ee4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5178,7 +5178,8 @@ build} (@pxref{Additional Build Options, @code{--expression} in @item --manifest=@var{file} @itemx -m @var{file} Use the packages contained in the manifest object returned by the Scheme -code in @var{file}. +code in @var{file}. This option can be repeated several times, in which +case the manifests are concatenated. This has a similar purpose as the same-named option in @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) and uses the diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 89b3e389fc..c8a52374bd 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -965,7 +965,10 @@ (define (manifest-from-args store opts) (list (transform store package) "out"))) (reverse (filter-map maybe-package-argument opts)))) - (manifest-file (assoc-ref opts 'manifest))) + (manifests (filter-map (match-lambda + (('manifest . file) file) + (_ #f)) + opts))) (define properties (if (assoc-ref opts 'save-provenance?) (lambda (package) @@ -979,11 +982,15 @@ (define properties (const '()))) (cond - ((and manifest-file (not (null? packages))) + ((and (not (null? manifests)) (not (null? packages))) (leave (G_ "both a manifest and a package list were given~%"))) - (manifest-file - (let ((user-module (make-user-module '((guix profiles) (gnu))))) - (load* manifest-file user-module))) + ((not (null? manifests)) + (concatenate-manifests + (map (lambda (file) + (let ((user-module (make-user-module + '((guix profiles) (gnu))))) + (load* file user-module))) + manifests))) (else (manifest (map (match-lambda diff --git a/tests/guix-pack.sh b/tests/guix-pack.sh index cf4e4ca4f9..7a0f3400c3 100644 --- a/tests/guix-pack.sh +++ b/tests/guix-pack.sh @@ -109,3 +109,14 @@ drv1="`guix pack -n guile 2>&1 | grep pack.*\.drv`" drv2="`guix pack -n --with-source=guile=$test_directory guile 2>&1 | grep pack.*\.drv`" test -n "$drv1" test "$drv1" != "$drv2" + +# Try '--manifest' options. +cat > "$test_directory/manifest1.scm" <manifest '("guile")) +EOF +cat > "$test_directory/manifest2.scm" <manifest '("emacs")) +EOF +drv="`guix pack -nd -m "$test_directory/manifest1.scm" -m "$test_directory/manifest2.scm"`" +guix gc -R "$drv" | grep `guix build guile -nd` +guix gc -R "$drv" | grep `guix build emacs -nd` -- cgit v1.2.3 From cf87919657bcbc422ca599007f5b111dc7807919 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 22 Nov 2019 15:12:11 +0100 Subject: gnu: libseccomp: Fix build on AArch64. This is a followup to d100d5d5449eabd65e9c26081b7620a3d342c9eb. * gnu/packages/patches/libseccomp-open-aarch64.patch: New file. * gnu/packages/linux.scm (libseccomp)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 3 ++- gnu/packages/patches/libseccomp-open-aarch64.patch | 27 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libseccomp-open-aarch64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7672295e69..ba86bf3224 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,6 +1078,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libreoffice-icu.patch \ %D%/packages/patches/libreoffice-glm.patch \ + %D%/packages/patches/libseccomp-open-aarch64.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f424eb0db8..9941129ba7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4794,7 +4794,8 @@ (define-public libseccomp "/libseccomp-" version ".tar.gz")) (sha256 (base32 - "0nsq81acrbkdr8zairxbwa33bj2a6126npp76b4srjl472sjfkxm")))) + "0nsq81acrbkdr8zairxbwa33bj2a6126npp76b4srjl472sjfkxm")) + (patches (search-patches "libseccomp-open-aarch64.patch")))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) diff --git a/gnu/packages/patches/libseccomp-open-aarch64.patch b/gnu/packages/patches/libseccomp-open-aarch64.patch new file mode 100644 index 0000000000..6e62825892 --- /dev/null +++ b/gnu/packages/patches/libseccomp-open-aarch64.patch @@ -0,0 +1,27 @@ +This patch fixes the build failure on AArch64 reported +at . + +From cc21c1b48d35f9d34ef2da0e184af3855bfeee5f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 20 Nov 2019 14:11:12 -0500 +Subject: [PATCH] tests: use openat instead of open + +On arm64, __NR_open is not defined, openat is always used. Let's use openat +instead, which is defined for architectures currently. +--- + tests/15-basic-resolver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/15-basic-resolver.c b/tests/15-basic-resolver.c +index 6badef1..4884faf 100644 +--- a/tests/15-basic-resolver.c ++++ b/tests/15-basic-resolver.c +@@ -55,7 +55,7 @@ int main(int argc, char *argv[]) + unsigned int arch; + char *name = NULL; + +- if (seccomp_syscall_resolve_name("open") != __NR_open) ++ if (seccomp_syscall_resolve_name("openat") != __NR_openat) + goto fail; + if (seccomp_syscall_resolve_name("read") != __NR_read) + goto fail; -- cgit v1.2.3 From 74f1718081a33203fcc92b811eac6a7094d8c64b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 20 Aug 2019 17:45:50 +0200 Subject: utils: Use target-aarch64? and target-arm? helpers. * guix/utils.scm (target-aarch64?, target-arm?): New exported procedures. --- guix/utils.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/guix/utils.scm b/guix/utils.scm index 64853f2989..728039fbf0 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -78,6 +78,8 @@ (define-module (guix utils) package-name->name+version target-mingw? target-arm32? + target-aarch64? + target-arm? target-64bit? version-compare version>? @@ -494,6 +496,12 @@ (define* (target-mingw? #:optional (target (%current-target-system))) (define (target-arm32?) (string-prefix? "arm" (or (%current-target-system) (%current-system)))) +(define (target-aarch64?) + (string-prefix? "aarch64" (or (%current-target-system) (%current-system)))) + +(define (target-arm?) + (or (target-arm32?) (target-aarch64?))) + (define (target-64bit?) (let ((system (or (%current-target-system) (%current-system)))) (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64")))) -- cgit v1.2.3 From 2608417ab8889cf8c1a61032633c474228141e78 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 23 Aug 2019 09:51:33 +0200 Subject: build: vm: Fix arm32 support. * gnu/build/vm.scm (load-in-linux-vm): Disable qemu highmem support on ARM32 systems. --- gnu/build/vm.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index a5d9fefa62..b85398ed24 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -102,6 +102,14 @@ (define arch-specific-flags ;; hardware limits imposed by other machines. ,@(if target-arm32? '("-M" "virt") '()) + ;; On ARM32, if the kernel is built without LPAE support, ECAM conflicts + ;; with VIRT_PCIE_MMIO causing PCI devices not to show up. Disable + ;; explicitely highmem to fix it. + ;; See: https://bugs.launchpad.net/qemu/+bug/1790975. + ,@(if target-arm32? + '("-machine" "highmem=off") + '()) + ;; Only enable kvm if we see /dev/kvm exists. This allows users without ;; hardware virtualization to still use these commands. KVM support is ;; still buggy on some ARM32 boards. Do not use it even if available. -- cgit v1.2.3 From 1ee72bb55b69796abc69d56a51b8eb3f42438be6 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 20 Aug 2019 18:00:40 +0200 Subject: system: vm: Add arm64 support. * gnu/build/vm.scm (load-in-linux-vm): Add target-arm64? argument and use it to pass correct arguments to qemu. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Pass the new target-arm64? argument added above. Do not add ESP partition on all ARM targets. Do not pass grub-efi package to initialize-hard-disk on ARM targets. --- gnu/build/vm.scm | 19 +++++++++++++------ gnu/system/vm.scm | 15 +++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index b85398ed24..6f920aec9e 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -82,6 +82,7 @@ (define* (load-in-linux-vm builder make-disk-image? single-file-output? target-arm32? + target-aarch64? (disk-image-size (* 100 (expt 2 20))) (disk-image-format "qcow2") (references-graphs '())) @@ -97,10 +98,14 @@ (define* (load-in-linux-vm builder REFERENCES-GRAPHS can specify a list of reference-graph files as produced by the #:references-graphs parameter of 'derivation'." + (define target-arm? (or target-arm32? target-aarch64?)) + (define arch-specific-flags `(;; On ARM, a machine has to be specified. Use "virt" machine to avoid ;; hardware limits imposed by other machines. - ,@(if target-arm32? '("-M" "virt") '()) + ,@(if target-arm? + '("-M" "virt") + '()) ;; On ARM32, if the kernel is built without LPAE support, ECAM conflicts ;; with VIRT_PCIE_MMIO causing PCI devices not to show up. Disable @@ -112,9 +117,9 @@ (define arch-specific-flags ;; Only enable kvm if we see /dev/kvm exists. This allows users without ;; hardware virtualization to still use these commands. KVM support is - ;; still buggy on some ARM32 boards. Do not use it even if available. + ;; still buggy on some ARM boards. Do not use it even if available. ,@(if (and (file-exists? "/dev/kvm") - (not target-arm32?)) + (not target-arm?)) '("-enable-kvm") '()) @@ -125,11 +130,11 @@ (define arch-specific-flags ;; The serial port name differs between emulated ;; architectures/machines. " console=" - (if target-arm32? "ttyAMA0" "ttyS0")) + (if target-arm? "ttyAMA0" "ttyS0")) ;; NIC is not supported on ARM "virt" machine, so use a user mode ;; network stack instead. - ,@(if target-arm32? + ,@(if target-arm? '("-device" "virtio-net-pci,netdev=mynet" "-netdev" "user,id=mynet") '("-net" "nic,model=virtio")))) @@ -153,7 +158,9 @@ (define arch-specific-flags (_ #f)) (apply invoke qemu "-nographic" "-no-reboot" - "-smp" (number->string (parallel-job-count)) + ;; CPU "max" behaves as "host" when KVM is enabled, and like a system + ;; CPU with the maximum possible feature set otherwise. + "-cpu" "max" "-m" (number->string memory-size) "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng" "-device" "virtio-rng-pci,rng=guixsd-vm-rng" diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 3fa9fd4ba5..9d4ed10ce5 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -235,10 +235,12 @@ (define builder #:memory-size #$memory-size #:make-disk-image? #$make-disk-image? #:single-file-output? #$single-file-output? - ;; FIXME: ‘target-arm32?’ may not operate on - ;; the right system/target values. Rewrite + ;; FIXME: ‘target-arm32?’ and + ;; ‘target-aarch64?’ may not operate on the + ;; right system/target values. Rewrite ;; using ‘let-system’ when available. #:target-arm32? #$(target-arm32?) + #:target-aarch64? #$(target-aarch64?) #:disk-image-format #$disk-image-format #:disk-image-size size #:references-graphs graphs)))))) @@ -452,10 +454,10 @@ (define schema ;; bootloaders if we are not targeting ARM because UEFI ;; support in U-Boot is experimental. ;; - ;; FIXME: ‘target-arm32?’ may be not operate on the right + ;; FIXME: ‘target-arm?’ may be not operate on the right ;; system/target values. Rewrite using ‘let-system’ when ;; available. - (if #$(target-arm32?) + (if #$(target-arm?) '() (list (partition ;; The standalone grub image is about 10MiB, but @@ -466,10 +468,11 @@ (define schema ;; when mounting. The actual FAT-ness is based ;; on file system size (16 in this case). (file-system "vfat") - (flags '(esp)))))))) + (flags '(esp))))))) + (grub-efi #$(and (not (target-arm?)) grub-efi))) (initialize-hard-disk "/dev/vda" #:partitions partitions - #:grub-efi #$grub-efi + #:grub-efi grub-efi #:bootloader-package #$(bootloader-package bootloader) #:bootcfg #$bootcfg-drv -- cgit v1.2.3 From ee4db149c29b6d0fe6bcab552f163bbbe5b09738 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 22 Nov 2019 19:46:24 +0100 Subject: gnu: php: Update to 7.3.12. * gnu/packages/php.scm (php): Update to 7.3.12. --- gnu/packages/php.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index bc60539fb4..1535cd7645 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -59,7 +59,7 @@ (define-module (gnu packages php) (define-public php (package (name "php") - (version "7.3.11") + (version "7.3.12") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -67,7 +67,7 @@ (define-public php "php-" version ".tar.xz")) (sha256 (base32 - "088hl1gyjr7a8ipdzylwy00c4xmvywn7mh2r1i4yja5c9d3gcz35")) + "1psmv3yw21rng2qqwck2b5w190s8q76qi35gqrh8i0mdc6c5xzma")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" -- cgit v1.2.3 From a608666d74f156819cecfabaf72290726d7964e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Feb 2019 03:50:22 +0100 Subject: gnu: Add xsane. * gnu/packages/scanner.scm (xsane): New public variable. --- gnu/packages/patches/xsane-fix-memory-leak.patch | 34 +++++ gnu/packages/patches/xsane-fix-pdf-floats.patch | 85 ++++++++++++ gnu/packages/patches/xsane-support-ipv6.patch | 153 +++++++++++++++++++++ .../patches/xsane-tighten-default-umask.patch | 36 +++++ gnu/packages/scanner.scm | 88 ++++++++++++ 5 files changed, 396 insertions(+) create mode 100644 gnu/packages/patches/xsane-fix-memory-leak.patch create mode 100644 gnu/packages/patches/xsane-fix-pdf-floats.patch create mode 100644 gnu/packages/patches/xsane-support-ipv6.patch create mode 100644 gnu/packages/patches/xsane-tighten-default-umask.patch diff --git a/gnu/packages/patches/xsane-fix-memory-leak.patch b/gnu/packages/patches/xsane-fix-memory-leak.patch new file mode 100644 index 0000000000..4e03e57e13 --- /dev/null +++ b/gnu/packages/patches/xsane-fix-memory-leak.patch @@ -0,0 +1,34 @@ +From bbd54510f0297afa2d1a81927db060cb0b791f14 Mon Sep 17 00:00:00 2001 +From: Ralph Little +Date: Sun, 1 Sep 2019 17:34:19 -0700 +Subject: [PATCH] Apply opensuse upstream patch xsane_memory_leak + +Removes completely redundant memory allocation. +--- + src/xsane-batch-scan.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/xsane-batch-scan.c b/src/xsane-batch-scan.c +index 90cc0e0..e77caca 100644 +--- a/src/xsane-batch-scan.c ++++ b/src/xsane-batch-scan.c +@@ -680,7 +680,6 @@ static GtkWidget *xsane_batch_scan_create_list_entry(Batch_Scan_Parameters *para + GtkWidget *list_item; + GtkWidget *hbox; + int size = 120; +- char *data; + + list_item = gtk_list_item_new(); + +@@ -688,8 +687,6 @@ static GtkWidget *xsane_batch_scan_create_list_entry(Batch_Scan_Parameters *para + gtk_container_add(GTK_CONTAINER(list_item), hbox); + gtk_widget_show(hbox); + +- data = calloc(size, size); +- + parameters->gtk_preview = gtk_preview_new(GTK_PREVIEW_COLOR); + gtk_preview_size(GTK_PREVIEW(parameters->gtk_preview), size, size); + gtk_box_pack_start(GTK_BOX(hbox), parameters->gtk_preview, FALSE, FALSE, 0); +-- +2.22.0 + diff --git a/gnu/packages/patches/xsane-fix-pdf-floats.patch b/gnu/packages/patches/xsane-fix-pdf-floats.patch new file mode 100644 index 0000000000..5f26fa140b --- /dev/null +++ b/gnu/packages/patches/xsane-fix-pdf-floats.patch @@ -0,0 +1,85 @@ +From c126eea11c4ee39cbe9c0c76f920626b618b6ee9 Mon Sep 17 00:00:00 2001 +From: Ralph Little +Date: Sun, 1 Sep 2019 17:03:44 -0700 +Subject: [PATCH] Apply debian upstream patch 0135-fix_pdf_floats + +Original patch commentary: + +Description: Fix floats in PDF and PostScript + Set LC_NUMERIC to POSIX before printing floats when building + PostScript or PDF output. +Author: Julien BLACHE +Forwarded: yes + +------------ +Looks like float printing format is affected by the current locale. +Ensures that we always get POSIX formatting of floats. +--- + src/xsane-save.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/src/xsane-save.c b/src/xsane-save.c +index f14df05..63550cc 100644 +--- a/src/xsane-save.c ++++ b/src/xsane-save.c +@@ -26,6 +26,8 @@ + #include "xsane-back-gtk.h" + #include "xsane-front-gtk.h" + #include "xsane-save.h" ++#include ++#include + #include + #include + +@@ -2425,6 +2427,7 @@ static void xsane_save_ps_create_image_header(FILE *outfile, + int flatedecode) + { + int depth; ++ char *save_locale; + + depth = image_info->depth; + +@@ -2442,8 +2445,15 @@ static void xsane_save_ps_create_image_header(FILE *outfile, + + fprintf(outfile, "%d rotate\n", degree); + fprintf(outfile, "%d %d translate\n", position_left, position_bottom); ++ ++ save_locale = strdup(setlocale(LC_NUMERIC, NULL)); ++ setlocale(LC_NUMERIC, "POSIX"); ++ + fprintf(outfile, "%f %f scale\n", width, height); + ++ setlocale(LC_NUMERIC, save_locale); ++ free(save_locale); ++ + fprintf(outfile, "<<\n"); + fprintf(outfile, " /ImageType 1\n"); + fprintf(outfile, " /Width %d\n", image_info->image_width); +@@ -3921,6 +3931,7 @@ static void xsane_save_pdf_create_page_header(FILE *outfile, struct pdf_xref *xr + int position_left, position_bottom, box_left, box_bottom, box_right, box_top, depth; + int left, bottom; + float rad; ++ char *save_locale; + + DBG(DBG_proc, "xsane_save_pdf_create_page_header\n"); + +@@ -4035,8 +4046,16 @@ static void xsane_save_pdf_create_page_header(FILE *outfile, struct pdf_xref *xr + + fprintf(outfile, "q\n"); + fprintf(outfile, "1 0 0 1 %d %d cm\n", position_left, position_bottom); /* translate */ ++ ++ save_locale = strdup(setlocale(LC_NUMERIC, NULL)); ++ setlocale(LC_NUMERIC, "POSIX"); ++ + fprintf(outfile, "%f %f -%f %f 0 0 cm\n", cos(rad), sin(rad), sin(rad), cos(rad)); /* rotate */ + fprintf(outfile, "%f 0 0 %f 0 0 cm\n", width, height); /* scale */ ++ ++ setlocale(LC_NUMERIC, save_locale); ++ free(save_locale); ++ + fprintf(outfile, "BI\n"); + fprintf(outfile, " /W %d\n", image_info->image_width); + fprintf(outfile, " /H %d\n", image_info->image_height); +-- +2.22.0 + diff --git a/gnu/packages/patches/xsane-support-ipv6.patch b/gnu/packages/patches/xsane-support-ipv6.patch new file mode 100644 index 0000000000..4e3bb87a1a --- /dev/null +++ b/gnu/packages/patches/xsane-support-ipv6.patch @@ -0,0 +1,153 @@ +From 62d9c172f258769e3a7540fe710e013bb39a704f Mon Sep 17 00:00:00 2001 +From: Ralph Little +Date: Sat, 7 Sep 2019 12:39:45 -0700 +Subject: [PATCH] Apply opensuse upstream patch 004-ipv6-support + +Appears to be related to this: +https://bugzilla.redhat.com/show_bug.cgi?id=198422 + +----- +Changes email socket connection code to use more IP version agnostic +calls. It appears to only be used by the scan email option and +originally comes from the RedHat IPv6 awareness program mentioned +in the bug report. + +In practice, I'm not sure how practical the implementation for emailing +scans in xsane is as it does not look to support encryption, pretty +much a given in today's world. +--- + src/xsane-save.c | 96 +++++++++++++++++++++++++++++++----------------- + 1 file changed, 62 insertions(+), 34 deletions(-) + +diff --git a/src/xsane-save.c b/src/xsane-save.c +index 63550cc..ff3c459 100644 +--- a/src/xsane-save.c ++++ b/src/xsane-save.c +@@ -31,6 +31,8 @@ + #include + #include + ++#include ++ + /* the following test is always false */ + #ifdef _native_WIN32 + # include +@@ -7540,55 +7542,81 @@ void write_email_attach_file(int fd_socket, char *boundary, FILE *infile, char * + /* returns fd_socket if sucessfull, < 0 when error occured */ + int open_socket(char *server, int port) + { +- int fd_socket; +- struct sockaddr_in sin; +- struct hostent *he; ++ int fd_socket, e; ++ ++ struct addrinfo *ai_list, *ai; ++ struct addrinfo hints; ++ gchar *port_s; ++ gint connected; ++ ++ memset(&hints, '\0', sizeof(hints)); ++ hints.ai_flags = AI_ADDRCONFIG; ++ hints.ai_socktype = SOCK_STREAM; ++ ++ port_s = g_strdup_printf("%d", port); ++ e = getaddrinfo(server, port_s, &hints, &ai_list); ++ g_free(port_s); + +- he = gethostbyname(server); +- if (!he) ++ if (e != 0) + { +- DBG(DBG_error, "open_socket: Could not get hostname of \"%s\"\n", server); ++ DBG(DBG_error, "open_socket: Could not lookup \"%s\"\n", server); + return -1; + } +- else ++ ++ connected = 0; ++ for (ai = ai_list; ai != NULL && !connected; ai = ai->ai_next) + { +- DBG(DBG_info, "open_socket: connecting to \"%s\" = %d.%d.%d.%d\n", +- he->h_name, +- (unsigned char) he->h_addr_list[0][0], +- (unsigned char) he->h_addr_list[0][1], +- (unsigned char) he->h_addr_list[0][2], +- (unsigned char) he->h_addr_list[0][3]); +- } ++ gchar hostname[NI_MAXHOST]; ++ gchar hostaddr[NI_MAXHOST]; ++ ++ /* If all else fails */ ++ strncpy(hostname, "(unknown name)", NI_MAXHOST-1); ++ strncpy(hostaddr, "(unknown address)", NI_MAXHOST-1); ++ ++ /* Determine canonical name and IPv4/IPv6 address */ ++ (void) getnameinfo(ai->ai_addr, ai->ai_addrlen, hostname, sizeof(hostname), ++ NULL, 0, 0); ++ (void) getnameinfo(ai->ai_addr, ai->ai_addrlen, hostaddr, sizeof(hostaddr), ++ NULL, 0, NI_NUMERICHOST); ++ ++ DBG(DBG_info, "open_socket: connecting to \"%s\" (\"%s\"): %s\n", ++ server, hostname, hostaddr); + +- if (he->h_addrtype != AF_INET) +- { +- DBG(DBG_error, "open_socket: Unknown address family: %d\n", he->h_addrtype); +- return -1; +- } ++ if ((ai->ai_family != AF_INET) && (ai->ai_family != AF_INET6)) ++ { ++ DBG(DBG_error, "open_socket: Unknown address family: %d\n", ai->ai_family); ++ continue; ++ } + +- fd_socket = socket(AF_INET, SOCK_STREAM, 0); ++ fd_socket = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); + +- if (fd_socket < 0) +- { +- DBG(DBG_error, "open_socket: Could not create socket: %s\n", strerror(errno)); +- return -1; +- } ++ if (fd_socket < 0) ++ { ++ DBG(DBG_error, "open_socket: Could not create socket: %s\n", strerror(errno)); ++ continue; ++ } + +-/* setsockopt (dev->ctl, level, TCP_NODELAY, &on, sizeof (on)); */ ++ /* setsockopt (dev->ctl, level, TCP_NODELAY, &on, sizeof (on)); */ + +- sin.sin_port = htons(port); +- sin.sin_family = AF_INET; +- memcpy(&sin.sin_addr, he->h_addr_list[0], he->h_length); ++ if (connect(fd_socket, ai->ai_addr, ai->ai_addrlen) != 0) ++ { ++ DBG(DBG_error, "open_socket: Could not connect with port %d of socket: %s\n", port, strerror(errno)); ++ continue; ++ } ++ ++ /* All went well */ ++ connected = 1; ++ } + +- if (connect(fd_socket, &sin, sizeof(sin))) ++ if (!connected) + { +- DBG(DBG_error, "open_socket: Could not connect with port %d of socket: %s\n", ntohs(sin.sin_port), strerror(errno)); +- return -1; ++ DBG(DBG_info, "open_socket: Could not connect to any address"); ++ return -1; + } + +- DBG(DBG_info, "open_socket: Connected with port %d\n", ntohs(sin.sin_port)); ++ DBG(DBG_info, "open_socket: Connected with port %d\n", port); + +- return fd_socket; ++ return fd_socket; + } + + /* ---------------------------------------------------------------------------------------------------------------------- */ +-- +2.22.0 + diff --git a/gnu/packages/patches/xsane-tighten-default-umask.patch b/gnu/packages/patches/xsane-tighten-default-umask.patch new file mode 100644 index 0000000000..5ee5fdfd37 --- /dev/null +++ b/gnu/packages/patches/xsane-tighten-default-umask.patch @@ -0,0 +1,36 @@ +From 5dc1e301a165709c60c435f00ec9bb6d7d5f21f3 Mon Sep 17 00:00:00 2001 +From: Ralph Little +Date: Tue, 27 Aug 2019 21:40:02 -0700 +Subject: [PATCH] Apply debian upstream patch 0160-fix_tighten_default_umask + +Original patch commentary: + +Description: Change default XSane umask from 0007 to 0077 + A default umask of 0007 can be mildly insecure in a multiuser environment, + so tighten things up a bit and go with 0077 instead. +Author: Adrien Thebo +Bug-Debian: http://bugs.debian.org/592972 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xsane/+bug/611950 + +---- +As above. +--- + src/xsane.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xsane.h b/src/xsane.h +index 67f06d4..fa04418 100644 +--- a/src/xsane.h ++++ b/src/xsane.h +@@ -104,7 +104,7 @@ + #define XSANE_DEBUG_ENVIRONMENT "XSANE_DEBUG" + + #define XSANE_PROGRESS_BAR_MIN_DELTA_PERCENT 0.025 +-#define XSANE_DEFAULT_UMASK 0007 ++#define XSANE_DEFAULT_UMASK 0077 + #define XSANE_HOLD_TIME 200 + #define XSANE_CONTINUOUS_HOLD_TIME 10 + #define XSANE_DEFAULT_DEVICE "SANE_DEFAULT_DEVICE" +-- +2.22.0 + diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index b371cf3105..aa58b5aa50 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -21,11 +21,16 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages scanner) + #:use-module (gnu packages) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages ghostscript) + #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages libusb) #:use-module (gnu packages pkg-config) #:use-module (guix build-system gnu) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix licence:) #:use-module (guix packages) @@ -148,3 +153,86 @@ (define out (string-append (assoc-ref outputs "out") proving access to any raster image scanner hardware (flatbed scanner, hand-held scanner, video- and still-cameras, frame-grabbers, etc.). The package contains the library and drivers."))) + +(define-public xsane + (package + (name "xsane") + (version "0.999") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/sane-project/frontend/xsane.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08zvxj7i1s88ckrsqldmsrikc3g62a6p3s3i5b5x4krcfpi3vs50")) + ;; Apply some important-looking fixes. There are many more unreleased + ;; commits upstream. A 1.0 release is planned. + (patches (search-patches "xsane-fix-memory-leak.patch" + "xsane-fix-pdf-floats.patch" + "xsane-support-ipv6.patch" + "xsane-tighten-default-umask.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove ancient bundled lprng code under a non-free licence. See + ;; , which solves the problem + ;; by replacing it with a newer (free) copy. We let the build fall + ;; back to the system version instead, which appears to work fine. + (delete-file "lib/snprintf.c") + (substitute* "lib/Makefile.in" + (("snprintf\\.o ") "")) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "xsanedocdir=" (assoc-ref %outputs "out") + "/share/doc/" ,name "-" ,version)) + #:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-invalid-dereference + ;; Fix the following compilation error with libpng: + ;; xsane-save.c: In function ‘xsane_save_png’: + ;; xsane-save.c:4913:21: error: dereferencing pointer to + ;; incomplete type ‘png_struct {aka struct png_struct_def}’ + ;; if (setjmp(png_ptr->jmpbuf)) + ;; ^ + (lambda _ + (substitute* "src/xsane-save.c" + (("png_ptr->jmpbuf") "png_jmpbuf(png_ptr)")) + #t)) + (add-after 'unpack 'use-sane-help-browser + (lambda _ + (substitute* "src/xsane.h" + (("netscape") (which "xdg-open"))) + #t)) + (add-after 'install 'delete-empty-/sbin + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (rmdir (string-append out "/sbin")) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("gtk+" ,gtk+-2) + ("lcms" ,lcms) + ("libjpeg" ,libjpeg) + ("libtiff" ,libtiff) + ("sane-backends" ,sane-backends) + + ;; To open the manual from the Help menu. + ("xdg-utils" ,xdg-utils))) + (home-page "https://gitlab.com/sane-project/frontend/xsane") + (synopsis "Featureful graphical interface for document and image scanners") + (description + "XSane is a graphical interface for controlling a scanner and acquiring +images from it. You can photocopy multi-page documents and save, fax, print, +or e-mail your scanned images. It is highly configurable and exposes all +device settings, letting you fine-tune the final result. It can also be used +as a GIMP plugin to acquire images directly from a scanner. + +XSane talks to scanners through the @acronym{SANE, Scanner Access Now Easy} +back-end library, which supports almost all existing scanners.") + (license licence:gpl2+))) -- cgit v1.2.3 From 61abb11481432b0349c193d85796036fb98244af Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Nov 2019 22:15:38 +0100 Subject: gnu: Register xsane patches. This follows up on commit a608666d74f156819cecfabaf72290726d7964e6. * gnu/local.mk (dist_patch_DATA): Add missing patches. --- gnu/local.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/local.mk b/gnu/local.mk index ba86bf3224..ebb392494b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1463,7 +1463,11 @@ dist_patch_DATA = \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xinetd-fix-fd-leak.patch \ - %D%/packages/patches/xinetd-CVE-2013-4342.patch + %D%/packages/patches/xinetd-CVE-2013-4342.patch \ + %D%/packages/patches/xsane-fix-memory-leak.patch \ + %D%/packages/patches/xsane-fix-pdf-floats.patch \ + %D%/packages/patches/xsane-support-ipv6.patch \ + %D%/packages/patches/xsane-tighten-default-umask.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in -- cgit v1.2.3 From 99b106022c8db67ee9bde847e1677e2dd0a39923 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Nov 2019 22:16:32 +0100 Subject: gnu: xsane: Fix snprintf buffer length. * gnu/packages/scanner.scm (xsane)[source]: Add patch. * gnu/packages/patches/xsane-fix-snprintf-buffer-length.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../patches/xsane-fix-snprintf-buffer-length.patch | 72 ++++++++++++++++++++++ gnu/packages/scanner.scm | 1 + 3 files changed, 74 insertions(+) create mode 100644 gnu/packages/patches/xsane-fix-snprintf-buffer-length.patch diff --git a/gnu/local.mk b/gnu/local.mk index ebb392494b..e6c6f57c3f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1466,6 +1466,7 @@ dist_patch_DATA = \ %D%/packages/patches/xinetd-CVE-2013-4342.patch \ %D%/packages/patches/xsane-fix-memory-leak.patch \ %D%/packages/patches/xsane-fix-pdf-floats.patch \ + %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ %D%/packages/patches/xsane-support-ipv6.patch \ %D%/packages/patches/xsane-tighten-default-umask.patch diff --git a/gnu/packages/patches/xsane-fix-snprintf-buffer-length.patch b/gnu/packages/patches/xsane-fix-snprintf-buffer-length.patch new file mode 100644 index 0000000000..412e127f5a --- /dev/null +++ b/gnu/packages/patches/xsane-fix-snprintf-buffer-length.patch @@ -0,0 +1,72 @@ +From 893a5ce1f75e5eea7c8d383038ff92a150819c9c Mon Sep 17 00:00:00 2001 +From: Ralph Little +Date: Thu, 19 Sep 2019 22:02:33 -0700 +Subject: [PATCH] xsane-*-project.c - reduced snprintf format pad to silence + warning about too long constrant string for buffer. + +--- + src/xsane-email-project.c | 4 ++-- + src/xsane-fax-project.c | 4 ++-- + src/xsane-multipage-project.c | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/xsane-email-project.c b/src/xsane-email-project.c +index f20cb12..ac93fc2 100644 +--- a/src/xsane-email-project.c ++++ b/src/xsane-email-project.c +@@ -896,7 +896,7 @@ static void xsane_email_project_update_project_status() + snprintf(filename, sizeof(filename), "%s/xsane-mail-list", preferences.email_project); + projectfile = fopen(filename, "r+b"); /* r+ = read and write, position = start of file */ + +- snprintf(buf, 32, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.email_status); /* fill 32 characters status line */ ++ snprintf(buf, 33, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.email_status); /* fill 32 characters status line */ + fprintf(projectfile, "%s\n", buf); /* first line is status of email */ + + fclose(projectfile); +@@ -936,7 +936,7 @@ void xsane_email_project_save() + { + char buf[TEXTBUFSIZE]; + +- snprintf(buf, 32, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.email_status); /* fill 32 characters status line */ ++ snprintf(buf, 33, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.email_status); /* fill 32 characters status line */ + fprintf(projectfile, "%s\n", buf); /* first line is status of email */ + gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.email_status)); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); +diff --git a/src/xsane-fax-project.c b/src/xsane-fax-project.c +index f263313..0c60a97 100644 +--- a/src/xsane-fax-project.c ++++ b/src/xsane-fax-project.c +@@ -452,7 +452,7 @@ static void xsane_fax_project_update_project_status() + snprintf(filename, sizeof(filename), "%s/xsane-fax-list", preferences.fax_project); + projectfile = fopen(filename, "r+b"); /* r+ = read and write, position = start of file */ + +- snprintf(buf, 32, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.fax_status); /* fill 32 characters status line */ ++ snprintf(buf, 33, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.fax_status); /* fill 32 characters status line */ + fprintf(projectfile, "%s\n", buf); /* first line is status of mail */ + + fclose(projectfile); +@@ -498,7 +498,7 @@ void xsane_fax_project_save() + { + char buf[TEXTBUFSIZE]; + +- snprintf(buf, 32, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.fax_status); /* fill 32 characters status line */ ++ snprintf(buf, 33, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.fax_status); /* fill 32 characters status line */ + fprintf(projectfile, "%s\n", buf); /* first line is status of mail */ + gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.fax_status)); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); +diff --git a/src/xsane-multipage-project.c b/src/xsane-multipage-project.c +index f23e5f8..9392e00 100644 +--- a/src/xsane-multipage-project.c ++++ b/src/xsane-multipage-project.c +@@ -522,7 +522,7 @@ void xsane_multipage_project_save() + { + char buf[TEXTBUFSIZE]; + +- snprintf(buf, 32, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.multipage_status); /* fill 32 characters status line */ ++ snprintf(buf, 33, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.multipage_status); /* fill 32 characters status line */ + fprintf(projectfile, "%s\n", buf); /* first line is status of multipage */ + gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status)); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); +-- +2.23.0 + diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index aa58b5aa50..98f7fd203a 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -171,6 +171,7 @@ (define-public xsane ;; commits upstream. A 1.0 release is planned. (patches (search-patches "xsane-fix-memory-leak.patch" "xsane-fix-pdf-floats.patch" + "xsane-fix-snprintf-buffer-length.patch" "xsane-support-ipv6.patch" "xsane-tighten-default-umask.patch")) (modules '((guix build utils))) -- cgit v1.2.3 From 4c7ca5d299cb9c900e8c3b4a2d289a6e11075ff9 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 22 Nov 2019 15:15:07 -0600 Subject: gnu: bear: Update to 2.4.2. * gnu/packages/build-tools.scm (bear): Update to 2.4.2. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 5c11266c89..a82b867282 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -80,7 +80,7 @@ (define-public bam (define-public bear (package (name "bear") - (version "2.3.13") + (version "2.4.2") (source (origin (method git-fetch) (uri (git-reference @@ -89,7 +89,7 @@ (define-public bear (file-name (git-file-name name version)) (sha256 (base32 - "0imvvs22gyr1v6ydgp5yn2nq8fb8llmz0ra1m733ikjaczl3jm7z")))) + "1w1kyjzvvy5lj16kn3yyf7iil2cqlfkszi8kvagql7f5h5l6w9b1")))) (build-system cmake-build-system) (inputs `(("python" ,python-wrapper))) -- cgit v1.2.3 From 8717fb8d5f30915999869e80782ae0fcf1c6698d Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 22 Nov 2019 15:25:27 -0600 Subject: gnu: polyml: Update to 5.8. * gnu/packages/sml.scm (polyml): Update to 5.8. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/sml.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sml.scm b/gnu/packages/sml.scm index 0874b81cc7..fd1ba4a539 100644 --- a/gnu/packages/sml.scm +++ b/gnu/packages/sml.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Andy Patterson ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2019 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +33,7 @@ (define-module (gnu packages sml) (define-public polyml (package (name "polyml") - (version "5.7.1") + (version "5.8") (source (origin (method git-fetch) (uri (git-reference @@ -41,7 +42,7 @@ (define-public polyml (file-name (git-file-name name version)) (sha256 (base32 - "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755")))) + "1jabrf9cnmsppawga6q5pjiq1cdayilxp66fkxykczs6vv2gz7f9")))) (build-system gnu-build-system) (inputs `(("gmp" ,gmp) -- cgit v1.2.3 From 116787d4adb89351ef7ad3f625c5138267f7740b Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 22 Nov 2019 15:25:38 -0600 Subject: gnu: polyml: Use HTTPS home page URI. * gnu/packages/sml.scm (polyml)[home-page]: Use HTTPS URI. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/sml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/sml.scm b/gnu/packages/sml.scm index fd1ba4a539..30ee58c498 100644 --- a/gnu/packages/sml.scm +++ b/gnu/packages/sml.scm @@ -66,7 +66,7 @@ (define flags make-flags) make-flags)) (apply system* "make" (append flags (list "compiler")))))))) - (home-page "http://www.polyml.org/") + (home-page "https://www.polyml.org/") (synopsis "Standard ML implementation") (description "Poly/ML is a Standard ML implementation. It is fully compatible with the ML97 standard. It includes a thread library, a foreign -- cgit v1.2.3 From 4afb7dd9f54c9ffa1eed3f3505a54c2587d9ffac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 00:14:33 +0100 Subject: gnu: simple-scan: Update to 3.34.2. * gnu/packages/gnome.scm (simple-scan): Update to 3.34.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 89dc7a3951..5b11238109 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4374,7 +4374,7 @@ (define-public gusb (define-public simple-scan (package (name "simple-scan") - (version "3.34.1") + (version "3.34.2") (source (origin (method url-fetch) @@ -4382,7 +4382,7 @@ (define-public simple-scan (version-major+minor version) "/" "simple-scan-" version ".tar.xz")) (sha256 - (base32 "0glzskxdc7p9z7nwcakqc7qzij4l79adlvvb2cj5fmis731zw9yq")))) + (base32 "1fk3g4f9slckqfwm576jrjq1d1qihw0dlgzdf00ns7qbhzb0kxsp")))) (build-system meson-build-system) ;; TODO: Fix icons in home screen, About dialogue, and scan menu. (arguments -- cgit v1.2.3 From d34c6a2a930c08fc1e4b87472a82192c124fea92 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Nov 2019 23:39:43 +0100 Subject: gnu: hangups: Update to 0.4.10. * gnu/packages/messaging.scm (hangups): Update to 0.4.10. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 694dfbb51d..33e752c9a0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1822,13 +1822,13 @@ (define-public quaternion (define-public hangups (package (name "hangups") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) (uri (pypi-uri "hangups" version)) (sha256 - (base32 "1jw4i58cd4j1ymsnhv9224xsi26w8y0qrj6z4nw50dnbl45b6aaa")))) + (base32 "0ww9z9kcb02pwnr8q1ll31wkzspc1fci1ly8ifrwzxysp4rxy3j5")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 520dc74369a9a8ec431b1eed969346d316c2b3c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Nov 2019 23:47:26 +0100 Subject: gnu: ocaml-odoc: Update to 1.4.2. * gnu/packages/ocaml.scm (ocaml-odoc): Update to 1.4.2. --- gnu/packages/ocaml.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d820b855d8..9cd29f2004 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5199,7 +5199,7 @@ (define-public ocaml-bisect-ppx (define-public ocaml-odoc (package (name "ocaml-odoc") - (version "1.4.1") + (version "1.4.2") (source (origin (method git-fetch) @@ -5208,8 +5208,7 @@ (define-public ocaml-odoc (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1i2j0krbzvb1n3dcic9h1pyyqxmf051ky82nrcyzx1nwqjb8zfh6")))) + (base32 "0rvhx139jx6wmlfz355mja6mk03x4swq1xxvk5ky6jzhalq3cf5i")))) (build-system dune-build-system) (inputs `(("ocaml-alcotest" ,ocaml-alcotest) -- cgit v1.2.3 From 9a3d4216f56d35d3ce6e3213164c29b01795d327 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:01:02 +0100 Subject: gnu: r-shinyfiles: Update to 0.7.5. * gnu/packages/cran.scm (r-shinyfiles): Update to 0.7.5. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 652593fbd0..fed8ec3d0b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -906,14 +906,13 @@ (define-public r-shinydashboard (define-public r-shinyfiles (package (name "r-shinyfiles") - (version "0.7.3") + (version "0.7.5") (source (origin (method url-fetch) (uri (cran-uri "shinyFiles" version)) (sha256 - (base32 - "01as3l9ffj5dwac0vviais2x5l3027zxlj67kcvkdwxaj5hql33i")))) + (base32 "1143m941hma9hc77c3xcw26c0ygfhn9ii2sbp9wrydxv4gc7mr8a")))) (properties `((upstream-name . "shinyFiles"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 36ca7898b6a3e28933be093808471fcb2cf3c932 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:14:48 +0100 Subject: gnu: r-algdesign: Update to 1.1-7.3.1. * gnu/packages/cran.scm (r-algdesign): Update to 1.1-7.3.1. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fed8ec3d0b..9445e2b1f9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4841,14 +4841,13 @@ (define-public r-radiant-data (define-public r-algdesign (package (name "r-algdesign") - (version "1.1-7.3") + (version "1.1-7.3.1") (source (origin (method url-fetch) (uri (cran-uri "AlgDesign" version)) (sha256 - (base32 - "0bl7mx4dnmkgs2x1fj7cqnrp7jx18mqwxyga0rzlniq12h8mc3fz")))) + (base32 "1s69yx0wxi9kqj9kyib0yvd363d7g4zrz0cvz1hn97ladr8656bz")))) (properties `((upstream-name . "AlgDesign"))) (build-system r-build-system) (home-page "https://github.com/jvbraun/AlgDesign") -- cgit v1.2.3 From 8f35d630a0279ee64464dc40f4074ae2639ee089 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:16:04 +0100 Subject: gnu: r-car: Update to 3.0-5. * gnu/packages/statistics.scm (r-car): Update to 3.0-5. --- gnu/packages/statistics.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index b4de0e812b..46acfd645f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5288,14 +5288,13 @@ (define-public r-cardata (define-public r-car (package (name "r-car") - (version "3.0-4") + (version "3.0-5") (source (origin (method url-fetch) (uri (cran-uri "car" version)) (sha256 - (base32 - "1mhfxrb62yanaz36f4n38p9hhnqbs5b19k0864w4ja1ccgh3nl3f")))) + (base32 "0w7fm81pn0wqrwzbjyddnrkpjl8gavg7ijh7rab9f21rkgkzgm3y")))) (build-system r-build-system) (propagated-inputs `(("r-abind" ,r-abind) -- cgit v1.2.3 From 19b85d029cdff9b9d6ba04ad7b6dbd2a053520e1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:22:25 +0100 Subject: gnu: r-cardata: Update to 3.0-3. * gnu/packages/statistics.scm (r-cardata): Update to 3.0-3. --- gnu/packages/statistics.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 46acfd645f..9e867f0cf5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5268,14 +5268,13 @@ (define-public r-pbkrtest (define-public r-cardata (package (name "r-cardata") - (version "3.0-2") + (version "3.0-3") (source (origin (method url-fetch) (uri (cran-uri "carData" version)) (sha256 - (base32 - "152lfgaspgx6x2wzdb5p3zv6r87a0d2pg10h6fjmdr613kzlwp1v")))) + (base32 "0cg2yxzn0pdjqykr60my1fzpfkqac21fll5hv3m9w5c9sayq8swq")))) (properties `((upstream-name . "carData"))) (build-system r-build-system) (home-page "https://r-forge.r-project.org/projects/car/") -- cgit v1.2.3 From 33ac190105ff9780f016a45d5284afc755d8a7c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:50:08 +0100 Subject: gnu: r-selectr: Update to 0.4-2. * gnu/packages/cran.scm (r-selectr): Update to 0.4-2. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9445e2b1f9..6a52c64e75 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -314,14 +314,13 @@ (define-public r-rvest (define-public r-selectr (package (name "r-selectr") - (version "0.4-1") + (version "0.4-2") (source (origin (method url-fetch) (uri (cran-uri "selectr" version)) (sha256 - (base32 - "1jp27rxks4w29l47k42869hp8hnkzq2rnvsqbr44wd19fqb2zm4b")))) + (base32 "09y1n3iy297g49xlpl7xrjpwgnm57pskx5991lyfcpizbz8ax22m")))) (build-system r-build-system) (propagated-inputs `(("r-stringr" ,r-stringr) -- cgit v1.2.3 From 3db9cbf67645caca8cd9ef4a921603751084c483 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:50:24 +0100 Subject: gnu: r-desolve: Update to 1.25. * gnu/packages/maths.scm (r-desolve): Update to 1.25. --- gnu/packages/maths.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 32608ea2ff..29a1bfd768 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4408,14 +4408,13 @@ (define-public r-subplex (define-public r-desolve (package (name "r-desolve") - (version "1.24") + (version "1.25") (source (origin (method url-fetch) (uri (cran-uri "deSolve" version)) (sha256 - (base32 - "0hkvspq0fp8j64l9zayab2l2nazazhwfgfym0jllh0xv5a12r99s")))) + (base32 "0735y3p5glhqx69rzrc8qgmvs7p7w0p98qxmvylb6bgqp6kp0cbp")))) (properties `((upstream-name . "deSolve"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From ec9a15c2eb7aa6cf0ba9784d666dfa9419328e7f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:51:35 +0100 Subject: gnu: r-quadprog: Update to 1.5-8. * gnu/packages/maths.scm (r-quadprog): Update to 1.5-8. --- gnu/packages/maths.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 29a1bfd768..e96a3199ff 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2345,14 +2345,13 @@ (define-public mumps-metis-openmpi (define-public r-quadprog (package (name "r-quadprog") - (version "1.5-7") + (version "1.5-8") (source (origin (method url-fetch) (uri (cran-uri "quadprog" version)) (sha256 - (base32 - "0vg7i9p241bwvfdspjbydjrsvgipl6nsb8bjigp0hbbgvxbixx0s")))) + (base32 "1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 748ae1c6b13cdc05a24751e3cce20d430f12fcb5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:52:41 +0100 Subject: gnu: r-glmnet: Update to 3.0-1. * gnu/packages/statistics.scm (r-glmnet): Update to 3.0-1. --- gnu/packages/statistics.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9e867f0cf5..08e3d65e30 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3256,14 +3256,13 @@ (define-public r-irlba (define-public r-glmnet (package (name "r-glmnet") - (version "3.0") + (version "3.0-1") (source (origin (method url-fetch) (uri (cran-uri "glmnet" version)) (sha256 - (base32 - "1fwspkxbsx7jy5h8zcdl0q8xsbj7svjjbcmg5lfpxdsgyyww46v7")))) + (base32 "04wa926mnss53p1fhx0mjgxnmwmmqls12sc0sy7w09kbmyqa3fq7")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From c84395943db0af15f58a147f891f03dc59073dd1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:56:42 +0100 Subject: gnu: r-vgam: Update to 1.1-2. * gnu/packages/statistics.scm (r-vgam): Update to 1.1-2. --- gnu/packages/statistics.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 08e3d65e30..c23a627fdc 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5019,14 +5019,13 @@ (define-public r-fpc (define-public r-vgam (package (name "r-vgam") - (version "1.1-1") + (version "1.1-2") (source (origin (method url-fetch) (uri (cran-uri "VGAM" version)) (sha256 - (base32 - "0lnsqx3q3k0c7sj8gj0n6shn2fyxwrh8xph8h1r1i23ybbb2n6fy")))) + (base32 "0kyan3a4ys2xbg9kf167cyf1gk7g963id62cjm2ij4i7y4wi61zq")))) (properties `((upstream-name . "VGAM"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From e25d068d847a610c0825a27ba3440fd6c5713320 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:56:50 +0100 Subject: gnu: r-roxygen2: Update to 7.0.1. * gnu/packages/statistics.scm (r-roxygen2): Update to 7.0.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c23a627fdc..655e404b73 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2309,13 +2309,13 @@ (define-public r-commonmark (define-public r-roxygen2 (package (name "r-roxygen2") - (version "7.0.0") + (version "7.0.1") (source (origin (method url-fetch) (uri (cran-uri "roxygen2" version)) (sha256 (base32 - "13sani3y9ql56cvja8pfjpwsbq8pismc52ns1cq1zgi0jycgqja5")))) + "07v7f7may3vr80f4m1w1ll41qdahszycyx4c1yf8pw7asx73d77j")))) (build-system r-build-system) (propagated-inputs `(("r-brew" ,r-brew) -- cgit v1.2.3 From b93a32977e591604d36350debaf6a4dd9aaf5371 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:59:00 +0100 Subject: gnu: r-biocmanager: Update to 1.30.10. * gnu/packages/cran.scm (r-biocmanager): Update to 1.30.10. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6a52c64e75..7715b1cf63 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9043,14 +9043,13 @@ (define-public r-ncdf4 (define-public r-biocmanager (package (name "r-biocmanager") - (version "1.30.9") + (version "1.30.10") (source (origin (method url-fetch) (uri (cran-uri "BiocManager" version)) (sha256 - (base32 - "1l9b2mr99nhpvk1wkd93397i0d6z4vvbq3zm8dk86gb1pfci26sx")))) + (base32 "03n9s2vf7vgpgb5alpxwamf9xfkn32cbzngwyn6spq1bnh9a9dzk")))) (properties `((upstream-name . "BiocManager"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/BiocManager/") -- cgit v1.2.3 From f9ec89f444906371dc058f202182b670e1ee4785 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 23 Nov 2019 00:36:38 -0500 Subject: gnu: Add srfi-64-driver. * gnu/packages/guile-xyz.scm (srfi-64-driver): New variable. --- gnu/packages/guile-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 1e676566ac..558fa4c1b4 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 swedebugia ;;; Copyright © 2019 Amar Singh +;;; Copyright © 2019 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -2660,3 +2661,31 @@ (define-public guile-ffi-fftw ;; TODO: This might actually be LGPLv3+ ;; See https://github.com/lloda/guile-ffi-fftw/issues/1 (license license:gpl3+)))) + +(define-public srfi-64-driver + (package + (name "srfi-64-driver") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://files.ngyro.com/srfi-64-driver/" + "srfi-64-driver-" version ".tar.gz")) + (sha256 + (base32 + "188b6mb7sjjg0a8zldikinglf40ky8mg8rwh5768gjmch6gkk3ph")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'build)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-2.2))) + (home-page "https://ngyro.com/software/srfi-64-driver.html") + (synopsis "Automake test driver for SRFI 64 test suites") + (description "This package provides an Automake test driver that can +run SRFI 64 test suites. It gives Automake insight into the individual +tests being run, resulting clearer and more specific output.") + (license license:gpl3+))) -- cgit v1.2.3 From f6bf4b2c85ea148e735ffa34139dfbdc4edf37e8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sat, 23 Nov 2019 00:53:39 -0500 Subject: gnu: Add guile-semver. * gnu/packages/guile-xyz.scm (guile-semver): New variable. --- gnu/packages/guile-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 558fa4c1b4..245eb9c0d6 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2689,3 +2689,27 @@ (define-public srfi-64-driver run SRFI 64 test suites. It gives Automake insight into the individual tests being run, resulting clearer and more specific output.") (license license:gpl3+))) + +(define-public guile-semver + (package + (name "guile-semver") + (version "0.1.0") + (source (origin + (method url-fetch) + (uri (string-append "https://files.ngyro.com/guile-semver/" + "guile-semver-" version ".tar.gz")) + (sha256 + (base32 + "06b66rj7nyhr6i3dpkwvfw1xb10w2pngrsw2hxfxkznwsbh9byfz")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("srfi-64-driver" ,srfi-64-driver))) + (inputs + `(("guile" ,guile-2.2))) + (home-page "https://ngyro.com/software/guile-semver.html") + (synopsis "Semantic Versioning (SemVer) for Guile") + (description "This Guile library provides tools for reading, +comparing, and writing Semantic Versions. It also includes ranges in +the style of the Node Package Manager (NPM).") + (license license:gpl3+))) -- cgit v1.2.3 From efafbc66674be199330434c848ab6b8552efd8c5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 11:30:52 +0100 Subject: gnu: guile-next: Update to 2.9.5. * gnu/packages/guile.scm (guile-next): Update to 2.9.5. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 4419c48d1a..57e9a0aca5 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -276,14 +276,14 @@ (define-public guile-next (package (inherit guile-2.2) (name "guile-next") - (version "2.9.4") + (version "2.9.5") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "1milviqhipyfx400pqhngxpxyajalzwmp597dxn5514pkk0g7v0p")))) + "1db91mhvphzmiyw6f41ks9haysphygngv400ivgqf23lg22wn5zr")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") -- cgit v1.2.3 From 1d48f1da5a580bb757e5d31d2350f84929ca125a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 11:43:14 +0100 Subject: gnu: guile-ssh: Remove redundant phase. * gnu/packages/ssh.scm (guile-ssh)[arguments]: Remove 'autoreconf' phase, which was redundant with the 'bootstrap' phase. --- gnu/packages/ssh.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index fa1d32a0e0..807cbafb7c 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -265,9 +265,6 @@ (define-public guile-ssh #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda* (#:key inputs #:allow-other-keys) - (invoke "autoreconf" "-vfi"))) (add-before 'build 'fix-libguile-ssh-file-name (lambda* (#:key outputs #:allow-other-keys) ;; Build and install libguile-ssh.so so that we can use -- cgit v1.2.3 From 7e90eb98a9d0e739d467d4096ab6662e4c58fe9b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 12:39:20 +0100 Subject: gnu: guile-ssh: Add "guile3.0-ssh" variant. * gnu/packages/ssh.scm (guile-ssh)[source]: Substitute 'GUILE_PKG' stanza in "configure.ac". * gnu/packages/ssh.scm (guile3.0-ssh): New variable. --- gnu/packages/ssh.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 807cbafb7c..b82d280089 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -65,6 +65,7 @@ (define-module (gnu packages ssh) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (srfi srfi-1)) (define-public libssh @@ -257,6 +258,11 @@ (define-public guile-ssh (substitute* "tests/server.scm" (("= %libssh-minor-version 7") ">= %libssh-minor-version 7")) + + ;; Allow builds with Guile 3.0. + (substitute* "configure.ac" + (("^GUILE_PKG.*$") + "GUILE_PKG([3.0 2.2 2.0])\n")) #t)))) (build-system gnu-build-system) (outputs '("out" "debug")) @@ -318,6 +324,39 @@ (define-public guile2.0-ssh (inputs `(("guile" ,guile-2.0) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) +(define-public guile3.0-ssh + (package + (inherit guile-ssh) + (name "guile3.0-ssh") + (arguments + (substitute-keyword-arguments (package-arguments guile-ssh) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'bootstrap 'delete-old-guile-m4 + (lambda _ + ;; The old 'guile.m4' that's shipped would fail to recognize + ;; Guile 2.9 as "3.0". + (delete-file "m4/guile.m4") + #t)) + (add-before 'build 'adjust-for-guile3 + (lambda _ + ;; Adjust for things that are deprecated in 2.2 and removed in + ;; 3.0. + (substitute* "tests/common.scm" + (("define-module \\(tests common\\)") + "define-module (tests common) + #:use-module (ice-9 threads)\n")) + (substitute* "modules/ssh/tunnel.scm" + (("define-module \\(ssh tunnel\\)") + "define-module (ssh tunnel) + #:use-module (ice-9 threads)")) + (substitute* "modules/srfi/srfi-64.upstream.scm" + (("_IOLBF") + "'line")) + #t)))))) + (inputs `(("guile" ,guile-next) + ,@(alist-delete "guile" (package-inputs guile-ssh)))))) + (define-public corkscrew (package (name "corkscrew") -- cgit v1.2.3 From 63292fd39e365eabf257767dd7dc419bf3c93db3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 14:46:08 +0100 Subject: gnu: perl-moox-late: Update to 0.016. * gnu/packages/perl.scm (perl-moox-late): Update to 0.016. --- gnu/packages/perl.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 6069413264..c77195a9ab 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6384,17 +6384,15 @@ (define-public perl-moox-handlesvia (define-public perl-moox-late (package (name "perl-moox-late") - (version "0.015") + (version "0.016") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-" - version - ".tar.gz")) + version ".tar.gz")) (sha256 - (base32 - "1gzvd9zws3v09sh0xx6srmw4jwi22fnrya4zcsc8dykn62pjclqp")))) + (base32 "0kjy86rrpzfy6w5r9ykjq7njwdnvp7swd6r2k4gfrh3picz3kdhz")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal) @@ -6405,8 +6403,7 @@ (define-public perl-moox-late ("perl-moox-handlesvia" ,perl-moox-handlesvia))) (propagated-inputs `(("perl-type-tiny" ,perl-type-tiny))) - (home-page - "https://metacpan.org/release/MooX-late") + (home-page "https://metacpan.org/release/MooX-late") (synopsis "Easily translate Moose code to Moo") (description "MooX::late does the following: -- cgit v1.2.3 From af6533d442a5217e94d91d79f1ffea73c7140810 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 14:47:08 +0100 Subject: gnu: perl-apache-logformat-compiler: Update to 0.36. * gnu/packages/web.scm (perl-apache-logformat-compiler): Update to 0.36. --- 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 aea13e0f99..86f6189743 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1596,14 +1596,14 @@ (define-public sassc (define-public perl-apache-logformat-compiler (package (name "perl-apache-logformat-compiler") - (version "0.35") + (version "0.36") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/K/KA/KAZEBURO/" "Apache-LogFormat-Compiler-" version ".tar.gz")) (sha256 - (base32 "06i70ydxk2wa2rcqn16842kra2qz3jwk0vk1abq8lah4180c0m0n")))) + (base32 "05xcl7j65vakx7x79jqjikyw0nzf60bc2w6hhc0q5sklxq1ral4l")))) (build-system perl-build-system) (native-inputs `(("perl-http-message" ,perl-http-message) -- cgit v1.2.3 From 97610a661482cf28d580054d48a26557ee90f877 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 14:48:14 +0100 Subject: gnu: python-whatever: Update to 0.6. * gnu/packages/python-xyz.scm (python-whatever): Update to 0.6. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8d53a59c40..684a41f70c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14820,15 +14820,14 @@ (define-public python2-gyp (define-public python-whatever (package (name "python-whatever") - (version "0.5") + (version "0.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/Suor/whatever/archive/" version ".tar.gz")) (sha256 - (base32 - "1iqvnaf0zpc6b4rvbqq4xy45mszcscyzpzknv8wg6j84pbp22sap")) + (base32 "1rchg9hrlvw4sn20lq1zspczr4x1pv57c02gv73igiqx1hqpy2nc")) (file-name (string-append name "-" version ".tar.gz")))) (build-system python-build-system) (arguments -- cgit v1.2.3 From 2767beb3d0e21db2f9d9f28a7a2a2fa8980811f7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 15:01:49 +0100 Subject: gnu: perl-cairo: Update to 1.107. * gnu/packages/gtk.scm (perl-cairo): Update to 1.107. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 436018efdb..e6b9042c00 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1295,7 +1295,7 @@ (define-public python2-pygtk (define-public perl-cairo (package (name "perl-cairo") - (version "1.106") + (version "1.107") (source (origin (method url-fetch) (uri (string-append @@ -1303,7 +1303,7 @@ (define-public perl-cairo version ".tar.gz")) (sha256 (base32 - "1i25kks408c54k2zxskvg54l5k3qadzm8n72ffga9jy7ic0h6j76")))) + "0sg1gf1f2pjq7pji0zsv4rbi3bzpsx82z98k7yqxafzrvlkf27ay")))) (build-system perl-build-system) (native-inputs `(("perl-extutils-depends" ,perl-extutils-depends) -- cgit v1.2.3 From 339bafad254c642e2eca371e93b18fb5432bedeb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 15:09:03 +0100 Subject: gnu: perl-indirect: Update to 0.39. * gnu/packages/perl.scm (perl-indirect): Update to 0.39. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c77195a9ab..1ace8ae208 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4286,7 +4286,7 @@ (define-public perl-inc-latest (define-public perl-indirect (package (name "perl-indirect") - (version "0.38") + (version "0.39") (source (origin (method url-fetch) @@ -4294,8 +4294,7 @@ (define-public perl-indirect "mirror://cpan/authors/id/V/VP/VPIT/indirect-" version ".tar.gz")) (sha256 - (base32 - "13k5a8p903m8x3pcv9qqkzvnb8gpgq36cr3dvn3lk1ngsi9w5ydy")))) + (base32 "1r971mykvvsrzrp6a9ccl649ihr84h254jmlfpazv64f6i63qwvi")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/indirect") (synopsis "Lexically warn about using the indirect method call syntax") -- cgit v1.2.3 From 63e633c6f69d4613bfb27d85c78f2b85fe3a5586 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 15:18:16 +0100 Subject: gnu: perl-file-slurp: Update to 9999.28. * gnu/packages/perl.scm (perl-file-slurp): Update to 9999.28. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 1ace8ae208..9b56e58d4f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3873,14 +3873,14 @@ (define-public perl-file-sharedir-install (define-public perl-file-slurp (package (name "perl-file-slurp") - (version "9999.27") + (version "9999.28") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/C/CA/CAPOEIRAB/" "File-Slurp-" version ".tar.gz")) (sha256 - (base32 "1x233kj1qifvii7j8d4wzarwhj5z11vnpxsqvdm98dsccr7qi79s")))) + (base32 "1vkwh880lbyr2qcrfka7yb3z4yz9id4va52gfjgdnyfb1c0wx1q5")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/File-Slurp") (synopsis "Reading/Writing/Modifying of complete files") -- cgit v1.2.3 From 74eee9f27da6a9d76281de57c40a78a2495ce843 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 15:37:15 +0100 Subject: gnu: python-django-pipeline: Fix tests. * gnu/packages/django.scm (python-django-pipeline)[arguments]: Set PYTHONPATH before running tests. --- gnu/packages/django.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index a8e0277e95..7cd4c3f784 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -695,6 +695,9 @@ (define-public python-django-pipeline (or (not tests?) (begin + (setenv "PYTHONPATH" + (string-append (getcwd) ":" + (getenv "PYTHONPATH"))) (setenv "DJANGO_SETTINGS_MODULE" "tests.settings") (invoke "django-admin" "test" "tests")))))))) (propagated-inputs -- cgit v1.2.3 From a91f4a77daaf6842a2e19aa9483a92b79a17a695 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 16:02:22 +0100 Subject: gnu: perl-devel-stacktrace: Update to 2.04. * gnu/packages/perl.scm (perl-devel-stacktrace): Update to 2.04. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 9b56e58d4f..b719885233 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2906,15 +2906,14 @@ (define-public perl-devel-partialdump (define-public perl-devel-stacktrace (package (name "perl-devel-stacktrace") - (version "2.03") + (version "2.04") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DR/DROLSKY/" "Devel-StackTrace-" version ".tar.gz")) (sha256 - (base32 - "0j58kgjr9s3vibsgifmk9k5h7daag0cb9x45f30m9qi4pr7cs63n")))) + (base32 "0mb8bngjq7s3kbh95h3ig4p3jfb156c4r0d53z344gbxaknh6g6d")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Devel-StackTrace") (synopsis "Object representing a stack trace") -- cgit v1.2.3 From 5415f3f8b3b4406e68c92ae1d783d94457d4fb2d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 16:28:48 +0100 Subject: gnu: parallel: Update to 20191122. * gnu/packages/parallel.scm (parallel): Update to 20191122. --- 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 98721fe1ff..0ad47bca0d 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -53,14 +53,14 @@ (define-module (gnu packages parallel) (define-public parallel (package (name "parallel") - (version "20191022") + (version "20191122") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "1a89x5ix9kls1abj8zkgxdf3g3s5phzb83xcd4cwpz4szfjfw6v4")))) + (base32 "01wmk3sf34d2lmhl37j4ga7aims2hcnzv1bydg1xs4pablar6ahq")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6f50c8a70cdd121e5c2bd42f087e7c3466b5ec28 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 20:39:06 +0100 Subject: gnu: perl-datetime: Update to 1.51. * gnu/packages/perl.scm (perl-datetime): Update to 1.51. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index b719885233..e7b5bb3e0f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2237,15 +2237,14 @@ (define-public perl-date-simple (define-public perl-datetime (package (name "perl-datetime") - (version "1.50") + (version "1.51") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DR/DROLSKY/" "DateTime-" version ".tar.gz")) (sha256 - (base32 - "165iqk1xvhs5j0kzsipa7aqycx3h37wqsl2r4jl104yqvmqhqszd")))) + (base32 "1ibfq6acz1ih28vl613yygbb3r2d8ykx6di669vajhvswl6xl8ny")))) (build-system perl-build-system) (native-inputs `(("perl-cpan-meta-check" ,perl-cpan-meta-check) -- cgit v1.2.3 From ea3e8fad744483a9b832044376ff685568e3790c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 16:43:55 +0100 Subject: gnu: perl-carp-assert-more: Update to 1.20. * gnu/packages/perl.scm (perl-carp-assert-more): Update to 1.20. --- gnu/packages/perl.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index e7b5bb3e0f..83aade6921 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -779,15 +779,14 @@ (define-public perl-carp-assert (define-public perl-carp-assert-more (package (name "perl-carp-assert-more") - (version "1.16") + (version "1.20") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/P/PE/PETDANCE/" "Carp-Assert-More-" version ".tar.gz")) (sha256 - (base32 - "1x9jd6s3lq97na6gz7g0zaq62l8z297xsfpdj2v42p3ijpfirl4f")))) + (base32 "16jnhdjgfwymrc5fki4xlf1rlziszf9k6q0245g976124k708ac5")))) (build-system perl-build-system) (native-inputs `(("perl-test-exception" ,perl-test-exception))) -- cgit v1.2.3 From 669bd43e7cf2d6f1a57434c83596c2edb8ffacd6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 16:49:53 +0100 Subject: gnu: perl-class-unload: Update to 0.11. * gnu/packages/perl.scm (perl-class-unload): Update to 0.11. [native-inputs]: Add perl-test-requires. --- gnu/packages/perl.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 83aade6921..a60afb8b12 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1220,16 +1220,17 @@ (define-public perl-class-tiny (define-public perl-class-unload (package (name "perl-class-unload") - (version "0.08") + (version "0.11") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/I/IL/ILMARI/" "Class-Unload-" version ".tar.gz")) (sha256 - (base32 - "097gr3r2jgnm1175m4lpg4a97hv2mxrn9r0b2c6bn1x9xdhkywgh")))) + (base32 "0pqa98z3ij6a3v9wkmvc8b410kv30y0xxqf0i6if3lp4lx3rgqjj")))) (build-system perl-build-system) + (native-inputs + `(("perl-test-requires" ,perl-test-requires))) (propagated-inputs `(("perl-class-inspector" ,perl-class-inspector))) (home-page "https://metacpan.org/release/Class-Unload") -- cgit v1.2.3 From 9a40a6219280cbb6da0184fa701fffaa53207307 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 16:57:52 +0100 Subject: gnu: perl-crypt-random-source: Update to 0.14. * gnu/packages/crypto.scm (perl-crypt-random-source): Update to 0.14. [native-inputs]: Replace perl-test-exception with perl-test-fatal. --- gnu/packages/crypto.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 559a3c051a..80c598ed86 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -535,19 +535,18 @@ (define-public perl-math-random-isaac (define-public perl-crypt-random-source (package (name "perl-crypt-random-source") - (version "0.12") + (version "0.14") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "Crypt-Random-Source-" version ".tar.gz")) (sha256 - (base32 - "00mw5m52sbz9nqp3f6axyrgcrihqxn7k8gv0vi1kvm1j1nc9g29h")))) + (base32 "1rpdds3sy5l1fhngnkrsgwsmwd54wpicx3i9ds69blcskwkcwkpc")))) (build-system perl-build-system) (native-inputs `(("perl-module-build-tiny" ,perl-module-build-tiny) - ("perl-test-exception" ,perl-test-exception))) + ("perl-test-fatal" ,perl-test-fatal))) (propagated-inputs `(("perl-capture-tiny" ,perl-capture-tiny) ("perl-module-find" ,perl-module-find) -- cgit v1.2.3 From e8f863704549445aeace0226bd0028e15d0eec5b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 17:30:36 +0100 Subject: gnu: perl-date-manip: Update to 6.78. * gnu/packages/perl.scm (perl-date-manip): Update to 6.78. [native-inputs]: Remove perl-module-build. --- gnu/packages/perl.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a60afb8b12..34a3f3f54e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2190,16 +2190,15 @@ (define-public perl-date-calc-xs (define-public perl-date-manip (package (name "perl-date-manip") - (version "6.76") + (version "6.78") (source (origin (method url-fetch) - (uri (string-append "https://cpan.metacpan.org/authors/id/S/SB/SBECK/" + (uri (string-append "mirror://cpan/authors/id/S/SB/SBECK/" "Date-Manip-" version ".tar.gz")) (sha256 - (base32 "1a33mpkx7qqb9nqxyh2kkb596d8xq6jw0ljrd4xrwiz30f6cg1qw")))) + (base32 "1faxj6gafrqir9hvy9r8q57s93n57b412s04qycrks7r0520hdnb")))) (build-system perl-build-system) - (native-inputs `(("perl-module-build" ,perl-module-build))) (arguments ;; Tests would require tzdata for timezone information, but tzdata is in ;; (gnu packages base) which would create a circular dependency. TODO: -- cgit v1.2.3 From 1e8609f2387905c06c42d0efe9d08391ca9354ea Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 23 Nov 2019 15:33:14 -0500 Subject: gnu: wxmaxima: Update to 19.11.1. * gnu/packages/maths.scm (wxmaxima): Update to 19.11.1. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e96a3199ff..83ff9919ad 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2991,7 +2991,7 @@ (define-public maxima (define-public wxmaxima (package (name "wxmaxima") - (version "19.09.0") + (version "19.11.1") (source (origin (method git-fetch) @@ -3000,7 +3000,7 @@ (define-public wxmaxima (commit (string-append "Version-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "195j6j8z0jd6xg3a63ywbrbsc6dany795m3fb95nbx1vq0bqqvvn")))) + (base32 "16xizaddb27432n1083y89ir5zdqvllsgbwrzzk4jc2rw1ldxfsv")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal))) -- cgit v1.2.3 From 5ce0aab3fb953e15e9319d356a2caf636ef219d8 Mon Sep 17 00:00:00 2001 From: Evan Straw Date: Fri, 22 Nov 2019 18:52:36 -0800 Subject: gnu: Add ashuffle. * gnu/packages/mpd.scm (ashuffle): New variable. Signed-off-by: Leo Famulari --- gnu/packages/mpd.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index c9a9c440d3..65535062c9 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016, 2018, 2019 Leo Famulari ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019 Evan Straw ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ (define-module (gnu packages mpd) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) @@ -340,3 +342,27 @@ (define-public sonata MPD servers, search and multimedia key support.") (home-page "https://www.nongnu.org/sonata/") (license license:gpl3+))) + +(define-public ashuffle + (package + (name "ashuffle") + (version "2.0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/joshkunz/ashuffle.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11aa95cg0yca2m2d00sar6wr14g3lc7cfm9bin1h7lk7asdm8azp")))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libmpdclient" ,libmpdclient))) + (build-system meson-build-system) + (home-page "https://github.com/joshkunz/ashuffle") + (synopsis "Automatic library-wide shuffle for mpd") + (description "ashuffle is an application for automatically shuffling your +MPD library in a similar way to many other music player's 'shuffle library' +feature. ashuffle works like any other MPD client, and can be used alongside +other MPD frontends.") + (license license:expat))) -- cgit v1.2.3 From a3e5361b64acc4223c01d829cf99389b3e7b1dad Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 23 Nov 2019 16:01:07 -0500 Subject: gnu: ashuffle: Fix typo. * gnu/packages/mpd.scm (ashuffle)[description]: Fix typo. --- gnu/packages/mpd.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 65535062c9..3afdbddc84 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -362,7 +362,7 @@ (define-public ashuffle (home-page "https://github.com/joshkunz/ashuffle") (synopsis "Automatic library-wide shuffle for mpd") (description "ashuffle is an application for automatically shuffling your -MPD library in a similar way to many other music player's 'shuffle library' +MPD library in a similar way to many other music players' 'shuffle library' feature. ashuffle works like any other MPD client, and can be used alongside other MPD frontends.") (license license:expat))) -- cgit v1.2.3 From 60353203ed9322326590cec30ff8ca870f694288 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 16:10:03 +0100 Subject: gnu: guile2.0-git: Fix compilation of libgit2. * gnu/packages/guile.scm (guile2.0-git): Inherit from what 'package-for-guile-2.0' returns. Add 'inputs' field. --- gnu/packages/guile.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 57e9a0aca5..c7a79f2b8a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -623,7 +623,15 @@ (define-public guile-git (license license:gpl3+))) (define-public guile2.0-git - (package-for-guile-2.0 guile-git)) + (let ((base (package-for-guile-2.0 guile-git))) + (package + (inherit base) + ;; Libgit2's Guile test driver requires (ice-9 textual-ports), which is + ;; not in Guile 2.0. Thus, keep LIBGIT2 as-is here (i.e., built against + ;; Guile 2.2). + (inputs `(("libgit2" ,libgit2) + ,@(srfi-1:alist-delete "libgit2" + (package-inputs base))))))) ;;; guile.scm ends here -- cgit v1.2.3 From 01c11aeb9516819cec3053a5abbd839b9205b60c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 16:10:47 +0100 Subject: gnu: guile-git: Add "guile3.0-git" variant. * gnu/packages/guile.scm (guile-git)[source](modules, snippet): New fields. * gnu/packages/guile.scm (guile3.0-git): New variable. --- gnu/packages/guile.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c7a79f2b8a..2063086575 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -604,7 +604,21 @@ (define-public guile-git (sha256 (base32 "018hmfsh0rjwfvr4h7y10jc6k8a2k9xsirngghy3pjasin4nd2yz")) - (file-name (git-file-name name version)))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure.ac" + (("^GUILE_PKG.*") + "GUILE_PKG([3.0 2.2 2.0])\n")) + + ;; The 'guile.m4' that's shipped is too old and fails to + ;; recognize Guile 2.9/3.0. Delete it and pick the one + ;; provided by the Guile we're using. + (delete-file "m4/guile.m4") + + #t)))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -622,6 +636,9 @@ (define-public guile-git manipulate repositories of the Git version control system.") (license license:gpl3+))) +(define-public guile3.0-git + (package-for-guile-3.0 guile-git)) + (define-public guile2.0-git (let ((base (package-for-guile-2.0 guile-git))) (package -- cgit v1.2.3 From d630d78104f59fb51a5011f37136bc39b603a696 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 19:13:16 +0100 Subject: gnu: gnutls: Add "guile3.0-gnutls" variant. * gnu/packages/tls.scm (gnutls-3.6.10, guile3.0-gnutls): New variables. --- gnu/packages/tls.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index dd8f0fa5c7..d09f579b01 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -263,6 +263,39 @@ (define-public gnutls/dane (inputs `(("unbound" ,unbound) ,@(package-inputs gnutls))))) +(define gnutls-3.6.10 + ;; This is for 'guile3.0-gnutls', below. Version 3.6.10 is the first to + ;; introduce Guile 2.9/3.0 support. + (package + (inherit gnutls) + (version "3.6.10") + (source (origin + (inherit (package-source gnutls)) + (uri (string-append "mirror://gnupg/gnutls/v" + (version-major+minor version) + "/gnutls-" version ".tar.xz")) + (sha256 + (base32 + "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi")))))) + +(define-public guile3.0-gnutls + (package + (inherit gnutls-3.6.10) + (name "guile3.0-gnutls") + (arguments + (substitute-keyword-arguments (package-arguments gnutls-3.6.10) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'build 'leave-guile-stdout-open + (lambda _ + ;; Work around . + (substitute* "guile/Makefile" + (("out=-") "out=/dev/null")) + #t)))))) + (inputs `(("guile" ,guile-next) + ,@(alist-delete "guile" + (package-inputs gnutls-3.6.10)))))) + (define-public openssl (package (name "openssl") -- cgit v1.2.3 From d15e4b1dc25000ba0ec5ae28cd5ea73c7d0ad1c5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 22:02:07 +0100 Subject: gnu: guile-sqlite3: Add "guile3.0-sqlite3" variant. * gnu/packages/guile.scm (guile-sqlite3)[source](modules, snippet): New fields. (guile3.0-sqlite3): New variable. --- gnu/packages/guile.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 2063086575..6526ad2a56 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -541,7 +541,15 @@ (define-public guile-sqlite3 (sha256 (base32 "1nv8j7wk6b5n4p22szyi8lv8fs31rrzxhzz16gyj8r38c1fyp9qp")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (string-append name "-" version "-checkout")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure.ac" + (("^GUILE_PKG.*") + "GUILE_PKG([3.0 2.2 2.0])\n")) + #t)))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -558,6 +566,9 @@ (define-public guile-sqlite3 (define-public guile2.0-sqlite3 (package-for-guile-2.0 guile-sqlite3)) +(define-public guile3.0-sqlite3 + (package-for-guile-3.0 guile-sqlite3)) + (define-public guile-bytestructures (package (name "guile-bytestructures") -- cgit v1.2.3 From fde60bfb84dbfab7668cacd4a0d206d77affc789 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 22:27:28 +0100 Subject: tests: Use (ice-9 threads). 'call-with-new-thread' as a core binding is deprecated in 2.2 and removed in 3.0. * tests/publish.scm: Use (ice-9 threads). --- tests/publish.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/publish.scm b/tests/publish.scm index 64a8ff3cae..204cfb4974 100644 --- a/tests/publish.scm +++ b/tests/publish.scm @@ -45,6 +45,7 @@ (define-module (test-publish) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-64) + #:use-module (ice-9 threads) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 rdelim)) -- cgit v1.2.3 From fed36328129def5f10b1d1f3e4ea8886916fd22a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 Nov 2019 22:43:40 +0100 Subject: compile: Adjust for Guile 2.9.5. * guix/build/compile.scm (optimizations-for-level): New procedure. Include '%lightweight-optimizations' and '%default-optimizations'. (optimization-options): Use 'optimizations-for-level'. --- guix/build/compile.scm | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/guix/build/compile.scm b/guix/build/compile.scm index 06ed57c9d7..3781e148ce 100644 --- a/guix/build/compile.scm +++ b/guix/build/compile.scm @@ -39,25 +39,32 @@ (define-module (guix build compile) ;;; ;;; Code: -(define %default-optimizations - ;; Default optimization options (equivalent to -O2 on Guile 2.2). - (append (if (defined? 'tree-il-default-optimization-options) - (tree-il-default-optimization-options) ;Guile 2.2 - (tree-il-optimizations)) ;Guile 3 - (if (defined? 'cps-default-optimization-options) - (cps-default-optimization-options) ;Guile 2.2 - (cps-optimizations)))) ;Guile 3 - -(define %lightweight-optimizations - ;; Lightweight optimizations (like -O0, but with partial evaluation). - (let loop ((opts %default-optimizations) - (result '())) - (match opts - (() (reverse result)) - ((#:partial-eval? _ rest ...) - (loop rest `(#t #:partial-eval? ,@result))) - ((kw _ rest ...) - (loop rest `(#f ,kw ,@result)))))) +(define optimizations-for-level + (or (and=> (false-if-exception + (resolve-interface '(system base optimize))) + (lambda (iface) + (module-ref iface 'optimizations-for-level))) ;Guile 3.0 + (let () ;Guile 2.2 + (define %default-optimizations + ;; Default optimization options (equivalent to -O2 on Guile 2.2). + (append (tree-il-default-optimization-options) + (cps-default-optimization-options))) + + (define %lightweight-optimizations + ;; Lightweight optimizations (like -O0, but with partial evaluation). + (let loop ((opts %default-optimizations) + (result '())) + (match opts + (() (reverse result)) + ((#:partial-eval? _ rest ...) + (loop rest `(#t #:partial-eval? ,@result))) + ((kw _ rest ...) + (loop rest `(#f ,kw ,@result)))))) + + (lambda (level) + (if (<= level 1) + %lightweight-optimizations + %default-optimizations))))) (define (supported-warning-type? type) "Return true if TYPE, a symbol, denotes a supported warning type." @@ -80,8 +87,8 @@ (define %warnings (define (optimization-options file) "Return the default set of optimizations options for FILE." (if (string-contains file "gnu/packages/") - %lightweight-optimizations ;build faster - '())) + (optimizations-for-level 1) ;build faster + (optimizations-for-level 3))) (define (scm->go file) "Strip the \".scm\" suffix from FILE, and append \".go\"." -- cgit v1.2.3 From 959d908dee8ded34ca4406ae5b40be01a6b86893 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 21:07:16 +0100 Subject: gnu: ruby-useragent: Update to 0.16.10. * gnu/packages/ruby.scm (ruby-useragent): Update to 0.16.10. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index dd796577f8..50a4e9db13 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2094,13 +2094,13 @@ (define-public ruby-simplecov (define-public ruby-useragent (package (name "ruby-useragent") - (version "0.16.8") + (version "0.16.10") (source (origin (method url-fetch) (uri (rubygems-uri "useragent" version)) (sha256 (base32 - "1139cjqyv1hk1qcw89k81ajjkqyakqgbcyvmfrsmjqi8yn9kgqhq")))) + "1fv5kvq494swy0p17h9qya9r50w15xsi9zmvhzb8gh55kq6ki50p")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; no test suite -- cgit v1.2.3 From 9d1cf6d42cf07c13562d56d024b986745105ce8d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 21:12:43 +0100 Subject: gnu: ruby-websocket-driver: Update to 0.7.1. * gnu/packages/ruby.scm (ruby-websocket-driver): Update to 0.7.1. --- gnu/packages/ruby.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 50a4e9db13..f27e772394 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6414,18 +6414,16 @@ (define-public ruby_version (define-public ruby-websocket-driver (package (name "ruby-websocket-driver") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (rubygems-uri "websocket-driver" version)) (sha256 - (base32 - "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn")))) + (base32 "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2")))) (build-system ruby-build-system) (arguments - '(;; No included tests - #:tests? #f)) + '(#:tests? #f)) ; no included tests (propagated-inputs `(("ruby-websocket-extensions" ,ruby-websocket-extensions))) (synopsis "WebSocket protocol handler with pluggable I/O") -- cgit v1.2.3 From 2d2a2363e71c76d1a2e7d352c85b313f5f2eba72 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 21:22:31 +0100 Subject: gnu: ruby-progressbar: Update to 1.10.1. * gnu/packages/ruby.scm (ruby-progressbar): Update to 1.10.1. --- gnu/packages/ruby.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f27e772394..f6632725bb 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3885,14 +3885,13 @@ (define-public ruby-dep (define-public ruby-progressbar (package (name "ruby-progressbar") - (version "1.10.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (rubygems-uri "ruby-progressbar" version)) (sha256 - (base32 - "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk")))) + (base32 "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf")))) (build-system ruby-build-system) (arguments '(;; TODO: There looks to be a circular dependency with ruby-fuubar. -- cgit v1.2.3 From d432682b496af656899cfa0e483b835f35031a73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 21:37:13 +0100 Subject: gnu: ruby-simplecov: Update to 0.17.1. * gnu/packages/ruby.scm (ruby-simplecov): Update to 0.17.1. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f6632725bb..873e6fd405 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2067,13 +2067,13 @@ (define-public ruby-simplecov-html (define-public ruby-simplecov (package (name "ruby-simplecov") - (version "0.17.0") + (version "0.17.1") (source (origin (method url-fetch) (uri (rubygems-uri "simplecov" version)) (sha256 (base32 - "0dq0nkaxvbsnl70hkimy35g4yjfs3blx4s7nbpzbvgqx72hxgv5v")))) + "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw")))) (build-system ruby-build-system) ;; Simplecov depends on rubocop for code style checking at build time. ;; Rubocop needs simplecov at build time. -- cgit v1.2.3 From 5dd10be5ab7c1111c68f210c0880598bf40196c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 23:00:36 +0100 Subject: gnu: ruby-oauth2: Update to 1.4.2. * gnu/packages/ruby.scm (ruby-oauth2): Update to 1.4.2. --- gnu/packages/ruby.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 873e6fd405..b5b8b05a2a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1256,17 +1256,16 @@ (define-public ruby-saikuro-treemap (define-public ruby-oauth2 (package (name "ruby-oauth2") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (rubygems-uri "oauth2" version)) (sha256 - (base32 - "0av6nlb5y2sm6m8fx669ywrqa9858yqaqfqzny75nqp3anag89qh")))) + (base32 "15i9z4j5pcjkr30lkcd79xzbr4kpmy0bqgwa436fqyqk646fv036")))) (build-system ruby-build-system) (arguments - '(#:tests? #f)) ; No included tests + '(#:tests? #f)) ; no included tests (propagated-inputs `(("ruby-faraday" ,ruby-faraday) ("ruby-jwt" ,ruby-jwt) -- cgit v1.2.3 From 8c1e4a4f3df77e433e948ffed44a4288963e4eb8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 23:05:35 +0100 Subject: gnu: ruby-notiffany: Update to 0.1.3. * gnu/packages/ruby.scm (ruby-notiffany): Update to 0.1.3. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b5b8b05a2a..fa5390b82d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1760,13 +1760,13 @@ (define-public ruby-shellany (define-public ruby-notiffany (package (name "ruby-notiffany") - (version "0.1.1") + (version "0.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "notiffany" version)) (sha256 (base32 - "0x838fa5il0dd9zbm3lxkpbfxcf5fxv9556mayc2mxsdl5ghv8nx")))) + "0f47h3bmg1apr4x51szqfv3rh2vq58z3grh4w02cp3bzbdh6jxnk")))) (build-system ruby-build-system) ;; Tests are not included in the gem. (arguments `(#:tests? #f)) -- cgit v1.2.3 From 60bc8952cef84674b495c3ffe554b516586ba697 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 23:08:12 +0100 Subject: gnu: ruby-mimemagic: Update to 0.3.3. * gnu/packages/ruby.scm (ruby-mimemagic): Update to 0.3.3. --- gnu/packages/ruby.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index fa5390b82d..4dd11ce3ce 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5968,14 +5968,13 @@ (define-public ruby-turn (define-public ruby-mimemagic (package (name "ruby-mimemagic") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (rubygems-uri "mimemagic" version)) (sha256 - (base32 - "00ibc1mhvdfyfyl103xwb45621nwyqxf124cni5hyfhag0fn1c3q")))) + (base32 "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw")))) (build-system ruby-build-system) (arguments '(#:phases -- cgit v1.2.3 From 37b23e447d12da506d80966edb2c3d5736378cfb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 23:12:00 +0100 Subject: gnu: ruby-jaro-winkler: Update to 1.5.4. * gnu/packages/ruby.scm (ruby-jaro-winkler): Update to 1.5.4. --- gnu/packages/ruby.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4dd11ce3ce..76f2202a86 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4403,18 +4403,16 @@ (define-public ruby-utils (define-public ruby-jaro-winkler (package (name "ruby-jaro-winkler") - (version "1.5.2") + (version "1.5.4") (source (origin (method url-fetch) (uri (rubygems-uri "jaro_winkler" version)) (sha256 - (base32 - "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l")))) + (base32 "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh")))) (build-system ruby-build-system) (arguments - '(;; No included tests - #:tests? #f)) + '(#:tests? #f)) ; no included tests (synopsis "Ruby implementation of Jaro-Winkler distance algorithm") (description "@code{jaro_winkler} is an implementation of Jaro-Winkler distance -- cgit v1.2.3 From ac87ffb818cc9b38e47a0742b3d0b0376e8ec034 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 23:29:18 +0100 Subject: gnu: vte: Don't use NAME in source URI. * gnu/packages/gnome.scm (vte)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5b11238109..3fd8ee3149 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2341,9 +2341,9 @@ (define-public vte (version "0.56.3") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/vte/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "vte-" version ".tar.xz")) (sha256 (base32 "0j166gic5znssdb9r45qazq4kb4v9fial82czand5wa8i2yd988p")))) -- cgit v1.2.3 From 68c47474bc8bc633fa3b13610d4f700891067bbc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Nov 2019 01:18:53 +0100 Subject: gnu: vte: Update to 0.58.3. * gnu/packages/gnome.scm (vte): Update to 0.58.3. [build-system]: Switch to Meson. --- gnu/packages/gnome.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3fd8ee3149..af2558d814 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2338,7 +2338,7 @@ (define-public vala (define-public vte (package (name "vte") - (version "0.56.3") + (version "0.58.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vte/" @@ -2346,20 +2346,20 @@ (define-public vte "vte-" version ".tar.xz")) (sha256 (base32 - "0j166gic5znssdb9r45qazq4kb4v9fial82czand5wa8i2yd988p")))) - (build-system gnu-build-system) + "0xa9ipwic4jnhhbzlnqbhssz10xkzv61cpkl1ammc6mdq95bbp12")))) + (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) ("vala" ,vala) ("gobject-introspection" ,gobject-introspection) - ("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("glib" ,glib "bin") ; for glib-genmarshal, etc. ("gperf" ,gperf) ("xmllint" ,libxml2))) (propagated-inputs - `(("gtk+" ,gtk+) ;required by vte-2.91.pc - ("gnutls" ,gnutls) ;ditto - ("pcre2" ,pcre2))) ;ditto + `(("gtk+" ,gtk+) ; required by vte-2.91.pc + ("gnutls" ,gnutls) ; ditto + ("pcre2" ,pcre2))) ; ditto (home-page "https://www.gnome.org/") (synopsis "Virtual Terminal Emulator") (description -- cgit v1.2.3 From 82de17dc8d3eb827aec5902078a0e87f43dece6b Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 19 Nov 2019 21:00:07 +0300 Subject: gnu: sdl2: Add libxcursor to inputs. * gnu/packages/sdl.scm (sdl2)[inputs]: Add libxcursor. --- gnu/packages/sdl.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 6093405c43..84bad1ca02 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -142,6 +142,7 @@ (define-public sdl2 ("glib" ,glib) ("ibus" ,ibus) ("libxkbcommon" ,libxkbcommon) + ("libxcursor" ,libxcursor) ; enables X11 cursor support ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols)) (package-inputs sdl))) -- cgit v1.2.3 From dd39f16ee6d9356fbc8e82e883605204a71b6e83 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 24 Nov 2019 05:14:52 +0300 Subject: gnu: jo: Update to 1.3. * gnu/packages/web.scm (jo): Update to 1.3. --- 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 86f6189743..0daf817374 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5588,7 +5588,7 @@ (define-public python-httpretty (define-public jo (package (name "jo") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) @@ -5596,7 +5596,7 @@ (define-public jo version "/jo-" version ".tar.gz")) (sha256 (base32 - "1bmdck53jslrl3anqqpm6iyjdxrz445qzcc4fr37hr3wjg22zv1n")))) + "0r6yb8pjsbcqfyac4240a0sj93pb91fv385bpk395cx3f5bcj9fy")))) (build-system gnu-build-system) (home-page "https://github.com/jpmens/jo") (synopsis "Output JSON from a shell") -- cgit v1.2.3 From 446316cad52430d345f34b164242dab9f0ed5024 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 23 Nov 2019 18:49:42 -0800 Subject: gnu: diffoscope: Update to 131. * gnu/packages/diffoscope (diffoscope): Update to 131. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index cfa98f63f2..7fe7766a15 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -67,7 +67,7 @@ (define-module (gnu packages diffoscope) #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "129")) + (let ((version "131")) (package (name "diffoscope") (version version) @@ -79,7 +79,7 @@ (define-public diffoscope (file-name (git-file-name name version)) (sha256 (base32 - "1r8hq93gga9n4jv4fyf1divc9cwvvjadkzl47lazzrfy3nn1qjwr")))) + "0jai3kycjlrc64f4vg8yklri6ds1451qy6r6sw2646bhjr0gs233")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 39bf4e0bad499aa6f9388164e73197a501915ff6 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 24 Nov 2019 09:31:26 +0300 Subject: gnu: Add shell-functools. * gnu/packages/shellutils.scm (shell-functools): New variable. --- gnu/packages/shellutils.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 83bbb55f6b..a5d2601de9 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -316,3 +316,26 @@ (define-public hstr bookmark your favourite commands.") (home-page "http://me.mindforger.com/projects/hh.html") (license license:asl2.0))) + +(define-public shell-functools + (package + (name "shell-functools") + (version "0.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sharkdp/shell-functools.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0d6zzg7cxfrzwzh1wmpj7q85kz33sak6ac59ncsm6dlbin12h0hi")))) + (build-system python-build-system) + (home-page "https://github.com/sharkdp/shell-functools/") + (synopsis "Functional programming tools for the shell") + (description "This package provides higher order functions like map, +filter, foldl, sort_by and take_while as simple command-line tools. Following +the UNIX philosophy, these commands are designed to be composed via pipes. A +large collection of functions such as basename, replace, contains or is_dir +are provided as arguments to these commands.") + (license license:expat))) -- cgit v1.2.3 From 40df1928d63703092e5e782948f0924895077dca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Nov 2019 01:52:04 +0100 Subject: gnu: restic: Update to 0.9.6. * gnu/packages/backup.scm (restic): Update to 0.9.6. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 0894cb38bf..7a95ae77e0 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -831,7 +831,7 @@ (define write-man (define-public restic (package (name "restic") - (version "0.9.5") + (version "0.9.6") ;; TODO Try packaging the bundled / vendored dependencies in the 'vendor/' ;; directory. (source (origin @@ -842,7 +842,7 @@ (define-public restic (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0afl3dv7gzwdc9klikk3fsb57d0px2fwihb0xxb7zq7d8vlhh8p2")))) + "1zmh42aah32ah8w5n6ilz9bci0y2xrf8p7qshy3yf1lzm5gnbj0w")))) (build-system go-build-system) (arguments `(#:import-path "github.com/restic/restic" -- cgit v1.2.3 From 9b0dae2222638ec3fe4bc30dcab3cffd41f918e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Nov 2019 11:45:59 +0100 Subject: gnu: perl-test-simple: Update to 1.302169. * gnu/packages/perl-check.scm (perl-test-simple): Update to 1.302169. --- gnu/packages/perl-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 0e1a0d653b..9944c31305 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1239,14 +1239,14 @@ (define-public perl-test-sharedfork (define-public perl-test-simple (package (name "perl-test-simple") - (version "1.302164") + (version "1.302169") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/EX/EXODIST/" "Test-Simple-" version ".tar.gz")) (sha256 (base32 - "05b61ndlf2d6xphq13caps001f0p0p76jb5hhzmm5k897xhpn9sh")))) + "08y7b817045w9bc1k9y01l5shl162q9fdc2g5qf7ny0gdxvh85s1")))) (build-system perl-build-system) (synopsis "Basic utilities for writing tests") (description -- cgit v1.2.3 From 8e77da0d11770f7761e6c3fbde0abe05a44491e7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Nov 2019 13:32:24 +0100 Subject: gnu: bambam: Update to 1.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (bambam): Update to 1.0.0. [arguments]: Use default Python (3). Delete obsolete ‘patch-data-dir-location’ phase. --- gnu/packages/games.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3d825cbe61..613b3acfeb 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3840,29 +3840,22 @@ (define-public laby (define-public bambam (package (name "bambam") - (version "0.6") + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/porridge/bambam") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "08hcd0gzia3pz7fzk4pqc5kbq1074j4q0jcmbpgvr7n623nj2xa5")))) + (base32 "18cwd1wpyyx8y61cags9bkdhx9x858xicc4y1c9c2s0xjmgzhl3i")))) (build-system python-build-system) (arguments - `(#:python ,python-2 - #:tests? #f ; no tests + `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases - (delete 'build) - (add-before 'install 'patch-data-dir-location - (lambda _ - (substitute* "bambam.py" - (("'data'") "'../share/bambam/data'")) - #t)) + (delete 'build) ; nothing to build (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From baac9ff97c2cdc9965bbff07d6fb3a594bd12581 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 Nov 2019 22:04:03 +0200 Subject: gnu: gnunet-gtk: Set upstream ftp-directory. * gnu/packages/gnunet.scm (gnunet-gtk)[properties]: New field. Set ftp-directory. --- gnu/packages/gnunet.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 0904022f08..9282c00436 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -358,4 +358,6 @@ (define-public gnunet-gtk (native-inputs `(("pkg-config" ,pkg-config) ("libglade" ,libglade))) - (synopsis "Graphical front-end tools for GNUnet"))) + (synopsis "Graphical front-end tools for GNUnet") + (properties '((ftp-server . "ftp.gnu.org") + (ftp-directory . "/gnunet"))))) -- cgit v1.2.3 From edce19938a3a4055f6337306502c429dc0c27156 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 Nov 2019 19:53:52 +0200 Subject: gnu: gnunet: Update to 0.11.8. * gnu/packages/gnunet.scm: Update to 0.11.8. [inputs]: Add libidn2, miniupnpc, zbar. Remove glib, gmp, gst-plugins-base, libidn, nss, openssl, perl, python-2. [native-inputs]: Add python, xxd, which. [arguments]: Remove configure-flags. Add phase to remove network dependent tests. Re-arrange location of new 'check phase. --- gnu/packages/gnunet.scm | 76 ++++++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 30 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 9282c00436..e6eb7aef09 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -55,7 +55,9 @@ (define-module (gnu packages gnunet) #:use-module (gnu packages python) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) + #:use-module (gnu packages upnp) #:use-module (gnu packages video) + #:use-module (gnu packages vim) #:use-module (gnu packages web) #:use-module (gnu packages xiph) #:use-module (gnu packages backup) @@ -232,7 +234,7 @@ (define-public gnurl (define-public gnunet (package (name "gnunet") - (version "0.10.1") + (version "0.11.8") (source (origin (method url-fetch) @@ -240,53 +242,67 @@ (define-public gnunet ".tar.gz")) (sha256 (base32 - "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n")))) + "1zkmcq75sfr3iyg8rgxp9dbl7fwsvc1a71rc0vgisghcbrx1n7yj")))) (build-system gnu-build-system) (inputs - `(("glpk" ,glpk) + `(("bluez" ,bluez) + ("glpk" ,glpk) ("gnurl" ,gnurl) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) ("gnutls" ,gnutls/dane) + ("gstreamer" ,gstreamer) + ("jansson" ,jansson) ("libextractor" ,libextractor) + ("libidn" ,libidn2) ("libgcrypt" ,libgcrypt) - ("libidn" ,libidn) - ("libmicrohttpd" ,libmicrohttpd) ; hostlist, pt, contrib, and more ("libltdl" ,libltdl) - ("libunistring" ,libunistring) ; fs and more - ("openssl" ,openssl) ; transport, certificate creation, contribs - ("opus" ,opus) ; gnunet-conversation - ("pulseaudio" ,pulseaudio) ; conversation - ("sqlite" ,sqlite) ; sqlite bindings, *store - ("zlib" ,zlib) - ("perl" ,perl) ; doxygen and more - ("jansson" ,jansson) ; identity, taler (external), gnunet-json, gns - ("nss" ,nss) ; gns - ("gmp" ,gmp) ; util - ("bluez" ,bluez) ; gnunet-transport - ("glib" ,glib) - ("libogg" ,libogg) ; gnunet-conversation - ("python-2" ,python-2))) ; tests, gnunet-qr + ("libmicrohttpd" ,libmicrohttpd) + ("libogg" ,libogg) + ("libunistring" ,libunistring) + ("miniupnpc" ,miniupnpc) + ("opus" ,opus) + ("pulseaudio" ,pulseaudio) + ("sqlite" ,sqlite) + ("zbar" ,zbar) + ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("python" ,python) + ("xxd" ,xxd) + ("which" ,(@ (gnu packages base) which)))) (arguments - '(#:configure-flags - (list (string-append "--with-nssdir=" %output "/lib")) - #:parallel-tests? #f - ;; test_gnunet_service_arm fails; reported upstream - #:tests? #f + '(#:parallel-tests? #f ; Parallel tests aren't supported. #:phases (modify-phases %standard-phases - ;; swap check and install phases and set paths to installed binaries + (add-after 'configure 'remove-failing-tests + ;; These tests fail in Guix's building envrionment. + (lambda _ + (substitute* "src/transport/Makefile" + (("test_transport_api_udp_nat\\$\\(EXEEXT\\) \\\\\n") "") + (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "")) + (substitute* "src/topology/Makefile" + (("^check_PROGRAMS.*") "\n") + (("test_gnunet_daemon_topology\\$\\(EXEEXT\\)\n") "")) + (substitute* "src/namestore/Makefile" + (("\\$\\(am__append_2\\)") "")) + (substitute* "src/gns/Makefile" + (("\\$\\(am__append_4\\)") "")) + (substitute* "contrib/Makefile" + (("^check_PROGRAMS.*") "\n")) + ;; 'test' from coreutils doesn't behave as the test expects. + (substitute* '("src/gns/gnunet-gns-proxy-setup-ca.in" + "src/transport/gnunet-transport-certificate-creation.in") + (("gnutls-certtool") "certtool")) + #t)) + ;; Swap 'check and 'install phases and add installed binaries to $PATH. (add-before 'check 'set-path-for-check (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (setenv "GNUNET_PREFIX" (string-append out "/lib")) (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))) #t)) + (delete 'check) (add-after 'install 'check - (assoc-ref %standard-phases 'check)) - (delete 'check)))) + (assoc-ref %standard-phases 'check))))) (synopsis "Secure, decentralized, peer-to-peer networking framework") (description "GNUnet is a framework for secure peer-to-peer networking. The -- cgit v1.2.3 From dbdd77074a2f45f2967cf20733b8111ce4df2c16 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 23 Nov 2019 21:39:08 +0200 Subject: gnu: gnunet-gtk: Update to 0.11.7. * gnu/packages/gnunet.scm (gnunet-gtk): Update to 0.11.7. [version]: Don't inherit version from gnutls. [inputs]: Add gnutls/dane. --- gnu/packages/gnunet.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index e6eb7aef09..9fe6a357d6 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -349,14 +349,14 @@ (define-public guile-gnunet ;GSoC 2015! (define-public gnunet-gtk (package (inherit gnunet) (name "gnunet-gtk") - (version (package-version gnunet)) + (version "0.11.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gnunet/gnunet-gtk-" version ".tar.gz")) (sha256 (base32 - "1p38k1s6a2fmcfc9a7cf1zrdycm9h06kqdyand4s3k500nj6mb4g")))) + "061ifhqk6q9kx71z5404fm4d60yj2dihlwwmdqmhkn5nn4bvcwb5")))) (arguments `(#:configure-flags (list "--with-libunique" @@ -365,6 +365,7 @@ (define-public gnunet-gtk (assoc-ref %build-inputs "gnunet"))))) (inputs `(("gnunet" ,gnunet) + ("gnutls" ,gnutls/dane) ("libgcrypt" ,libgcrypt) ("gtk+" ,gtk+) ("libextractor" ,libextractor) -- cgit v1.2.3 From 2f6500faa4da3fd4b4e57101d69569a49b4f215a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 23 Nov 2019 21:40:33 +0200 Subject: gnu: gnunet-gtk: Sort inputs alphabetically. * gnu/packages/gnunet.scm (gnunet-gtk)[inputs]: Sort alphabetically. --- gnu/packages/gnunet.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 9fe6a357d6..9d53ca5b80 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -364,14 +364,14 @@ (define-public gnunet-gtk (string-append "--with-gnunet=" (assoc-ref %build-inputs "gnunet"))))) (inputs - `(("gnunet" ,gnunet) + `(("glade3" ,glade3) + ("gnunet" ,gnunet) ("gnutls" ,gnutls/dane) - ("libgcrypt" ,libgcrypt) ("gtk+" ,gtk+) ("libextractor" ,libextractor) - ("glade3" ,glade3) - ("qrencode" ,qrencode) - ("libunique" ,libunique))) + ("libgcrypt" ,libgcrypt) + ("libunique" ,libunique) + ("qrencode" ,qrencode))) (native-inputs `(("pkg-config" ,pkg-config) ("libglade" ,libglade))) -- cgit v1.2.3 From 115ace6ba515bcd3057ecb61c77785bd57c20ffe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Nov 2019 16:13:56 +0200 Subject: gnu: imlib2: Update to 1.6.0. * gnu/packages/image.scm (imlib2): Update to 1.6.0. [inputs]: Add libwebp, libid3tag. --- gnu/packages/image.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 1ef702795d..b96f2cd934 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Amirouche Boubekki ;;; Copyright © 2014, 2017 John Darrington ;;; Copyright © 2016, 2017, 2018 Leo Famulari -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016, 2017 Arun Isaac @@ -63,6 +63,7 @@ (define-module (gnu packages image) #:use-module (gnu packages man) #:use-module (gnu packages maths) #:use-module (gnu packages mcrypt) + #:use-module (gnu packages mp3) #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) @@ -853,7 +854,7 @@ (define-public libungif (define-public imlib2 (package (name "imlib2") - (version "1.5.1") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append @@ -861,7 +862,7 @@ (define-public imlib2 "/imlib2-" version ".tar.bz2")) (sha256 (base32 - "1bms2iwmvnvpz5jqq3r52glarqkafif47zbh1ykz8hw85d2mfkps")))) + "07b9v3ycwhici35fnczvpyjpgkc7gbcdhajpl9dwhpzdzbfl1i6g")))) (build-system gnu-build-system) (native-inputs `(("pkgconfig" ,pkg-config))) @@ -873,6 +874,8 @@ (define-public imlib2 ("libpng" ,libpng) ("libtiff" ,libtiff) ("giflib" ,giflib) + ("libwebp" ,libwebp) + ("libid3tag" ,libid3tag) ("bzip2" ,bzip2))) (home-page "https://sourceforge.net/projects/enlightenment/") (synopsis -- cgit v1.2.3 From e56d02a0e0108d68741f52d81e16bebcb2836332 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Nov 2019 16:17:39 +0200 Subject: gnu: imlib2: Sort inputs alphabetically. * gnu/packages/image.scm (imlib2)[inputs]: Sort alphabetically. --- gnu/packages/image.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index b96f2cd934..ade3ea63dd 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -867,16 +867,16 @@ (define-public imlib2 (native-inputs `(("pkgconfig" ,pkg-config))) (inputs - `(("libx11" ,libx11) - ("libxext" ,libxext) + `(("bzip2" ,bzip2) ("freetype" ,freetype) + ("giflib" ,giflib) + ("libid3tag" ,libid3tag) ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libtiff" ,libtiff) - ("giflib" ,giflib) - ("libwebp" ,libwebp) - ("libid3tag" ,libid3tag) - ("bzip2" ,bzip2))) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libwebp" ,libwebp))) (home-page "https://sourceforge.net/projects/enlightenment/") (synopsis "Loading, saving, rendering and manipulating image files") -- cgit v1.2.3 From fea30e12f7b0810c90b278127a7d3c75ef59cec7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Nov 2019 19:16:50 +0200 Subject: gnu: sparsehash: Don't use unstable tarball. * gnu/packages/datastructures.scm (sparsehash)[source]: Download using git-fetch. --- gnu/packages/datastructures.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index dabb1f421e..7eab65fd5f 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015, 2016, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Meiyo Peng +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,12 +81,14 @@ (define-public sparsehash (name "sparsehash") (version "2.0.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/sparsehash/sparsehash/" - "archive/sparsehash-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sparsehash/sparsehash.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "133szz0ldwch0kd91l0sa57qsnl020njn622szd9cxrjqyjqds85")))) + "0m3f0cnpnpf6aak52wn8xbrrdw8p0yhq8csgc8nlvf9zp8c402na")))) (build-system gnu-build-system) (synopsis "Memory-efficient hashtable implementations") (description -- cgit v1.2.3 From 609ba8d1162cb44c5caae0ddabeb06c8e24550a5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Nov 2019 19:21:07 +0200 Subject: gnu: cinnamon-desktop: Don't use unstable tarball. * gnu/packages/cinnamon.scm (cinnamon-desktop)[source]: Download using git-fetch. --- gnu/packages/cinnamon.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm index 72403e1b11..a8850391aa 100644 --- a/gnu/packages/cinnamon.scm +++ b/gnu/packages/cinnamon.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 ng0 ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ (define-module (gnu packages cinnamon) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) @@ -40,13 +42,14 @@ (define-public cinnamon-desktop (name "cinnamon-desktop") (version "3.4.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/linuxmint/cinnamon-desktop/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/linuxmint/cinnamon-desktop") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jf24csrbfi9aiza1g70jpvsbjiqwphk0i5wilxq9kpjjsl99maq")))) + "18mjy80ly9361npjhxpm3n0pkmrwviaqr2kixjb7hyxa6kzzh5xw")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From d40362f4258e835131ac95930440ef711ca1e78c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Nov 2019 19:23:56 +0200 Subject: gnu: sfarklib: Don't use unstable tarball. * gnu/packages/compression.scm (sfarklib)[source]: Download using git-fetch. --- gnu/packages/compression.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 5583c8a461..326b0a42e5 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -650,13 +650,14 @@ (define-public sfarklib (name "sfarklib") (version "2.24") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/raboof/sfArkLib/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/raboof/sfArkLib.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0bzs2d98rk1xw9qwpnc7gmlbxwmwc3dg1rpn310afy9pq1k9clzi")))) + "0jrxy24gak7q5ml06p5jjgzk9i5r2mkfjk4ycirkp4kg7k5a237w")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no "check" target -- cgit v1.2.3 From 898ac8e732cca10bde0717aac5b8255fe6a331ee Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Nov 2019 19:27:33 +0200 Subject: gnu: snappy: Don't use unstable tarball. * gnu/packages/compression.scm (snappy)[source]: Download using git-fetch. --- gnu/packages/compression.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 326b0a42e5..cb1ababca2 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1107,12 +1107,13 @@ (define-public snappy (version "1.1.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/google/snappy/archive/" - version ".tar.gz")) - (file-name (string-append "snappy-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/snappy.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1m7rcdqzkys5lspj8jcsaah8w33zh28s771bw0ga2lgzfgl05yix")) + (base32 "1x7r8sjmdqlqjz0xfiwdyrqpgaj5yrvrgb28ivgpvnxgar5qv6m2")) (patches (search-patches "snappy-add-O2-flag-in-CmakeLists.txt.patch")))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 298180cdb28d85303b019c1132c5e66bf5173035 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Nov 2019 19:30:45 +0200 Subject: gnu: unshield: Don't use unstable tarball. * gnu/packages/compression.scm (unshield)[source]: Download using git-fetch. --- gnu/packages/compression.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index cb1ababca2..9275938858 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1302,13 +1302,14 @@ (define-public unshield (name "unshield") (version "1.4.3") (source - (origin (method url-fetch) - (uri (string-append "http://github.com/twogood/unshield/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (origin (method git-fetch) + (uri (git-reference + (url "http://github.com/twogood/unshield.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1avv5c11jbmzwizq10pwvlh1dmyna8ccvpgacv95h4gbq26rg35a")))) + "19wn22vszhci8dfcixx5rliz7phx3lv5ablvhjlclvj75k2vsdqd")))) (build-system cmake-build-system) (inputs `(("zlib" ,zlib) -- cgit v1.2.3 From ff9838640c86943e3d7c106937094b0d50c0ae47 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Nov 2019 19:36:21 +0200 Subject: gnu: innoextract: Don't use unstable tarball. * gnu/packages/compression.scm (innoextract)[source]: Download the release tarball. --- gnu/packages/compression.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 9275938858..ccbe6ddb74 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1819,12 +1819,12 @@ (define-public innoextract (source (origin (method url-fetch) - (uri (string-append "https://github.com/dscharrer/innoextract/archive/" - version ".tar.gz")) + (uri (string-append "https://github.com/dscharrer/innoextract/releases" + "/download/" version + "/innoextract-" version ".tar.gz")) (sha256 (base32 - "0khwi9f0q0h6xfbixrrc1rfpgj0b7ajwilq7yhmxnn5lpc807f6x")) - (file-name (string-append name "-" version ".tar.gz")))) + "197hs9aj1ska6czrsq4caazsw9v0xbaa0lazbh380fmwy8rbgvy1")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 46b0136e09b14d35bf8ce160cbb9bd93b49e525a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Nov 2019 20:01:17 +0200 Subject: gnu: innoextract: Update to 1.8. * gnu/packages/compression.scm (innoextract): Update to 1.8. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ccbe6ddb74..dd9a33a6f4 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1815,7 +1815,7 @@ (define-public plzip (define-public innoextract (package (name "innoextract") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) @@ -1824,7 +1824,7 @@ (define-public innoextract "/innoextract-" version ".tar.gz")) (sha256 (base32 - "197hs9aj1ska6czrsq4caazsw9v0xbaa0lazbh380fmwy8rbgvy1")))) + "0saj50n8ds85shygy4mq1h6s99510r9wgjjdll4dmvhra4lzcy2y")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 8b1fd3cafd9c3040d098ff538a233bf7dc43b397 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Nov 2019 23:48:44 +0200 Subject: gnu: bioperl-minimal: Don't use unstable tarball. * gnu/packages/bioinformatics.scm (bioperl-minimal)[source]: Download using git-fetch. --- gnu/packages/bioinformatics.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 511146bb6e..beb442ebe0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -983,16 +983,17 @@ (define-public bioperl-minimal (version "1.7.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/bioperl/bioperl-live/" - "archive/release-" - (string-map (lambda (c) - (if (char=? c #\.) - #\- c)) version) - ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/bioperl/bioperl-live") + (commit (string-append "release-" + (string-map (lambda (c) + (if (char=? c #\.) + #\- c)) version))))) + (file-name (git-file-name name version)) (sha256 (base32 - "12phgpxwgkqflkwfb9dcqg7a31dpjlfhar8wcgv0aj5ln4akfz06")))) + "0wl8yvzcls59pwwk6m8ahy87pwg6nnibzy5cldbvmcwg2x2w7783")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From 775373b872df7b2e00232e72715dda0ada89e876 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Nov 2019 23:57:52 +0200 Subject: gnu: coq-bignums: Don't use unstable tarball. * gnu/pacakges/coq.scm (coq-bignums)[source]: Download using git-fetch. --- gnu/packages/coq.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 2c5674f57a..75b9831d39 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -377,13 +377,14 @@ (define-public coq-bignums (name "coq-bignums") (version "8.9.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/coq/bignums/archive/V" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/coq/bignums.git") + (commit (string-append "V" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0pmk9smw7a14wrfkvjlvmpxim4bsv6xnm5xkrlld2faqy74a044g")))) + "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01")))) (build-system gnu-build-system) (native-inputs `(("ocaml" ,ocaml) -- cgit v1.2.3 From 31872b3e75da777c3f02b7544808d30849a56d7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Nov 2019 09:36:32 +0200 Subject: gnu: Add boost-static. * gnu/packages/boost.scm (boost-static): New variable. --- gnu/packages/boost.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 2ef0591223..0a2a5c5c01 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -178,6 +178,23 @@ (define-public boost-with-python3 (symlink "libboost_python37.so" "libboost_python3.so")) #t))))))))) +(define-public boost-static + (package + (inherit boost) + (name "boost-static") + (arguments + (substitute-keyword-arguments (package-arguments boost) + ((#:make-flags flags) + `(cons "link=static" (delete "link=shared" ,flags))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'provide-libboost_python + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion (string-append out "/lib") + (symlink "libboost_python27.a" "libboost_python.a")) + #t))))))))) + (define-public boost-for-mysql ;; Older version for MySQL 5.7.23. (package -- cgit v1.2.3 From 3546771cc8e5a24de89965e69f74c1d20027fefd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Nov 2019 10:55:01 +0200 Subject: gnu: libdivsufsort: Move to datastructures.scm. * gnu/packages/bioinformatics.scm (libdivsufsort): Move to ... * gnu/packages/datastructures.scm: ... here. --- gnu/packages/bioinformatics.scm | 29 ----------------------------- gnu/packages/datastructures.scm | 31 ++++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index beb442ebe0..616fcedc35 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11572,35 +11572,6 @@ (define-public libgff dependency like SeqAn.") (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt")))) -(define-public libdivsufsort - (package - (name "libdivsufsort") - (version "2.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/y-256/libdivsufsort.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0fgdz9fzihlvjjrxy01md1bv9vh12rkgkwbm90b1hj5xpbaqp7z2")))) - (build-system cmake-build-system) - (arguments - '(#:tests? #f ; there are no tests - #:configure-flags - ;; Needed for rapmap and sailfish. - '("-DBUILD_DIVSUFSORT64=ON"))) - (home-page "https://github.com/y-256/libdivsufsort") - (synopsis "Lightweight suffix-sorting library") - (description "libdivsufsort is a software library that implements a -lightweight suffix array construction algorithm. This library provides a -simple and an efficient C API to construct a suffix array and a -Burrows-Wheeler transformed string from a given string over a constant-size -alphabet. The algorithm runs in O(n log n) worst-case time using only 5n+O(1) -bytes of memory space, where n is the length of the string.") - (license license:expat))) - (define-public sailfish (package (name "sailfish") diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 7eab65fd5f..3ead3ac2c4 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Meiyo Peng ;;; Copyright © 2019 Efraim Flashner @@ -229,3 +229,32 @@ (define-public sdsl-lite complexity of an operation performed on the classical data structure and the equivalent succinct data structure are (most of the time) identical.") (license license:gpl3+))) + +(define-public libdivsufsort + (package + (name "libdivsufsort") + (version "2.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/y-256/libdivsufsort.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fgdz9fzihlvjjrxy01md1bv9vh12rkgkwbm90b1hj5xpbaqp7z2")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ; there are no tests + #:configure-flags + ;; Needed for rapmap and sailfish. + '("-DBUILD_DIVSUFSORT64=ON"))) + (home-page "https://github.com/y-256/libdivsufsort") + (synopsis "Lightweight suffix-sorting library") + (description "libdivsufsort is a software library that implements a +lightweight suffix array construction algorithm. This library provides a +simple and an efficient C API to construct a suffix array and a +Burrows-Wheeler transformed string from a given string over a constant-size +alphabet. The algorithm runs in O(n log n) worst-case time using only 5n+O(1) +bytes of memory space, where n is the length of the string.") + (license license:expat))) -- cgit v1.2.3 From 2b04bb3b4ede92907228a2d5940e63b6684aff45 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Nov 2019 09:59:38 +0200 Subject: gnu: sdsl-lite: Remove unused inputs. Documentation also wants graphviz, which drastically increases 'guiz size sdsl-lite'. * gnu/packages/datastructures.scm (sdsl-lite)[native-inputs]: Remove doxygen. --- gnu/packages/datastructures.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 3ead3ac2c4..36a135c606 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -21,7 +21,6 @@ (define-module (gnu packages datastructures) #:use-module (gnu packages) - #:use-module (gnu packages documentation) #:use-module (gnu packages perl) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -216,8 +215,6 @@ (define-public sdsl-lite (base32 "1v86ivv3mmdy802i9xkjpxb4cggj3s27wb19ja4sw1klnivjj69g")))) (build-system cmake-build-system) - (native-inputs - `(("doxygen" ,doxygen))) (home-page "https://github.com/simongog/sdsl-lite") (synopsis "Succinct data structure library") (description "The Succinct Data Structure Library (SDSL) is a powerful and -- cgit v1.2.3 From aca2bf51b767bfdc152896430f83b7c1124c346d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Nov 2019 09:58:15 +0200 Subject: gnu: sdsl-lite: Don't use bundled libraries. * gnu/packages/datastructures.scm (sdsl-lite)[source]: Remove bundled libraries in a snippet. Add patch to link to external libraries. [arguments]: Add phase to install static library. [native-inputs]: Add libdivsufsort. --- gnu/packages/datastructures.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 36a135c606..e7833b8e70 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -213,8 +213,31 @@ (define-public sdsl-lite ".tar.gz.offline.install.gz")) (sha256 (base32 - "1v86ivv3mmdy802i9xkjpxb4cggj3s27wb19ja4sw1klnivjj69g")))) + "1v86ivv3mmdy802i9xkjpxb4cggj3s27wb19ja4sw1klnivjj69g")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "external") #t)) + (patches + (list (origin + (method url-fetch) + (uri "https://salsa.debian.org/science-team/libsdsl/raw/debian/2.1.1+dfsg-2/debian/patches/0001-Patch-cmake-files.patch") + (file-name "sdsl-lite-dont-use-bundled-libraries.patch") + (sha256 + (base32 + "0m542xpys54bni29zibgrfpgpd0zgyny4h131virxsanixsbz52z"))))))) (build-system cmake-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-file "lib/libsdsl_static.a" + (string-append out "/lib/libsdsl.a"))) + #t))))) + (native-inputs + `(("libdivsufsort" ,libdivsufsort))) (home-page "https://github.com/simongog/sdsl-lite") (synopsis "Succinct data structure library") (description "The Succinct Data Structure Library (SDSL) is a powerful and -- cgit v1.2.3 From 46130b7bee382c6f9de8f80fb0f067253fcd9ca9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 14:03:26 +0100 Subject: gnu: r-scales: Move to (gnu packages cran). * gnu/packages/statistics.scm (r-scales): Move variable from here... * gnu/packages/cran.scm (r-scales): ...to here. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ gnu/packages/statistics.scm | 26 -------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7715b1cf63..947d60721f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016, 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Roel Janssen ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice @@ -95,6 +96,32 @@ (define-public r-clipr the system clipboards.") (license license:gpl3))) +(define-public r-scales + (package + (name "r-scales") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "scales" version)) + (sha256 + (base32 "0353dkh3d7x78463c6ds80hcml59lrqwr8rlv82a8dnkxla4l7qc")))) + (build-system r-build-system) + (propagated-inputs + `(("r-labeling" ,r-labeling) + ("r-munsell" ,r-munsell) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rcpp" ,r-rcpp) + ("r-r6" ,r-r6) + ("r-viridislite" ,r-viridislite))) + (home-page "https://github.com/hadley/scales") + (synopsis "Scale functions for visualization") + (description + "This package provides graphical scales that map data to aesthetics, and +provides methods for automatically determining breaks and labels for axes and +legends.") + (license license:expat))) + (define-public r-ellipsis (package (name "r-ellipsis") diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 655e404b73..ea91126c74 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1108,32 +1108,6 @@ (define-public r-reshape2 using just two functions: melt and dcast (or acast).") (license license:expat))) -(define-public r-scales - (package - (name "r-scales") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (cran-uri "scales" version)) - (sha256 - (base32 "0353dkh3d7x78463c6ds80hcml59lrqwr8rlv82a8dnkxla4l7qc")))) - (build-system r-build-system) - (propagated-inputs - `(("r-labeling" ,r-labeling) - ("r-munsell" ,r-munsell) - ("r-rcolorbrewer" ,r-rcolorbrewer) - ("r-rcpp" ,r-rcpp) - ("r-r6" ,r-r6) - ("r-viridislite" ,r-viridislite))) - (home-page "https://github.com/hadley/scales") - (synopsis "Scale functions for visualization") - (description - "This package provides graphical scales that map data to aesthetics, and -provides methods for automatically determining breaks and labels for axes and -legends.") - (license license:expat))) - (define-public r-ggplot2 (package (name "r-ggplot2") -- cgit v1.2.3 From 54a8cb963de17663fd41387b23972994354535b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 14:05:08 +0100 Subject: gnu: r-scales: Update to 1.1.0. * gnu/packages/cran.scm (r-scales): Update to 1.1.0. [propagated-inputs]: Remove r-rcpp; add r-farver and r-lifecycle. --- gnu/packages/cran.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 947d60721f..82ff17db07 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -99,19 +99,20 @@ (define-public r-clipr (define-public r-scales (package (name "r-scales") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "scales" version)) (sha256 - (base32 "0353dkh3d7x78463c6ds80hcml59lrqwr8rlv82a8dnkxla4l7qc")))) + (base32 "00rdbfj5mwc3kr8pskidn3n2zkp4ms6cx36xazz54pxw3pysdr0y")))) (build-system r-build-system) (propagated-inputs - `(("r-labeling" ,r-labeling) + `(("r-farver" ,r-farver) + ("r-labeling" ,r-labeling) + ("r-lifecycle" ,r-lifecycle) ("r-munsell" ,r-munsell) ("r-rcolorbrewer" ,r-rcolorbrewer) - ("r-rcpp" ,r-rcpp) ("r-r6" ,r-r6) ("r-viridislite" ,r-viridislite))) (home-page "https://github.com/hadley/scales") -- cgit v1.2.3 From 5b720c15d1842b203d133ba46d91749f66ba07cc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 14:06:16 +0100 Subject: gnu: r-pheatmap: Move to (gnu packages cran). * gnu/packages/statistics.scm (r-pheatmap): Move from here... * gnu/packages/cran.scm (r-pheatmap): ...to here. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ gnu/packages/statistics.scm | 24 ------------------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 82ff17db07..d6127196a0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -123,6 +123,29 @@ (define-public r-scales legends.") (license license:expat))) +(define-public r-pheatmap + (package + (name "r-pheatmap") + (version "1.0.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "pheatmap" version)) + (sha256 + (base32 + "1hdh74az3vyzz6dqa311rhxdm74n46lyr03p862kn80p0kp9d7ap")))) + (build-system r-build-system) + (propagated-inputs + `(("r-gtable" ,r-gtable) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-scales" ,r-scales))) + (home-page "https://cran.r-project.org/web/packages/pheatmap") + (synopsis "Pretty heatmaps") + (description + "This package provides an implementation of heatmaps that offers more +control over dimensions and appearance.") + (license license:gpl2+))) + (define-public r-ellipsis (package (name "r-ellipsis") diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ea91126c74..a83e792ef0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -848,30 +848,6 @@ (define-public r-estimability non-estimable cases correctly.") (license license:gpl2+))) -(define-public r-pheatmap - (package - (name "r-pheatmap") - (version "1.0.12") - (source - (origin - (method url-fetch) - (uri (cran-uri "pheatmap" version)) - (sha256 - (base32 - "1hdh74az3vyzz6dqa311rhxdm74n46lyr03p862kn80p0kp9d7ap")))) - (build-system r-build-system) - (propagated-inputs - `(("r-gtable" ,r-gtable) - ("r-rcolorbrewer" ,r-rcolorbrewer) - ("r-scales" ,r-scales))) - (home-page - "https://cran.r-project.org/web/packages/pheatmap") - (synopsis "Pretty heatmaps") - (description - "This package provides an implementation of heatmaps that offers more -control over dimensions and appearance.") - (license license:gpl2+))) - (define-public r-labeling (package (name "r-labeling") -- cgit v1.2.3 From 0dc62774e12c43a11fd2848967573465d7b1aed8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:02:31 +0100 Subject: gnu: r-digest: Update to 0.6.23. * gnu/packages/statistics.scm (r-digest): Update to 0.6.23. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a83e792ef0..0c449e6181 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -803,13 +803,13 @@ (define-public r-dichromat (define-public r-digest (package (name "r-digest") - (version "0.6.22") + (version "0.6.23") (source (origin (method url-fetch) (uri (cran-uri "digest" version)) (sha256 - (base32 "1qav52y1qmkg9j2g48mrl6bbjwhs0fs9dl55xb62lfkrihkappqh")))) + (base32 "18h5s8vkdcz2vhpsx6g3ig00zalrihr03skn95zw3lr2y56pafmp")))) (build-system r-build-system) ;; Vignettes require r-knitr, which requires r-digest, so we have to ;; disable them and the tests. -- cgit v1.2.3 From 55bb00b1989d7be730e0dae5d6541d34f159396d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:02:45 +0100 Subject: gnu: r-rlang: Update to 0.4.2. * gnu/packages/statistics.scm (r-rlang): Update to 0.4.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 0c449e6181..de6d1fca71 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1606,13 +1606,13 @@ (define-public r-r6 (define-public r-rlang (package (name "r-rlang") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) (uri (cran-uri "rlang" version)) (sha256 (base32 - "122hhc7pdri8wkjmk37y71m4h1gmdzaqcfdizfdjg1bhy935i10k")))) + "0fczcp17kaz3s4p0nd4126bppwl20vpxfybhsndpcky9h75wklgv")))) (build-system r-build-system) (home-page "http://rlang.tidyverse.org") (synopsis "Functions for base types, core R and Tidyverse features") -- cgit v1.2.3 From 7b4b1136cc31116e2f83a00903914c47ec3f4874 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:02:53 +0100 Subject: gnu: r-rcppeigen: Update to 0.3.3.7.0. * gnu/packages/statistics.scm (r-rcppeigen): Update to 0.3.3.7.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index de6d1fca71..69e8bbeef7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5036,14 +5036,14 @@ (define-public r-minqa (define-public r-rcppeigen (package (name "r-rcppeigen") - (version "0.3.3.5.0") + (version "0.3.3.7.0") (source (origin (method url-fetch) (uri (cran-uri "RcppEigen" version)) (sha256 (base32 - "01bz41c29591ybzqn4z88ss036ai3anh9figryvmfpqcfwbszip5")))) + "1b78qcjim0n9klgkr82n794d6bj9r9f33g0kcsszsns2hir65sk2")))) (properties `((upstream-name . "RcppEigen"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 24edd279e4d21605ba66f7feadbae07e8ba8cf49 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:03:45 +0100 Subject: gnu: Add r-effectsize. * gnu/packages/cran.scm (r-effectsize): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d6127196a0..64a39bb39d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8379,6 +8379,31 @@ (define-public r-ggeffects results using @code{ggplot2}.") (license license:gpl3))) +(define-public r-effectsize + (package + (name "r-effectsize") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "effectsize" version)) + (sha256 + (base32 + "07vgmxdl75798hgdh90zysafjh97rmmj2wjjyr6xff4fbhi8rlkb")))) + (properties `((upstream-name . "effectsize"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bayestestr" ,r-bayestestr) + ("r-insight" ,r-insight) + ("r-parameters" ,r-parameters))) + (home-page "https://github.com/easystats/effectsize") + (synopsis "Indices of effect size and standardized parameters") + (description + "This package provides utilities to work with indices of effect size and +standardized parameters for a wide variety of models, allowing computation and +conversion of indices such as Cohen's d, r, odds, etc.") + (license license:gpl3))) + (define-public r-sjplot (package (name "r-sjplot") -- cgit v1.2.3 From 2cef54c06085871211c2f9c6b3ede03ab7dd7fcf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:04:06 +0100 Subject: gnu: r-insight: Update to 0.7.0. * gnu/packages/cran.scm (r-insight): Update to 0.7.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 64a39bb39d..62f5132b1d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6251,14 +6251,14 @@ (define-public r-prediction (define-public r-insight (package (name "r-insight") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "1izqh4j0gzyk25cga67gs0i6rl0j471h5y2c3y1maz79r32fs7fd")))) + "1alxc483r3d1ydp983m2872mxd4nj3j25qv47zzgj10nbi4y32sq")))) (build-system r-build-system) (home-page "https://easystats.github.io/insight/") (synopsis "Easy access to model information for various model objects") -- cgit v1.2.3 From 3d391d2df4a9fa4cd62012c574ca15f6aa9150db Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:04:17 +0100 Subject: gnu: r-webshot: Update to 0.5.2. * gnu/packages/cran.scm (r-webshot): Update to 0.5.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 62f5132b1d..6c366f02a0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3875,14 +3875,14 @@ (define-public r-gclus (define-public r-webshot (package (name "r-webshot") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (cran-uri "webshot" version)) (sha256 (base32 - "08sb1xi376pfy1vwilk2d68zljsg9yiv04n2dkqz383gdhh0sxdr")))) + "0gq4h8cw51z95yvsnf38kj5l58wgljkm0dalmi8mn1sp06bxr0zi")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) -- cgit v1.2.3 From 3b2c3878f57f52beac551aaf602c561f84fe38a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:04:29 +0100 Subject: gnu: r-prodlim: Update to 2019.11.13. * gnu/packages/cran.scm (r-prodlim): Update to 2019.11.13. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6c366f02a0..ed7e75255b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2633,14 +2633,14 @@ (define-public r-drr (define-public r-prodlim (package (name "r-prodlim") - (version "2019.10.13") + (version "2019.11.13") (source (origin (method url-fetch) (uri (cran-uri "prodlim" version)) (sha256 (base32 - "0rsyfpz667y5cijmq33l318mrdw8r340khp72gcg8n490b1g0176")))) + "03wvh3kirp1prac5nky6a5whs97rvaf4hc27x0fnh51sa17r42b8")))) (build-system r-build-system) (propagated-inputs `(("r-kernsmooth" ,r-kernsmooth) -- cgit v1.2.3 From f94705d606fbd98eaf6ad2e98754d48f6e581db1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:05:04 +0100 Subject: gnu: r-limsolve: Update to 1.5.6. * gnu/packages/cran.scm (r-limsolve): Update to 1.5.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ed7e75255b..81ec7a518a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2388,14 +2388,14 @@ (define-public r-lpsolve (define-public r-limsolve (package (name "r-limsolve") - (version "1.5.5.3") + (version "1.5.6") (source (origin (method url-fetch) (uri (cran-uri "limSolve" version)) (sha256 (base32 - "1ll6ir42h3g2fzf0wqai213bm82gpwjj2hfma2np3mz024sc09rg")))) + "1829rd2cnd8qj80z9a7sgc7gx4sf3kvl5g6d2a0lqqw30f9sjzmr")))) (properties `((upstream-name . "limSolve"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From a6828e0bf544c39b7f488ba05964d6de4586fcb7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:05:19 +0100 Subject: gnu: r-abn: Update to 2.2. * gnu/packages/cran.scm (r-abn): Update to 2.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 81ec7a518a..6e7f2c6fef 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6100,14 +6100,14 @@ (define-public r-officer (define-public r-abn (package (name "r-abn") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) (uri (cran-uri "abn" version)) (sha256 (base32 - "08jlvb6i5f7ry2dwm0jgrnn2w95vr0l67dpx13n9878lz9ld131b")))) + "19w6bdjyp4zwqs6p0flry4qxqynf9rh8ykdrfrp61wrdf7kysw0d")))) (build-system r-build-system) (inputs `(("gsl" ,gsl))) -- cgit v1.2.3 From eb6aad884f5763197ddeeadbd97748fd5581288c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:06:13 +0100 Subject: gnu: r-parameters: Update to 0.3.0. * gnu/packages/cran.scm (r-parameters): Update to 0.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6e7f2c6fef..399aa95e56 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15609,14 +15609,14 @@ (define-public r-assertr (define-public r-parameters (package (name "r-parameters") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "1mgggb3l67wgjiccq4y84wbs2dw9qk01akd553yiwbwky9rpawgh")))) + "0ifb9g1h8sn661q7jf9d8glk58gxdcym5ywbmx7phwn0y3is5wdv")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 10faf810977687d267d5e5586e0568e81ae43f90 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:08:22 +0100 Subject: gnu: r-tidyverse: Update to 1.3.0. * gnu/packages/cran.scm (r-tidyverse): Update to 1.3.0. [propagated-inputs]: Add r-pillar. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 399aa95e56..f4de87cf46 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -294,14 +294,14 @@ (define-public r-vegan (define-public r-tidyverse (package (name "r-tidyverse") - (version "1.2.1") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "tidyverse" version)) (sha256 (base32 - "0yy3fkjksgcn6wkbgsb0pbnmsyqs4m01mziqafhig578nixs4rxd")))) + "02gyys08qv2v4cl2d66gml4d31ipxay0iyfwwksvxyclx60wp2kd")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) @@ -318,6 +318,7 @@ (define-public r-tidyverse ("r-lubridate" ,r-lubridate) ("r-magrittr" ,r-magrittr) ("r-modelr" ,r-modelr) + ("r-pillar" ,r-pillar) ("r-purrr" ,r-purrr) ("r-readr" ,r-readr) ("r-readxl" ,r-readxl) -- cgit v1.2.3 From 3356eb511c4f6589c742e61ff18437089a7ac9f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:08:43 +0100 Subject: gnu: r-sjplot: Update to 2.8.0. * gnu/packages/cran.scm (r-sjplot): Update to 2.8.0. [propagated-inputs]: Remove r-broom and r-nlme; add r-effectsize and r-parameters. --- gnu/packages/cran.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f4de87cf46..d66050fdf8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8408,19 +8408,19 @@ (define-public r-effectsize (define-public r-sjplot (package (name "r-sjplot") - (version "2.7.2") + (version "2.8.0") (source (origin (method url-fetch) (uri (cran-uri "sjPlot" version)) (sha256 - (base32 "1kx1qqgp4fhwwwpqn9mv8m1pnpjxfs7ww36ns7j1ja4a7ydwn2hp")))) + (base32 "0ahz6v6bhvq1537inwakmrafs44hs2m9w0ra8q17fz626nn9rb9b")))) (properties `((upstream-name . "sjPlot"))) (build-system r-build-system) (propagated-inputs `(("r-bayestestr" ,r-bayestestr) - ("r-broom" ,r-broom) ("r-dplyr" ,r-dplyr) + ("r-effectsize" ,r-effectsize) ("r-forcats" ,r-forcats) ("r-ggeffects" ,r-ggeffects) ("r-ggplot2" ,r-ggplot2) @@ -8432,7 +8432,7 @@ (define-public r-sjplot ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) ("r-modelr" ,r-modelr) - ("r-nlme" ,r-nlme) + ("r-parameters" ,r-parameters) ("r-performance" ,r-performance) ("r-psych" ,r-psych) ("r-purrr" ,r-purrr) -- cgit v1.2.3 From 2eff036278aaae8ab8613334e8720dc64688127d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:09:13 +0100 Subject: gnu: r-tidytree: Update to 0.3.0. * gnu/packages/cran.scm (r-tidytree): Update to 0.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d66050fdf8..22b7c7b77c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9653,13 +9653,13 @@ (define-public r-colorramps (define-public r-tidytree (package (name "r-tidytree") - (version "0.2.9") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "tidytree" version)) (sha256 - (base32 "1l9rk71dzlwg8736l0g4rdlq3pghxkfzmlxyln8y4bxx7ym51i6g")))) + (base32 "1sbfwcxf9v1lhpa0392b49b6qfjrq7nlqz2djqzk5aknj9j64zvy")))) (build-system r-build-system) (propagated-inputs `(("r-ape" ,r-ape) -- cgit v1.2.3 From 138fbdf354041d885e04420f04b65c04ae12d543 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:09:26 +0100 Subject: gnu: r-rnifti: Update to 1.0.0. * gnu/packages/cran.scm (r-rnifti): Update to 1.0.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 22b7c7b77c..bf941e0c5f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10042,14 +10042,14 @@ (define-public r-tfmpvalue (define-public r-rnifti (package (name "r-rnifti") - (version "0.11.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "RNifti" version)) (sha256 (base32 - "0jcgdg5k2swmi57aqj347kfi1fc4nvag7pxdfz61kc0vqqamm0wg")))) + "0l61hjnzv043ibpkgrhc0yngaqmc58lkvii8j1dzh022z5wbqrj8")))) (properties `((upstream-name . "RNifti"))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) -- cgit v1.2.3 From 401cc85e6182dcec4a5b45c1fe5b6038762259da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:09:36 +0100 Subject: gnu: r-protviz: Update to 0.5.1. * gnu/packages/cran.scm (r-protviz): Update to 0.5.1. [inputs]: Remove perl and python-2. --- gnu/packages/cran.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bf941e0c5f..c55a81f8ca 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11218,19 +11218,16 @@ (define-public r-rbamtools (define-public r-protviz (package (name "r-protviz") - (version "0.4.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "protViz" version)) (sha256 (base32 - "150i2q4nakz28f39kmhrchz4qsr8ax6y02512md94k8hq4hamxg1")))) + "0cznzm1ijlq33yd5wsa61prav77y2vi698w0n2fx1xcv504c4bjv")))) (properties `((upstream-name . "protViz"))) (build-system r-build-system) - (inputs - `(("perl" ,perl) - ("python-2" ,python-2))) (propagated-inputs `(("r-rcpp" ,r-rcpp))) (home-page "https://github.com/protViz/protViz/") (synopsis "Visualizing and analyzing mass spectrometry data in proteomics") -- cgit v1.2.3 From 19600e08102dba55193bedf0e7eaa64cffbb46e2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 24 Nov 2019 15:09:54 +0100 Subject: gnu: r-bookdown: Update to 0.16. * gnu/packages/cran.scm (r-bookdown): Update to 0.16. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c55a81f8ca..c406025747 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13428,13 +13428,13 @@ (define-public r-sparql (define-public r-bookdown (package (name "r-bookdown") - (version "0.15") + (version "0.16") (source (origin (method url-fetch) (uri (cran-uri "bookdown" version)) (sha256 (base32 - "0pgkabaqsckaz8z1nlza84jp172jyzv17kx5dily43jfx5psy2ap")))) + "1gwgvx1yg6q3wccnhidr3gshdvlgr42i4pvlg4h29kpsa7smjiv1")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) -- cgit v1.2.3 From ea2884c12ce089392c01b63f84e29a4ebaa0e16b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 25 Nov 2019 00:09:15 +0100 Subject: gnu: Add bsequencer. * gnu/packages/music.scm (bsequencer): New variable. --- gnu/packages/music.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2c3b2ff5ff..30c2ddd3ef 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1128,6 +1128,40 @@ (define-public non-timeline complete studio.") (license license:gpl2+))) +(define-public bsequencer + (package + (name "bsequencer") + (version "1.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sjaehn/BSEQuencer.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08xwz5v8wrar0rx7qdr9pkpjz2k9sw6bn5glhpn6sp6453fabf8q")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:tests? #f ; there are none + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("cairo" ,cairo) + ("lv2" ,lv2) + ("libx11" ,libx11))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/sjaehn/BSEQuencer") + (synopsis "Multi-channel MIDI step sequencer LV2 plugin") + (description + "This package provides a multi-channel MIDI step sequencer LV2 plugin +with a selectable pattern matrix size.") + (license license:gpl3+))) + (define-public solfege (package (name "solfege") -- cgit v1.2.3 From b5d4d5b9bcf267fddd02fcc14b88eac0bebf979f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 25 Nov 2019 00:11:05 +0100 Subject: gnu: guile-gi: Update to 0.2.1. * gnu/packages/guile-xyz.scm (guile-gi): Update to 0.2.1. [arguments]: Add phase to start Xorg server for tests. [native-inputs]: Add xorg-server. --- gnu/packages/guile-xyz.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 245eb9c0d6..e2eee47457 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2255,22 +2255,32 @@ (define-public guile-file-names (define-public guile-gi (package (name "guile-gi") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (string-append "http://lonelycactus.com/tarball/guile_gi-" version ".tar.gz")) (sha256 (base32 - "1n4pbrmbrjkrx826a4m31ag5c35rgkj1sirqh4qalk7gg67cfb41")))) + "1ah5bmkzplsmkrk7v9vlxlqch7i91qv4cq2d2nar9xshbpcrj484")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-gnu-filesystem-hierarchy"))) + `(#:configure-flags '("--with-gnu-filesystem-hierarchy") + #:phases + (modify-phases %standard-phases + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The init_check test requires a running X server. + (system (format #f "~a/bin/Xvfb :1 &" + (assoc-ref inputs "xorg-server"))) + (setenv "DISPLAY" ":1") + #t))))) (native-inputs `(("gettext" ,gnu-gettext) ("glib:bin" ,glib "bin") ; for glib-compile-resources ("libtool" ,libtool) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (propagated-inputs `(("glib" ,glib) ("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 2baed6429148d384b4acb1c2ba152032e648f1f9 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 18 Sep 2019 21:21:55 +0200 Subject: gnu: mes: Update to 0.21. * gnu/packages/mes.scm (mes): Update to 0.21. --- gnu/packages/mes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 1a55342279..59710c45ae 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -140,14 +140,14 @@ (define-public mes-0.19 (define-public mes (package (inherit mes-0.19) - (version "0.20") + (version "0.21") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) (sha256 (base32 - "04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n")))) + "104qxngxyl7pql8vqrnli3wfyx0ayfaqg8gjfhmk4qzrafs46slm")))) (propagated-inputs `(("mescc-tools" ,mescc-tools) ("nyacc" ,nyacc))))) -- cgit v1.2.3 From b674f87a46c48abbfe89020b1f7ccffddba257be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 25 Nov 2019 15:24:02 +0100 Subject: gnu: r-vioplot: Update to 0.3.3. * gnu/packages/cran.scm (r-vioplot): Update to 0.3.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c406025747..9f23252ad8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3445,14 +3445,14 @@ (define-public r-venndiagram (define-public r-vioplot (package (name "r-vioplot") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "vioplot" version)) (sha256 (base32 - "13kfjp747bnzksai8j39y2hyl3ljc6n53c2cfhaw78q3d63x0lbv")))) + "1jjrsds7p1jnnr4970h43526b9cdv3azizjbalbfzjjylc53lrca")))) (build-system r-build-system) (propagated-inputs `(("r-sm" ,r-sm) -- cgit v1.2.3 From 0ee5e9fb75cd43d92c31d7fc10e3bfabc7d629bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 25 Nov 2019 15:24:28 +0100 Subject: gnu: r-epi: Update to 2.40. * gnu/packages/cran.scm (r-epi): Update to 2.40. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9f23252ad8..8621f7d0cb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11294,14 +11294,14 @@ (define-public r-etm (define-public r-epi (package (name "r-epi") - (version "2.38") + (version "2.40") (source (origin (method url-fetch) (uri (cran-uri "Epi" version)) (sha256 (base32 - "0ald9fjynrlyah8nzwfs49a08j4myd3c5bm56zn61gg5pyyhi8hd")))) + "046y10vwks5y84pzccmrn6d4pd6qz70imvp1hw5ywp8fnwzfh4g5")))) (properties `((upstream-name . "Epi"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 166995af929221074c2831534a56cc527e1038be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 25 Nov 2019 15:24:40 +0100 Subject: gnu: r-future: Update to 1.15.1. * gnu/packages/cran.scm (r-future): Update to 1.15.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8621f7d0cb..29aef19659 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11476,14 +11476,14 @@ (define-public r-globals (define-public r-future (package (name "r-future") - (version "1.15.0") + (version "1.15.1") (source (origin (method url-fetch) (uri (cran-uri "future" version)) (sha256 (base32 - "1cbp7agb9lipjxsh7xm1yphh8a4hrjy7wrbkvhsxn1swh0c4s3b7")))) + "101hi8warqa0py9l6c5p98f7i9xjhx01w655z6a35jx1dhspykzd")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From dae3458cd23b39a7ad0bc105f73c5233eb18d323 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 25 Nov 2019 15:24:50 +0100 Subject: gnu: r-rrcov: Update to 1.4-9. * gnu/packages/statistics.scm (r-rrcov): Update to 1.4-9. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 69e8bbeef7..c7860d2ea1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4833,14 +4833,14 @@ (define-public r-pcapp (define-public r-rrcov (package (name "r-rrcov") - (version "1.4-7") + (version "1.4-9") (source (origin (method url-fetch) (uri (cran-uri "rrcov" version)) (sha256 (base32 - "14zjyqcdiqx6js99nx5s8hmyx564ixy2d8s6i7wa50xmx368rl6b")))) + "11zvxidlb1pr2j5dzvmbjqdgsmmicsq8ppjf5wcfykfyf2fkcmz7")))) (build-system r-build-system) (propagated-inputs `(("r-cluster" ,r-cluster) -- cgit v1.2.3 From 377606238f0260a849a1f529d94e1546276a5db6 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Tue, 19 Nov 2019 19:59:32 -0600 Subject: gnu: Add netcat-openbsd. * gnu/packages/admin.scm (netcat-openbsd): New variable. --- gnu/packages/admin.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 761b26a8d6..10caeac763 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 Hartmut Goebel +;;; Copyright © 2019 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,6 +68,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages file) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) + #:use-module (gnu packages libbsd) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages guile) @@ -87,6 +89,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages glib) #:use-module (gnu packages openldap) #:use-module (gnu packages mcrypt) + #:use-module (gnu packages patchutils) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages python) @@ -620,6 +623,64 @@ (define-public netcat would need and has several interesting built-in capabilities.") (license license:gpl2+))) +(define-public netcat-openbsd + (package + (name "netcat-openbsd") + (version "1.203-2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/debian/netcat-openbsd.git") + (commit (string-append "debian/" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j85gzbjzs6yrhgabh3zkwzd27qkr5s0zjjczl0hah8q7yhrjk3m")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no test suite + #:make-flags + (list "CC=gcc" + (string-append "CFLAGS=-I" (assoc-ref %build-inputs "libbsd") "/include") + "LDFLAGS=-lbsd") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch + (lambda _ + (setenv "QUILT_PATCHES" "debian/patches") + (invoke "quilt" "push" "-a") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man1")) + (doc (string-append out "/share/doc/netcat-openbsd-" ,version)) + (examples (string-append doc "/examples"))) + (install-file "nc" bin) + (install-file "nc.1" man) + (install-file "debian/copyright" doc) + (copy-recursively "debian/examples" examples) + #t)))))) + (inputs `(("libbsd" ,libbsd))) + (native-inputs `(("pkg-config" ,pkg-config) + ("quilt" ,quilt))) + (home-page "https://packages.debian.org/sid/netcat-openbsd") + (synopsis "Read and write data over TCP/IP") + (description + "Netcat is a simple Unix utility which reads and writes data across +network connections using TCP or UDP protocol. It is designed to be a reliable +\"back-end\" tool that can be used directly or easily driven by other programs +and scripts. At the same time it is a feature-rich network debugging and +exploration tool, since it can create almost any kind of connection you would +need and has several interesting built-in capabilities. + +This package contains the OpenBSD rewrite of netcat, including support for +IPv6, proxies, and Unix sockets.") + (license (list license:bsd-3 + license:bsd-2)))) ; atomicio.*, socks.c + (define-public sipcalc (package (name "sipcalc") -- cgit v1.2.3 From 79832fb285a6ce67469287f6b0defbf2b5a1a074 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 25 Nov 2019 01:45:42 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.156. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.156. (linux-libre-4.14-pristine-source): Update hash. --- 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 9941129ba7..5fff866f1d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -368,10 +368,10 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.155") +(define-public linux-libre-4.14-version "4.14.156") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "10g4493ldc398qza304z5yz8qdp93w7a2bs5h5dwk0bbamwikmkp"))) + (hash (base32 "1h47fxfbq0d5ry7j3jxz45v5c4103qncgm2vydpz6zdx1kmrz27q"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 6c693a6e3f0516475351954a29149ed2b10e3664 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 25 Nov 2019 01:46:15 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.86. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.86. (linux-libre-4.19-pristine-source): Update hash. --- 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 5fff866f1d..386b47233b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -360,10 +360,10 @@ (define-public linux-libre-5.3-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.3))) -(define-public linux-libre-4.19-version "4.19.85") +(define-public linux-libre-4.19-version "4.19.86") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1dsgbys73jga5h0a9icgif6qbi31g84315zlcdid9bzf1abkbx3v"))) + (hash (base32 "1xmzcxsiydym574y7k313qd8s4c3mdahpb3nx3cingfl36ivnb5z"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 5d297ca6760d62f1287c9d6f4729ce3352752df8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 25 Nov 2019 01:47:07 -0500 Subject: gnu: linux-libre: Update to 5.3.13. * gnu/packages/linux.scm (linux-libre-5.3-version): Update to 5.3.13. (linux-libre-5.3-pristine-source): Update hash. --- 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 386b47233b..49be57c3bc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,10 +352,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.3-version "5.3.12") +(define-public linux-libre-5.3-version "5.3.13") (define-public linux-libre-5.3-pristine-source (let ((version linux-libre-5.3-version) - (hash (base32 "184pmjyqh4bkrc3vj65zn6xnljzv9d1x7c1z0hlgj6fakpwgdgsk"))) + (hash (base32 "0by9lmgmllf19yflzm9f24cy9glcq6m73ywm25bddsnh0czya14z"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.3))) -- cgit v1.2.3 From 1d64afbdc0644a2be8bd2ad157085731e212ab74 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 24 Nov 2019 20:47:20 +0100 Subject: tests: Avoid (catch 'srfi-34 …) form. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * tests/build-utils.scm ("wrap-script, raises condition"): Use 'guard' instead of "catch 'srfi-34". --- tests/build-utils.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/build-utils.scm b/tests/build-utils.scm index 61e6c44e63..ec442c267b 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm @@ -235,13 +235,11 @@ (define-module (test-build-utils) (lambda (port) (format port "This is not a script"))) (chmod script-file-name #o777) - (catch 'srfi-34 - (lambda () - (wrap-script script-file-name - #:guile "MYGUILE" - `("GUIX_FOO" prefix ("/some/path" - "/some/other/path")))) - (lambda (type obj) - (wrap-error? obj))))))) + (guard (c ((wrap-error? c) #t)) + (wrap-script script-file-name + #:guile "MYGUILE" + `("GUIX_FOO" prefix ("/some/path" + "/some/other/path"))) + #f))))) (test-end) -- cgit v1.2.3 From f5698dfb87df1132ca5c73a8ed7f75f63c07669f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 24 Nov 2019 20:48:11 +0100 Subject: tests: Avoid unnecessary use of 'mock'. * tests/build-utils.scm ("wrap-script, simple case"): Use the real 'which' instead of mocking it. --- tests/build-utils.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/build-utils.scm b/tests/build-utils.scm index ec442c267b..47a57a984b 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm @@ -151,11 +151,12 @@ (define-module (test-build-utils) (test-equal "wrap-script, simple case" (string-append (format #f "\ -#!GUILE --no-auto-compile +#!~a --no-auto-compile #!#; Guix wrapper #\\-~s #\\-~s " + (which "guile") '(begin (let ((current (getenv "GUIX_FOO"))) (setenv "GUIX_FOO" (if current @@ -175,11 +176,9 @@ (define-module (test-build-utils) (lambda (port) (format port script-contents))) (chmod script-file-name #o777) - - (mock ((guix build utils) which (const "GUILE")) - (wrap-script script-file-name - `("GUIX_FOO" prefix ("/some/path" - "/some/other/path")))) + (wrap-script script-file-name + `("GUIX_FOO" prefix ("/some/path" + "/some/other/path"))) (let ((str (call-with-input-file script-file-name get-string-all))) (with-directory-excursion directory (delete-file "foo")) -- cgit v1.2.3 From d482e13fbe94490c91a2759a982575853e46039b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 Nov 2019 21:30:40 +0100 Subject: doc: cookbook: Use @lisp for Scheme snippets. * doc/guix-cookbook.texi: Use @lisp instead of @example where appropriate. --- doc/guix-cookbook.texi | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 869b9666df..02869a8242 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -581,7 +581,7 @@ To add several directories, separate them with a colon (@code{:}). Our previous @samp{my-hello} needs some adjustments though: -@example +@lisp (define-module (my-hello) #:use-module (guix licenses) #:use-module (guix packages) @@ -607,7 +607,7 @@ serves as an example of standard GNU coding practices. As such, it supports command-line arguments, multiple languages, and so on.") (home-page "https://www.gnu.org/software/hello/") (license gpl3+))) -@end example +@end lisp Note that we have assigned the package value to an exported variable name with @code{define-public}. This is effectively assigning the package to the @code{my-hello} @@ -619,14 +619,14 @@ will fail because the last expression, @code{define-public}, does not return a package. If you want to use @code{define-public} in this use-case nonetheless, make sure the file ends with an evaluation of @code{my-hello}: -@example +@lisp ; ... (define-public my-hello ; ... ) my-hello -@end example +@end lisp This last example is not very typical. @@ -739,7 +739,7 @@ The above "Hello World" example is as simple as it goes. Packages can be more complex than that and Guix can handle more advanced scenarios. Let's look at another, more sophisticated package (slightly modified from the source): -@example +@lisp (define-module (gnu packages version-control) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) @@ -812,7 +812,7 @@ provided as a re-entrant linkable library with a solid API, allowing you to write native speed custom Git applications in any language with bindings.") ;; GPLv2 with linking exception (license license:gpl2)))) -@end example +@end lisp (In those cases were you only want to tweak a few fields from a package definition, you should rely on inheritance instead of copy-pasting everything. @@ -851,17 +851,17 @@ Snippets might need additional Guile modules which can be imported from the First, a syntactic comment: See the quasi-quote / comma syntax? -@example +@lisp (native-inputs `(("pkg-config" ,pkg-config))) -@end example +@end lisp is equivalent to -@example +@lisp (native-inputs (list (list "pkg-config" pkg-config))) -@end example +@end lisp You'll mostly see the former because it's shorter. @@ -930,10 +930,10 @@ Another common argument is @code{:make-flags}, which specifies a list of flags append when running make, as you would from the command line. For instance, the following flags -@example +@lisp #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) "CC=gcc") -@end example +@end lisp translate into @@ -948,9 +948,9 @@ global variable pointing to the destination directory in the store (something li Similarly, it's possible to set the "configure" flags. -@example +@lisp #:configure-flags '("-DUSE_SHA1DC=ON") -@end example +@end lisp The @code{%build-inputs} variable is also generated in scope. It's an association table that maps the input names to their store directories. @@ -960,7 +960,7 @@ phases include @code{unpack}, @code{configure}, @code{build}, @code{install} and more about those phases, you need to work out the appropriate build system definition in @samp{$GUIX_CHECKOUT/guix/build/gnu-build-system.scm}: -@example +@lisp (define %standard-phases ;; Standard build phases, as a list of symbol/procedure pairs. (let-syntax ((phases (syntax-rules () @@ -978,16 +978,16 @@ definition in @samp{$GUIX_CHECKOUT/guix/build/gnu-build-system.scm}: install-license-files reset-gzip-timestamps compress-documentation))) -@end example +@end lisp Or from the REPL: -@example +@lisp > (add-to-load-path "/path/to/guix/checkout") > ,module (guix build gnu-build-system) > (map first %standard-phases) (set-SOURCE-DATE-EPOCH set-paths install-locale unpack bootstrap patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs build check install patch-shebangs strip validate-runpath validate-documentation-location delete-info-dir-file patch-dot-desktop-files install-license-files reset-gzip-timestamps compress-documentation) -@end example +@end lisp If you want to know more about what happens during those phases, consult the associated procedures. @@ -995,7 +995,7 @@ associated procedures. For instance, as of this writing the definition of @code{unpack} for the GNU build system is -@example +@lisp (define* (unpack #:key source #:allow-other-keys) "Unpack SOURCE in the working directory, and change directory within the source. When SOURCE is a directory, copy it in a sub-directory of the current @@ -1015,7 +1015,7 @@ working directory." (invoke "tar" "xvf" source)) (chdir (first-subdirectory ".")))) #t) -@end example +@end lisp Note the @code{chdir} call: it changes the working directory to where the source was unpacked. @@ -1045,14 +1045,14 @@ by their name in those variables. Thus @code{(assoc-ref outputs "out")} is the directory of the main output of the package. A phase procedure may look like this: -@example +@lisp (lambda* (#:key inputs outputs #:allow-other-keys) (let (((bash-directory (assoc-ref inputs "bash")) (output-directory (assoc-ref outputs "out")) (doc-directory (assoc-ref outputs "doc")) ; ... #t) -@end example +@end lisp The procedure must return @code{#t} on success. It's brittle to rely on the return value of the last expression used to tweak the phase because there is no @@ -1233,7 +1233,7 @@ $ guix refresh hello --update If you've started browsing the existing package definitions, you might have noticed that a significant number of them have a @code{inherit} field: -@example +@lisp (define-public adwaita-icon-theme (package (inherit gnome-icon-theme) (name "adwaita-icon-theme") @@ -1248,7 +1248,7 @@ noticed that a significant number of them have a @code{inherit} field: "17fpahgh5dyckgz7rwqvzgnhx53cx9kr2xw0szprc6bnqy977fi8")))) (native-inputs `(("gtk-encode-symbolic-svg" ,gtk+ "bin"))))) -@end example +@end lisp All unspecified fields are inherited from the parent package. This is very convenient to create alternative packages, for instance with different source, -- cgit v1.2.3 From e97a4a294480cafd5c7cc79e700a86263659b70c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 Nov 2019 21:35:53 +0100 Subject: doc: cookbook: Add cross-reference about ./pre-inst-env. * doc/guix-cookbook.texi (Direct checkout hacking): Refer to "Running Guix Before It Is Installed". --- doc/guix-cookbook.texi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 02869a8242..be610cc540 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -670,7 +670,7 @@ In the rest of this article, we use @samp{$GUIX_CHECKOUT} to refer to the locati the checkout. -Follow the instruction in the manual (@pxref{Contributing,,, guix, GNU Guix +Follow the instructions in the manual (@pxref{Contributing,,, guix, GNU Guix Reference Manual}) to set up the repository environment. Once ready, you should be able to use the package definitions from the @@ -679,7 +679,8 @@ repository environment. Feel free to edit package definitions found in @samp{$GUIX_CHECKOUT/gnu/packages}. The @samp{$GUIX_CHECKOUT/pre-inst-env} script lets you use @samp{guix} over the package -collection of the repository. +collection of the repository (@pxref{Running Guix Before It Is +Installed,,, guix, GNU Guix Reference Manual}). @itemize @item -- cgit v1.2.3 From 0cbef07b34bbe00f9728ad39308ca209c9e8f428 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 Nov 2019 21:44:29 +0100 Subject: doc: cookbook: Use Texinfo quotes. * doc/guix-cookbook.texi: Use Texinfo quotes ``like this'' instead of straight quotes or curly quotes. --- doc/guix-cookbook.texi | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index be610cc540..c8d9beaa66 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -121,7 +121,7 @@ REPL. Scheme syntax boils down to a tree of expressions (or @emph{s-expression} in Lisp lingo). An expression can be a literal such as numbers and strings, or a compound which is a parenthesized list of compounds and literals. @code{#t} -and @code{#f} stand for the booleans "true" and "false", respectively. +and @code{#f} stand for the Booleans ``true'' and ``false'', respectively. Examples of valid expressions: @@ -331,14 +331,14 @@ It does not assume much knowledge of the Guix system nor of the Lisp language. The reader is only expected to be familiar with the command line and to have some basic programming knowledge. -@node A "Hello World" package -@subsection A "Hello World" package +@node A ``Hello World'' package +@subsection A ``Hello World'' package -The “Defining Packages” section of the manual introduces the basics of Guix +The ``Defining Packages'' section of the manual introduces the basics of Guix packaging (@pxref{Defining Packages,,, guix, GNU Guix Reference Manual}). In the following section, we will partly go over those basics again. -``GNU hello'' is a dummy project that serves as an idiomatic example for +GNU@tie{}Hello is a dummy project that serves as an idiomatic example for packaging. It uses the GNU build system (@code{./configure && make && make install}). Guix already provides a package definition which is a perfect example to start with. You can look up its declaration with @code{guix edit @@ -416,10 +416,10 @@ available licenses. @end table Time to build our first package! Nothing fancy here for now: we will stick to a -dummy "my-hello", a copy of the above declaration. +dummy @code{my-hello}, a copy of the above declaration. -As with the ritualistic "Hello World" taught with most programming languages, -this will possibly be the most "manual" approach. We will work out an ideal +As with the ritualistic ``Hello World'' taught with most programming languages, +this will possibly be the most ``manual'' approach. We will work out an ideal setup later; for now we will go the simplest route. Save the following to a file @file{my-hello.scm}. @@ -554,20 +554,20 @@ earlier example. The @code{use-modules} expression tells which of the modules we need in the file. Modules are a collection of values and procedures. They are commonly called -"libraries" or "packages" in other programming languages. +``libraries'' or ``packages'' in other programming languages. @node @samp{GUIX_PACKAGE_PATH} @subsubsection @samp{GUIX_PACKAGE_PATH} -@emph{Note: Starting from Guix 0.16, the more flexible Guix "channels" are the +@emph{Note: Starting from Guix 0.16, the more flexible Guix @dfn{channels} are the preferred way and supersede @samp{GUIX_PACKAGE_PATH}. See next section.} It can be tedious to specify the file from the command line instead of simply calling @code{guix package --install my-hello} as you would do with the official packages. -Guix makes it possible to streamline the process by adding as many "package -declaration paths" as you want. +Guix makes it possible to streamline the process by adding as many ``package +declaration directories'' as you want. Create a directory, say @samp{~./guix-packages} and add it to the @samp{GUIX_PACKAGE_PATH} environment variable: @@ -736,7 +736,7 @@ It's a community effort so the more join in, the better Guix becomes! @node Extended example @subsection Extended example -The above "Hello World" example is as simple as it goes. Packages can be more +The above ``Hello World'' example is as simple as it goes. Packages can be more complex than that and Guix can handle more advanced scenarios. Let's look at another, more sophisticated package (slightly modified from the source): @@ -841,9 +841,7 @@ version when packaging programs for a specific commit. Snippets are quoted (i.e. non-evaluated) Scheme code that are a means of patching the source. They are a Guix-y alternative to the traditional @samp{.patch} files. Because of the quote, the code in only evaluated when passed to the Guix daemon -for building. - -There can be as many snippet as needed. +for building. There can be as many snippets as needed. Snippets might need additional Guile modules which can be imported from the @code{modules} field. @@ -884,7 +882,7 @@ being present at build time. The distinction between the various inputs is important: if a dependency can be handled as an @emph{input} instead of a @emph{propagated input}, it should be done so, or -else it "pollutes" the user profile for no good reason. +else it ``pollutes'' the user profile for no good reason. For instance, a user installing a graphical program that depends on a command line tool might only be interested in the graphical part, so there is no @@ -947,7 +945,7 @@ directory in Make parlance) to @code{(assoc-ref %outputs "out")}, which is a bui global variable pointing to the destination directory in the store (something like @samp{/gnu/store/...-my-libgit2-20180408}). -Similarly, it's possible to set the "configure" flags. +Similarly, it's possible to set the configure flags: @lisp #:configure-flags '("-DUSE_SHA1DC=ON") @@ -1067,11 +1065,11 @@ argument field. Indeed, the build code in the package declaration should not be evaluated on the client side, but only when passed to the Guix daemon. This mechanism of passing code around two running processes is called @uref{https://arxiv.org/abs/1709.00833, code staging}. -@subsubsection "Utils" functions +@subsubsection Utility functions When customizing @code{phases}, we often need to write code that mimics the equivalent system invocations (@code{make}, @code{mkdir}, @code{cp}, etc.) commonly used during -regular "Unix-style" installations. +regular ``Unix-style'' installations. Some like @code{chmod} are native to Guile. @xref{,,, guile, Guile reference manual} for a complete list. @@ -1104,7 +1102,7 @@ Run an executable. This should be used instead of @code{system*}. Run the body in a different working directory, then restore the previous working directory. @item substitute* -A "sed-like" function. +A ``@command{sed}-like'' function. @end table @subsubsection Module prefix @@ -1300,7 +1298,7 @@ The @uref{https://www.gnu.org/software/guix/manual/en/html_node/Defining-Package @uref{https://gitlab.com/pjotrp/guix-notes/blob/master/HACKING.org, Pjotr’s hacking guide to GNU Guix} @item -@uref{https://www.gnu.org/software/guix/guix-ghm-andreas-20130823.pdf, "GNU Guix: Package without a scheme!"}, by Andreas Enge +@uref{https://www.gnu.org/software/guix/guix-ghm-andreas-20130823.pdf, ``GNU Guix: Package without a scheme!''}, by Andreas Enge @end itemize @c ********************************************************************* @@ -1534,7 +1532,7 @@ CONFIG_VIRTIO=m @end example After copying all the configuration options, run @code{make localmodconfig} -again to make sure that you don't have any output starting with "module". +again to make sure that you don't have any output starting with ``module''. After all of these machine specific modules there are a couple more left that are also needed. @code{CONFIG_MODULES} is necessary so that you can build and load modules separately and not have everything built into the kernel. -- cgit v1.2.3 From cf1e6f5f9016b3471f10581ee840c26398f44736 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 Nov 2019 21:55:46 +0100 Subject: doc: cookbook: Use @result{} & co. instead of a '>' prompt. * doc/guix-cookbook.texi (A Scheme Crash Course) (Extended example): Use @result{}, @print{}, and @error{}. --- doc/guix-cookbook.texi | 89 +++++++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 41 deletions(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index c8d9beaa66..0a33efc73a 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -111,9 +111,10 @@ REPL} by running @code{guile} from the command line. Alternatively you can also run @code{guix environment --ad-hoc guile -- guile} if you'd rather not have Guile installed in your user profile. -In the following examples we use the @code{>} symbol to denote the REPL -prompt, that is, the line reserved for user input. @xref{Using Guile -Interactively,,, guile, GNU Guile Reference Manual}) for more details on the +In the following examples, lines show what you would type at the REPL; +lines starting with ``@result{}'' show evaluation results, while lines +starting with ``@print{}'' show things that get printed. @xref{Using Guile +Interactively,,, guile, GNU Guile Reference Manual}), for more details on the REPL. @itemize @@ -126,12 +127,15 @@ and @code{#f} stand for the Booleans ``true'' and ``false'', respectively. Examples of valid expressions: @lisp -> "Hello World!" "Hello World!" -> 17 +@result{} "Hello World!" + 17 -> (display (string-append "Hello " "Guix" "\n")) -"Hello Guix!" +@result{} 17 + +(display (string-append "Hello " "Guix" "\n")) +@print{} Hello Guix! +@result{} # @end lisp @item @@ -144,8 +148,8 @@ last evaluated expression as its return value. Anonymous functions are declared with the @code{lambda} term: @lisp -> (lambda (x) (* x x)) -#:24:0 (x)> +(lambda (x) (* x x)) +@result{} #:24:0 (x)> @end lisp The above procedure returns the square of its argument. Since everything is @@ -153,18 +157,18 @@ an expression, the @code{lambda} expression returns an anonymous procedure, which can in turn be applied to an argument: @lisp -> ((lambda (x) (* x x)) 3) -9 +((lambda (x) (* x x)) 3) +@result{} 9 @end lisp @item Anything can be assigned a global name with @code{define}: @lisp -> (define a 3) -> (define square (lambda (x) (* x x))) -> (square a) -9 +(define a 3) +(define square (lambda (x) (* x x))) +(square a) +@result{} 9 @end lisp @item @@ -178,8 +182,8 @@ Procedures can be defined more concisely with the following syntax: A list structure can be created with the @code{list} procedure: @lisp -> (list 2 a 5 7) -(2 3 5 7) +(list 2 a 5 7) +@result{} (2 3 5 7) @end lisp @item @@ -188,20 +192,21 @@ term is not called over the other terms. Thus it effectively returns a list of terms. @lisp -> '(display (string-append "Hello " "Guix" "\n")) -(display (string-append "Hello " "Guix" "\n")) -> '(2 a 5 7) -(2 a 5 7) +'(display (string-append "Hello " "Guix" "\n")) +@result{} (display (string-append "Hello " "Guix" "\n")) + +'(2 a 5 7) +@result{} (2 a 5 7) @end lisp @item -The @emph{quasiquote} disables evaluation of a parenthesized expression until +The @dfn{quasiquote} disables evaluation of a parenthesized expression until a comma re-enables it. Thus it provides us with fine-grained control over what is evaluated and what is not. @lisp -> `(2 a 5 7 (2 ,a 5 ,(+ a 4))) -(2 a 5 7 (2 3 5 7)) +`(2 a 5 7 (2 ,a 5 ,(+ a 4))) +@result{} (2 a 5 7 (2 3 5 7)) @end lisp Note that the above result is a list of mixed elements: numbers, symbols (here @@ -211,25 +216,27 @@ Note that the above result is a list of mixed elements: numbers, symbols (here Multiple variables can be named locally with @code{let}: @lisp -> (define x 10) -> (let ((x 2) - (y 3)) - (list x y)) -(2 3) -> x -10 -> y -ERROR: In procedure module-lookup: Unbound variable: y +(define x 10) +(let ((x 2) + (y 3)) + (list x y)) +@result{} (2 3) + +x +@result{} 10 + +y +@error{} In procedure module-lookup: Unbound variable: y @end lisp Use @code{let*} to allow later variable declarations to refer to earlier definitions. @lisp -> (let* ((x 2) - (y (* x 3))) - (list x y)) -(2 6) +(let* ((x 2) + (y (* x 3))) + (list x y)) +@result{} (2 6) @end lisp @item @@ -982,10 +989,10 @@ definition in @samp{$GUIX_CHECKOUT/guix/build/gnu-build-system.scm}: Or from the REPL: @lisp -> (add-to-load-path "/path/to/guix/checkout") -> ,module (guix build gnu-build-system) -> (map first %standard-phases) -(set-SOURCE-DATE-EPOCH set-paths install-locale unpack bootstrap patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs build check install patch-shebangs strip validate-runpath validate-documentation-location delete-info-dir-file patch-dot-desktop-files install-license-files reset-gzip-timestamps compress-documentation) +(add-to-load-path "/path/to/guix/checkout") +,use (guix build gnu-build-system) +(map first %standard-phases) +@result{} (set-SOURCE-DATE-EPOCH set-paths install-locale unpack bootstrap patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs build check install patch-shebangs strip validate-runpath validate-documentation-location delete-info-dir-file patch-dot-desktop-files install-license-files reset-gzip-timestamps compress-documentation) @end lisp If you want to know more about what happens during those phases, consult the -- cgit v1.2.3 From 6a893fa8692ef32a1dbef219d87b2336e26f1423 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 Nov 2019 22:03:37 +0100 Subject: doc: cookbook: Add cross-references to the Guile manual. * doc/guix-cookbook.texi (A Scheme Crash Course): Add cross-reference to the Guile manual. --- doc/guix-cookbook.texi | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 0a33efc73a..7c3860fbf5 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -187,9 +187,10 @@ A list structure can be created with the @code{list} procedure: @end lisp @item -The @emph{quote} disables evaluation of a parenthesized expression: the first -term is not called over the other terms. Thus it effectively returns a list -of terms. +The @dfn{quote} disables evaluation of a parenthesized expression: the +first term is not called over the other terms (@pxref{Expression Syntax, +quote,, guile, GNU Guile Reference Manual}). Thus it effectively +returns a list of terms. @lisp '(display (string-append "Hello " "Guix" "\n")) @@ -200,9 +201,9 @@ of terms. @end lisp @item -The @dfn{quasiquote} disables evaluation of a parenthesized expression until -a comma re-enables it. Thus it provides us with fine-grained control over -what is evaluated and what is not. +The @dfn{quasiquote} disables evaluation of a parenthesized expression +until @dfn{unquote} (a comma) re-enables it. Thus it provides us with +fine-grained control over what is evaluated and what is not. @lisp `(2 a 5 7 (2 ,a 5 ,(+ a 4))) @@ -213,7 +214,8 @@ Note that the above result is a list of mixed elements: numbers, symbols (here @code{a}) and the last element is a list itself. @item -Multiple variables can be named locally with @code{let}: +Multiple variables can be named locally with @code{let} (@pxref{Local +Bindings,,, guile, GNU Guile Reference Manual}): @lisp (define x 10) @@ -249,7 +251,8 @@ the build stage. Note that it is merely a convention, like @code{_} in C. Scheme treats @code{%} exactly the same as any other letter. @item -Modules are created with @code{define-module}. For instance +Modules are created with @code{define-module} (@pxref{Creating Guile +Modules,,, guile, GNU Guile Reference Manual}). For instance @lisp (define-module (guix build-system ruby) -- cgit v1.2.3 From dc209d5a5ddba4320c9a4f893d6df4b70f3685a0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 21 Nov 2019 15:14:33 +0100 Subject: guix build, daemon: Rename "--no-build-hook" to "--no-offload". This is a followup to bc69ea2d605810cc32e13ed03d5848b8dc358b61. * guix/scripts/build.scm (show-build-options-help): Rename "--no-build-hook" to "--no-offload". (%standard-build-options): Likewise, and warn when "--no-build-hook" is passed. * nix/nix-daemon/guix-daemon.cc (options): Add "--no-offload" and mark "--no-build-hook" as hidden. * guix/scripts/offload.scm: Adjust comment. * doc/guix.texi (Invoking guix-daemon, Common Build Options): Replace "--no-build-hook" with "--no-offload". * etc/completion/fish/guix.fish, etc/completion/zsh/_guix: Adjust accordingly. --- doc/guix.texi | 20 +++++++++----------- etc/completion/fish/guix.fish | 28 ++++++++++++++-------------- etc/completion/zsh/_guix | 8 ++++---- guix/scripts/build.scm | 8 ++++++-- guix/scripts/offload.scm | 2 +- nix/nix-daemon/guix-daemon.cc | 7 +++++-- 6 files changed, 39 insertions(+), 34 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7a004d2ee4..5756b6aa2c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1368,13 +1368,11 @@ source URLs. When this option is omitted, This means that substitutes may be downloaded from @var{urls}, as long as they are signed by a trusted signature (@pxref{Substitutes}). -@cindex build hook -@item --no-build-hook -Do not use the @dfn{build hook}. - -The build hook is a helper program that the daemon can start and to -which it submits build requests. This mechanism is used to offload -builds to other machines (@pxref{Daemon Offload Setup}). +@cindex offloading +@item --no-offload +Do not use offload builds to other machines (@pxref{Daemon Offload +Setup}). That is, always build things locally instead of offloading +builds to remote machines. @item --cache-failures Cache build failures. By default, only successful builds are cached. @@ -8112,10 +8110,10 @@ stashing one of the build results with @code{guix archive --export} (@pxref{Invoking guix archive}), then rebuilding, and finally comparing the two results. -@item --no-build-hook -Do not attempt to offload builds @i{via} the ``build hook'' of the daemon -(@pxref{Daemon Offload Setup}). That is, always build things locally -instead of offloading builds to remote machines. +@item --no-offload +Do not use offload builds to other machines (@pxref{Daemon Offload +Setup}). That is, always build things locally instead of offloading +builds to remote machines. @item --max-silent-time=@var{seconds} When the build or substitution process remains silent for more than diff --git a/etc/completion/fish/guix.fish b/etc/completion/fish/guix.fish index 525d39679d..6582f3a186 100644 --- a/etc/completion/fish/guix.fish +++ b/etc/completion/fish/guix.fish @@ -133,7 +133,7 @@ complete -f -c guix -n '__fish_guix_using_command pull' -l url -d 'download the complete -f -c guix -n '__fish_guix_using_command pull' -l bootstrap -d 'use the bootstrap Guile to build the new Guix' #### system -set -l remotecommands reconfigure roll-back switch-generation list-generations build container vm vm-image disk-image init extension-graph shepherd-graph load-path keep-failed keep-going dry-run fallback no-substitutes substitutes-urls no-grafts no-build-hook max-silent-time timeout verbosity rounds cores max-jobs derivation on-error image-size no-grub share expose full-boot +set -l remotecommands reconfigure roll-back switch-generation list-generations build container vm vm-image disk-image init extension-graph shepherd-graph load-path keep-failed keep-going dry-run fallback no-substitutes substitutes-urls no-grafts no-offload max-silent-time timeout verbosity rounds cores max-jobs derivation on-error image-size no-grub share expose full-boot complete -f -c guix -n '__fish_guix_needs_command' -a system -d 'Build the operating system declared in FILE according to ACTION.' complete -f -c guix -n '__fish_guix_using_command system' -l reconfigure -d 'switch to a new operating system configuration' complete -f -c guix -n '__fish_guix_using_command system' -l roll-back -d 'switch to the previous operating system configuration' @@ -156,7 +156,7 @@ complete -f -c guix -n '__fish_guix_using_command system' -l fallback -d 'fall b complete -f -c guix -n '__fish_guix_using_command system' -l no-substitutes -d 'build instead of resorting to pre-built substitutes' complete -f -c guix -n '__fish_guix_using_command system' -a "--substitute-urls=" -d 'fetch substitute from URLS if they are authorized' complete -f -c guix -n '__fish_guix_using_command system' -l no-grafts -d 'do not graft packages' -complete -f -c guix -n '__fish_guix_using_command system' -l no-build-hook -d 'do not attempt to offload builds via the build hook' +complete -f -c guix -n '__fish_guix_using_command system' -l no-offload -d 'do not attempt to offload builds' complete -f -c guix -n '__fish_guix_using_command system' -a "--max-silent-time=" -d 'mark the build as failed after SECONDS of silence' complete -f -c guix -n '__fish_guix_using_command system' -a "--timeout=" -d 'mark the build as failed after SECONDS of activity' complete -f -c guix -n '__fish_guix_using_command system' -a "--verbosity=" -d 'use the given verbosity LEVEL' @@ -174,7 +174,7 @@ complete -f -c guix -n '__fish_guix_using_command system' -a "--expose=" -d 'for complete -f -c guix -n '__fish_guix_using_command system' -l full-boot -d 'for \'vm\', make a full boot sequence' #### build -set -l remotecommands expression file source sources system target derivations check repair root quiet log-file load-path keep-failed keep-going dry-run fallback no-substitutes substitute-urls no-grafts no-build-hook max-silent-time timeout verbosity rounds cores max-jobs with-source with-input with-graft +set -l remotecommands expression file source sources system target derivations check repair root quiet log-file load-path keep-failed keep-going dry-run fallback no-substitutes substitute-urls no-grafts no-offload max-silent-time timeout verbosity rounds cores max-jobs with-source with-input with-graft complete -f -c guix -n '__fish_guix_needs_command' -a build -d 'Build the given PACKAGE-OR-DERIVATION and return their output paths.' complete -f -c guix -n '__fish_guix_using_command build' -a "--expression=" -d 'build the package or derivation EXPR evaluates to' complete -f -c guix -n '__fish_guix_using_command build' -s f -d 'build the package or derivation that the code within FILE evaluates to' --exclusive --arguments "(ls -ap)" @@ -201,7 +201,7 @@ complete -f -c guix -n '__fish_guix_using_command build' -l fallback -d 'fall ba complete -f -c guix -n '__fish_guix_using_command build' -l no-substitutes -d 'build instead of resorting to pre-built substitutes' complete -f -c guix -n '__fish_guix_using_command build' -a "--substitute-urls=" -d 'fetch substitute from URLS if they are authorized' complete -f -c guix -n '__fish_guix_using_command build' -l no-grafts -d 'do not graft packages' -complete -f -c guix -n '__fish_guix_using_command build' -l no-build-hook -d 'do not attempt to offload builds via the build hook' +complete -f -c guix -n '__fish_guix_using_command build' -l no-offload -d 'do not attempt to offload builds' complete -f -c guix -n '__fish_guix_using_command build' -a "--max-silent-time=" -d 'mark the build as failed after SECONDS of silence' complete -f -c guix -n '__fish_guix_using_command build' -a "--timeout=" -d 'mark the build as failed after SECONDS of activity' complete -f -c guix -n '__fish_guix_using_command build' -a "--verbosity=" -d 'use the given verbosity LEVEL' @@ -215,7 +215,7 @@ complete -f -c guix -n '__fish_guix_using_command build' -a "--with-input=" -d ' complete -f -c guix -n '__fish_guix_using_command build' -a "--with-graft=" -d 'PACKAGE=REPLACEMENT .. graft REPLACEMENT on packages that refer to PACKAGE' #### package -set -l remotecommands install install-from-expression install-from-file remove upgrade manifest do-no-upgrade roll-back search-paths list-generations delete-generations switch-generation profile bootstrap verbose search list-installed list-available show load-path keep-failed keep-going dry-run fallback no.substitutes substitute-urls no-grafts no-build-hook max-silent-time timenout verbosity rounds cores max-jobs with-source with-input with-graft +set -l remotecommands install install-from-expression install-from-file remove upgrade manifest do-no-upgrade roll-back search-paths list-generations delete-generations switch-generation profile bootstrap verbose search list-installed list-available show load-path keep-failed keep-going dry-run fallback no.substitutes substitute-urls no-grafts no-offload max-silent-time timenout verbosity rounds cores max-jobs with-source with-input with-graft complete -f -c guix -n '__fish_guix_needs_command' -a package -d 'Install, remove, or upgrade packages in a single transaction.' complete -f -c guix -n '__fish_guix_using_command package' -s i -l install -d 'install PACKAGEs' complete -f -c guix -n '__fish_guix_using_command package' -s e -d 'install the package EXP evaluates to' @@ -252,7 +252,7 @@ complete -f -c guix -n '__fish_guix_using_command package' -l fallback -d 'fall complete -f -c guix -n '__fish_guix_using_command package' -l no-substitutes -d 'build instead of resorting to pre-built substitutes' complete -f -c guix -n '__fish_guix_using_command package' -a "--substitute-urls=" -d 'URLS fetch substitute from URLS if they are authorized' complete -f -c guix -n '__fish_guix_using_command package' -l no-grafts -d 'do not graft packages' -complete -f -c guix -n '__fish_guix_using_command package' -l no-build-hook -d 'do not attempt to offload builds via the build hook' +complete -f -c guix -n '__fish_guix_using_command package' -l no-offload -d 'do not attempt to offload builds' complete -f -c guix -n '__fish_guix_using_command package' -a "--max-silent-time=" -d 'SECONDS mark the build as failed after SECONDS of silence' complete -f -c guix -n '__fish_guix_using_command package' -a "--timeout=" -d 'SECONDS mark the build as failed after SECONDS of activity' complete -f -c guix -n '__fish_guix_using_command package' -a "--verbosity=" -d 'LEVEL use the given verbosity LEVEL' @@ -391,7 +391,7 @@ complete -f -c guix -n '__fish_guix_using_command gc' -l list-failures -d 'list complete -f -c guix -n '__fish_guix_using_command gc' -l clear-failures -d 'remove PATHS from the set of cached failures' #### environment -set -l remotecommands expression load ad-hoc pure search-paths system root container network share expose bootstrap load-path keep-failed keep-going dry-run fallback no-substitutes substitute-urls no-grafts no-build-hook max-silent-time timeout verbosity rounds cores max-jobs +set -l remotecommands expression load ad-hoc pure search-paths system root container network share expose bootstrap load-path keep-failed keep-going dry-run fallback no-substitutes substitute-urls no-grafts no-offload max-silent-time timeout verbosity rounds cores max-jobs complete -f -c guix -n '__fish_guix_needs_command' -a environment -d 'Build an environment that includes the dependencies of PACKAGE and execute COMMAND or an interactive shell in that environment.' complete -f -c guix -n '__fish_guix_using_command environment' -s e -d 'Create environment for the package that EXPR evaluates to' complete -f -c guix -n '__fish_guix_using_command environment' -a "--expression=" -d 'Create environment for the package that EXPR evaluates to' @@ -418,7 +418,7 @@ complete -f -c guix -n '__fish_guix_using_command environment' -l fallback -d 'f complete -f -c guix -n '__fish_guix_using_command environment' -l no-substitutes -d 'build instead of resorting to pre-built substitutes' complete -f -c guix -n '__fish_guix_using_command environment' -a "--substitute-urls=" -d 'fetch substitute from URLS if they are authorized' complete -f -c guix -n '__fish_guix_using_command environment' -l no-grafts -d 'do not graft packages' -complete -f -c guix -n '__fish_guix_using_command environment' -l no-build-hook -d 'do not attempt to offload builds via the build hook' +complete -f -c guix -n '__fish_guix_using_command environment' -l no-offload -d 'do not attempt to offload builds' complete -f -c guix -n '__fish_guix_using_command environment' -a "--max-silent-time=" -d 'mark the build as failed after SECONDS of silence' complete -f -c guix -n '__fish_guix_using_command environment' -a "--timeout=" -d 'mark the build as failed after SECONDS of activity' complete -f -c guix -n '__fish_guix_using_command environment' -a "--verbosity=" -d 'use the given verbosity LEVEL' @@ -432,7 +432,7 @@ complete -f -c guix -n '__fish_guix_using_command environment' -a "--max-jobs=" complete -f -c guix -n '__fish_guix_needs_command' -a edit -d 'Start $VISUAL or $EDITOR to edit the definitions of PACKAGE.' #### copy -set -l remotecommands to= from= load-path= keep-failed keep-going dry-run fallback no-substitutes substitute-urls= no-grafts no-build-hook max-silent-time= timeout= verbosity= rounds= cores= max-jobs= +set -l remotecommands to= from= load-path= keep-failed keep-going dry-run fallback no-substitutes substitute-urls= no-grafts no-offload max-silent-time= timeout= verbosity= rounds= cores= max-jobs= complete -f -c guix -n '__fish_guix_needs_command' -a copy -d 'Copy ITEMS to or from the specified host over SSH.' complete -f -c guix -n '__fish_guix_using_command copy' -a "--to=" -d 'send ITEMS to HOST' complete -f -c guix -n '__fish_guix_using_command copy' -a "--from=" -d 'receive ITEMS from HOST' @@ -445,7 +445,7 @@ complete -f -c guix -n '__fish_guix_using_command copy' -l fallback -d 'fall bac complete -f -c guix -n '__fish_guix_using_command copy' -l no-substitutes -d 'build instead of resorting to pre-built substitutes' complete -f -c guix -n '__fish_guix_using_command copy' -a "--substitute-urls=" -d 'fetch substitute from URLS if they are authorized' complete -f -c guix -n '__fish_guix_using_command copy' -l no-grafts -d 'do not graft packages' -complete -f -c guix -n '__fish_guix_using_command copy' -l no-build-hook -d 'do not attempt to offload builds via the build hook' +complete -f -c guix -n '__fish_guix_using_command copy' -l no-offload -d 'do not attempt to offload builds' complete -f -c guix -n '__fish_guix_using_command copy' -a "--max-silent-time=" -d 'mark the build as failed after SECONDS of silence' complete -f -c guix -n '__fish_guix_using_command copy' -a "--timeout=" -d 'mark the build as failed after SECONDS of activity' complete -f -c guix -n '__fish_guix_using_command copy' -a "--verbosity=" -d 'use the given verbosity LEVEL' @@ -467,7 +467,7 @@ complete -f -c guix -n '__fish_guix_using_command challenge' -a "--substitute-ur complete -f -c guix -n '__fish_guix_using_command challenge' -s v -l verbose -d 'show details about successful comparisons' #### archive -set -l remotecommands export format= recursive import missing extract= generate-key authorize expression= source system= target= load-path= keep-failed keep-going dry-run fallback no-substitutes substitute-urls= no-grafts no-build-hook max-silent-time= timeout= verbosity= rounds= cores= max-jobs= +set -l remotecommands export format= recursive import missing extract= generate-key authorize expression= source system= target= load-path= keep-failed keep-going dry-run fallback no-substitutes substitute-urls= no-grafts no-offload max-silent-time= timeout= verbosity= rounds= cores= max-jobs= complete -f -c guix -n '__fish_guix_needs_command' -a archive -d 'Export/import one or more packages from/to the store.' complete -f -c guix -n '__fish_guix_using_command archive' -l export -d 'export the specified files/packages to stdout' complete -f -c guix -n '__fish_guix_using_command archive' -a "--format=" -d 'export files/packages in the specified format FMT' @@ -489,7 +489,7 @@ complete -f -c guix -n '__fish_guix_using_command archive' -l fallback -d 'fall complete -f -c guix -n '__fish_guix_using_command archive' -l no-substitutes -d 'build instead of resorting to pre-built substitutes' complete -f -c guix -n '__fish_guix_using_command archive' -a "--substitute-urls=" -d 'fetch substitute from URLS if they are authorized' complete -f -c guix -n '__fish_guix_using_command archive' -l no-grafts -d 'do not graft packages' -complete -f -c guix -n '__fish_guix_using_command archive' -l no-build-hook -d 'do not attempt to offload builds via the build hook' +complete -f -c guix -n '__fish_guix_using_command archive' -l no-offload -d 'do not attempt to offload builds' complete -f -c guix -n '__fish_guix_using_command archive' -a "--max-silent-time=" -d 'mark the build as failed after SECONDS of silence' complete -f -c guix -n '__fish_guix_using_command archive' -a "--timeout=" -f -d 'mark the build as failed after SECONDS of activity' complete -f -c guix -n '__fish_guix_using_command archive' -a "--verbosity=" -d 'use the given verbosity LEVEL' @@ -498,7 +498,7 @@ complete -f -c guix -n '__fish_guix_using_command archive' -a "--cores=" -d 'all complete -f -c guix -n '__fish_guix_using_command archive' -a "--max-jobs=" -d 'allow at most N build jobs' #### pack -set -l remotecommands --load-path= --keep-failed --keep-going --dry-run --fallback --no-substitutes --substitute-urls= --no-grafts --no-build-hook --max-silent-time= --timeout= --verbosity= --rounds= --cores= --max-jobs= --with-source= --with-input= --with-graft= --format= --expression= --system= --target= --compression= --symlink= --localstatedir --help --version +set -l remotecommands --load-path= --keep-failed --keep-going --dry-run --fallback --no-substitutes --substitute-urls= --no-grafts --no-offload --max-silent-time= --timeout= --verbosity= --rounds= --cores= --max-jobs= --with-source= --with-input= --with-graft= --format= --expression= --system= --target= --compression= --symlink= --localstatedir --help --version complete -f -c guix -n '__fish_guix_needs_command' -a pack -d 'Create a bundle of PACKAGE.' complete -f -c guix -n '__fish_guix_using_command pack' -a "--load-path=" -d 'prepend DIR to the package module search path' complete -f -c guix -n '__fish_guix_using_command pack' -s L -d 'prepend DIR to the package module search path' @@ -512,7 +512,7 @@ complete -f -c guix -n '__fish_guix_using_command pack' -a "--fallback" -d 'fall complete -f -c guix -n '__fish_guix_using_command pack' -a "--no-substitutes" -d 'build instead of resorting to pre-built substitutes' complete -f -c guix -n '__fish_guix_using_command pack' -a "--substitute-urls=" -d 'fetch substitute from URLS if they are authorized' complete -f -c guix -n '__fish_guix_using_command pack' -a "--no-grafts" -d 'do not graft packages' -complete -f -c guix -n '__fish_guix_using_command pack' -a "--no-build-hook" -d 'do not attempt to offload builds via the build hook' +complete -f -c guix -n '__fish_guix_using_command pack' -a "--no-offload" -d 'do not attempt to offload builds via the build hook' complete -f -c guix -n '__fish_guix_using_command pack' -a "--max-silent-time=" -d 'mark the build as failed after SECONDS of silence' complete -f -c guix -n '__fish_guix_using_command pack' -a "--timeout=" -d 'mark the build as failed after SECONDS of activity' complete -f -c guix -n '__fish_guix_using_command pack' -a "--verbosity=" -d 'use the given verbosity LEVEL' diff --git a/etc/completion/zsh/_guix b/etc/completion/zsh/_guix index 3760bb629b..ae93b62b1d 100644 --- a/etc/completion/zsh/_guix +++ b/etc/completion/zsh/_guix @@ -87,7 +87,7 @@ _guix_list_installed_packages() '--no-substitutes[build instead of resorting to pre-built substitutes]' \ '--substitute-urls=[fetch substitute from URLS if they are authorized]:URLS:_urls' \ '--no-grafts[do not graft packages]' \ - '--no-build-hook[do not attempt to offload builds via the build hook]' \ + '--no-offload[do not attempt to offload builds]' \ '--max-silent-time=[mark the build as failed after SECONDS of silence]:SECONDS' \ '--timeout=[mark the build as failed after SECONDS of activity]:SECONDS' \ '--verbosity=[use the given verbosity LEVEL]:LEVEL' \ @@ -158,7 +158,7 @@ _guix_list_installed_packages() '--no-substitutes[build instead of resorting to pre-built substitutes]' \ '--substitute-urls=[fetch substitute from URLS if they are authorized]:URLS:_urls' \ '--no-grafts[do not graft packages]' \ - '--no-build-hook[do not attempt to offload builds via the build hook]' \ + '--no-offload[do not attempt to offload builds]' \ '--max-silent-time=[mark the build as failed after SECONDS of silence]:SECONDS' \ '--timeout=[mark the build as failed after SECONDS of activity]:SECONDS' \ '--verbosity=[use the given verbosity LEVEL]:LEVEL' \ @@ -282,7 +282,7 @@ _guix_list_installed_packages() '--no-substitutes[build instead of resorting to pre-built substitutes]' \ '--substitute-urls=[fetch substitute from URLS if they are authorized]:URLS:_urls' \ '--no-grafts[do not graft packages]' \ - '--no-build-hook[do not attempt to offload builds via the build hook]' \ + '--no-offload[do not attempt to offload builds]' \ '--max-silent-time=[mark the build as failed after SECONDS of silence]:SECONDS' \ '--timeout=[mark the build as failed after SECONDS of activity]:SECONDS' \ '--verbosity=[use the given verbosity LEVEL]:LEVEL' \ @@ -374,7 +374,7 @@ _guix_list_installed_packages() '--no-substitutes[build instead of resorting to pre-built substitutes]' \ '--substitute-urls=[fetch substitute from URLS if they are authorized]:URL:_urls' \ '--no-grafts[do not graft packages]' \ - '--no-build-hook[do not attempt to offload builds via the build hook]' \ + '--no-offload[do not attempt to offload builds]' \ '--max-silent-time=[mark the build as failed after SECONDS of silence]:SECONDS' \ '--timeout=[mark the build as failed after SECONDS of activity]:SECONDS' \ '--verbosity=[use the given verbosity LEVEL]:LEVEL' \ diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index ae78df9c5c..e72b89d2d4 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -504,7 +504,7 @@ (define (show-build-options-help) (display (G_ " --no-grafts do not graft packages")) (display (G_ " - --no-build-hook do not attempt to offload builds via the build hook")) + --no-offload do not attempt to offload builds")) (display (G_ " --max-silent-time=SECONDS mark the build as failed after SECONDS of silence")) @@ -610,8 +610,12 @@ (define %standard-build-options (alist-cons 'graft? #f (alist-delete 'graft? result eq?)) rest))) - (option '("no-build-hook") #f #f + (option '("no-offload" "no-build-hook") #f #f (lambda (opt name arg result . rest) + (when (string=? name "no-build-hook") + (warning (G_ "'--no-build-hook' is deprecated; \ +use '--no-offload' instead~%"))) + (apply values (alist-cons 'build-hook? #f (alist-delete 'build-hook? result)) diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm index 1384f6b41d..18473684eb 100644 --- a/guix/scripts/offload.scm +++ b/guix/scripts/offload.scm @@ -60,7 +60,7 @@ (define-module (guix scripts offload) ;;; retrieving the build output(s) over SSH upon success. ;;; ;;; This command should not be used directly; instead, it is called on-demand -;;; by the daemon, unless it was started with '--no-build-hook' or a client +;;; by the daemon, unless it was started with '--no-offload' or a client ;;; inhibited build hooks. ;;; ;;; Code: diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc index 6f9c404c8d..cd949aca67 100644 --- a/nix/nix-daemon/guix-daemon.cc +++ b/nix/nix-daemon/guix-daemon.cc @@ -113,8 +113,11 @@ static const struct argp_option options[] = n_("do not use substitutes") }, { "substitute-urls", GUIX_OPT_SUBSTITUTE_URLS, n_("URLS"), 0, n_("use URLS as the default list of substitute providers") }, - { "no-build-hook", GUIX_OPT_NO_BUILD_HOOK, 0, 0, - n_("do not use the 'build hook'") }, + { "no-offload", GUIX_OPT_NO_BUILD_HOOK, 0, 0, + n_("do not attempt to offload builds") }, + { "no-build-hook", GUIX_OPT_NO_BUILD_HOOK, 0, + OPTION_HIDDEN, // deprecated + n_("do not attempt to offload builds") }, { "cache-failures", GUIX_OPT_CACHE_FAILURES, 0, 0, n_("cache build failures") }, { "rounds", GUIX_OPT_BUILD_ROUNDS, "N", 0, -- cgit v1.2.3 From 7f44ab48f902e713ece5c5a0ae68519577a2344e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 21 Nov 2019 15:28:13 +0100 Subject: Use 'offload?' instead of 'build-hook?' internally. * guix/scripts/archive.scm (%default-options): Replace 'build-hook?' with 'offload?'. * guix/scripts/build.scm (set-build-options-from-command-line): Pass #:offload? instead of #:use-build-hook?. (%standard-build-options): Use the 'offload? key instead of 'build-hook?. (%default-options): Replace 'build-hook?' with 'offload?'. * guix/scripts/copy.scm (%default-options): Likewise. * guix/scripts/deploy.scm (%default-options): Likewise. * guix/scripts/environment.scm (%default-options): Likewise. * guix/scripts/pack.scm (%default-options): Likewise. * guix/scripts/package.scm (%default-options): Likewise. * guix/scripts/pull.scm (%default-options): Likewise. * guix/scripts/system.scm (%default-options): Likewise. * guix/scripts/time-machine.scm (%default-options): Likewise. * guix/store.scm (set-build-options): Have #:use-build-hook? default to *unspecified*. Add #:offload?. Add call to 'warn-about-deprecation' when #:use-build-hook? is specified. --- guix/scripts/archive.scm | 2 +- guix/scripts/build.scm | 8 ++++---- guix/scripts/copy.scm | 2 +- guix/scripts/deploy.scm | 2 +- guix/scripts/environment.scm | 2 +- guix/scripts/pack.scm | 2 +- guix/scripts/package.scm | 2 +- guix/scripts/pull.scm | 2 +- guix/scripts/system.scm | 2 +- guix/scripts/time-machine.scm | 2 +- guix/store.scm | 11 +++++++++-- 11 files changed, 22 insertions(+), 15 deletions(-) diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm index fba0f73826..3318ef0889 100644 --- a/guix/scripts/archive.scm +++ b/guix/scripts/archive.scm @@ -55,7 +55,7 @@ (define %default-options ;; Alist of default option values. `((system . ,(%current-system)) (substitutes? . #t) - (build-hook? . #t) + (offload? . #t) (graft? . #t) (print-build-trace? . #t) (print-extended-build-trace? . #t) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index e72b89d2d4..acb495a462 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -545,7 +545,7 @@ (define (set-build-options-from-command-line store opts) #:fallback? (assoc-ref opts 'fallback?) #:use-substitutes? (assoc-ref opts 'substitutes?) #:substitute-urls (assoc-ref opts 'substitute-urls) - #:use-build-hook? (assoc-ref opts 'build-hook?) + #:offload? (assoc-ref opts 'offload?) #:max-silent-time (assoc-ref opts 'max-silent-time) #:timeout (assoc-ref opts 'timeout) #:print-build-trace (assoc-ref opts 'print-build-trace?) @@ -617,8 +617,8 @@ (define %standard-build-options use '--no-offload' instead~%"))) (apply values - (alist-cons 'build-hook? #f - (alist-delete 'build-hook? result)) + (alist-cons 'offload? #f + (alist-delete 'offload? result)) rest))) (option '("max-silent-time") #t #f (lambda (opt name arg result . rest) @@ -663,7 +663,7 @@ (define %default-options `((build-mode . ,(build-mode normal)) (graft? . #t) (substitutes? . #t) - (build-hook? . #t) + (offload? . #t) (print-build-trace? . #t) (print-extended-build-trace? . #t) (multiplexed-build-output? . #t) diff --git a/guix/scripts/copy.scm b/guix/scripts/copy.scm index ce70f2f0b3..664cb32b7c 100644 --- a/guix/scripts/copy.scm +++ b/guix/scripts/copy.scm @@ -158,7 +158,7 @@ (define %options (define %default-options `((system . ,(%current-system)) (substitutes? . #t) - (build-hook? . #t) + (offload? . #t) (graft? . #t) (print-build-trace? . #t) (print-extended-build-trace? . #t) diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 27b7e4fd1c..bc0ceabd3f 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -84,7 +84,7 @@ (define %default-options (debug . 0) (graft? . #t) (substitutes? . #t) - (build-hook? . #t) + (offload? . #t) (print-build-trace? . #t) (print-extended-build-trace? . #t) (multiplexed-build-output? . #t))) diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index d78ca0f303..f04363750e 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -191,7 +191,7 @@ (define (show-help) (define %default-options `((system . ,(%current-system)) (substitutes? . #t) - (build-hook? . #t) + (offload? . #t) (graft? . #t) (print-build-trace? . #t) (print-extended-build-trace? . #t) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index c8a52374bd..61d18e2609 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -759,7 +759,7 @@ (define %default-options (profile-name . "guix-profile") (system . ,(%current-system)) (substitutes? . #t) - (build-hook? . #t) + (offload? . #t) (graft? . #t) (print-build-trace? . #t) (print-extended-build-trace? . #t) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index eb578f7642..97436feee7 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -318,7 +318,7 @@ (define %default-options (debug . 0) (graft? . #t) (substitutes? . #t) - (build-hook? . #t) + (offload? . #t) (print-build-trace? . #t) (print-extended-build-trace? . #t) (multiplexed-build-output? . #t))) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index ef8d5c8fd9..a74776bd7b 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -71,7 +71,7 @@ (define %default-options ;; Alist of default option values. `((system . ,(%current-system)) (substitutes? . #t) - (build-hook? . #t) + (offload? . #t) (print-build-trace? . #t) (print-extended-build-trace? . #t) (multiplexed-build-output? . #t) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 27b014db68..e49c9d36b9 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -1013,7 +1013,7 @@ (define %default-options ;; Alist of default option values. `((system . ,(%current-system)) (substitutes? . #t) - (build-hook? . #t) + (offload? . #t) (print-build-trace? . #t) (print-extended-build-trace? . #t) (multiplexed-build-output? . #t) diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm index 19e635555a..1e800e160f 100644 --- a/guix/scripts/time-machine.scm +++ b/guix/scripts/time-machine.scm @@ -94,7 +94,7 @@ (define %default-options ;; Alist of default option values. `((system . ,(%current-system)) (substitutes? . #t) - (build-hook? . #t) + (offload? . #t) (print-build-trace? . #t) (print-extended-build-trace? . #t) (multiplexed-build-output? . #t) diff --git a/guix/store.scm b/guix/store.scm index a276554a52..cf25d347fc 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -763,7 +763,8 @@ (define* (set-build-options server max-build-jobs timeout max-silent-time - (use-build-hook? #t) + (offload? #t) + (use-build-hook? *unspecified*) ;deprecated (build-verbosity 0) (log-type 0) (print-build-trace #t) @@ -803,6 +804,10 @@ (define* (set-build-options server (define socket (store-connection-socket server)) + (unless (unspecified? use-build-hook?) + (warn-about-deprecation #:use-build-hook? #f + #:replacement #:offload?)) + (let-syntax ((send (syntax-rules () ((_ (type option) ...) (begin @@ -816,7 +821,9 @@ (define socket (max-silent-time (or max-silent-time 3600))) (send (integer max-build-jobs) (integer max-silent-time)))) (when (>= (store-connection-minor-version server) 2) - (send (boolean use-build-hook?))) + (send (boolean (if (unspecified? use-build-hook?) + offload? + use-build-hook?)))) (when (>= (store-connection-minor-version server) 4) (send (integer build-verbosity) (integer log-type) (boolean print-build-trace))) -- cgit v1.2.3 From 2ce08a5d79f6eb1d2d3839aca859559b9829ae36 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 21 Nov 2019 15:41:11 +0100 Subject: guix build: '--keep-failed' implies '--no-offload'. * guix/scripts/build.scm (set-build-options-from-command-line): Pass #:offload? #f when 'keep-failed? is true. * doc/guix.texi (Common Build Options): Document it. --- doc/guix.texi | 6 +++--- guix/scripts/build.scm | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5756b6aa2c..a64b0fb84c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8051,9 +8051,9 @@ the end of the build log. This is useful when debugging build issues. @xref{Debugging Build Failures}, for tips and tricks on how to debug build issues. -This option has no effect when connecting to a remote daemon with a -@code{guix://} URI (@pxref{The Store, the @code{GUIX_DAEMON_SOCKET} -variable}). +This option implies @option{--no-offload}, and it has no effect when +connecting to a remote daemon with a @code{guix://} URI (@pxref{The +Store, the @code{GUIX_DAEMON_SOCKET} variable}). @item --keep-going @itemx -k diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index acb495a462..a853ac6c7d 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -545,7 +545,8 @@ (define (set-build-options-from-command-line store opts) #:fallback? (assoc-ref opts 'fallback?) #:use-substitutes? (assoc-ref opts 'substitutes?) #:substitute-urls (assoc-ref opts 'substitute-urls) - #:offload? (assoc-ref opts 'offload?) + #:offload? (and (assoc-ref opts 'offload?) + (not (assoc-ref opts 'keep-failed?))) #:max-silent-time (assoc-ref opts 'max-silent-time) #:timeout (assoc-ref opts 'timeout) #:print-build-trace (assoc-ref opts 'print-build-trace?) -- cgit v1.2.3 From 3a4d5ddd322c7daf0a8c83ca2c87c3fc38b19f0b Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 11 Nov 2019 19:14:16 -0800 Subject: daemon: boost::format: Fix typo "referred". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * nix/boost/format/exceptions.hpp (too_few_args): Fix typo. (too_many_args): Fix typo. Signed-off-by: Ludovic Courtès --- nix/boost/format/exceptions.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/boost/format/exceptions.hpp b/nix/boost/format/exceptions.hpp index 79e452449e..80da6d5718 100644 --- a/nix/boost/format/exceptions.hpp +++ b/nix/boost/format/exceptions.hpp @@ -59,7 +59,7 @@ public: virtual const char *what() const throw() { return "boost::too_few_args: " - "format-string refered to more arguments than were passed"; + "format-string referred to more arguments than were passed"; } }; @@ -70,7 +70,7 @@ public: virtual const char *what() const throw() { return "boost::too_many_args: " - "format-string refered to less arguments than were passed"; + "format-string referred to less arguments than were passed"; } }; -- cgit v1.2.3 From f170603e026deac200ebde05401d9a81d87884b3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 12 Nov 2019 19:05:17 +0100 Subject: gnu: Add libhx. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (libhx): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/c.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 6e1d304dfc..6428e86e70 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -281,3 +282,25 @@ (define-public libfixposix "The purpose of libfixposix is to offer replacements for parts of POSIX whose behaviour is inconsistent across *NIX flavours.") (license license:boost1.0))) + +(define-public libhx + (package + (name "libhx") + (version "3.24") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libhx/libHX/" + "libHX-" version ".tar.xz")) + (sha256 + (base32 + "0i8v2464p830c15myknvvs6bhxaf663lrqgga95l94ygfynkw6x5")))) + (build-system gnu-build-system) + (home-page "http://libhx.sourceforge.net") + (synopsis "C library with common data structures and functions") + (description + "This is a C library (with some C++ bindings available) that provides data +structures and functions commonly needed, such as maps, deques, linked lists, +string formatting and autoresizing, option and config file parsing, type +checking casts and more.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From cd2ce8abae37bc900286e5282ebaa08b88768a54 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 12 Nov 2019 19:05:18 +0100 Subject: gnu: Add pam-mount. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (pam-mount): New variable. * gnu/packages/patches/pam-mount-luks2-support.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/admin.scm | 68 ++++++++++++++++++++++ gnu/packages/patches/pam-mount-luks2-support.patch | 51 ++++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 gnu/packages/patches/pam-mount-luks2-support.patch diff --git a/gnu/local.mk b/gnu/local.mk index e6c6f57c3f..0129e42944 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1216,6 +1216,7 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-CVE-2016-9296.patch \ %D%/packages/patches/p7zip-CVE-2017-17969.patch \ %D%/packages/patches/p7zip-remove-unused-code.patch \ + %D%/packages/patches/pam-mount-luks2-support.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/pcre2-fix-jit_match-crash.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 10caeac763..d838c81717 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,8 +62,10 @@ (define-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages c) #:use-module (gnu packages check) #:use-module (gnu packages crypto) + #:use-module (gnu packages cryptsetup) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages dns) #:use-module (gnu packages file) @@ -3513,3 +3516,68 @@ (define-public ngrep filter logic in the same fashion as more common packet sniffing tools, such as tcpdump and snoop.") (license license:bsd-3))) + +(define-public pam-mount + (package + (name "pam-mount") + (version "2.16") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/pam-mount/pam_mount/" + version "/pam_mount-" version ".tar.xz")) + (sha256 + (base32 + "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf")) + (patches + ;; Patch adding support for encrypted volumes in LUKS2 format. + ;; It comes from the Gentoo package definition for sys-auth/pam_mount. + (search-patches "pam-mount-luks2-support.patch")))) + (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("cryptsetup" ,cryptsetup) + ("libhx" ,libhx) + ("libxml2" ,libxml2) + ("linux-pam" ,linux-pam) + ("lvm2" ,lvm2) + ("openssl" ,openssl) + ("pcre" ,pcre) + ("util-linux" ,util-linux))) + (arguments + `(#:configure-flags + (list (string-append "--with-slibdir=" %output "/lib") + (string-append "--with-ssbindir=" %output "/sbin")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-program-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((util-linux (assoc-ref inputs "util-linux")) + (out (assoc-ref outputs "out"))) + (substitute* "src/mtcrypt.c" + (("\"mount\";") + (string-append "\"" util-linux "/bin/mount\";")) + (("\"umount\";") + (string-append "\"" util-linux "/bin/umount\";")) + (("\"fsck\",") + (string-append "\"" util-linux "/sbin/fsck\","))) + (substitute* "src/rdconf1.c" + (("\"mount\", \"") + (string-append "\"" util-linux "/bin/mount\", \"")) + (("\"umount\", \"") + (string-append "\"" util-linux "/bin/umount\", \"")) + (("\"fsck\", \"") + (string-append "\"" util-linux "/sbin/fsck\", \"")) + (("\"pmvarrun\", \"") + (string-append "\"" out "/sbin/pmvarrun\", \"")))) + #t))))) + (home-page "http://pam-mount.sourceforge.net") + (synopsis "PAM module to mount volumes for a user session") + (description + "Pam-mount is a PAM module that can mount volumes when a user logs in. +It supports mounting local filesystems of any kind the normal mount utility +supports. It can also mount encrypted LUKS volumes using the password +supplied by the user when logging in.") + (license (list license:gpl2+ license:lgpl2.1+)))) diff --git a/gnu/packages/patches/pam-mount-luks2-support.patch b/gnu/packages/patches/pam-mount-luks2-support.patch new file mode 100644 index 0000000000..b59daf5ce1 --- /dev/null +++ b/gnu/packages/patches/pam-mount-luks2-support.patch @@ -0,0 +1,51 @@ +From d4434c05e7c0cf05d87089404cfa2deedc60811a Mon Sep 17 00:00:00 2001 +From: Ingo Franzki +Date: Mon, 29 Oct 2018 16:47:40 +0100 +Subject: [PATCH] crypto: Add support for LUKS2 + +Cryptsetup version 2.0 added support for LUKS2. +This patch adds support for mounting LUKS2 volumes with +pam_mount. + +Signed-off-by: Ingo Franzki +--- + src/crypto-dmc.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/crypto-dmc.c b/src/crypto-dmc.c +index d0ab6ca..abd0358 100644 +--- a/src/crypto-dmc.c ++++ b/src/crypto-dmc.c +@@ -21,6 +21,12 @@ + #include "libcryptmount.h" + #include "pam_mount.h" + ++#ifndef CRYPT_LUKS ++ #define CRYPT_LUKS NULL /* Passing NULL to crypt_load will ++ default to LUKS(1) on older ++ libcryptsetup versions. */ ++#endif ++ + /** + * dmc_is_luks - check if @path points to a LUKS volume (cf. normal dm-crypt) + * @path: path to the crypto container +@@ -48,7 +54,7 @@ EXPORT_SYMBOL int ehd_is_luks(const char *path, bool blkdev) + + ret = crypt_init(&cd, device); + if (ret == 0) { +- ret = crypt_load(cd, CRYPT_LUKS1, NULL); ++ ret = crypt_load(cd, CRYPT_LUKS, NULL); + if (ret == -EINVAL) + ret = false; + else if (ret == 0) +@@ -106,7 +112,7 @@ static bool dmc_run(const struct ehd_mount_request *req, + #endif + } + +- ret = crypt_load(cd, CRYPT_LUKS1, NULL); ++ ret = crypt_load(cd, CRYPT_LUKS, NULL); + if (ret == 0) { + ret = crypt_activate_by_passphrase(cd, mt->crypto_name, + CRYPT_ANY_SLOT, req->key_data, req->key_size, flags); +-- +2.21.0 -- cgit v1.2.3 From ae8a0184bf5a77f88b95e98d7e042110b082e970 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 20 Nov 2019 13:46:37 +0100 Subject: gnu: Add libdbi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (libdbi): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index acce540e06..2ccaae205c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2019 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -3170,3 +3171,24 @@ (define-public python-crate It implements the Python DB API 2.0 specification and includes support for SQLAlchemy.") (license license:asl2.0))) + +(define-public libdbi + (package + (name "libdbi") + (version "0.9.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libdbi/libdbi/libdbi-" + version "/libdbi-" version ".tar.gz")) + (sha256 + (base32 + "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys")))) + (build-system gnu-build-system) + (synopsis "Database independent abstraction layer in C") + (description + "This library implements a database independent abstraction layer in C, +similar to the DBI/DBD layer in Perl. Writing one generic set of code, +programmers can leverage the power of multiple databases and multiple +simultaneous database connections by using this framework.") + (home-page "http://libdbi.sourceforge.net/") + (license license:lgpl2.1+))) -- cgit v1.2.3 From df81de86836686ac713a375bd647d49b8f8f344d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 20 Nov 2019 13:46:38 +0100 Subject: gnu: Add libdbi-drivers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (libdbi-drivers): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2ccaae205c..4be5912022 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3192,3 +3192,71 @@ (define-public libdbi simultaneous database connections by using this framework.") (home-page "http://libdbi.sourceforge.net/") (license license:lgpl2.1+))) + +(define-public libdbi-drivers + (package + (name "libdbi-drivers") + (version "0.9.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libdbi-drivers/" + "libdbi-drivers/libdbi-drivers-" version + "/libdbi-drivers-" version ".tar.gz")) + (sha256 + (base32 + "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3")))) + (build-system gnu-build-system) + (native-inputs + `(("inetutils" ,inetutils) + ("glibc-locales" ,glibc-locales))) + (inputs + `(("libdbi" ,libdbi) + ("mysql" ,mariadb) + ("postgresql" ,postgresql) + ("sqlite" ,sqlite))) + (arguments + `(#:configure-flags + (let ((libdbi (assoc-ref %build-inputs "libdbi")) + (mysql (assoc-ref %build-inputs "mysql")) + (postgresql (assoc-ref %build-inputs "postgresql")) + (sqlite (assoc-ref %build-inputs "sqlite"))) + (list "--disable-docs" + (string-append "--with-dbi-incdir=" libdbi "/include") + (string-append "--with-dbi-libdir=" libdbi "/lib") + "--with-mysql" + (string-append "--with-mysql-incdir=" mysql "/include/mysql") + (string-append "--with-mysql-libdir=" mysql "/lib") + "--with-pgsql" + (string-append "--with-pgsql-incdir=" postgresql "/include") + (string-append "--with-pgsql-libdir=" postgresql "/lib") + "--with-sqlite3" + (string-append "--with-sqlite-incdir=" sqlite "/include") + (string-append "--with-sqlite-libdir=" sqlite "/lib"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/test_mysql.sh" + (("^MYMYSQLD=.*") + (string-append "MYMYSQLD=" + (assoc-ref inputs "mysql") + "/bin/mysqld"))) + #t)) + (add-after 'install 'remove-empty-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((var (string-append (assoc-ref outputs "out") "/var"))) + (delete-file-recursively var)) + #t))))) + (synopsis "Database drivers for the libdbi framework") + (description + "The @code{libdbi-drivers} library provides the database specific drivers +for the @code{libdbi} framework. + +The drivers officially supported by @code{libdbi} are: +@itemize +@item MySQL, +@item PostgreSQL, +@item SQLite. +@end itemize") + (home-page "http://libdbi-drivers.sourceforge.net/") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 54a80b58d4e49bd27c47d2cd57e641738852a81a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 20 Nov 2019 13:46:39 +0100 Subject: gnu: gnucash: Activate database support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnucash.scm (gnucash)[inputs]: Add libdbi and libdbi-drivers. [arguments]: Remove '-DWITH_SQL=OFF' from 'configure-flags' and add 'GNC_DBD_DIR' to program wrapping. Signed-off-by: Ludovic Courtès --- gnu/packages/gnucash.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index de916a8829..af017e108d 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Chris Marusich ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer +;;; Copyright © 2019 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ (define-module (gnu packages gnucash) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages cmake) + #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages gnome) @@ -70,6 +72,8 @@ (define-public gnucash ("icu4c" ,icu4c) ("glib" ,glib) ("gtk" ,gtk+) + ("libdbi" ,libdbi) + ("libdbi-drivers" ,libdbi-drivers) ("libgnomecanvas" ,libgnomecanvas) ("libxml2" ,libxml2) ("libxslt" ,libxslt) @@ -89,8 +93,7 @@ (define-public gnucash (arguments `(#:test-target "check" #:configure-flags - (list "-DWITH_OFX=OFF" ; libofx is not available yet - "-DWITH_SQL=OFF") ; without dbi.h + (list "-DWITH_OFX=OFF") ; libofx is not available yet #:make-flags '("GUILE_AUTO_COMPILE=0") #:modules ((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) @@ -147,6 +150,10 @@ (define-public gnucash (for-each (lambda (prog) (wrap-program (string-append (assoc-ref outputs "out") "/bin/" prog) + `("GNC_DBD_DIR" = + (,(string-append + (assoc-ref inputs "libdbi-drivers") + "/lib/dbd"))) `("PERL5LIB" ":" prefix ,(map (lambda (o) (string-append o "/lib/perl5/site_perl/" -- cgit v1.2.3 From 70a60d66973639460bf6dbb6cd10044300c846c2 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 22 Nov 2019 16:44:05 -0600 Subject: gnu: emacs-dashboard: Update to 1.6.0. From 9e3e34ccabc6330c9e0528028bef64e388783c78 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Fri, 22 Nov 2019 16:42:54 -0600 Subject: [PATCH] gnu: emacs-dashboard: Update to 1.6.0. * gnu/packages/emacs-xyz.scm (emacs-dashboard): Update to 1.6.0. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0caf12a423..e87444b39d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14482,7 +14482,7 @@ (define-public emacs-highlight-escape-sequences (define-public emacs-dashboard (package (name "emacs-dashboard") - (version "1.5.0") + (version "1.6.0") (source (origin (method git-fetch) @@ -14491,7 +14491,7 @@ (define-public emacs-dashboard (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0ihpcagwgc9qy70lf2y3dvx2bm5h9lnqh4sx6643cr8pp06ysbvq")))) + (base32 "1g6g8vad1kdmv1zxp95a8sn70idl26isqjb3xk1r95pqnx1cn591")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-page-break-lines" ,emacs-page-break-lines))) -- cgit v1.2.3 From ab6bddbc68fe9848670c993a7ffe9c8c47434f56 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 26 Nov 2019 07:21:15 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-6.af13248. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-6.af13248. --- 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 0daf817374..e2ca9de9e4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4190,8 +4190,8 @@ (define-public python2-feedparser (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "23f60a6bbb923a9510d95250b4a1626cb8a84b7f") - (revision "5")) + (let ((commit "af1324855e1ecaf9b1dd7afcc714d09aaa38f081") + (revision "6")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4203,7 +4203,7 @@ (define-public guix-data-service (file-name (git-file-name name version)) (sha256 (base32 - "08v6wdj5ia139krplc7y74s4rm1iblqf91713z69yhh5zbkvyxg8")))) + "1qxs1sbyx894njw4f898wzc5shjj85h9kgz95p8mq1acmazhlhkv")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 1a016d9dda8291a7fc5ffd2d10d844d422018513 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 11:00:09 +0200 Subject: gnu: youtube-dl: Update to 2019.11.22. * gnu/packages/video.scm (youtube-dl): Update to 2019.11.22. --- 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 3a7b7dc29d..9836f67386 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1497,7 +1497,7 @@ (define-public libvpx-1.7 (define-public youtube-dl (package (name "youtube-dl") - (version "2019.11.05") + (version "2019.11.22") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1505,7 +1505,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "129461i4103slqj3nq69djnlmgjj3lfgmazn41avc5g967w29b85")))) + "0avdlp0dc9p3lm68mfnic21x6blxmr0zvlxa4br5vj4y4sckq2m8")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 8ebf4e3a71d945b95fc917fbdde096ef4e07a9e6 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 Nov 2019 09:07:50 +0100 Subject: gnu: sddm: Fix output directory for QML files. Path must match qtbase's native-search-path specification, otherwise it will not be picked up by other packages. * gnu/packages/display-managers.scm (sddm)[arguments]: Change value of "-DQT_IMPORTS_DIR". --- gnu/packages/display-managers.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 0b8f742c38..21afc0ec5c 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -102,7 +102,7 @@ (define-public sddm (assoc-ref %build-inputs "shadow") "/etc/login.defs") (string-append "-DQT_IMPORTS_DIR=" - (assoc-ref %outputs "out") "/qml") + (assoc-ref %outputs "out") "/lib/qt5/qml") (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" (assoc-ref %outputs "out") "/etc")) #:modules ((guix build cmake-build-system) -- cgit v1.2.3 From d1e4e64cd788b2a7179d0ca5e5c5d3a4518bfa51 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 Nov 2019 09:25:56 +0100 Subject: guix: Fix wrap-qt-program. Directory names added here need to match qtbase's native-search-path specifications. * guix/build/qt-utils.scm (wrap-qt-program): Change paths used for QML2_IMPORT_PATH and QT_PLUGIN_PATH. --- guix/build/qt-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index 48a32674e9..d2486ee86c 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -26,9 +26,9 @@ (define (suffix env-var path) (if env-val (string-append env-val ":" path) path))) (let ((qml-path (suffix "QML2_IMPORT_PATH" - (string-append out "/qml"))) + (string-append out "/lib/qt5/qml"))) (plugin-path (suffix "QT_PLUGIN_PATH" - (string-append out "/plugins"))) + (string-append out "/lib/qt5/plugins"))) (xdg-data-path (suffix "XDG_DATA_DIRS" (string-append out "/share"))) (xdg-config-path (suffix "XDG_CONFIG_DIRS" -- cgit v1.2.3 From 4ae8180ca669a00ad6050936a1e541f6c3fa321a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 Nov 2019 09:56:20 +0100 Subject: gnu: python-pyqt: Fix output directory for plugins. This defaults to QT_INSTALL_PLUGINS, thus we should use the same sub-directory ($out/lib/qt5/plugins) here. * gnu/packages/qt.scm (python-pyqt)[arguments]{configure}: Change base file name for plugins. --- gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 241e73d575..c85fa93266 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1615,7 +1615,7 @@ (define-public python-pyqt (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (sip (string-append out "/share/sip")) - (plugins (string-append out "/plugins")) + (plugins (string-append out "/lib/qt5/plugins")) (designer (string-append plugins "/designer")) (qml (string-append plugins "/PyQt5")) (python (assoc-ref inputs "python")) -- cgit v1.2.3 From 0d455d9865c1bfd21a9415aa8515e75058dd7ee5 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 Nov 2019 10:26:15 +0100 Subject: gnu: kdeconnect: Remove useless code. After fixing wrap-qt-program, setting QT_PLUGIN_PATH here is no longer necessary. * gnu/packages/kde.scm (kdeconnect)[arguments]{wrap-executable}: Remove setting QT_PLUGIN_PATH. --- gnu/packages/kde.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index ab5118583e..778873e99c 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -558,9 +558,6 @@ (define-public kdeconnect (add-after 'install 'wrap-executable (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (setenv "QT_PLUGIN_PATH" - (string-append out "/lib/qt5/plugins" - ":" (getenv "QT_PLUGIN_PATH"))) (wrap-qt-program out "../lib/libexec/kdeconnectd") (wrap-qt-program out "kdeconnect-cli") (wrap-qt-program out "kdeconnect-handler") -- cgit v1.2.3 From ba40e1fe0683c8e6b24b2060a1acd07e6fca0d3f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 11:44:21 +0200 Subject: doc: Fix typo. * doc/guix.texi (php-fpm-service-type): Note that the socket-group default is "nagios" and not "php-fpm". --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index a64b0fb84c..23a30ce553 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20360,7 +20360,7 @@ User who will own the php worker processes. Group of the worker processes. @item @code{socket-user} (default: @code{php-fpm}) User who can speak to the php-fpm socket. -@item @code{socket-group} (default: @code{php-fpm}) +@item @code{socket-group} (default: @code{nginx}) Group that can speak to the php-fpm socket. @item @code{pid-file} (default: @code{(string-append "/var/run/php" (version-major (package-version php)) "-fpm.pid")}) The process id of the php-fpm process is written to this file -- cgit v1.2.3 From bfa157906ed34cae2d3a7a29d9795da4898e8662 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 17:38:33 +0200 Subject: gnupg: Update to 2.2.18. * gnu/packages/gnupg.scm (gnupg): Update to 2.2.18. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index f71c627781..6b6b8f616d 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -247,14 +247,14 @@ (define-public npth (define-public gnupg (package (name "gnupg") - (version "2.2.17") + (version "2.2.18") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "056mgy09lvsi03531a437qj58la1j2x1y1scvfi53diris3658mg")))) + "02pcdmb9p4a8hil88gyd86mnc85jldss3cl02jvbkcjmrbi7rlrh")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From b392de0c195503d719f57e1b302fb36cb45c335c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 18:15:54 +0200 Subject: gnu: gnuastro: Update to 0.11. * gnu/packages/astronomy.scm (gnuastro): Update to 0.11. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 3aa608ae29..efba05315f 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -120,7 +120,7 @@ (define-public wcslib (define-public gnuastro (package (name "gnuastro") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) @@ -128,7 +128,7 @@ (define-public gnuastro version ".tar.lz")) (sha256 (base32 - "0gmhmh0yddb2aql4hd5ffrr0d4hrmh4pa3yln0n186hslqinp81b")))) + "0c1yc2qb7vrqad96savfn06rn01izlfz0va738signv93qqj5k3v")))) (inputs `(("cfitsio" ,cfitsio) ("gsl" ,gsl) -- cgit v1.2.3 From 2894bd60db41749fa41baace66f7682ffade3d04 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 26 Nov 2019 17:48:03 +0100 Subject: gnu: musescore: Update to 3.3.3. * gnu/packages/music.scm (musescore): Update to 3.3.3. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 30c2ddd3ef..ab91d8e36f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3838,7 +3838,7 @@ (define-public lmms (define-public musescore (package (name "musescore") - (version "3.3.2") + (version "3.3.3") (source (origin (method git-fetch) (uri (git-reference @@ -3847,7 +3847,7 @@ (define-public musescore (file-name (git-file-name name version)) (sha256 (base32 - "0r2xhhwv09v8ykgvh38fgpmpcmkra7lvhv7714xp7vb0wpcnh8l3")) + "11pcw2ihi7ddd4rr83y72i61yyc1qfj6v14a82zwlak2qnllpbmr")) (modules '((guix build utils))) (snippet ;; Un-bundle OpenSSL and remove unused libraries. -- cgit v1.2.3 From 60ba9d8c2c95fa2cc1096ddb718eba88df689123 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Tue, 26 Nov 2019 18:38:53 +0100 Subject: gnu: pdfposter: Update to 0.7.post1. * gnu/packages/pdf.scm (pdfposter): Update to 0.7.post1. [source] Remove extra file extension. [arguments]: No longer use python-2. Update comment. [inputs]: Replace PyPDF by PyPDF2. --- gnu/packages/pdf.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 8afa99a901..609e75b28c 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1027,20 +1027,18 @@ (define-public pdfarranger (define-public pdfposter (package (name "pdfposter") - (version "0.6.0") + (version "0.7.post1") (source (origin (method url-fetch) - (uri (pypi-uri "pdftools.pdfposter" version ".tar.bz2")) + (uri (pypi-uri "pdftools.pdfposter" version)) (sha256 (base32 - "1i9jqawf279va089ykicglcq4zlsnwgcnsdzaa8vnm836lqhywma")))) + "0c1avpbr9q53yzq5ar2x485rmp9d0l3z27aham32bg7gplzd7w0j")))) (build-system python-build-system) (arguments - `(#:tests? #f ; no test suite, only for visual control - #:python ,python-2)) + `(#:tests? #f)) ; test-suite not included in source archive (inputs - ;; pdfposter 0.6.0 still uses the old pyPdf - `(("python2-pypdf" ,python2-pypdf))) + `(("python-pypdf2" ,python-pypdf2))) (home-page "https://pythonhosted.org/pdftools.pdfposter/") (synopsis "Scale and tile PDF images/pages to print on multiple pages") (description "@command{pdfposter} can be used to create a large poster by -- cgit v1.2.3 From 854d4d40fd9bbc41c23bee11f3f25aff95ea863f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:25:10 +0200 Subject: gnu: python-django-debug-toolbar: Don't use unstable tarball. * gnu/packages/django.scm (python-django-debug-toolbar)[source]: Download using git-fetch. --- gnu/packages/django.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 7cd4c3f784..c47ea44fd4 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ricardo Wurmus @@ -348,14 +348,14 @@ (define-public python-django-debug-toolbar (version "1.10.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/jazzband/django-debug-toolbar/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jazzband/django-debug-toolbar.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1rww056hyzks8spbgf4h7kf6ybxlc5p08a2b6gn1nqrrzs4yx9sy")))) + "0zr6yjsms97wlvvd17rdbrx01irkg887dn9x70c1hzfjmfvp9afk")))) (build-system python-build-system) (propagated-inputs `(("python-sqlparse" ,python-sqlparse) -- cgit v1.2.3 From 9f00d13d5dc720dbbe1ec95c48a2c8a15c0b40c4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:27:24 +0200 Subject: gnu: python-django-jinja: Don't use unstable tarball. * gnu/packages/django.scm (python-django-jinja)[source]: Download using git-fetch. --- gnu/packages/django.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index c47ea44fd4..7e7bc5d002 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -456,14 +456,14 @@ (define-public python-django-jinja (version "2.4.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/niwinz/django-jinja/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/niwinz/django-jinja.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0bzrb4m6wx9ph5cpvz7wpvg5k6ksvj0dnxlg0nhhqskhvp46brs1")))) + "1fcrxlznlq1xvl26y3j1r22vvy6m08r5l97xi2wj50rdmxhfvhis")))) (build-system python-build-system) (propagated-inputs `(("python-django" ,python-django) -- cgit v1.2.3 From 4a3df6c8e181962911423eaae1a2c5b9274edc1c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:30:02 +0200 Subject: gnu: emacs-solarized-theme: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-solarized-theme)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e87444b39d..2634b309e8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4814,13 +4814,14 @@ (define-public emacs-solarized-theme (name "emacs-solarized-theme") (version "1.2.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/bbatsov/solarized-emacs/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/bbatsov/solarized-emacs/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ha3slc6d9wi9ilkhmwrzkvf308n6ph7b0k69pk369s9304awxzx")))) + "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash))) -- cgit v1.2.3 From fbb162de75b7824b88935d52bc3bd7444925b784 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:31:33 +0200 Subject: gnu: emacs-better-defaults: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-better-defaults)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2634b309e8..cdfb93061f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5937,13 +5937,14 @@ (define-public emacs-better-defaults (version "0.1.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/technomancy/better-defaults" - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/technomancy/better-defaults") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "08fg4zslzlxbvyil5g4gwvwd22fh4zsgqprs5wh9hv1rgc6757m2")))) + "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr")))) (build-system emacs-build-system) (home-page "https://github.com/technomancy/better-defaults") (synopsis "Better defaults for Emacs") -- cgit v1.2.3 From 25f6b444b0eb3dc1596bfac08b366e4bc3a29d30 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:33:29 +0200 Subject: gnu: emacs-neotree: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-neotree)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cdfb93061f..b688bb69fe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7947,14 +7947,14 @@ (define-public emacs-neotree (version "0.5.2") (home-page "https://github.com/jaypei/emacs-neotree") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/jaypei/" name - "/archive/" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) (sha256 (base32 - "1zd6dchwyijnf7kgchfcp51gs938l204dk9z6mljrfqf2zy0gp12")) - (file-name (string-append name "-" version ".tar.gz")))) + "0hx72fq10772bbyqrj7mhhp02k26cccjxdadiqm1ykainhfmn1x0")) + (file-name (git-file-name name version)))) (build-system emacs-build-system) (synopsis "Folder tree view for Emacs") (description "This Emacs package provides a folder tree view.") -- cgit v1.2.3 From d1de1ab21a9477f72632d3b217d50d889ca136bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:41:03 +0200 Subject: gnu: emacs-flx: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-flx)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b688bb69fe..7cebb8192d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8035,13 +8035,14 @@ (define-public emacs-flx (version "0.6.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/lewang/" - "flx/archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lewang/flx.git") + (commit (string-append "v" version)))) (sha256 (base32 - "0bkcpnf1j4i2fcc2rllwbz62l00sw2mcia6rm5amgwvlkqavmkv6")) - (file-name (string-append name "-" version ".tar.gz")))) + "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc")) + (file-name (git-file-name name version)))) (build-system emacs-build-system) (home-page "https://github.com/lewang/flx") (synopsis "Fuzzy matching for Emacs") -- cgit v1.2.3 From 0dcb8e83f4c96cffa790b46768496988b390937a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:43:04 +0200 Subject: gnu: emacs-cyberpunk-theme: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-cyberpunk-theme)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7cebb8192d..415814baa2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8060,13 +8060,14 @@ (define-public emacs-cyberpunk-theme (version "1.19") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/n3mo/cyberpunk-theme.el/" - "archive/" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/n3mo/cyberpunk-theme.el/") + (commit version))) (sha256 (base32 - "05l5fxw1mn5py6mfhxrzyqjq0d8m5m1akfi46vrgh13r414jffvv")) - (file-name (string-append name "-" version ".tar.gz")))) + "1npwrw3pgdmvqhihcqcfi2yrs178iiip5fcj8zhpp6cr9yqsvvgi")) + (file-name (git-file-name name version)))) (build-system emacs-build-system) (home-page "https://github.com/n3mo/cyberpunk-theme.el") (synopsis "Cyberpunk theme for emacs built-in color theme support") -- cgit v1.2.3 From ed1ff94fe23dbe28ce39fa9c7be5bec6c1ae29dc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:44:58 +0200 Subject: gnu: emacs-auto-complete: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-auto-complete)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 415814baa2..7d36c6dcbf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8135,13 +8135,14 @@ (define-public emacs-auto-complete (version "1.5.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/auto-complete/" - "auto-complete/archive/v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/auto-complete/auto-complete.git") + (commit (string-append "v" version)))) (sha256 (base32 - "1jvq4lj00hwml75lpmlciazy8f3bbg13gffsfnl835p4qd8l7yqv")) - (file-name (string-append name "-" version ".tar.gz")))) + "04i9b11iksg6acn885wl3qgi5xpsm3yszlqmd2x21yhprndlz7gb")) + (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs `(("emacs-popup" ,emacs-popup))) -- cgit v1.2.3 From 7335f4617c7ecc0805f46e07c77c2ab97314271c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:46:27 +0200 Subject: gnu: emacs-pretty-mode: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-pretty-mode)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7d36c6dcbf..788cbc7b4a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8472,13 +8472,14 @@ (define-public emacs-pretty-mode (version "2.0.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/akatov/pretty-mode/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/akatov/pretty-mode/") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1fan7m4vnqs8kpg7r54kx3g7faadkpkf9kzarfv8n57kq8w157pl")))) + "013fig9i4fyx16krp2vfv953p3rwdzr38zs6i50af4pqz4vrcfvh")))) (build-system emacs-build-system) (home-page "https://github.com/akatov/pretty-mode") (synopsis "Redisplay parts of the buffer as Unicode symbols") -- cgit v1.2.3 From 2e1afa2a7cc819371cc384c9c1e842b3a004900f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:48:19 +0200 Subject: gnu: emacs-groovy-modes: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-groovy-modes)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 788cbc7b4a..4fe469b5e8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11229,14 +11229,14 @@ (define-public emacs-groovy-modes (name "emacs-groovy-modes") (version "2.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes" - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "15j0hnkx9nppjzda5cqsxxz5f3bq9hc4xfyjcdypzqiypcvmpa39")))) + "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-s" ,emacs-s))) -- cgit v1.2.3 From c75d100858a383c82fb6a36f95ace1a81ffc3f27 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:49:55 +0200 Subject: gnu: emacs-validate: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-validate)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4fe469b5e8..3a2750973b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12663,13 +12663,14 @@ (define-public emacs-validate (name "emacs-validate") (version "1.0.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/Malabarba/validate.el" - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Malabarba/validate.el") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "125mbd111f1h1baw0z3fzm48y1bvaigljyzvvnqgrn0shxbj0khg")))) + "1l12ibx6cw4mgicgjpw71fb4fr4sd0k54lvbpq7ngc29br3j6i4v")))) (build-system emacs-build-system) (home-page "https://github.com/Malabarba/validate.el") (synopsis "Emacs library for scheme validation") -- cgit v1.2.3 From b8e4626542184df54f563b88e86b59f6b4f5130f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:51:31 +0200 Subject: gnu: emacs-m-buffer-el: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-m-buffer-el)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3a2750973b..4c3c7a1fac 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13037,13 +13037,14 @@ (define-public emacs-m-buffer-el (version "0.15") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/phillord/m-buffer-el" - "/archive/" "v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/phillord/m-buffer-el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "17vdcc8q37q9db98jyww1c0ivinmwfcw4l04zccfacalra63a214")))) + "1sx76i59razwccvn6x7rx5a124bfyjw9fcbxf4gj7nsg33qiq809")))) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From b495fbfad9cd04ffe387d812fc126777bdf6e40d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:53:34 +0200 Subject: gnu: emacs-helm-mode-manager: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-helm-mode-manager)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4c3c7a1fac..a4eed54127 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13365,13 +13365,14 @@ (define-public emacs-helm-mode-manager (version "1.0.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/istib/helm-mode-manager/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/istib/helm-mode-manager") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0wllj321z16hgrx0ddwzk5wz4mnnx5am7w5nclqclfc5dfdn92wm")))) + "1srx5f0s9x7zan7ayqd6scxfhcvr3nkd4yzs96hphd87rb18apzk")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm))) -- cgit v1.2.3 From 83612310191bd4ea86b37784f7de61d4a8e11e05 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:56:03 +0200 Subject: gnu: emacs-rsw-elisp: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-rsw-elisp)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a4eed54127..f124dc3a76 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14056,13 +14056,14 @@ (define-public emacs-rsw-elisp (name "emacs-rsw-elisp") (version "1.0.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/rswgnu/rsw-elisp" - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/rswgnu/rsw-elisp") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jnn7xfwl3wxc87v44ccsf1wwp80par3xgcvfb1icd6zchjmlcps")))) + "0dfq8myg0r91900bk1s70amsmm4mjk2qsg12v5pk7lla5d2vnyaf")))) (build-system emacs-build-system) (home-page "https://github.com/rswgnu/rsw-elisp") (synopsis "Improved expressions that interactively evaluate Emacs Lisp") -- cgit v1.2.3 From 67057b1baf9640979d5a230caa0d59ede3829594 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Nov 2019 20:57:33 +0200 Subject: gnu: emacs-shift-number: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-shift-number)[source]: Download using git-fetch. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f124dc3a76..3862cced20 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14276,13 +14276,14 @@ (define-public emacs-shift-number (version "0.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/alezost/shift-number.el" - "/archive/" "v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/alezost/shift-number.el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1g79m0hqn9jgpm565vvh8pdfzndc4vw7xisnh5qysj55qfg8cb1x")))) + "0zlwmzsxkv4mkggylxfx2fkrwgz7dz3zbg2gkn2rxcpy2k2gla64")))) (build-system emacs-build-system) (home-page "https://github.com/alezost/shift-number.el") (synopsis "Increase or decrease the number at point") -- cgit v1.2.3 From 93cae7458ae2b3e42538cfb6399e7abd53d70a08 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 26 Nov 2019 14:37:01 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.203. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.203. (linux-libre-4.4-pristine-source): Update hash. --- 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 49be57c3bc..58a6c5e499 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -384,10 +384,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.202") +(define-public linux-libre-4.4-version "4.4.203") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0adrmps7izfqy0yn4440isxvigslwzk1a375r9kh86idwbmcxb7x"))) + (hash (base32 "02krniihix9mb9bc0ffs03q4i9grjhwymnfp10h1r6gmxa554qlj"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 778ae9f980c74d6b093eaae68ca5ee2be5f2ca8a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 26 Nov 2019 14:38:02 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.203. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.203. (linux-libre-4.9-pristine-source): Update hash. --- 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 58a6c5e499..457f6579a8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -376,10 +376,10 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.202") +(define-public linux-libre-4.9-version "4.9.203") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1gsfbvsswpwj6r56ynb6mmx7dc8hp9yhi7sfr0hhii0gs4ffq241"))) + (hash (base32 "0jd8n8y3yf59sgfjhgjxsznxng7s4b30x5vdb48wrpgqmz7m1n8w"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 7281c8fd7eed3bfbf2c7ed9879bcb89603eac225 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Fri, 8 Nov 2019 09:25:08 +0000 Subject: gnu: Add helm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm: (helm): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/music.scm | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ab91d8e36f..3d9b5a14fd 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5047,3 +5047,62 @@ (define-public avldrums-lv2 MacArthur's AVLdrums. This plugin provides a convenient way to sequence and mix MIDI drums and comes as two separate drumkits: Black Pearl and Red Zeppelin.") (license license:gpl2+))) + +(define-public helm + (package + (name "helm") + (version "0.9.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/mtytel/helm.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17ys2vvhncx9i3ydg3xwgz1d3gqv4yr5mqi7vr0i0ca6nad6x3d4")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no "check" target + #:make-flags + (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) + "lv2" "standalone") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'include-pnglib-code-and-remove-usr-from-paths + (lambda _ + (substitute* "standalone/builds/linux/Makefile" + (("JUCE_INCLUDE_PNGLIB_CODE=0") + "JUCE_INCLUDE_PNGLIB_CODE=1")) + (substitute* "builds/linux/LV2/Makefile" + (("JUCE_INCLUDE_PNGLIB_CODE=0") + "JUCE_INCLUDE_PNGLIB_CODE=1")) + (substitute* "Makefile" + (("/usr") "")) + #t)) + (add-before 'reset-gzip-timestamps 'make-gz-files-writable + (lambda* (#:key outputs #:allow-other-keys) + (for-each make-file-writable + (find-files (string-append (assoc-ref outputs "out")) + ".*\\.gz$")) + #t)) + (delete 'configure)))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("curl" ,curl) + ("freetype2" ,freetype) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("libxcursor" ,libxcursor) + ("libxinerama", libxinerama) + ("jack", jack-1) + ("mesa" ,mesa))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lv2", lv2))) + (home-page "https://tytel.org/helm/") + (synopsis "Polyphonic synth with lots of modulation") + (description "Helm is a cross-platform polyphonic synthesizer available standalone +and as an LV2 plugin.") + (license license:gpl3+))) -- cgit v1.2.3 From 7f3bbfaf8ec3b96e02e0cf74e7515ac33c002107 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 26 Nov 2019 12:21:26 +0100 Subject: ui: Adjust SRFI-34 exception handling to Guile 2.9.5. * guix/ui.scm (report-load-error, warn-about-load-error) (read/eval): Match (or 'srfi-34 '%exception) instead of just 'srfi-34 to match what Guile 2.9.5 does. --- guix/ui.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index eb17d274c8..12611cb2bc 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -372,7 +372,7 @@ (define* (report-load-error file args #:optional frame) (report-error loc (G_ "~a~%") message))) (('unbound-variable _ ...) (report-unbound-variable-error args #:frame frame)) - (('srfi-34 obj) + (((or 'srfi-34 '%exception) obj) (if (message-condition? obj) (report-error (and (error-location? obj) (error-location obj)) @@ -404,7 +404,7 @@ (define (warn-about-load-error file module args) ;FIXME: factorize with ↑ (warning loc (G_ "~a~%") message))) (('unbound-variable _ ...) (report-unbound-variable-error args)) - (('srfi-34 obj) + (((or 'srfi-34 '%exception) obj) (if (message-condition? obj) (warning (G_ "failed to load '~a': ~a~%") file @@ -813,7 +813,7 @@ (define (read/eval str) (match args (('syntax-error proc message properties form . rest) (report-error (G_ "syntax error: ~a~%") message)) - (('srfi-34 obj) + (((or 'srfi-34 '%exception) obj) (if (message-condition? obj) (report-error (G_ "~a~%") (gettext (condition-message obj) -- cgit v1.2.3 From 434138e2f26b28bb5cc83e62327aae8ed0902475 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 26 Nov 2019 12:30:45 +0100 Subject: substitute: Make '%allow-unauthenticated-substitutes?' public. * guix/scripts/substitute.scm (warn-about-missing-authentication): New procedure. (%allow-unauthenticated-substitutes?): Turn into a public parameter and use 'warn-about-missing-authentication'. (valid-narinfo?): Adjust accordingly. * tests/substitute.scm (call-with-narinfo): Likewise. --- guix/scripts/substitute.scm | 22 +++++++++++++++------- tests/substitute.scm | 6 ++---- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 992b21d505..ba2fb291d8 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -86,6 +86,8 @@ (define-module (guix scripts substitute) read-narinfo write-narinfo + %allow-unauthenticated-substitutes? + substitute-urls guix-substitute)) @@ -118,15 +120,21 @@ (define %narinfo-cache-directory (string-append %state-directory "/substitute/cache")) (string-append (cache-directory #:ensure? #f) "/substitute"))) +(define (warn-about-missing-authentication) + (warning (G_ "authentication and authorization of substitutes \ +disabled!~%")) + #t) + (define %allow-unauthenticated-substitutes? ;; Whether to allow unchecked substitutes. This is useful for testing ;; purposes, and should be avoided otherwise. - (and (and=> (getenv "GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES") - (cut string-ci=? <> "yes")) - (begin - (warning (G_ "authentication and authorization of substitutes \ -disabled!~%")) - #t))) + (make-parameter + (and=> (getenv "GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES") + (cut string-ci=? <> "yes")) + (lambda (value) + (when value + (warn-about-missing-authentication)) + value))) (define %narinfo-ttl ;; Number of seconds during which cached narinfo lookups are considered @@ -370,7 +378,7 @@ (define %mandatory-fields (define* (valid-narinfo? narinfo #:optional (acl (current-acl)) #:key verbose?) "Return #t if NARINFO's signature is not valid." - (or %allow-unauthenticated-substitutes? + (or (%allow-unauthenticated-substitutes?) (let ((hash (narinfo-sha256 narinfo)) (signature (narinfo-signature narinfo)) (uri (uri->string (first (narinfo-uris narinfo))))) diff --git a/tests/substitute.scm b/tests/substitute.scm index ff2be662be..a4246aff82 100644 --- a/tests/substitute.scm +++ b/tests/substitute.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Nikita Karetnikov -;;; Copyright © 2014, 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2014, 2015, 2017, 2018, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -169,9 +169,7 @@ (define* (call-with-narinfo narinfo thunk (cute write-file (string-append narinfo-directory "/example.out") <>)) - (set! (@@ (guix scripts substitute) - %allow-unauthenticated-substitutes?) - #f)) + (%allow-unauthenticated-substitutes? #f)) thunk (lambda () (when (file-exists? cache-directory) -- cgit v1.2.3 From 7738a72186583afb3bb2e0a866c8aba130372400 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 26 Nov 2019 23:35:24 +0100 Subject: daemon: GC remove-unused-links phase uses 'statx' when available. * config-daemon.ac: Check for 'statx'. * nix/libstore/gc.cc (LocalStore::removeUnusedLinks) [HAVE_STATX]: Use 'statx' instead of 'lstat'. --- config-daemon.ac | 3 ++- nix/libstore/gc.cc | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/config-daemon.ac b/config-daemon.ac index 848e1e58da..50ead355a8 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -91,8 +91,9 @@ if test "x$guix_build_daemon" = "xyes"; then dnl sched_setaffinity: to improve RPC locality. dnl statvfs: to detect disk-full conditions. dnl strsignal: for error reporting. + dnl statx: fine-grain 'stat' call, new in glibc 2.28. AC_CHECK_FUNCS([lutimes lchown posix_fallocate sched_setaffinity \ - statvfs nanosleep strsignal]) + statvfs nanosleep strsignal statx]) dnl Check whether the store optimiser can optimise symlinks. AC_MSG_CHECKING([whether it is possible to create a link to a symlink]) diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc index 7976ff7d76..29b75aa875 100644 --- a/nix/libstore/gc.cc +++ b/nix/libstore/gc.cc @@ -570,8 +570,17 @@ void LocalStore::removeUnusedLinks(const GCState & state) if (name == "." || name == "..") continue; Path path = linksDir + "/" + name; +#ifdef HAVE_STATX +# define st_size stx_size +# define st_nlink stx_nlink + struct statx st; + if (statx(AT_FDCWD, path.c_str(), + AT_SYMLINK_NOFOLLOW | AT_STATX_DONT_SYNC, + STATX_SIZE | STATX_NLINK, &st) == -1) +#else struct stat st; if (lstat(path.c_str(), &st) == -1) +#endif throw SysError(format("statting `%1%'") % path); if (st.st_nlink != 1) { @@ -586,6 +595,8 @@ void LocalStore::removeUnusedLinks(const GCState & state) throw SysError(format("deleting `%1%'") % path); state.results.bytesFreed += st.st_size; +#undef st_size +#undef st_nlink } struct stat st; -- cgit v1.2.3 From fbecb5cddb2d36cc1a29dac3751b017fa531383c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 26 Nov 2019 23:51:11 +0100 Subject: daemon: 'deletePath' uses 'statx' when available. * nix/libutil/util.cc (_deletePath) [HAVE_STATX]: Use 'statx'. --- nix/libutil/util.cc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc index 9a83876013..8093b4c8b4 100644 --- a/nix/libutil/util.cc +++ b/nix/libutil/util.cc @@ -306,7 +306,18 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed) printMsg(lvlVomit, format("%1%") % path); +#ifdef HAVE_STATX +# define st_mode stx_mode +# define st_size stx_size +# define st_nlink stx_nlink + struct statx st; + if (statx(AT_FDCWD, path.c_str(), + AT_SYMLINK_NOFOLLOW, + STATX_SIZE | STATX_NLINK | STATX_MODE, &st) == -1) + throw SysError(format("getting status of `%1%'") % path); +#else struct stat st = lstat(path); +#endif if (!S_ISDIR(st.st_mode) && st.st_nlink == 1) bytesFreed += st.st_size; @@ -321,6 +332,9 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed) for (auto & i : readDirectory(path)) _deletePath(path + "/" + i.name, bytesFreed); } +#undef st_mode +#undef st_size +#undef st_nlink if (remove(path.c_str()) == -1) throw SysError(format("cannot unlink `%1%'") % path); -- cgit v1.2.3 From f9bd82e7a6e4e991be3f3cc6bf8bccd7feeb5241 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 26 Nov 2019 21:01:47 +0100 Subject: gnu: python-seaborn: Add patch to fix tests. * gnu/packages/python-xyz.scm (python-seaborn)[source]: Add upstream patch to fix test failures. --- gnu/packages/python-xyz.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 684a41f70c..c89df24dd4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6265,7 +6265,19 @@ (define-public python-seaborn (method url-fetch) (uri (pypi-uri "seaborn" version)) (sha256 - (base32 "0bqysi3fxfjl1866m5jq8z7mynhqbqnikim74dmzn8539iwkzj3n")))) + (base32 "0bqysi3fxfjl1866m5jq8z7mynhqbqnikim74dmzn8539iwkzj3n")) + (patches + (list (origin + (method url-fetch) + ;; This has already been merged, but there is no new + ;; release including this patch. It fixes problems + ;; with axis rotation that would lead to test + ;; failures. + (uri "https://patch-diff.githubusercontent.com/raw/mwaskom/seaborn/pull/1716.diff") + (sha256 + (base32 + "1lm870z316n9ivsyr86hpk1gxaraw0mrjvq42lqsm0znhjdp9q9w")) + (file-name "seaborn-0.9.0-axis-rotation.patch")))))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 9e7cb2f1e16fc5b70c6c0e4187443e216767323d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Nov 2019 08:21:12 +0100 Subject: gnu: python-matplotlib: Update to 3.1.2. * gnu/packages/python-xyz.scm (python-matplotlib): Update to 3.1.2. [arguments]: Disable test_backend_webagg and test_constrainedlayout; skip other tests tagged with "webagg". --- gnu/packages/python-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c89df24dd4..cb74a7ab7f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3996,14 +3996,14 @@ (define-public python2-colorspacious (define-public python-matplotlib (package (name "python-matplotlib") - (version "3.1.1") + (version "3.1.2") (source (origin (method url-fetch) (uri (pypi-uri "matplotlib" version)) (sha256 (base32 - "14qc109dibp32xfd9lah54djc0rc76fhbsj9cwyb328lzqmd5sqz")))) + "1nmshfqh7wyg15i16hx1yiylcvzkws29ivn66n3i0wyqwcpjr3lf")))) (build-system python-build-system) (propagated-inputs ; the following packages are all needed at run time `(("python-cycler" ,python-cycler) @@ -4068,8 +4068,14 @@ (define-public python-matplotlib (for-each delete-file ;; test_normal_axes, test_get_tightbbox_polar '("lib/matplotlib/tests/test_axes.py" + ;; We don't use the webagg backend and this test forces it. + "lib/matplotlib/tests/test_backend_webagg.py" ;; test_outward_ticks "lib/matplotlib/tests/test_tightlayout.py" + ;; test_hidden_axes fails with minor extent + ;; differences, possibly due to the use of a + ;; different version of FreeType. + "lib/matplotlib/tests/test_constrainedlayout.py" ;; Fontconfig returns no fonts. "lib/matplotlib/tests/test_font_manager.py")) #t)) @@ -4087,7 +4093,7 @@ (define-public python-matplotlib (lambda* (#:key outputs inputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) (invoke "python" "tests.py" "-v" - "-m" "not network"))) + "-m" "not network and not webagg"))) (add-before 'build 'configure-environment (lambda* (#:key outputs inputs #:allow-other-keys) (let ((cairo (assoc-ref inputs "cairo"))) -- cgit v1.2.3 From a132276537fba4fd8065f85fc2961dfedb5f385b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Nov 2019 09:57:45 +0100 Subject: gnu: python-seaborn: Disable matrix test. * gnu/packages/python-xyz.scm (python-seaborn)[arguments]: Add phase "fix-tests". --- gnu/packages/python-xyz.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cb74a7ab7f..f9e726e8fc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6296,6 +6296,12 @@ (define-public python-seaborn (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) (setenv "DISPLAY" ":1") #t))) + (add-after 'unpack 'fix-tests + (lambda _ + ;; test_cbar_ticks fails probably because of matplotlib's + ;; expectation of using an older version of FreeType. + (delete-file "seaborn/tests/test_matrix.py") + #t)) (replace 'check (lambda _ (invoke "pytest" "seaborn") #t))))) (propagated-inputs `(("python-pandas" ,python-pandas) -- cgit v1.2.3 From 255bb7be0adaa315e13cfb2931b86f14aefa9461 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 27 Nov 2019 11:24:41 +0200 Subject: gnu: denemo: Move some inputs to native-inputs. * gnu/packages/music.scm (denemo)[inputs]: Move intltool, gtk-doc, libtool ... [native-inputs]: .. to here. --- gnu/packages/music.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3d9b5a14fd..87497f6f66 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Al McElrath -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2016, 2018 Leo Famulari ;;; Copyright © 2016, 2017, 2019 Kei Kebreau ;;; Copyright © 2016 John J. Foerch @@ -423,7 +423,10 @@ (define-public denemo "Clarinet in Bb.denemo")) #t))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for gtester + `(("intltool" ,intltool) + ("glib:bin" ,glib "bin") ; for gtester + ("gtk-doc" ,gtk-doc) + ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) @@ -433,13 +436,10 @@ (define-public denemo ("fluidsynth" ,fluidsynth) ("glib" ,glib) ("gtk+" ,gtk+) - ("gtk-doc" ,gtk-doc) ("gtksourceview" ,gtksourceview-3) ("guile" ,guile-2.0) - ("intltool" ,intltool) ("librsvg" ,librsvg) ("libsndfile" ,libsndfile) - ("libtool" ,libtool) ("libxml2" ,libxml2) ("lilypond" ,lilypond) ("portaudio" ,portaudio) -- cgit v1.2.3 From f678cc9c793bcf23ced842f815c5d98bbde5fa31 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 11 Nov 2019 15:38:11 +0100 Subject: gnu: Add glib-with-documentation. * gnu/packages/glib.scm (glib-with-documentation): New variable. (glib)[properties]: Hide package. --- gnu/packages/glib.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b3e85f8df9..528b67e6cf 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -339,6 +339,7 @@ (define pattern+procs (variable "GIO_EXTRA_MODULES") (files '("lib/gio/modules"))))) (search-paths native-search-paths) + (properties '((hidden? . #t))) (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME") (description @@ -348,6 +349,34 @@ (define pattern+procs (home-page "https://developer.gnome.org/glib/") (license license:lgpl2.1+))) +(define-public glib-with-documentation + ;; glib's doc must be built in a separate package since it requires gtk-doc, + ;; which in turn depends on glib. + (package + (inherit glib) + (properties (alist-delete 'hidden? (package-properties glib))) + (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc reference + (native-inputs + `(("gtk-doc" ,gtk-doc) ; for the doc + ("docbook-xml" ,docbook-xml) + ("libxml2" ,libxml2) + ,@(package-native-inputs glib))) + (arguments + (substitute-keyword-arguments (package-arguments glib) + ((#:configure-flags flags ''()) + `(cons "-Dgtk_doc=true" ,flags)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (html (string-append "/share/gtk-doc"))) + (copy-recursively (string-append out html) + (string-append doc html)) + (delete-file-recursively (string-append out html)) + #t))))))))) + (define gobject-introspection (package (name "gobject-introspection") -- cgit v1.2.3 From 0eb59d9eac63068f382cf3fe6c0d4dd867c6256c Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 27 Nov 2019 17:59:25 +0100 Subject: gnu: r-quadprog: Move to (gnu packages cran). * gnu/packages/maths.scm (r-quadprog): Move from here... * gnu/packages/cran.scm (r-quadprog): ...to here. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ gnu/packages/maths.scm | 20 -------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 29aef19659..62113ab7e0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15741,3 +15741,23 @@ (define-public r-assertable files and to efficiently import multiple tabular data files into one data.table.") (license license:gpl3))) + +(define-public r-quadprog + (package + (name "r-quadprog") + (version "1.5-8") + (source + (origin + (method url-fetch) + (uri (cran-uri "quadprog" version)) + (sha256 + (base32 "1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2")))) + (build-system r-build-system) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/web/packages/quadprog") + (synopsis "Functions to solve quadratic programming problems") + (description + "This package contains routines and documentation for solving quadratic +programming problems.") + (license license:gpl3+))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 83ff9919ad..cf78d0b7a4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2342,26 +2342,6 @@ (define-public mumps-metis-openmpi (inputs (alist-delete "pt-scotch" (package-inputs mumps-openmpi))))) -(define-public r-quadprog - (package - (name "r-quadprog") - (version "1.5-8") - (source - (origin - (method url-fetch) - (uri (cran-uri "quadprog" version)) - (sha256 - (base32 "1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2")))) - (build-system r-build-system) - (native-inputs - `(("gfortran" ,gfortran))) - (home-page "https://cran.r-project.org/web/packages/quadprog") - (synopsis "Functions to solve quadratic programming problems") - (description - "This package contains routines and documentation for solving quadratic -programming problems.") - (license license:gpl3+))) - (define-public r-pracma (package (name "r-pracma") -- cgit v1.2.3 From 9bd56b1a77e7011a044e9da6d4f7a00226eb01e0 Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 27 Nov 2019 18:04:18 +0100 Subject: gnu: r-desolve: Move to (gnu packages cran). * gnu/packages/maths.scm (r-desolve): Move from here... * gnu/packages/cran.scm (r-desolve): ...to here. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/maths.scm | 28 ---------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 62113ab7e0..943cd0deec 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15761,3 +15761,31 @@ (define-public r-quadprog "This package contains routines and documentation for solving quadratic programming problems.") (license license:gpl3+))) + +(define-public r-desolve + (package + (name "r-desolve") + (version "1.25") + (source + (origin + (method url-fetch) + (uri (cran-uri "deSolve" version)) + (sha256 + (base32 "0735y3p5glhqx69rzrc8qgmvs7p7w0p98qxmvylb6bgqp6kp0cbp")))) + (properties `((upstream-name . "deSolve"))) + (build-system r-build-system) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://desolve.r-forge.r-project.org/") + (synopsis "Solvers for initial value problems of differential equations") + (description "This package provides functions that solve initial +value problems of a system of first-order ordinary differential equations (ODE), +of partial differential equations (PDE), of differential algebraic equations +(DAE), and of delay differential equations. The functions provide an interface +to the FORTRAN functions lsoda, lsodar, lsode, lsodes of the ODEPACK collection, +to the FORTRAN functions dvode and daspk and a C-implementation of solvers of +the Runge-Kutta family with fixed or variable time steps. The package contains +routines designed for solving ODEs resulting from 1-D, 2-D and 3-D partial +differential equations (PDE) that have been converted to ODEs by numerical +differencing.") + (license license:gpl2+))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cf78d0b7a4..9108150de9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4384,34 +4384,6 @@ (define-public r-subplex are noisy or are discontinuous at the solution.") (license license:gpl3+))) -(define-public r-desolve - (package - (name "r-desolve") - (version "1.25") - (source - (origin - (method url-fetch) - (uri (cran-uri "deSolve" version)) - (sha256 - (base32 "0735y3p5glhqx69rzrc8qgmvs7p7w0p98qxmvylb6bgqp6kp0cbp")))) - (properties `((upstream-name . "deSolve"))) - (build-system r-build-system) - (native-inputs - `(("gfortran" ,gfortran))) - (home-page "https://desolve.r-forge.r-project.org/") - (synopsis "Solvers for initial value problems of differential equations") - (description "This package provides functions that solve initial -value problems of a system of first-order ordinary differential equations (ODE), -of partial differential equations (PDE), of differential algebraic equations -(DAE), and of delay differential equations. The functions provide an interface -to the FORTRAN functions lsoda, lsodar, lsode, lsodes of the ODEPACK collection, -to the FORTRAN functions dvode and daspk and a C-implementation of solvers of -the Runge-Kutta family with fixed or variable time steps. The package contains -routines designed for solving ODEs resulting from 1-D, 2-D and 3-D partial -differential equations (PDE) that have been converted to ODEs by numerical -differencing.") - (license license:gpl2+))) - (define-public tcalc (package (name "tcalc") -- cgit v1.2.3 From 682768deb036b730c25694adbd81cd1574b37dfd Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 27 Nov 2019 18:07:02 +0100 Subject: gnu: r-pracma: Move to (gnu packages cran). * gnu/packages/maths.scm (r-pracma): Move from here... * gnu/packages/cran.scm (r-pracma): ...to here. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 20 +++++++++++++++++++- gnu/packages/maths.scm | 18 ------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 943cd0deec..9a49602fff 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016, 2017 Ben Woodcroft -;;; Copyright © 2017, 2018 Roel Janssen +;;; Copyright © 2016, 2017, 2018 Roel Janssen ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Raoul Bonnal ;;; Copyright © 2018 Vijayalakshmi Vedantham @@ -15789,3 +15789,21 @@ (define-public r-desolve differential equations (PDE) that have been converted to ODEs by numerical differencing.") (license license:gpl2+))) + +(define-public r-pracma + (package + (name "r-pracma") + (version "2.2.5") + (source (origin + (method url-fetch) + (uri (cran-uri "pracma" version)) + (sha256 + (base32 "0isd3s0i4mzmva8lkh0j76hwjy1w50q7d1n9lhxsnnkgalx3xs1g")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/pracma/") + (synopsis "Practical numerical math functions") + (description "This package provides functions for numerical analysis and +linear algebra, numerical optimization, differential equations, plus some +special functions. It uses Matlab function names where appropriate to simplify +porting.") + (license license:gpl3+))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9108150de9..c8e0e39343 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2342,24 +2342,6 @@ (define-public mumps-metis-openmpi (inputs (alist-delete "pt-scotch" (package-inputs mumps-openmpi))))) -(define-public r-pracma - (package - (name "r-pracma") - (version "2.2.5") - (source (origin - (method url-fetch) - (uri (cran-uri "pracma" version)) - (sha256 - (base32 "0isd3s0i4mzmva8lkh0j76hwjy1w50q7d1n9lhxsnnkgalx3xs1g")))) - (build-system r-build-system) - (home-page "https://cran.r-project.org/web/packages/pracma/") - (synopsis "Practical numerical math functions") - (description "This package provides functions for numerical analysis and -linear algebra, numerical optimization, differential equations, plus some -special functions. It uses Matlab function names where appropriate to simplify -porting.") - (license license:gpl3+))) - (define-public ruby-asciimath (package (name "ruby-asciimath") -- cgit v1.2.3 From ef7944b94f38a1ed92f164ca6b37c8c9ad4bcbee Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 27 Nov 2019 18:13:56 +0100 Subject: gnu: r-subplex: Move to (gnu packages cran). * gnu/packages/maths.scm (r-subplex): Move from here... * gnu/packages/cran.scm (r-subplex): ...to here. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ gnu/packages/maths.scm | 22 ---------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9a49602fff..0797897acd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15807,3 +15807,26 @@ (define-public r-pracma special functions. It uses Matlab function names where appropriate to simplify porting.") (license license:gpl3+))) + +(define-public r-subplex + (package + (name "r-subplex") + (version "1.5-4") + (source + (origin + (method url-fetch) + (uri (cran-uri "subplex" version)) + (sha256 + (base32 + "10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z")))) + (build-system r-build-system) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/web/packages/subplex") + (synopsis "Unconstrained optimization using the subplex algorithm") + (description + "This package implements the Subplex optimization algorithm. +It solves unconstrained optimization problems using a simplex method on +subspaces. The method is well suited for optimizing objective functions that +are noisy or are discontinuous at the solution.") + (license license:gpl3+))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c8e0e39343..16bb85efbc 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4344,28 +4344,6 @@ (define-public mcrl2-minimal (arguments '(#:configure-flags '("-DMCRL2_ENABLE_GUI_TOOLS=OFF"))))) -(define-public r-subplex - (package - (name "r-subplex") - (version "1.5-4") - (source - (origin - (method url-fetch) - (uri (cran-uri "subplex" version)) - (sha256 - (base32 - "10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z")))) - (build-system r-build-system) - (native-inputs - `(("gfortran" ,gfortran))) - (home-page "https://cran.r-project.org/web/packages/subplex") - (synopsis "Unconstrained optimization using the subplex algorithm") - (description "This package implements the Subplex optimization algorithm. -It solves unconstrained optimization problems using a simplex method on -subspaces. The method is well suited for optimizing objective functions that -are noisy or are discontinuous at the solution.") - (license license:gpl3+))) - (define-public tcalc (package (name "tcalc") -- cgit v1.2.3 From f3640e7395b54c801bde8ba40ad08bdad488453d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Nov 2019 18:29:32 +0100 Subject: gnu: Remove obsolete import of R build system module. * gnu/packages/maths.scm: Remove import of (guix build-system r). --- gnu/packages/maths.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 16bb85efbc..16e070eeff 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -62,7 +62,6 @@ (define-module (gnu packages maths) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) - #:use-module (guix build-system r) #:use-module (guix build-system ruby) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) -- cgit v1.2.3 From dcc7fad0016d7ef062ccfe0b1deb3368251e8ff8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Nov 2019 18:36:39 +0100 Subject: gnu: r-txtplot: Move to (gnu packages cran). * gnu/packages/statistics.scm (r-txtplot): Move from here... * gnu/packages/cran.scm (r-txtplot): ...to here. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ gnu/packages/statistics.scm | 20 -------------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0797897acd..f2da9ca88a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Laura Lazzati ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018 Eric Brown ;;; Copyright © 2018, 2019 Brett Gilio ;;; Copyright © 2019 Nicolò Balzarotti ;;; Copyright © 2019 Wiktor Żelazny @@ -15830,3 +15831,23 @@ (define-public r-subplex subspaces. The method is well suited for optimizing objective functions that are noisy or are discontinuous at the solution.") (license license:gpl3+))) + +(define-public r-txtplot + (package + (name "r-txtplot") + (version "1.0-3") + (source + (origin + (method url-fetch) + (uri (cran-uri "txtplot" version)) + (sha256 + (base32 + "1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/txtplot/") + (synopsis "Text-based plotting") + (description "This package provides functions to produce rudimentary ASCII +graphics directly in the terminal window. This package provides a basic +plotting function (and equivalents of curve, density, acf and barplot) as well +as a boxplot function.") + (license license:lgpl3+))) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c7860d2ea1..1c315c23ef 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5710,26 +5710,6 @@ (define-public r-colorout to any arbitrary string. In this case, it is up to you to set valid values.") (license license:gpl3+))) -(define-public r-txtplot - (package - (name "r-txtplot") - (version "1.0-3") - (source - (origin - (method url-fetch) - (uri (cran-uri "txtplot" version)) - (sha256 - (base32 - "1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h")))) - (build-system r-build-system) - (home-page "https://cran.r-project.org/web/packages/txtplot/") - (synopsis "Text-based plotting") - (description "This package provides functions to produce rudimentary ASCII -graphics directly in the terminal window. This package provides a basic -plotting function (and equivalents of curve, density, acf and barplot) as well -as a boxplot function.") - (license license:lgpl3+))) - (define-public python-rpy2 ;; We need to take this changeset instead of the RELEASE_3_0_4 tag, because ;; it fixes a regression when using ggplot 3.2.0. -- cgit v1.2.3 From ff3375251d6a316e3ee05589d70a8bb135ec47a6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 22:19:13 +0100 Subject: gnu: Use the test-only Xorg variant for tests. * gnu/packages/education.scm (gcompris-qt)[native-inputs]: Change XORG-SERVER to XORG-SERVER-FOR-TESTS. * gnu/packages/engineering.scm (pcb, qucs, openscad)[native-inputs]: Likewise. * gnu/packages/gnome.scm (libbonoboui, d-feet, gspell, libdazzle, libhandy)[native-inputs]: Likewise. * gnu/packages/gnupg.scm (parcimonie)[native-inputs]: Likewise. * gnu/packages/graphics.scm (opensubdiv, rapicorn)[native-inputs]: Likewise. * gnu/packages/gtk.scm (gtksourceview-2, gtksourceview)[native-inputs]: Likewise. * gnu/packages/image-processing.scm (opencv)[native-inputs]: Likewise. * gnu/packages/kde-frameworks.scm (kconfig, kcoreaddons, kwidgetsaddons, kwindowsystem, kdeclarative)[native-inputs]: Likewise. * gnu/packages/kde-plasma.scm (kscreenlocker)[native-inputs]: Likewise. * gnu/packages/messaging.scm (gajim)[native-inputs]: Likewise. * gnu/packages/python-xyz.scm (python-seaborn)[native-inputs]: Likewise. --- gnu/packages/education.scm | 2 +- gnu/packages/engineering.scm | 6 +++--- gnu/packages/gnome.scm | 10 +++++----- gnu/packages/gnupg.scm | 2 +- gnu/packages/graphics.scm | 4 ++-- gnu/packages/gtk.scm | 4 ++-- gnu/packages/image-processing.scm | 2 +- gnu/packages/kde-frameworks.scm | 10 +++++----- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/vim.scm | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index c84fa54223..46262fd14b 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -167,7 +167,7 @@ (define-public gcompris-qt ("gettext" ,gettext-minimal) ("perl" ,perl) ("qttools" ,qttools) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("openssl" ,openssl) ("python-2" ,python-2) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 294105a757..c5e2f58aeb 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -373,7 +373,7 @@ (define-public pcb ("imagemagick" ,imagemagick) ("gerbv" ,gerbv) ("ghostscript" ,ghostscript) - ("xvfb" ,xorg-server))) + ("xvfb" ,xorg-server-for-tests))) (home-page "http://pcb.geda-project.org/") (synopsis "Design printed circuit board layouts") (description @@ -1771,7 +1771,7 @@ (define-public qucs ("python" ,python-2) ; for tests ("matplotlib" ,python2-matplotlib) ; for tests ("numpy" ,python2-numpy) ; for tests - ("xorg-server" ,xorg-server))) ; for tests + ("xorg-server" ,xorg-server-for-tests))) ; for tests (inputs `(("adms" ,adms) ("asco" ,asco) @@ -2174,7 +2174,7 @@ (define-public openscad ("imagemagick" ,imagemagick) ("ps" ,procps) ("python" ,python) - ("xvfb" ,xorg-server))) + ("xvfb" ,xorg-server-for-tests))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index af2558d814..11ed035919 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2025,7 +2025,7 @@ (define-public libbonoboui (native-inputs `(("glib" ,glib "bin") ; for glib-genmarshal, etc. ("intltool" ,intltool) - ("xorg-server" ,xorg-server) ; For running the tests + ("xorg-server" ,xorg-server-for-tests) ; For running the tests ("pkg-config" ,pkg-config))) (home-page "https://developer.gnome.org/libbonoboui/") (synopsis "Some user interface controls using Bonobo") @@ -4591,7 +4591,7 @@ (define-public d-feet ("pkg-config" ,pkg-config) ("python-pep8" ,python-pep8) ("xmllint" ,libxml2) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("gobject-introspection" ,gobject-introspection) ("gtk+" ,gtk+) @@ -7752,7 +7752,7 @@ (define-public gspell ;; For tests. ("aspell-dict-en" ,aspell-dict-en) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs `(("enchant" ,enchant))) ;enchant.pc is required by gspell-1.pc (home-page "https://wiki.gnome.org/Projects/gspell") @@ -8167,7 +8167,7 @@ (define-public libdazzle `(("glib" ,glib "bin") ; glib-compile-resources ("pkg-config" ,pkg-config) ;; For tests. - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("glib" ,glib) ("gobject-introspection" ,gobject-introspection) @@ -8389,9 +8389,9 @@ (define-public libhandy ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ("xorg-server" ,xorg-server) ;; Test suite dependencies. + ("xorg-server" ,xorg-server-for-tests) ("hicolor-icon-theme" ,hicolor-icon-theme))) (home-page "https://source.puri.sm/Librem5/libhandy") (synopsis "Library full of GTK+ widgets for mobile phones") diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 6b6b8f616d..23d3aba90e 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1045,7 +1045,7 @@ (define-public parcimonie ("perl-xml-twig" ,perl-xml-twig) ("torsocks" ,torsocks))) (native-inputs - `(("xorg-server" ,xorg-server))) + `(("xorg-server" ,xorg-server-for-tests))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4f1c50b272..8795107dcb 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -758,7 +758,7 @@ (define-public rapicorn ("graphviz" ,graphviz) ("intltool" ,intltool) ("pkg-config" ,pkg-config) - ("xvfb" ,xorg-server))) + ("xvfb" ,xorg-server-for-tests))) (home-page "https://rapicorn.testbit.org/") (synopsis "Toolkit for rapid development of user interfaces") (description @@ -1055,7 +1055,7 @@ (define-public opensubdiv (setenv "DISPLAY" ":1") #t))))) (native-inputs - `(("xorg-server" ,xorg-server))) + `(("xorg-server" ,xorg-server-for-tests))) (inputs `(("glew" ,glew) ("libxrandr" ,libxrandr) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e6b9042c00..817c03c30e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -360,7 +360,7 @@ (define-public gtksourceview-2 ("glib" ,glib "bin") ; for glib-genmarshal, etc. ("pkg-config" ,pkg-config) ;; For testing. - ("xorg-server" ,xorg-server) + ("xorg-server" ,xorg-server-for-tests) ("shared-mime-info" ,shared-mime-info))) (propagated-inputs ;; As per the pkg-config file. @@ -431,7 +431,7 @@ (define-public gtksourceview ("pkg-config" ,pkg-config) ("vala" ,vala) ;; For testing. - ("xorg-server" ,xorg-server) + ("xorg-server" ,xorg-server-for-tests) ("shared-mime-info" ,shared-mime-info))) (propagated-inputs ;; gtksourceview-3.0.pc refers to all these. diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 2579da3d6a..1961b47361 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -373,7 +373,7 @@ (define-public opencv (zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp))))))))) (native-inputs `(("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server) ; For running the tests + ("xorg-server" ,xorg-server-for-tests) ; For running the tests ("opencv-extra" ,(origin (method git-fetch) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ec735d8903..6f7c5df7b4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -483,7 +483,7 @@ (define-public kconfig ("extra-cmake-modules" ,extra-cmake-modules) ("inetutils" ,inetutils) ("qttools" ,qttools) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("qtbase" ,qtbase))) (arguments @@ -548,7 +548,7 @@ (define-public kcoreaddons ("qttools" ,qttools) ("shared-mime-info" ,shared-mime-info) ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam - ("xorg-server" ,xorg-server))) ; for the tests + ("xorg-server" ,xorg-server-for-tests))) ; for the tests (inputs `(("qtbase" ,qtbase))) (arguments @@ -1041,7 +1041,7 @@ (define-public kwidgetsaddons (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("qtbase" ,qtbase))) (arguments @@ -1091,7 +1091,7 @@ (define-public kwindowsystem ("dbus" ,dbus) ; for the tests ("openbox" ,openbox) ; for the tests ("qttools" ,qttools) - ("xorg-server" ,xorg-server))) ; for the tests + ("xorg-server" ,xorg-server-for-tests))) ; for the tests (inputs `(("libxrender" ,libxrender) ("qtbase" ,qtbase) @@ -2201,7 +2201,7 @@ (define-public kdeclarative (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("kauth" ,kauth) ("kbookmarks" ,kbookmarks) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index c1731d459a..d381ae9fb4 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -96,7 +96,7 @@ (define-public kscreenlocker ;; For tests. ("dbus" ,dbus) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("kcmutils" ,kcmutils) ("kcrash" ,kcrash) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 33e752c9a0..2429bad3e5 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -644,7 +644,7 @@ (define-public gajim (native-inputs `(("intltool" ,intltool) ("python-docutils" ,python-docutils) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("adwaita-icon-theme" ,adwaita-icon-theme) ("gnome-keyring" ,gnome-keyring) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f9e726e8fc..7343366cd9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6310,7 +6310,7 @@ (define-public python-seaborn ("python-scipy" ,python-scipy))) (native-inputs `(("python-pytest" ,python-pytest) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (home-page "http://stanford.edu/~mwaskom/software/seaborn/") (synopsis "Statistical data visualization") (description diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index ae07bcd9b6..b360d1fcbe 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -198,7 +198,7 @@ (define-public vim-full display " &"))))))))))) (native-inputs `(("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server) + ("xorg-server" ,xorg-server-for-tests) ,@(package-native-inputs vim))) (inputs `(("acl" ,acl) -- cgit v1.2.3 From 38ae96e9c590fbec6938f8145b7fd3fbb3a7ef45 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 22:23:07 +0100 Subject: gnu: xorg-server: Update to 1.20.6. * gnu/packages/xorg.scm (xorg-server): Update to 1.20.6. (xorg-server-for-tests): Stay on 1.20.5. --- gnu/packages/xorg.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 72480f76f1..2baeed9e05 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5072,7 +5072,7 @@ (define-public libxcb (define-public xorg-server (package (name "xorg-server") - (version "1.20.5") + (version "1.20.6") (source (origin (method url-fetch) @@ -5081,7 +5081,7 @@ (define-public xorg-server "xorg-server-" version ".tar.bz2")) (sha256 (base32 - "17dc3g8cc55nbkx3np64dsz04n621dnzjmcc9wys0xbyyd1q47d8")) + "1laib9z17jksgzb67z69blcmnpbvj7i7m604b5ns7s760iii85k3")) (patches (list ;; See: @@ -5203,7 +5203,16 @@ (define-public xorg-server (define-public xorg-server-for-tests (hidden-package (package - (inherit xorg-server)))) + (inherit xorg-server) + (version "1.20.5") + (source (origin + (inherit (package-source xorg-server)) + (uri (string-append + "mirror://xorg/individual/xserver/" + "xorg-server-" version ".tar.bz2")) + (sha256 + (base32 + "17dc3g8cc55nbkx3np64dsz04n621dnzjmcc9wys0xbyyd1q47d8"))))))) (define-public xorg-server-xwayland (package -- cgit v1.2.3 From 60392114ae9d01260e0534206d5fc28a2ef69394 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 22:58:34 +0100 Subject: gnu: notmuch: Update to 0.29.3. * gnu/packages/mail.scm (notmuch): Update to 0.29.3. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 80f7c91f06..01ec02df18 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -854,14 +854,14 @@ (define-public notifymuch (define-public notmuch (package (name "notmuch") - (version "0.29.2") + (version "0.29.3") (source (origin (method url-fetch) (uri (string-append "https://notmuchmail.org/releases/notmuch-" version ".tar.xz")) (sha256 (base32 - "1pjmrnbn0iavm5pnw7wgfw5d6hg5i6miqfa6s7s4027vn94n3nhv")))) + "0dfwa38vgnxk9cvvpza66szjgp8lir6iz6yy0cry9593lywh9xym")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 7b5a120730135c47ec6ab911935d90a6a6b9b599 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 23:07:14 +0100 Subject: gnu: xapian: Update to 1.4.14. * gnu/packages/search.scm (xapian, python-xapian-bindings): Update to 1.4.14. --- gnu/packages/search.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index ca8a928e60..1f9bce6f02 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -49,14 +49,14 @@ (define-module (gnu packages search) (define-public xapian (package (name "xapian") - (version "1.4.13") + (version "1.4.14") ;; Note: When updating Xapian, remember to update xapian-bindings below. (source (origin (method url-fetch) (uri (string-append "https://oligarchy.co.uk/xapian/" version "/xapian-core-" version ".tar.xz")) (sha256 - (base32 "0z0k8902bz2ckdggikj5yz11ik2n8krmdwzvpqv60phcm3zzzy4k")))) + (base32 "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("util-linux" ,util-linux))) @@ -94,7 +94,7 @@ (define-public python-xapian-bindings "/xapian-bindings-" version ".tar.xz")) (sha256 (base32 - "14jqm8mi55z4jxyi9qnnxdljli81zknsp2ja2yjx17hm28kmsnks")))) + "0qb17cw8n0g5gcg8dq5b3hs6i16w74rgxcryd0ja9n2h0rlda2an")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-python3") -- cgit v1.2.3 From 164d0ad352993a0d1abe43a49015a39120f30d72 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 23:11:11 +0100 Subject: gnu: python-xapian-bindings: Sphinx is a native input. * gnu/packages/search.scm (python-xapian-bindings)[inputs]: Remove PYTHON-SPHINX. [native-inputs]: New field. --- gnu/packages/search.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 1f9bce6f02..3b7bc36889 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -104,9 +104,10 @@ (define-public python-xapian-bindings "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/xapian")))) + (native-inputs + `(("python-sphinx" ,python-sphinx))) ;for documentation (inputs `(("python" ,python) - ("python-sphinx" ,python-sphinx) ; for documentation ("xapian" ,xapian) ("zlib" ,zlib))) (synopsis "Python bindings for the Xapian search engine library") -- cgit v1.2.3 From 546c9fa660882312009337bed5ef23d77b8c3bf3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 23:17:39 +0100 Subject: gnu: bubblewrap: Update home page. * gnu/packages/virtualization.scm (bubblewrap)[source, home-page]: Follow redirect to. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index d9cda7696d..a832df64cd 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1085,7 +1085,7 @@ (define-public bubblewrap (version "0.3.3") (source (origin (method url-fetch) - (uri (string-append "https://github.com/projectatomic/bubblewrap/" + (uri (string-append "https://github.com/containers/bubblewrap/" "releases/download/v" version "/bubblewrap-" version ".tar.xz")) (sha256 @@ -1127,7 +1127,7 @@ (define-public bubblewrap (native-inputs `(("python-2" ,python-2) ("util-linux" ,util-linux))) - (home-page "https://github.com/projectatomic/bubblewrap") + (home-page "https://github.com/containers/bubblewrap") (synopsis "Unprivileged sandboxing tool") (description "Bubblewrap is aimed at running applications in a sandbox, restricting their access to parts of the operating system or user data such as -- cgit v1.2.3 From fd5ccec796549eac23ceccc406e0b4a22ccdde01 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 23:19:13 +0100 Subject: gnu: bubblewrap: Update to 0.4.0. * gnu/packages/virtualization.scm (bubblewrap): Update to 0.4.0. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index a832df64cd..fa7b07e179 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1082,7 +1082,7 @@ (define-public python-vagrant (define-public bubblewrap (package (name "bubblewrap") - (version "0.3.3") + (version "0.4.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/containers/bubblewrap/" @@ -1090,7 +1090,7 @@ (define-public bubblewrap version ".tar.xz")) (sha256 (base32 - "1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966")))) + "08r0f4c3fjkb4zjrb4kkax1zfcgcgic702vb62sjjw5xfhppvzp5")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From e1695f4d588b88bc454a766c13f6787a235d1d13 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 23:27:45 +0100 Subject: gnu: whois: Update to 5.5.3. * gnu/packages/networking.scm (whois): Update to 5.5.3. --- 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 87cabee645..3ab5e71828 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -553,7 +553,7 @@ (define-public iodine (define-public whois (package (name "whois") - (version "5.5.2") + (version "5.5.3") (source (origin (method url-fetch) @@ -561,7 +561,7 @@ (define-public whois "whois_" version ".tar.xz")) (sha256 (base32 - "1h55zs3cj4w9b0hq0x3z7s2mn46v0jyc39gz320ra4hwr0xlsnf0")))) + "0imb87iz17a530fg1x9wnsm4bvr61hxydv29chfwzh015af3zhsm")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From ba5ef9997ba071339473590805331a5eec29b10d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 23:46:21 +0100 Subject: gnu: python-dbus: Update to 1.2.14. * gnu/packages/python-xyz.scm (python-dbus): Update to 1.2.14. (python2-dbus)[arguments]: Remove. --- gnu/packages/python-xyz.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7343366cd9..d2efa74228 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5950,14 +5950,14 @@ (define-public python2-user-agents (define-public python-dbus (package (name "python-dbus") - (version "1.2.10") + (version "1.2.14") (source (origin (method url-fetch) (uri (string-append "https://dbus.freedesktop.org/releases/dbus-python/" "dbus-python-" version ".tar.gz")) (sha256 - (base32 "11nqk01iq5bx2llgb3ksknyinijdp29w4ndj210glm009ayjncyl")))) + (base32 "0cdchkgnivlka4lf8q4qfk0yxq483i3r3aqickjf8hfn7nx0c0mi")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -5976,10 +5976,7 @@ (define-public python2-dbus (inputs `(("python" ,python-2) ,@(alist-delete "python" (package-inputs python-dbus) - equal?))) - ;; FIXME: on Python 2, the test_utf8 fails with: - ;; "ValueError: unichr() arg not in range(0x10000) (narrow Python build)" - (arguments `(#:tests? #f)))) + equal?))))) (define-public python-notify2 (package -- cgit v1.2.3 From 9943d238e9f07dccae973b641eb7738637ce95fb Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 27 Nov 2019 10:40:56 +0000 Subject: gnu: feh: Adapt tests for imlib2 1.6. * gnu/packages/patches/feh-fix-tests-for-imlib2-1.6.patch: New file. * gnu/packages/image-viewers.scm (feh)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 + gnu/packages/image-viewers.scm | 5 ++- .../patches/feh-fix-tests-for-imlib2-1.6.patch | 51 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/feh-fix-tests-for-imlib2-1.6.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0129e42944..082465a24a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -826,6 +826,7 @@ dist_patch_DATA = \ %D%/packages/patches/fbreader-curl-7.62.patch \ %D%/packages/patches/fcgi-2.4.0-gcc44-fixes.patch \ %D%/packages/patches/fcgi-2.4.0-poll.patch \ + %D%/packages/patches/feh-fix-tests-for-imlib2-1.6.patch \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ %D%/packages/patches/file-CVE-2018-10360.patch \ diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index d237a27c4a..c0300f5087 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Guy Fleury Iteriteka +;;; Copyright © 2019 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -72,7 +73,9 @@ (define-public feh name "-" version ".tar.bz2")) (sha256 (base32 - "070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg")))) + "070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg")) + (patches + (search-patches "feh-fix-tests-for-imlib2-1.6.patch")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) diff --git a/gnu/packages/patches/feh-fix-tests-for-imlib2-1.6.patch b/gnu/packages/patches/feh-fix-tests-for-imlib2-1.6.patch new file mode 100644 index 0000000000..a91906dbe9 --- /dev/null +++ b/gnu/packages/patches/feh-fix-tests-for-imlib2-1.6.patch @@ -0,0 +1,51 @@ +commit 8048fb542d0c36f868760ba1590fbe14a3a85df7 +Author: Pierre Langlois +Date: Wed Nov 27 10:42:05 2019 +0000 + + Adapt tests for imlib2 1.6 + + Reported upstream on https://github.com/derf/feh/issues/497 + +diff --git a/test/list/custom b/test/list/custom +index dbe2074..40ac557 100644 +--- a/test/list/custom ++++ b/test/list/custom +@@ -1,4 +1,4 @@ + test/ok/gif; 16; 4; list; gif; 256; 953; gif; 1; 16 +-test/ok/jpg; 16; 4; list; jpg; 256; 354; jpeg; 2; 16 ++test/ok/jpg; 16; 4; list; jpg; 256; 354; jpg; 2; 16 + test/ok/png; 16; 4; list; png; 256; 403; png; 3; 16 + test/ok/pnm; 16; 4; list; pnm; 256; 269; pnm; 4; 16 +diff --git a/test/list/default b/test/list/default +index bc0ef52..e480db3 100644 +--- a/test/list/default ++++ b/test/list/default +@@ -1,5 +1,5 @@ + NUM FORMAT WIDTH HEIGHT PIXELS SIZE ALPHA FILENAME + 1 gif 16 16 256 953 - test/ok/gif +-2 jpeg 16 16 256 354 - test/ok/jpg ++2 jpg 16 16 256 354 - test/ok/jpg + 3 png 16 16 256 403 X test/ok/png + 4 pnm 16 16 256 269 - test/ok/pnm +diff --git a/test/list/format_reverse b/test/list/format_reverse +index 9216184..3301f78 100644 +--- a/test/list/format_reverse ++++ b/test/list/format_reverse +@@ -1,5 +1,5 @@ + NUM FORMAT WIDTH HEIGHT PIXELS SIZE ALPHA FILENAME + 1 pnm 16 16 256 269 - test/ok/pnm + 2 png 16 16 256 403 X test/ok/png +-3 jpeg 16 16 256 354 - test/ok/jpg ++3 jpg 16 16 256 354 - test/ok/jpg + 4 gif 16 16 256 953 - test/ok/gif +diff --git a/test/list/size b/test/list/size +index cad60b0..7716239 100644 +--- a/test/list/size ++++ b/test/list/size +@@ -1,5 +1,5 @@ + NUM FORMAT WIDTH HEIGHT PIXELS SIZE ALPHA FILENAME + 1 pnm 16 16 256 269 - test/ok/pnm +-2 jpeg 16 16 256 354 - test/ok/jpg ++2 jpg 16 16 256 354 - test/ok/jpg + 3 png 16 16 256 403 X test/ok/png + 4 gif 16 16 256 953 - test/ok/gif -- cgit v1.2.3