nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into core-updates

This commit is contained in:
Ricardo Wurmus 2019-10-06 22:02:20 +02:00
parent 1714edc3d4 f58702465d
commit e08902d3cb
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
65 changed files with 46438 additions and 628 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -316,6 +316,11 @@ dist_noinst_DATA = \
AUX_FILES = \ AUX_FILES = \
gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/chromium/master-preferences.json \
gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/emacs/guix-emacs.el \
gnu/packages/aux-files/linux-libre/5.3-arm.conf \
gnu/packages/aux-files/linux-libre/5.3-arm-veyron.conf \
gnu/packages/aux-files/linux-libre/5.3-arm64.conf \
gnu/packages/aux-files/linux-libre/5.3-i686.conf \
gnu/packages/aux-files/linux-libre/5.3-x86_64.conf \
gnu/packages/aux-files/linux-libre/5.2-arm.conf \ gnu/packages/aux-files/linux-libre/5.2-arm.conf \
gnu/packages/aux-files/linux-libre/5.2-arm-veyron.conf \ gnu/packages/aux-files/linux-libre/5.2-arm-veyron.conf \
gnu/packages/aux-files/linux-libre/5.2-arm64.conf \ gnu/packages/aux-files/linux-libre/5.2-arm64.conf \

26
doc/guix.texi
View File

@ -9083,6 +9083,16 @@ The crate importer also allows you to specify a version string:
guix import crate constant-time-eq@@0.1.0 guix import crate constant-time-eq@@0.1.0
@end example @end example
Additional options include:
@table @code
@item --recursive
@itemx -r
Traverse the dependency graph of the given upstream package recursively
and generate package expressions for all those packages that are not yet
in Guix.
@end table
@item opam @item opam
@cindex OPAM @cindex OPAM
@cindex OCaml @cindex OCaml
@ -19409,13 +19419,13 @@ Other services can also extend the @code{httpd-service-type} to add to
the configuration. the configuration.
@lisp @lisp
(simple-service 'my-extra-server httpd-service-type (simple-service 'www.example.com-server httpd-service-type
(list (list
(httpd-virtualhost (httpd-virtualhost
"*:80" "*:80"
(list (string-append (list (string-join '("ServerName www.example.com"
"ServerName "www.example.com "DocumentRoot /srv/http/www.example.com")
DocumentRoot \"/srv/http/www.example.com\""))))) "\n")))))
@end lisp @end lisp
@end deffn @end deffn
@ -19549,13 +19559,13 @@ This data type represents a virtualhost configuration block for the httpd servic
These should be added to the extra-config for the httpd-service. These should be added to the extra-config for the httpd-service.
@lisp @lisp
(simple-service 'my-extra-server httpd-service-type (simple-service 'www.example.com-server httpd-service-type
(list (list
(httpd-virtualhost (httpd-virtualhost
"*:80" "*:80"
(list (string-append (list (string-join '("ServerName www.example.com"
"ServerName "www.example.com "DocumentRoot /srv/http/www.example.com")
DocumentRoot \"/srv/http/www.example.com\""))))) "\n")))))
@end lisp @end lisp
@table @asis @table @asis

1
gnu/local.mk
View File

@ -475,6 +475,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/tex.scm \ %D%/packages/tex.scm \
%D%/packages/textutils.scm \ %D%/packages/textutils.scm \
%D%/packages/text-editors.scm \ %D%/packages/text-editors.scm \
%D%/packages/tigervnc.scm \
%D%/packages/time.scm \ %D%/packages/time.scm \
%D%/packages/tls.scm \ %D%/packages/tls.scm \
%D%/packages/tmux.scm \ %D%/packages/tmux.scm \

115
gnu/packages/admin.scm
View File

@ -851,14 +851,14 @@ tools: server, client, and relay agent.")
(define-public libpcap (define-public libpcap
(package (package
(name "libpcap") (name "libpcap")
(version "1.9.0") (version "1.9.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.tcpdump.org/release/libpcap-" (uri (string-append "https://www.tcpdump.org/release/libpcap-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"06bhydl4vr4z9c3vahl76f2j96z1fbrcl7wwismgs4sris08inrf")))) "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
@ -879,14 +879,14 @@ network statistics collection, security monitoring, network debugging, etc.")
(define-public tcpdump (define-public tcpdump
(package (package
(name "tcpdump") (name "tcpdump")
(version "4.9.2") (version "4.9.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.tcpdump.org/release/tcpdump-" (uri (string-append "https://www.tcpdump.org/release/tcpdump-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0ygy0layzqaj838r5xd613iraz09wlfgpyh7pc6cwclql8v3b2vr")))) "0434vdcnbqaia672rggjzdn4bb8p8dchz559yiszzdk0sjrprm1c"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("libpcap" ,libpcap) (inputs `(("libpcap" ,libpcap)
("openssl" ,openssl))) ("openssl" ,openssl)))
@ -1723,7 +1723,7 @@ track changes in important system configuration files.")
(define-public libcap-ng (define-public libcap-ng
(package (package
(name "libcap-ng") (name "libcap-ng")
(version "0.7.9") (version "0.7.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1731,7 +1731,7 @@ track changes in important system configuration files.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa")))) "1gzzy12agfa9ddipdf72h9y68zqqnvsjjylv4vnq6hj4w2safk58"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -2852,61 +2852,60 @@ you are running, what theme or icon set you are using, etc.")
(license license:expat))) (license license:expat)))
(define-public screenfetch (define-public screenfetch
(let ((commit "e7b94fc3c529b9b97f32b71fd4bc05fb1d0f5864")) (package
(package (name "screenfetch")
(name "screenfetch") (version "3.9.0")
(version (git-version "3.8.0" "2" commit)) (source (origin
(source (origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url "https://github.com/KittyKatt/screenFetch")
(url "https://github.com/KittyKatt/screenFetch") (commit (string-append "v" version))))
(commit commit))) (file-name (git-file-name name version))
(file-name (git-file-name name version)) (sha256
(sha256 (base32
(base32 "13i7dczbqwhws08zzrdraki1zkqv0qkbgx9c1r8vmg5qr9f7hfzg"))))
"13i7dczbqwhws08zzrdraki1zkqv0qkbgx9c1r8vmg5qr9f7hfzg")))) (build-system trivial-build-system)
(build-system trivial-build-system) (arguments
(arguments `(#:modules ((guix build utils))
`(#:modules ((guix build utils)) #:builder
#:builder (begin
(begin (use-modules (guix build utils))
(use-modules (guix build utils)) (let ((source (assoc-ref %build-inputs "source"))
(let ((source (assoc-ref %build-inputs "source")) (out (assoc-ref %outputs "out")))
(out (assoc-ref %outputs "out"))) (mkdir-p (string-append out "/bin/"))
(mkdir-p (string-append out "/bin/")) (copy-file (string-append source "/screenfetch-dev")
(copy-file (string-append source "/screenfetch-dev") (string-append out "/bin/screenfetch"))
(string-append out "/bin/screenfetch")) (install-file (string-append source "/screenfetch.1")
(install-file (string-append source "/screenfetch.1") (string-append out "/man/man1/"))
(string-append out "/man/man1/")) (install-file (string-append source "/COPYING")
(install-file (string-append source "/COPYING") (string-append out "/share/doc/" ,name "-" ,version))
(string-append out "/share/doc/" ,name "-" ,version)) (substitute* (string-append out "/bin/screenfetch")
(substitute* (string-append out "/bin/screenfetch") (("/usr/bin/env bash")
(("/usr/bin/env bash") (string-append (assoc-ref %build-inputs "bash")
(string-append (assoc-ref %build-inputs "bash") "/bin/bash")))
"/bin/bash"))) (wrap-program
(wrap-program
(string-append out "/bin/screenfetch") (string-append out "/bin/screenfetch")
`("PATH" ":" prefix `("PATH" ":" prefix
(,(string-append (assoc-ref %build-inputs "bc") "/bin:" (,(string-append (assoc-ref %build-inputs "bc") "/bin:"
(assoc-ref %build-inputs "scrot") "/bin:" (assoc-ref %build-inputs "scrot") "/bin:"
(assoc-ref %build-inputs "xdpyinfo") "/bin" (assoc-ref %build-inputs "xdpyinfo") "/bin"
(assoc-ref %build-inputs "xprop") "/bin")))) (assoc-ref %build-inputs "xprop") "/bin"))))
(substitute* (string-append out "/bin/screenfetch") (substitute* (string-append out "/bin/screenfetch")
(("#!#f") (("#!#f")
(string-append "#!" (assoc-ref %build-inputs "bash") (string-append "#!" (assoc-ref %build-inputs "bash")
"/bin/bash"))))))) "/bin/bash")))))))
(inputs (inputs
`(("bash" ,bash) `(("bash" ,bash)
("bc" ,bc) ("bc" ,bc)
("scrot" ,scrot) ("scrot" ,scrot)
("xdpyinfo" ,xdpyinfo) ("xdpyinfo" ,xdpyinfo)
("xprop" ,xprop))) ("xprop" ,xprop)))
(home-page "https://github.com/KittyKatt/screenFetch") (home-page "https://github.com/KittyKatt/screenFetch")
(synopsis "System information script") (synopsis "System information script")
(description "Bash screenshot information tool which can be used to (description "Bash screenshot information tool which can be used to
generate those nifty terminal theme information and ASCII distribution logos in generate those nifty terminal theme information and ASCII distribution logos in
everyone's screenshots nowadays.") everyone's screenshots nowadays.")
(license license:gpl3)))) (license license:gpl3)))
(define-public nnn (define-public nnn
(package (package

4997
gnu/packages/aux-files/linux-libre/5.3-arm-veyron.conf Normal file
View File

File diff suppressed because it is too large Load Diff

9316
gnu/packages/aux-files/linux-libre/5.3-arm.conf Normal file
View File

File diff suppressed because it is too large Load Diff

9246
gnu/packages/aux-files/linux-libre/5.3-arm64.conf Normal file
View File

File diff suppressed because it is too large Load Diff

10271
gnu/packages/aux-files/linux-libre/5.3-i686.conf Normal file
View File

File diff suppressed because it is too large Load Diff

10227
gnu/packages/aux-files/linux-libre/5.3-x86_64.conf Normal file
View File

File diff suppressed because it is too large Load Diff

35
gnu/packages/axoloti.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -20,6 +21,7 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system ant) #:use-module (guix build-system ant)
@ -64,20 +66,21 @@
(package (package
(name "axoloti-runtime") (name "axoloti-runtime")
(version "1.0.12") (version "1.0.12")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://github.com/axoloti/axoloti/" (method git-fetch)
"archive/" version ".tar.gz")) (uri (git-reference
(file-name (string-append name "-" version ".tar.gz")) (url "https://github.com/axoloti/axoloti.git")
(sha256 (commit version)))
(base32 (file-name (git-file-name name version))
"1dynk6h0nixp4zihpirpqa4vi8fq1lhm443jsmvhk135ykhf364p")) (sha256
(modules '((guix build utils))) (base32 "05hyr9qx9dplp0gkx4v34i17972b3f512qndnarzy4wzfpnp0s3b"))
(snippet (modules '((guix build utils)))
'(begin (snippet
;; Remove pre-built Java binaries. '(begin
(delete-file-recursively "lib/") ;; Remove pre-built Java binaries.
#t)))) (delete-file-recursively "lib/")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
@ -231,6 +234,10 @@ runtime.")
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'make-git-checkout-writable
(lambda _
(for-each make-file-writable (find-files "."))
#t))
(delete 'configure) (delete 'configure)
(replace 'build (replace 'build
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)

7
gnu/packages/bioinformatics.scm
View File

@ -8407,6 +8407,13 @@ library implementing most of the pipeline's features.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'find-RCAS
;; The configure script can't find non-1.3.x versions of RCAS because
;; its R expression ‘1.10.1 >= 1.3.4’ evaluates to false.
(lambda _
(substitute* "configure"
(("1\\.3\\.4") "0.0.0"))
#t))
(add-after 'install 'wrap-executable (add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))

6
gnu/packages/conky.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu> ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Vasile Dumitrascu <va511e@yahoo.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -31,6 +32,7 @@
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
(define-public conky (define-public conky
@ -51,7 +53,8 @@
(arguments (arguments
`(#:tests? #f ; there are no tests `(#:tests? #f ; there are no tests
#:configure-flags #:configure-flags
(list "-DRELEASE=true") (list "-DRELEASE=true"
"-DBUILD_PULSEAUDIO=ON")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'add-freetype-to-search-path (add-after 'unpack 'add-freetype-to-search-path
@ -76,6 +79,7 @@
("libxext" ,libxext) ("libxext" ,libxext)
("libxft" ,libxft) ("libxft" ,libxft)
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("pulseaudio", pulseaudio)
("lua" ,lua) ("lua" ,lua)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("curl" ,curl))) ("curl" ,curl)))

69
gnu/packages/cran.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2018 Roel Janssen <roel@gnu.org> ;;; Copyright © 2017, 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Raoul Bonnal <ilpuccio.febo@gmail.com> ;;; Copyright © 2017 Raoul Bonnal <ilpuccio.febo@gmail.com>
;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com> ;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com>
;;; Copyright © 2018 Sahithi Yarlagadda <sahi@swecha.net> ;;; Copyright © 2018 Sahithi Yarlagadda <sahi@swecha.net>
@ -1492,14 +1492,13 @@ error stream.")
(define-public r-pls (define-public r-pls
(package (package
(name "r-pls") (name "r-pls")
(version "2.7-1") (version "2.7-2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "pls" version)) (uri (cran-uri "pls" version))
(sha256 (sha256
(base32 (base32 "121byimd6bg7jbrq5wz5fpi0vxq0vh8g724vkhnjzszbvcv1xsb7"))))
"0jw3zl5z06023zxr74phnvwax8m3i4a4i6lsqiq6j15aq9zq3zgq"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "http://mevik.net/work/software/pls.html") (home-page "http://mevik.net/work/software/pls.html")
(synopsis "Partial Least Squares and Principal Component Regression") (synopsis "Partial Least Squares and Principal Component Regression")
@ -1693,14 +1692,13 @@ is provided.")
(define-public r-calibrate (define-public r-calibrate
(package (package
(name "r-calibrate") (name "r-calibrate")
(version "1.7.2") (version "1.7.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "calibrate" version)) (uri (cran-uri "calibrate" version))
(sha256 (sha256
(base32 (base32 "1s423nr176l2sc66wp7hzgqkv7c2bq8d2bjrrvrrm5qa9y3zdx1k"))))
"010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-mass" ,r-mass))) `(("r-mass" ,r-mass)))
@ -1733,14 +1731,13 @@ ellipses, circles, cylinders, arrows, ...")
(define-public r-globaloptions (define-public r-globaloptions
(package (package
(name "r-globaloptions") (name "r-globaloptions")
(version "0.1.0") (version "0.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "GlobalOptions" version)) (uri (cran-uri "GlobalOptions" version))
(sha256 (sha256
(base32 (base32 "0x89hfz80avq4zcskxl71i4zi0mgniqqxfrvz050aa2189wfyja2"))))
"1wlyqz1yhmhjwslrd7q69jbd9vsbjkjfc01g60kl3cdpyr8hlyjn"))))
(properties `((upstream-name . "GlobalOptions"))) (properties `((upstream-name . "GlobalOptions")))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://github.com/jokergoo/GlobalOptions") (home-page "https://github.com/jokergoo/GlobalOptions")
@ -3903,14 +3900,13 @@ iVAT).")
(define-public r-xfun (define-public r-xfun
(package (package
(name "r-xfun") (name "r-xfun")
(version "0.9") (version "0.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "xfun" version)) (uri (cran-uri "xfun" version))
(sha256 (sha256
(base32 (base32 "065ygh046ah43p5aqyrkv2vkxcnvnb4j7blfdygysg6hmqzp4pbv"))))
"1c3wmy6s4ck821mwl7i2g8cxd31g30llbpivbgq21g1rxs4zwlyl"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://github.com/yihui/xfun") (home-page "https://github.com/yihui/xfun")
(synopsis "Miscellaneous functions") (synopsis "Miscellaneous functions")
@ -8301,14 +8297,13 @@ results using @code{ggplot2}.")
(define-public r-sjplot (define-public r-sjplot
(package (package
(name "r-sjplot") (name "r-sjplot")
(version "2.7.1") (version "2.7.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "sjPlot" version)) (uri (cran-uri "sjPlot" version))
(sha256 (sha256
(base32 (base32 "1kx1qqgp4fhwwwpqn9mv8m1pnpjxfs7ww36ns7j1ja4a7ydwn2hp"))))
"14shypabpahf68hd66rb1dpqhiyl3i0yx1yc85wamdvljh9fdymb"))))
(properties `((upstream-name . "sjPlot"))) (properties `((upstream-name . "sjPlot")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -9578,17 +9573,17 @@ manipulate tree data.")
(define-public r-rvcheck (define-public r-rvcheck
(package (package
(name "r-rvcheck") (name "r-rvcheck")
(version "0.1.3") (version "0.1.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "rvcheck" version)) (uri (cran-uri "rvcheck" version))
(sha256 (sha256
(base32 (base32 "15222q3sglq0mad5q806p99fhrb96qizmpqw35fa1rb148f95paf"))))
"1i2g6gyiqyd1pn6y0h6vmlcmg1qb5pv7rym8mkw8jnyc3in9hn8b"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-rlang" ,r-rlang))) `(("r-biocmanager" ,r-biocmanager)
("r-rlang" ,r-rlang)))
(home-page "https://cran.r-project.org/web/packages/rvcheck") (home-page "https://cran.r-project.org/web/packages/rvcheck")
(synopsis "R package version check") (synopsis "R package version check")
(description (description
@ -11804,14 +11799,13 @@ such software by imputing dropout events.")
(define-public r-gamlss-dist (define-public r-gamlss-dist
(package (package
(name "r-gamlss-dist") (name "r-gamlss-dist")
(version "5.1-4") (version "5.1-5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "gamlss.dist" version)) (uri (cran-uri "gamlss.dist" version))
(sha256 (sha256
(base32 (base32 "1rl7hzdg5xpvaq3yyzwxhsaqzzs0qidi3ibv454fisijgv8l4vqw"))))
"0zi87lgigr83l35zqq1y1g4cdq6ssjamripzz7yis74aznh6qg1l"))))
(properties `((upstream-name . "gamlss.dist"))) (properties `((upstream-name . "gamlss.dist")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs `(("r-mass" ,r-mass))) (propagated-inputs `(("r-mass" ,r-mass)))
@ -12502,14 +12496,13 @@ extensions.")
(define-public r-wgaim (define-public r-wgaim
(package (package
(name "r-wgaim") (name "r-wgaim")
(version "2.0-0") (version "2.0-1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "wgaim" version)) (uri (cran-uri "wgaim" version))
(sha256 (sha256
(base32 (base32 "1qiyfkpsbzjr9xsq5kqq6rlqpndngkn2irdfh3gyi45h6hn118j4"))))
"0wnb10vibgq8h1ly6lq8kzymf30vx0j0g8fc2zidblbvwag9ka1g"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-ggplot2" ,r-ggplot2) `(("r-ggplot2" ,r-ggplot2)
@ -12954,14 +12947,13 @@ also provided to illustrate various methods.")
(define-public r-pegas (define-public r-pegas
(package (package
(name "r-pegas") (name "r-pegas")
(version "0.11") (version "0.12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "pegas" version)) (uri (cran-uri "pegas" version))
(sha256 (sha256
(base32 (base32 "0sb8cmz4d238mcb56hv9fa0cagm00k82r7aj4cj4lxa1flxlpy8p"))))
"0l21bapzbjcvblbvks3jh9rpy9hng1ccd7f0glhqw695lc737bpx"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-adegenet" ,r-adegenet) `(("r-adegenet" ,r-adegenet)
@ -13062,14 +13054,13 @@ either PDF/EPS files.")
(define-public r-polspline (define-public r-polspline
(package (package
(name "r-polspline") (name "r-polspline")
(version "1.1.15") (version "1.1.16")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "polspline" version)) (uri (cran-uri "polspline" version))
(sha256 (sha256
(base32 (base32 "0d49h7if8h6d784nsnqqxakg19kvl8cmz8k53901m2h0c0amlfxa"))))
"19zs4kpagsrzhng1byjbz1c4jxnfk58h4rgr096ml1bjwrgamnwc"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs `(("gfortran" ,gfortran))) (native-inputs `(("gfortran" ,gfortran)))
(home-page "https://cran.r-project.org/web/packages/polspline/") (home-page "https://cran.r-project.org/web/packages/polspline/")
@ -13319,13 +13310,13 @@ SELECT or UPDATE queries to an end-point.")
(define-public r-bookdown (define-public r-bookdown
(package (package
(name "r-bookdown") (name "r-bookdown")
(version "0.13") (version "0.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "bookdown" version)) (uri (cran-uri "bookdown" version))
(sha256 (sha256
(base32 (base32
"15r9scgnq68hmfcfxvjk286hpbr825bib1d2kgh0lv3dgz2i2bg1")))) "1jiq2d292y0l3f4npyfzfpnmb0sqxsl212kkjfbjg5301h0na762"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
`(("r-htmltools" ,r-htmltools) `(("r-htmltools" ,r-htmltools)
@ -15065,14 +15056,13 @@ customize styles using a readable syntax.")
(define-public r-glasso (define-public r-glasso
(package (package
(name "r-glasso") (name "r-glasso")
(version "1.10") (version "1.11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "glasso" version)) (uri (cran-uri "glasso" version))
(sha256 (sha256
(base32 (base32 "02p3612rpydk195n2qr77lp1j2w8zsw1ckkk98c8angm4r5q8dsc"))))
"0nshpx14v2yny7lr8ll6nnz71n0f02sddh2c2dglfprbk89p9yp6"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs `(("gfortran" ,gfortran))) (native-inputs `(("gfortran" ,gfortran)))
(home-page "http://www-stat.stanford.edu/~tibs/glasso") (home-page "http://www-stat.stanford.edu/~tibs/glasso")
@ -15529,14 +15519,13 @@ effect size.")
(define-public r-rgdal (define-public r-rgdal
(package (package
(name "r-rgdal") (name "r-rgdal")
(version "1.4-4") (version "1.4-6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "rgdal" version)) (uri (cran-uri "rgdal" version))
(sha256 (sha256
(base32 (base32 "0lj1dax56dxxsj1hindxcvgz169p9dxd0y4wjypbyr01nja8rz4d"))))
"1my56hdc9x40ynxx1qwqwqxjvjxybmm00w4xg5gi8zgj19pffci5"))))
(properties `((upstream-name . "rgdal"))) (properties `((upstream-name . "rgdal")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs

41
gnu/packages/crates-io.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -475,31 +476,6 @@ depending on a large number of #[cfg] parameters. Structured like an
colorization.") colorization.")
(license license:expat))) (license license:expat)))
(define-public rust-clippy
(package
(name "rust-clippy")
(version "0.0.302")
(source
(origin
(method url-fetch)
(uri (crate-uri "clippy" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1562x3sq9mgmc8j39gd34wqm7ybrdvpmj7cc1n450gwsawayw4fr"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-term" ,rust-term))))
(home-page "https://github.com/rust-lang/rust-clippy")
(synopsis
"A bunch of helpful lints to avoid common pitfalls in Rust.")
(description
"This package provides a bunch of helpful lints to avoid common pitfalls in Rust.")
(license (list license:asl2.0
license:expat))))
(define-public rust-cloudabi (define-public rust-cloudabi
(package (package
(name "rust-cloudabi") (name "rust-cloudabi")
@ -1971,15 +1947,14 @@ file IO.")
(define-public rust-miniz-oxide (define-public rust-miniz-oxide
(package (package
(name "rust-miniz-oxide") (name "rust-miniz-oxide")
(version "0.3.2") (version "0.3.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (crate-uri "miniz_oxide" version)) (uri (crate-uri "miniz_oxide" version))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "1bmanbbcdmssfbgik3fs323g7vljc5wkjz7s61jsbbz2kg0nckrh"))))
"041s41l5w7z8pkp93pdzn8rngxr93q4wxp034pr0cvc7bgway23i"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:cargo-inputs `(#:cargo-inputs
@ -2428,15 +2403,14 @@ system for OpenSSL.")
(define-public rust-openssl-sys (define-public rust-openssl-sys
(package (package
(name "rust-openssl-sys") (name "rust-openssl-sys")
(version "0.9.49") (version "0.9.50")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (crate-uri "openssl-sys" version)) (uri (crate-uri "openssl-sys" version))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "1dn3capgiz77s6rpmc2sf8gadwkmhwgfd6mw4rcnnm9jp36dqhic"))))
"1168vivyqbzaxl48bvv9r1x714c03f5c1za8pv5x8fyj9gjxkypl"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:cargo-inputs `(#:cargo-inputs
@ -4147,15 +4121,14 @@ or XID_Continue properties according to Unicode Standard Annex #31.")
(define-public rust-unindent (define-public rust-unindent
(package (package
(name "rust-unindent") (name "rust-unindent")
(version "0.1.3") (version "0.1.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (crate-uri "unindent" version)) (uri (crate-uri "unindent" version))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "14s97blyqgf9hzxk22iazrghj60midajkw2801dfspz3n2iqmwb3"))))
"1x21ilf78aqcq9xzb9b7i628wm10rhk0jp0chlv06rkc690l8jw3"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(home-page "https://github.com/dtolnay/indoc") (home-page "https://github.com/dtolnay/indoc")
(synopsis "Remove a column of leading whitespace from a string") (synopsis "Remove a column of leading whitespace from a string")

52
gnu/packages/cryptsetup.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -25,30 +26,43 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages password-utils)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages popt) #:use-module (gnu packages popt)
#:use-module (gnu packages python) #:use-module (gnu packages linux)
#:use-module (gnu packages linux)) #:use-module (gnu packages web))
(define-public cryptsetup (define-public cryptsetup
(package (package
(name "cryptsetup") (name "cryptsetup")
(version "1.7.5") (version "2.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v"
(version-major+minor version) (version-major+minor version)
"/" name "-" version ".tar.xz")) "/cryptsetup-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1gail831j826lmpdx2gsc83lp3br6wfnwh3vqwxaa1nn1lfwsc1b")))) "0q8w3khiwsw708169vahm0nccajsc2hwqz5gv6nb1g9qxlqrmrwl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (arguments
`(("libgcrypt" ,libgcrypt) `(#:configure-flags
("lvm2" ,lvm2) (list
("util-linux" ,util-linux) ;; Argon2 is always enabled, this just selects the (faster) full version.
("popt" ,popt))) "--enable-libargon2"
;; The default is OpenSSL which provides better PBKDF performance.
"--with-crypto_backend=gcrypt"
;; GRUB as of 2.04 still can't read LUKS2 containers.
"--with-default-luks-format=LUKS1")))
(native-inputs (native-inputs
`(("python" ,python-wrapper))) `(("pkg-config" ,pkg-config)))
(inputs
`(("argon2" ,argon2)
("json-c" ,json-c)
("libgcrypt" ,libgcrypt)
("lvm2" ,lvm2) ; device-mapper
("popt" ,popt)
("util-linux" ,util-linux))) ; libuuid
(synopsis "Hard disk encryption tool") (synopsis "Hard disk encryption tool")
(description (description
"LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk "LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk
@ -81,6 +95,14 @@ files). This assumes LIBRARY uses Libtool."
'(#:configure-flags '("--disable-shared" '(#:configure-flags '("--disable-shared"
"--enable-static-cryptsetup" "--enable-static-cryptsetup"
"--disable-veritysetup"
"--disable-cryptsetup-reencrypt"
"--disable-integritysetup"
;; The default is OpenSSL which provides better PBKDF performance.
"--with-crypto_backend=gcrypt"
"--disable-blkid"
;; 'libdevmapper.a' pulls in libpthread, libudev and libm. ;; 'libdevmapper.a' pulls in libpthread, libudev and libm.
"LIBS=-ludev -pthread -lm") "LIBS=-ludev -pthread -lm")
@ -94,8 +116,7 @@ files). This assumes LIBRARY uses Libtool."
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'install 'remove-cruft (add-after 'install 'remove-cruft
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Remove everything except the 'cryptsetup' command and ;; Remove everything except the 'cryptsetup' command.
;; its friend.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(with-directory-excursion out (with-directory-excursion out
(let ((dirs (scandir "." (let ((dirs (scandir "."
@ -109,7 +130,7 @@ files). This assumes LIBRARY uses Libtool."
".static") ".static")
file) file)
(remove-store-references file)) (remove-store-references file))
'("sbin/cryptsetup" "sbin/veritysetup")) '("sbin/cryptsetup"))
#t)))))))) #t))))))))
(inputs (inputs
(let ((libgcrypt-static (let ((libgcrypt-static
@ -117,7 +138,8 @@ files). This assumes LIBRARY uses Libtool."
(inherit (static-library libgcrypt)) (inherit (static-library libgcrypt))
(propagated-inputs (propagated-inputs
`(("libgpg-error-host" ,(static-library libgpg-error))))))) `(("libgpg-error-host" ,(static-library libgpg-error)))))))
`(("libgcrypt" ,libgcrypt-static) `(("json-c" ,json-c)
("libgcrypt" ,libgcrypt-static)
("lvm2" ,lvm2-static) ("lvm2" ,lvm2-static)
("util-linux" ,util-linux "static") ("util-linux" ,util-linux "static")
("util-linux" ,util-linux) ("util-linux" ,util-linux)

11
gnu/packages/dav.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -69,14 +69,17 @@ clients.")
"1vqjhn2bffy2bx45a1r14crsyn2cylf5by567g44c4mhpjwwz6vc")))) "1vqjhn2bffy2bx45a1r14crsyn2cylf5by567g44c4mhpjwwz6vc"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:tests? #f ; The test suite is very flakey.
#:phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs tests? #:allow-other-keys)
(add-installed-pythonpath inputs outputs) (add-installed-pythonpath inputs outputs)
(setenv "DETERMINISTIC_TESTS" "true") (setenv "DETERMINISTIC_TESTS" "true")
(setenv "DAV_SERVER" "radicale") (setenv "DAV_SERVER" "radicale")
(setenv "REMOTESTORAGE_SERVER" "skip") (setenv "REMOTESTORAGE_SERVER" "skip")
(invoke "make" "test"))) (if tests?
(invoke "make" "test")
#t)))
(add-after 'install 'manpage (add-after 'install 'manpage
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(invoke "make" "--directory=docs/" "man") (invoke "make" "--directory=docs/" "man")

4
gnu/packages/dictionaries.scm
View File

@ -219,7 +219,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
(define-public grammalecte (define-public grammalecte
(package (package
(name "grammalecte") (name "grammalecte")
(version "1.4.0") (version "1.5.0")
(source (source
(origin (origin
(method url-fetch/zipbomb) (method url-fetch/zipbomb)
@ -227,7 +227,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
"Grammalecte-fr-v" version ".zip")) "Grammalecte-fr-v" version ".zip"))
(sha256 (sha256
(base32 (base32
"0k30b9kcczsadjjgwja03rkm11cpcc1xi6w8l6k0qfbjfpkhsh66")))) "0byh578apbyq2jdpgmbaw01izlkyw2h5nsr28az44rvaqrsndy0z"))))
(build-system python-build-system) (build-system python-build-system)
(home-page "https://grammalecte.net") (home-page "https://grammalecte.net")
(synopsis "French spelling and grammar checker") (synopsis "French spelling and grammar checker")

108
gnu/packages/emacs-xyz.scm
View File

@ -976,15 +976,14 @@ optional minor mode which can apply this command automatically on save.")
(define-public emacs-relint (define-public emacs-relint
(package (package
(name "emacs-relint") (name "emacs-relint")
(version "1.10") (version "1.11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://elpa.gnu.org/packages/relint-" version ".el")) "https://elpa.gnu.org/packages/relint-" version ".tar"))
(sha256 (sha256
(base32 (base32 "0c7d35kp5k11fnyjrq9cg8i2r005gs57pmb3rvpf8ilwv0scn1m7"))))
"1l0lh4pkksw7brmhhbaikwzs4zkgd2962ks1zy7m262dvkhxjfv8"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs `(("emacs-xr" ,emacs-xr))) (propagated-inputs `(("emacs-xr" ,emacs-xr)))
(home-page "https://github.com/mattiase/relint") (home-page "https://github.com/mattiase/relint")
@ -2119,6 +2118,31 @@ code written in the D programming language. This mode is currently known to
work with Emacs 24 and 25.") work with Emacs 24 and 25.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public emacs-extempore-mode
;; Use the latest commit at time of packaging. There are no releases or tags.
(let ((commit "848ad0084f27b92d1cf98dabffbad29f959a642d")
(revision "1"))
(package
(name "emacs-extempore-mode")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/extemporelang/extempore-emacs-mode.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "00wr025php7nl33x541s9rjm99hj0jbdcmnw9ljx5hqpm04aqm7c"))))
(build-system emacs-build-system)
(home-page "https://github.com/extemporelang/extempore-emacs-mode")
(synopsis "Emacs major mode for Extempore source files")
(description
"This package provides a major mode for editing Extempore code. It can
create an Extempore REPL, connect the current @code{extempore-mode} buffer to a
running Extempore process, and more.")
(license license:bsd-2))))
(define-public emacs-keyfreq (define-public emacs-keyfreq
(package (package
(name "emacs-keyfreq") (name "emacs-keyfreq")
@ -3650,8 +3674,8 @@ completion backends according to mode, and integrates with
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-handle (define-public emacs-handle
(let ((commit "0180a33c92b53d042c3e248a047e15337122d922") (let ((commit "51c050bc1c6e5caf0eb47ecd985daea1db7241ab")
(revision "1")) (revision "2"))
(package (package
(name "emacs-handle") (name "emacs-handle")
(version (git-version "0.1" revision commit)) (version (git-version "0.1" revision commit))
@ -3663,8 +3687,10 @@ completion backends according to mode, and integrates with
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0ldrdfxspkq0m07l98hhj9nydgj9qi557mnnpd3v4xrwqwhyr4nc")))) (base32 "14f15qzfmwdslml4rv37zb5d1lsjf0jibriz636hb7q7knx1n4sg"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs
`(("emacs-parent-mode" ,emacs-parent-mode)))
(home-page "https://gitlab.com/jjzmajic/handle") (home-page "https://gitlab.com/jjzmajic/handle")
(synopsis "Handle generic functions across related major modes") (synopsis "Handle generic functions across related major modes")
(description "This package provides generic functions that specialize on (description "This package provides generic functions that specialize on
@ -4487,8 +4513,8 @@ organizer.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-org-tanglesync (define-public emacs-org-tanglesync
(let ((commit "ab76a3eaaed263677d2e029d43f6c4de8fc21418") (let ((commit "d99181f173b4e55b4e835d99fcd415e62beb047f")
(revision "1")) (revision "2"))
(package (package
(name "emacs-org-tanglesync") (name "emacs-org-tanglesync")
(version (git-version "0.6" revision commit)) (version (git-version "0.6" revision commit))
@ -4500,7 +4526,7 @@ organizer.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "14ify3yirq2qmi9isk8kcbwx8pbclv1fyg49kraz4srhgf2fssgf")))) (base32 "0x94gy1bgfd1f3p9w2bfrqj11bwy9ql0cpi1gw6srpj7kykx0lml"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-org" ,emacs-org))) `(("emacs-org" ,emacs-org)))
@ -13839,12 +13865,11 @@ interactive loop.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-eros (define-public emacs-eros
(let ((commit "a42e45c9b2397156c684330b0fc90ee0eba773f5") (let ((commit "dd8910279226259e100dab798b073a52f9b4233a")
(revision "1")) (revision "2"))
(package (package
(name "emacs-eros") (name "emacs-eros")
(version (string-append "0.0.1" "-" revision "." (version (git-version "0.0.1" revision commit))
(string-take commit 7)))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -13854,7 +13879,7 @@ interactive loop.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0whlsq90v13fz69k3wjrwcwb9gkpfxqjd75mg3nrp85j9nwhb5i4")))) "08chj3a0lw4ygi2sv7wj0i6ihfbi8jhylr8p92inif8b88r6wg3k"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/xiongtx/eros") (home-page "https://github.com/xiongtx/eros")
(synopsis "Evaluation result overlays") (synopsis "Evaluation result overlays")
@ -14348,8 +14373,8 @@ defaults.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-evil-mc (define-public emacs-evil-mc
(let ((commit "5205fe671803465149e578849bbbe803c23a8e4e") (let ((commit "1cabb869fe70cef49f7dc06f015c3ade1a969c8c")
(revision "1")) (revision "2"))
(package (package
(name "emacs-evil-mc") (name "emacs-evil-mc")
(version (git-version "0.0.3" revision commit)) (version (git-version "0.0.3" revision commit))
@ -14361,7 +14386,7 @@ defaults.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "03pxpjjxbai4dwp84bgxh52ahh0f6ac58xi2mds1kl4v93nm7v42")))) (base32 "0p83p90faq1p02lmsfs7zrnky3cyzgy8z4m83a81r9kakjzhkrnb"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-evil" ,emacs-evil))) `(("emacs-evil" ,emacs-evil)))
@ -15503,10 +15528,11 @@ files) are provided.")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public emacs-hackernews (define-public emacs-hackernews
(let ((commit "916c3da8da45c757f5ec2faeed57fa370513d4ac")) (let ((commit "2362d7b00e59da7caddc8c0adc24dccb42fddef9")
(revision "2"))
(package (package
(name "emacs-hackernews") (name "emacs-hackernews")
(version (git-version "0.5.0" "1" commit)) (version (git-version "0.5.0" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -15516,7 +15542,7 @@ files) are provided.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"09bxaaczana1cfvxyk9aagjvdszkj0j1yldl5r4xa60b59lxihsg")))) "1hcc5b173yzcvvd2ls3jxrmsw2w9bi21m9hcpcirkn0nh93ywadv"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/clarete/hackernews.el") (home-page "https://github.com/clarete/hackernews.el")
(synopsis "Hacker News client for Emacs") (synopsis "Hacker News client for Emacs")
@ -16832,6 +16858,33 @@ like @code{company}, @code{flycheck}, and @code{projectile}.")
and code peeking.") and code peeking.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-lsp-ivy
(let ((commit "6fd55316dd62d290429c25ea9b0c1f66069b2f37")
(revision "1"))
(package
(name "emacs-lsp-ivy")
(version (git-version "0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacs-lsp/lsp-ivy.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0hx9rs66ahl2rqgnmyiyrwk12v7iv8c6gnn7b66985mxjqyyh94r"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ivy" ,emacs-ivy)
("emacs-lsp-mode" ,emacs-lsp-mode)
("emacs-dash" ,emacs-dash)))
(home-page "https://github.com/emacs-lsp/lsp-ivy")
(synopsis "Provide LSP-enhanced completion for symbols")
(description
"This package enhances @code{ivy} with completion for symbols from
workspaces with a LSP-compliant server running.")
(license license:gpl3+))))
(define-public emacs-helm-lsp (define-public emacs-helm-lsp
(let ((commit "3a58ca4cfd94b9ab1e15e819d3b16ef568e8889b") (let ((commit "3a58ca4cfd94b9ab1e15e819d3b16ef568e8889b")
(revision "1")) (revision "1"))
@ -16855,8 +16908,8 @@ and code peeking.")
(home-page "https://github.com/emacs-lsp/helm-lsp") (home-page "https://github.com/emacs-lsp/helm-lsp")
(synopsis "Provide LSP-enhanced completion for symbols") (synopsis "Provide LSP-enhanced completion for symbols")
(description (description
"This package provides completion for symbols from workspaces with a "This package enhances @code{helm} with completion for symbols from
LSP-compliant server running.") workspaces with a LSP-compliant server running.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-helm-notmuch (define-public emacs-helm-notmuch
@ -16990,8 +17043,8 @@ packages with a consistent way to use them.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-undo-propose-el (define-public emacs-undo-propose-el
(let ((commit "47b7df0c97ad0099537d1ade21c4c52f0618a945") (let ((commit "f80baee566807d733fbacbab08a897bcd62579c3")
(revision "2")) (revision "3"))
(package (package
(name "emacs-undo-propose-el") (name "emacs-undo-propose-el")
(version (git-version "3.0.0" revision commit)) (version (git-version "3.0.0" revision commit))
@ -17004,8 +17057,11 @@ packages with a consistent way to use them.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"078bs8lk9f0lklxqh15976fffayg5z5386y59nxxfhm27lmwgka9")))) "00rqz63bhh66q78l646q3w16gydygj8h4d8np0dpbifgzciak90b"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments
`(#:tests? #t
#:test-command '("make" "test")))
(home-page "https://github.com/jackkamm/undo-propose-el") (home-page "https://github.com/jackkamm/undo-propose-el")
(synopsis "Simple and safe navigation of @code{undo} history") (synopsis "Simple and safe navigation of @code{undo} history")
(description "This package permits navigation of @code{undo} history in a (description "This package permits navigation of @code{undo} history in a

124
gnu/packages/enlightenment.scm
View File

@ -29,6 +29,7 @@
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages avahi)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages code) #:use-module (gnu packages code)
@ -45,6 +46,7 @@
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gstreamer) #:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages ibus)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
@ -65,7 +67,7 @@
(define-public efl (define-public efl
(package (package
(name "efl") (name "efl")
(version "1.22.5") (version "1.23.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -73,28 +75,22 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1cjk56z0whpzcqwg3xdq23kyp1g83xa67m9dlp7ywmb36bn4ca59")))) "1iawq5k1ggas41h3vrwc0y98hf83vr0vh3phfgw22iij3cb2b5nd"))))
(outputs '("out" ; 53 MB (build-system meson-build-system)
"include")) ; 21 MB
(build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("check" ,check)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("curl" ,curl)
("curl" ,curl)
("ghostscript" ,ghostscript)
("giflib" ,giflib) ("giflib" ,giflib)
("gstreamer" ,gstreamer) ("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base) ("gst-plugins-base" ,gst-plugins-base)
("libexif" ,libexif) ("ibus" ,ibus)
("libjpeg" ,libjpeg) ("mesa" ,mesa)
("libraw" ,libraw) ("libraw" ,libraw)
("librsvg" ,librsvg) ("librsvg" ,librsvg)
("libsndfile" ,libsndfile)
("libspectre" ,libspectre) ("libspectre" ,libspectre)
("libtiff" ,libtiff)
("libwebp" ,libwebp)
("libx11" ,libx11)
("libxau" ,libxau) ("libxau" ,libxau)
("libxcomposite" ,libxcomposite) ("libxcomposite" ,libxcomposite)
("libxcursor" ,libxcursor) ("libxcursor" ,libxcursor)
@ -107,55 +103,59 @@
("libxp" ,libxp) ("libxp" ,libxp)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("libxrender" ,libxrender) ("libxrender" ,libxrender)
("libxscrnsaver" ,libxscrnsaver) ("libxss" ,libxscrnsaver)
("libxtst" ,libxtst) ("libxtst" ,libxtst)
("lz4" ,lz4)
("openjpeg" ,openjpeg-1)
("poppler" ,poppler) ("poppler" ,poppler)
("printproto" ,printproto) ("wayland-protocols" ,wayland-protocols)))
("pulseaudio" ,pulseaudio)
("wayland-protocols" ,wayland-protocols)
("xinput" ,xinput)
("xpr" ,xpr)
("xorgproto" ,xorgproto)))
(propagated-inputs (propagated-inputs
;; All these inputs are in package config files in section ;; All these inputs are in package config files in section
;; Requires.private. ;; Requires.private.
`(("bullet" ,bullet) ; ephysics.pc `(("avahi" ,avahi)
("dbus" ,dbus) ; eldbus.pc, elementary.pc, elocation.pc, ethumb_client.pc ("bullet" ,bullet)
("eudev" ,eudev) ; eeze.pc ("dbus" ,dbus)
("fontconfig" ,fontconfig) ; evas.pc, evas-cxx.pc ("elogind" ,elogind)
("freetype" ,freetype) ; evas.pc, evas-cxx.pc ("eudev" ,eudev)
("fribidi" ,fribidi) ; evas.pc, evas-cxx.pc ("fontconfig" ,fontconfig)
("glib" ,glib) ; ecore.pc, ecore-cxx.pc ("freetype" ,freetype)
("harfbuzz" ,harfbuzz) ; evas.pc, evas-cxx.pc ("fribidi" ,fribidi)
("luajit" ,luajit) ; elua.pc, evas.pc, evas-cxx.pc ("glib" ,glib)
("libinput" ,libinput-minimal) ; elput.pc ("harfbuzz" ,harfbuzz)
("libpng" ,libpng) ; evas.pc, evas-cxx.pc ("luajit" ,luajit)
("libxkbcommon" ,libxkbcommon) ; ecore-wl2.pc, elementary.pc, elput.pc ("libinput" ,libinput-minimal)
("mesa" ,mesa) ; ecore-drm2.pc ("libjpeg" ,libjpeg)
("openssl" ,openssl) ; ecore-con.pc, eet.pc, eet-cxx.pc, emile.pc ("libpng" ,libpng)
("util-linux" ,util-linux) ; mount: eeze.pc ("libsndfile" ,libsndfile)
("wayland" ,wayland) ; ecore-wl2.pc, elementary.pc ("libtiff" ,libtiff)
("zlib" ,zlib))) ; eet.pc, eet-cxx.pc, emile.pc ("libwebp" ,libwebp)
("libx11" ,libx11)
("libxkbcommon" ,libxkbcommon)
("lz4" ,lz4)
("openssl" ,openssl)
("pulseaudio" ,pulseaudio)
("util-linux" ,util-linux)
("wayland" ,wayland)
("zlib" ,zlib)))
(arguments (arguments
`(#:configure-flags '("--disable-silent-rules" `(#:configure-flags '("-Dsystemd=false"
"--disable-systemd" "-Dembedded-lz4=false"
"--with-profile=release" "-Devas-loaders-disabler=json"
"--enable-liblz4" "-Dbuild-examples=false"
"--enable-xinput22" ;(string-append "-Ddictionaries-hyphen-dir="
"--enable-image-loader-webp" ; (assoc-ref %build-inputs "hyphen")
"--enable-multisense" ; "/share/hyphen")
"-Delogind=true"
"-Dnetwork-backend=connman"
,@(match (%current-system) ,@(match (%current-system)
("armhf-linux" ("armhf-linux"
'("--with-opengl=es" "--with-egl")) '("-opengl=es-egl"))
(_ (_
'("--with-opengl=full"))) '("-Dopengl=full")))
"--enable-harfbuzz"
;; for wayland ;; for wayland
"--enable-wayland" "-Dwl-deprecated=true" ; ecore_wayland
"--enable-elput" "-Ddrm-deprecated=true" ; ecore_drm
"--enable-drm") "-Dwl=true"
"-Ddrm=true")
#:tests? #f ; Many tests fail due to timeouts and network requests.
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; If we don't hardcode the location of libcurl.so then we ;; If we don't hardcode the location of libcurl.so then we
@ -168,6 +168,14 @@
(("libcurl.so.?" libcurl) ; libcurl.so.[45] (("libcurl.so.?" libcurl) ; libcurl.so.[45]
(string-append lib libcurl))) (string-append lib libcurl)))
#t))) #t)))
(add-after 'unpack 'fix-install-paths
(lambda _
(substitute* "dbus-services/meson.build"
(("install_dir.*")
"install_dir: join_paths(dir_data, 'dbus-1', 'services'))\n"))
(substitute* "src/tests/elementary/meson.build"
(("dir_data") "meson.source_root(), 'test-output'"))
#t))
(add-after 'unpack 'set-home-directory (add-after 'unpack 'set-home-directory
;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2 ;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2
(lambda _ (setenv "HOME" "/tmp") #t))))) (lambda _ (setenv "HOME" "/tmp") #t)))))
@ -273,7 +281,7 @@ Libraries with some extra bells and whistles.")
(define-public enlightenment (define-public enlightenment
(package (package
(name "enlightenment") (name "enlightenment")
(version "0.23.0") (version "0.23.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -281,7 +289,7 @@ Libraries with some extra bells and whistles.")
"enlightenment/enlightenment-" version ".tar.xz")) "enlightenment/enlightenment-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1y7x594gvyvl5zbb1rnf3clj2pm6j97n8wl5mp9x6xjmhx0d1idq")) "0d1cyl07w9pvi2pf029kablazks2q9aislzl46b6fq5m1465jc75"))
(patches (search-patches "enlightenment-fix-setuid-path.patch")))) (patches (search-patches "enlightenment-fix-setuid-path.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
@ -531,7 +539,7 @@ directories.
(define-public evisum (define-public evisum
(package (package
(name "evisum") (name "evisum")
(version "0.2.3") (version "0.2.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -539,7 +547,7 @@ directories.
"evisum/evisum-" version ".tar.xz")) "evisum/evisum-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1lj62n896kablsl687c66yxrwajrh6ralb3y6nmcqv34pglnigca")))) "1rg3kri6j8nmab0kdljnmcc096c8ibgwzvbhqr0b25xpmrq8bcac"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests

5
gnu/packages/finance.scm
View File

@ -735,14 +735,13 @@ Ledger Nano as a hardware SSH/GPG agent.")
(define-public python-mnemonic (define-public python-mnemonic
(package (package
(name "python-mnemonic") (name "python-mnemonic")
(version "0.18") (version "0.19")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "mnemonic" version)) (uri (pypi-uri "mnemonic" version))
(sha256 (sha256
(base32 (base32 "0cd9prmdj8wzdmc7lxbf9lz0xrlkvak5ignag406mmfbn81fndsf"))))
"07bzfa5di6nv5xwwcwbypnflpj50wlfczhh6q6hg8w13g5m319q2"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-pbkdf2" ,python-pbkdf2))) `(("python-pbkdf2" ,python-pbkdf2)))

37
gnu/packages/games.scm
View File

@ -43,6 +43,7 @@
;;; Copyright © 2019 Jesse Gibbons <jgibbons2357+guix@gmail.com> ;;; Copyright © 2019 Jesse Gibbons <jgibbons2357+guix@gmail.com>
;;; Copyright © 2019 Dan Frumin <dfrumin@cs.ru.nl> ;;; Copyright © 2019 Dan Frumin <dfrumin@cs.ru.nl>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -253,34 +254,26 @@ mouse and joystick control, and original music.")
(define-public alex4 (define-public alex4
(package (package
(name "alex4") (name "alex4")
(version "1.2-alpha") (version "1.2.1")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/carstene1ns/alex4/archive/" (uri (git-reference
version ".tar.gz")) (url "https://github.com/carstene1ns/alex4.git")
(commit version)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "0jj1g3v1a6lyfwp5g2ly0n9z65ryqck8jxvzr01kaqjj3lsfkrhg")))) (base32 "098wy72mh4lsvq3gm0rhamjssf9l1hp6hhkpzrv7klpb97cwwc3h"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:make-flags #:make-flags
(list "-Csrc" (list "CC=gcc"
"CC=gcc"
"CFLAGS=-D_FILE_OFFSET_BITS=64" "CFLAGS=-D_FILE_OFFSET_BITS=64"
(string-append "DATADIR=" (assoc-ref %outputs "out")
"/share/" ,name)
(string-append "PREFIX=" (assoc-ref %outputs "out"))) (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (delete 'configure) ; no configure script
(lambda _
(substitute* '("src/main.c"
"src/shooter.c")
(("fcos") "fixcos")
(("fmul") "fixmul")
(("fsin") "fixsin"))
#t))
(add-after 'install 'install-data (add-after 'install 'install-data
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((share (string-append (assoc-ref outputs "out") (let ((share (string-append (assoc-ref outputs "out")
@ -6193,7 +6186,7 @@ your score gets higher, you level up and the blocks fall faster.")
(define-public endless-sky (define-public endless-sky
(package (package
(name "endless-sky") (name "endless-sky")
(version "0.9.8") (version "0.9.10")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -6203,7 +6196,7 @@ your score gets higher, you level up and the blocks fall faster.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0i36lawypikbq8vvzfis1dn7yf6q0d2s1cllshfn7kmjb6pqfi6c")))) "1wax9qhxakydg6bs92d1jy2fki1n9r0wkps1np02y0pvm1fl189i"))))
(build-system scons-build-system) (build-system scons-build-system)
(arguments (arguments
`(#:scons ,scons-python2 `(#:scons ,scons-python2
@ -7126,7 +7119,7 @@ simulator.")
(define-public jumpnbump (define-public jumpnbump
(package (package
(name "jumpnbump") (name "jumpnbump")
(version "1.60") (version "1.61")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -7135,7 +7128,7 @@ simulator.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0gwi58ck4magvdim8wmxdqnsi0fqdpvqia9kcc7q73nqf34jjz3v")))) "12lwl5sl5n009nb83r8l4lakb9286csqdf1ynpmwwydy17giqsdp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags

3
gnu/packages/gl.scm
View File

@ -350,7 +350,8 @@ also known as DXTn or DXTC) for Mesa.")
(substitute* "src/intel/genxml/gen_pack_header.py" (substitute* "src/intel/genxml/gen_pack_header.py"
(("/usr/bin/env python2") (which "python"))) (("/usr/bin/env python2") (which "python")))
#t)) #t))
,@(if (string-prefix? "i686" (%current-system)) ,@(if (string-prefix? "i686" (or (%current-target-system)
(%current-system)))
;; Disable new test from Mesa 19 that fails on i686. Upstream ;; Disable new test from Mesa 19 that fails on i686. Upstream
;; report: <https://bugs.freedesktop.org/show_bug.cgi?id=110612>. ;; report: <https://bugs.freedesktop.org/show_bug.cgi?id=110612>.
`((add-after 'unpack 'disable-failing-test `((add-after 'unpack 'disable-failing-test

18
gnu/packages/graphics.scm
View File

@ -17,6 +17,7 @@
;;; Copyright © 2019 John Soo <jsoo1@asu.edu> ;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -914,28 +915,25 @@ rendering SVG graphics.")
(define-public python-pastel (define-public python-pastel
(package (package
(name "python-pastel") (name "python-pastel")
(version "0.1.0") (version "0.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pastel" version)) (uri (pypi-uri "pastel" version))
(sha256 (sha256
(base32 (base32
"1hqbm934n5yjwn31aq8h7shrr0rcy326wrqfc856vyn0gr0sy21i")))) "1qxcrcl8pzh66l8s6hym153mijdhwna0afcsmgca0bj4n80ijfxz"))))
(build-system python-build-system) (build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda _ (invoke "pytest" "pastel" "tests/"))))))
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest))) `(("python-pytest" ,python-pytest)))
(home-page "https://github.com/sdispater/pastel") (home-page "https://github.com/sdispater/pastel")
(synopsis "Library to colorize strings in your terminal") (synopsis "Library to colorize strings in your terminal")
(description "Pastel is a simple library to help you colorize strings in (description "Pastel is a simple library to help you colorize strings in
your terminal. It comes bundled with predefined styles: your terminal.")
@enumerate
@item info: green
@item comment: yellow
@item question: black on cyan
@item error: white on red
@end enumerate
")
(license license:expat))) (license license:expat)))
(define-public python2-pastel (define-public python2-pastel

6
gnu/packages/guile-xyz.scm
View File

@ -1994,8 +1994,8 @@ The picture values can directly be displayed in Geiser.")
(license license:lgpl3+)))) (license license:lgpl3+))))
(define-public guile-studio (define-public guile-studio
(let ((commit "e2da64f014942a73996286c4abe3c3b1f8bd220c") (let ((commit "4d63f3d684f61bf83566745e8572496cdf6daad0")
(revision "1")) (revision "2"))
(package (package
(name "guile-studio") (name "guile-studio")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -2006,7 +2006,7 @@ The picture values can directly be displayed in Geiser.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"10v3kw41bzd8c2a6vxgrwbvl216d0k8f5s9h6pm8hahpd03jl7lm")))) "1d3hhw3c3mk5i87xvfqa643674f08j1jd1rc1pl534gydz529vd5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there are none `(#:tests? #f ; there are none

13
gnu/packages/java.scm
View File

@ -197,10 +197,14 @@ language.")
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-classpath-install-dir=" (list (string-append "--with-classpath-install-dir="
(assoc-ref %build-inputs "classpath"))))) (assoc-ref %build-inputs "classpath"))
"--disable-int-caching"
"--enable-runtime-reloc-checks"
"--enable-ffi")))
(inputs (inputs
`(("classpath" ,classpath-bootstrap) `(("classpath" ,classpath-bootstrap)
("jikes" ,jikes) ("jikes" ,jikes)
("libffi" ,libffi)
("zlib" ,zlib))) ("zlib" ,zlib)))
;; When built with a recent GCC and glibc the configure step of icedtea-6 ;; When built with a recent GCC and glibc the configure step of icedtea-6
;; fails with an invalid instruction error. ;; fails with an invalid instruction error.
@ -1402,7 +1406,12 @@ bootstrapping purposes.")
(add-after 'install 'install-libjvm (add-after 'install 'install-libjvm
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((lib-path (string-append (assoc-ref outputs "out") (let* ((lib-path (string-append (assoc-ref outputs "out")
"/lib/amd64"))) "/lib/"
,(match (%current-system)
("i686-linux"
"i386")
("x86_64-linux"
"amd64")))))
(symlink (string-append lib-path "/server/libjvm.so") (symlink (string-append lib-path "/server/libjvm.so")
(string-append lib-path "/libjvm.so"))) (string-append lib-path "/libjvm.so")))
#t)) #t))

49
gnu/packages/license.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -19,10 +19,15 @@
(define-module (gnu packages license) (define-module (gnu packages license)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages check)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages perl-check) #:use-module (gnu packages perl-check)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (guix packages)) #:use-module (guix packages))
@ -160,3 +165,45 @@ statements and serializes in normalized format.")
to each file passed to it, by searching the start of the file for text to each file passed to it, by searching the start of the file for text
belonging to various licenses.") belonging to various licenses.")
(license (package-license perl)))) (license (package-license perl))))
(define-public reuse
(package
(name "reuse")
(version "0.5.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://git.fsfe.org/reuse/tool.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1w17g6jvs715rjc93nnnqnfdphijq4ymj9jjkr3ccc286ywvn3ih"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest" ,python-pytest)))
(inputs
`(("python-binaryornot" ,python-binaryornot)
("python-boolean.py" ,python-boolean.py)
("python-debian" ,python-debian)
("python-jinja2" ,python-jinja2)
("python-license-expression" ,python-license-expression)
("python-requests" ,python-requests)))
(home-page "https://reuse.software/")
(synopsis "Provide and verify copyright and licensing information")
(description
"The REUSE tool helps you achieve and confirm license compliance with the
@uref{https://reuse.software, REUSE specification}, a set of recommendations
for licensing Free Software projects. REUSE makes it easy to declare the
licenses under which your works are released, especially when reusing software
from different projects released under different licenses. It avoids reliance
on fuzzy heuristicts and allows both legal experts and computers to understand
how your project is licensed. This allows generating a \"bill of materials\"
for software.
This tool downloads full license texts, adds copyright and license information
to file headers, and contains a linter to identify problems. There are other
tools that have a lot more features and functionality surrounding the analysis
and inspection of copyright and licenses in software projects. This one is
designed to be simple.")
(license (list asl2.0 gpl3+))))

51
gnu/packages/linux.scm
View File

@ -115,6 +115,7 @@
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages rsync)
#:use-module (gnu packages selinux) #:use-module (gnu packages selinux)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
@ -180,6 +181,12 @@ defconfig. Return the appropriate make target if applicable, otherwise return
"deblob-check")) "deblob-check"))
(sha256 deblob-check-hash)))) (sha256 deblob-check-hash))))
(define deblob-scripts-5.3
(linux-libre-deblob-scripts
"5.3.1"
(base32 "15n09zq38d69y1wl28s3nasf3377qp2yil5b887zpqrm00dif7i4")
(base32 "1av9ykv714cnl0clls8rhwa8rwflz6ivg17gharj1x650qp6vnw3")))
(define deblob-scripts-5.2 (define deblob-scripts-5.2
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
"5.2.17" "5.2.17"
@ -350,18 +357,26 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
"linux-" version ".tar.xz")) "linux-" version ".tar.xz"))
(sha256 hash))) (sha256 hash)))
(define-public linux-libre-5.2-version "5.2.17") (define-public linux-libre-5.3-version "5.3.2")
(define-public linux-libre-5.3-pristine-source
(let ((version linux-libre-5.3-version)
(hash (base32 "0szw21mpp94gp3zn2fgllbv6fdjjf20njgrcjay7vjmm7farq7rn")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.3)))
(define-public linux-libre-5.2-version "5.2.18")
(define-public linux-libre-5.2-pristine-source (define-public linux-libre-5.2-pristine-source
(let ((version linux-libre-5.2-version) (let ((version linux-libre-5.2-version)
(hash (base32 "1y9d218w83qgd6wima6h6n4zbj1rxz15yb6hdlhv8dm9kv88lfvv"))) (hash (base32 "0q6akmhcdj52lhvs5fjxrr25r0hyklh7115hg0zl0fcpdj30y2bd")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.2))) deblob-scripts-5.2)))
(define-public linux-libre-4.19-version "4.19.75") (define-public linux-libre-4.19-version "4.19.76")
(define-public linux-libre-4.19-pristine-source (define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version) (let ((version linux-libre-4.19-version)
(hash (base32 "0y0vcmxyfg98mm63vaqq6n2bmxkbmrnvigm5zdh1al74w53p2pnx"))) (hash (base32 "0rhyjw5r3xdnj37dd6wrpihdqc3zn5ih6hcpa4x2cjvk0acx4kds")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.19))) deblob-scripts-4.19)))
@ -418,6 +433,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(patches (append (origin-patches source) (patches (append (origin-patches source)
patches)))) patches))))
(define-public linux-libre-5.3-source
(source-with-patches linux-libre-5.3-pristine-source
(list %boot-logo-patch
%linux-libre-arm-export-__sync_icache_dcache-patch)))
(define-public linux-libre-5.2-source (define-public linux-libre-5.2-source
(source-with-patches linux-libre-5.2-pristine-source (source-with-patches linux-libre-5.2-pristine-source
(list (search-patch "linux-libre-active-entropy.patch") (list (search-patch "linux-libre-active-entropy.patch")
@ -463,6 +483,9 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
,@(if (version>=? version "4.16") ,@(if (version>=? version "4.16")
`(("flex" ,flex) `(("flex" ,flex)
("bison" ,bison)) ("bison" ,bison))
'())
,@(if (version>=? version "5.3")
`(("rsync" ,rsync))
'()))) '())))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
@ -511,6 +534,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(description "Headers of the Linux-Libre kernel.") (description "Headers of the Linux-Libre kernel.")
(license license:gpl2))) (license license:gpl2)))
(define-public linux-libre-headers-5.3
(make-linux-libre-headers* linux-libre-5.3-version
linux-libre-5.3-source))
(define-public linux-libre-headers-5.2 (define-public linux-libre-headers-5.2
(make-linux-libre-headers* linux-libre-5.2-version (make-linux-libre-headers* linux-libre-5.2-version
linux-libre-5.2-source)) linux-libre-5.2-source))
@ -765,17 +792,23 @@ It has been modified to remove all non-free binary blobs.")
;;; Generic kernel packages. ;;; Generic kernel packages.
;;; ;;;
(define-public linux-libre-5.3
(make-linux-libre* linux-libre-5.3-version
linux-libre-5.3-source
'("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux")
#:configuration-file kernel-config))
(define-public linux-libre-version linux-libre-5.3-version)
(define-public linux-libre-pristine-source linux-libre-5.3-pristine-source)
(define-public linux-libre-source linux-libre-5.3-source)
(define-public linux-libre linux-libre-5.3)
(define-public linux-libre-5.2 (define-public linux-libre-5.2
(make-linux-libre* linux-libre-5.2-version (make-linux-libre* linux-libre-5.2-version
linux-libre-5.2-source linux-libre-5.2-source
'("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux") '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux")
#:configuration-file kernel-config)) #:configuration-file kernel-config))
(define-public linux-libre-version linux-libre-5.2-version)
(define-public linux-libre-pristine-source linux-libre-5.2-pristine-source)
(define-public linux-libre-source linux-libre-5.2-source)
(define-public linux-libre linux-libre-5.2)
(define-public linux-libre-4.19 (define-public linux-libre-4.19
(make-linux-libre* linux-libre-4.19-version (make-linux-libre* linux-libre-4.19-version
linux-libre-4.19-source linux-libre-4.19-source

234
gnu/packages/lisp.scm
View File

@ -217,7 +217,8 @@ interface to the Tk widget system.")
("libgc" ,libgc) ("libgc" ,libgc)
("libffi" ,libffi))) ("libffi" ,libffi)))
(arguments (arguments
'(#:tests? #t '(#:configure-flags '("--without-rt")
#:tests? #t
#:parallel-tests? #f #:parallel-tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -700,10 +701,10 @@ libraries for Machine Learning, Neural Nets and statistical estimation.")
(define-public sbcl-alexandria (define-public sbcl-alexandria
(let ((revision "1") (let ((revision "1")
(commit "926a066611b7b11cb71e26c827a271e500888c30")) (commit "3b849bc0116ea70f215ee6b2fbf354e862aaa9dd"))
(package (package
(name "sbcl-alexandria") (name "sbcl-alexandria")
(version (string-append "0.0.0-" revision "." (string-take commit 7))) (version (git-version "1.0.0" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -712,9 +713,11 @@ libraries for Machine Learning, Neural Nets and statistical estimation.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"18yncicdkh294j05rhgm23gzi36y9qy6vrfba8vg69jrxjp1hx8l")) "04amwvx2vl691f0plcfbqqwxgib9zimih7jrn5zl7mbwvrxy022b"))
(file-name (string-append "alexandria-" version "-checkout")))) (file-name (git-file-name name version))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs
`(("rt" ,sbcl-rt)))
(synopsis "Collection of portable utilities for Common Lisp") (synopsis "Collection of portable utilities for Common Lisp")
(description (description
"Alexandria is a collection of portable utilities. It does not contain "Alexandria is a collection of portable utilities. It does not contain
@ -1703,26 +1706,23 @@ consistent across multiple Common Lisp implementations.")
(sbcl-package->ecl-package sbcl-trivial-features)) (sbcl-package->ecl-package sbcl-trivial-features))
(define-public sbcl-hu.dwim.asdf (define-public sbcl-hu.dwim.asdf
(let ((commit "170b0e4fdde3df0bc537327e7600575daac9e141")) (package
(package (name "sbcl-hu.dwim.asdf")
(name "sbcl-hu.dwim.asdf") (version "20190521")
(version (git-version "0.0.0" "1" commit)) (source
(source (origin
(origin (method url-fetch)
(method git-fetch) (uri (string-append "http://beta.quicklisp.org/archive/hu.dwim.asdf/"
(uri "2019-05-21/hu.dwim.asdf-" version "-darcs.tgz"))
(git-reference (sha256
(url "https://github.com/nixeagle/hu.dwim.asdf") (base32
(commit commit))) "0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn"))))
(sha256 (build-system asdf-build-system/sbcl)
(base32 "10ax7p8y6vjqxzcq125p62kf68zi455a65ysgk0kl1f2v839c33v")) (home-page "https://hub.darcs.net/hu.dwim/hu.dwim.asdf")
(file-name (git-file-name "hu.dwim.asdf" version)))) (synopsis "Extensions to ASDF")
(build-system asdf-build-system/sbcl) (description "Various ASDF extensions such as attached test and
(home-page "https://hub.darcs.net/hu.dwim/hu.dwim.asdf")
(synopsis "Extensions to ASDF")
(description "Various ASDF extensions such as attached test and
documentation system, explicit development support, etc.") documentation system, explicit development support, etc.")
(license license:public-domain)))) (license license:public-domain)))
(define-public cl-hu.dwim.asdf (define-public cl-hu.dwim.asdf
(sbcl-package->cl-source-package sbcl-hu.dwim.asdf)) (sbcl-package->cl-source-package sbcl-hu.dwim.asdf))
@ -2327,42 +2327,27 @@ writing code that contains string literals that contain code themselves.")
(define-public ecl-pythonic-string-reader (define-public ecl-pythonic-string-reader
(sbcl-package->ecl-package sbcl-pythonic-string-reader)) (sbcl-package->ecl-package sbcl-pythonic-string-reader))
(define-public sbcl-slime-swank ;; SLIME does not have a ASDF system definition to build all of Swank. As a
;; result, the asdf-build-system/sbcl will produce an almost empty package.
;; Some work was done to fix this at
;; https://github.com/sionescu/slime/tree/swank-asdf but it was never merged
;; and is now lagging behind. Building SBCL fasls might not be worth the
;; hassle, so let's just ship the source then.
(define-public cl-slime-swank
(package (package
(name "sbcl-slime-swank") (name "cl-slime-swank")
(version "2.22") (version "2.24")
(source (source
(origin (origin
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
;; (url "https://github.com/slime/slime/") (url "https://github.com/slime/slime/")
;; (commit "841f61467c03dea9f38ff9d5af0e21a8aa29e8f7") (commit (string-append "v" version))))
;; REVIEW: Do we need sionescu's patch to package SWANK?
(url "https://github.com/sionescu/slime/")
;; (commit "swank-asdf")
(commit "2f7c3fcb3ac7d50d844d5c6ca0e89b52a45e1d3a")))
(sha256 (sha256
(base32 (base32
;; "065bc4y6iskazdfwlhgcjlzg9bi2hyjbhmyjw3461506pgkj08vi" "0js24x42m7b5iymb4rxz501dff19vav5pywnzv50b673rbkaaqvh"))))
"0pkmg94wn4ii1zhlrncn44mdc5i6c5v0i9gbldx4dwl2yy7ibz5c")) (build-system asdf-build-system/source)
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "contrib/swank-listener-hooks.lisp"
((":compile-toplevel :load-toplevel ") ""))
(substitute* "contrib/swank-presentations.lisp"
((":compile-toplevel :load-toplevel ") ""))
(substitute* "swank.asd"
((":file \"packages\".*" all)
(string-append all "(:file \"swank-loader-asdf\")\n")))
(substitute* "swank-loader-asdf.lisp"
((":common-lisp" all) (string-append all " #:asdf")))
#t))))
(build-system asdf-build-system/sbcl)
(arguments
`(#:asd-file "swank.asd"
#:asd-system-name "swank"))
(home-page "https://github.com/slime/slime") (home-page "https://github.com/slime/slime")
(synopsis "Common Lisp Swank server") (synopsis "Common Lisp Swank server")
(description (description
@ -2371,6 +2356,9 @@ processes that doesn't run under Emacs. Lisp processes created by
@command{M-x slime} automatically start the server.") @command{M-x slime} automatically start the server.")
(license (list license:gpl2+ license:public-domain)))) (license (list license:gpl2+ license:public-domain))))
(define-public sbcl-slime-swank
(deprecated-package "sbcl-slime-swank" cl-slime-swank))
(define-public sbcl-mgl-pax (define-public sbcl-mgl-pax
(let ((commit "818448418d6b9de74620f606f5b23033c6082769")) (let ((commit "818448418d6b9de74620f606f5b23033c6082769"))
(package (package
@ -2395,7 +2383,7 @@ processes that doesn't run under Emacs. Lisp processes created by
("ironclad" ,sbcl-ironclad) ("ironclad" ,sbcl-ironclad)
("named-readtables" ,sbcl-named-readtables) ("named-readtables" ,sbcl-named-readtables)
("pythonic-string-reader" ,sbcl-pythonic-string-reader) ("pythonic-string-reader" ,sbcl-pythonic-string-reader)
("swank" ,sbcl-slime-swank))) ("swank" ,cl-slime-swank)))
(synopsis "Exploratory programming environment and documentation generator") (synopsis "Exploratory programming environment and documentation generator")
(description (description
"PAX provides an extremely poor man's Explorable Programming "PAX provides an extremely poor man's Explorable Programming
@ -7360,3 +7348,143 @@ compression/decompression using bindings to the lzlib C library.")
(define-public ecl-lzlib (define-public ecl-lzlib
(sbcl-package->ecl-package sbcl-lzlib)) (sbcl-package->ecl-package sbcl-lzlib))
(define-public sbcl-chanl
(let ((commit "2362b57550c2c9238cc882d03553aaa1040b7340")
(revision "0"))
(package
(name "sbcl-chanl")
(version (git-version "0.4.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/zkat/chanl.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0ag3wz7yrqwp0s5069wwda98z3rrqd25spg8sa8rdqghj084w28w"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(inputs
`(("bordeaux-threads" ,sbcl-bordeaux-threads)))
(synopsis "Portable channel-based concurrency for Common Lisp")
(description "Common Lisp library for channel-based concurrency. In
a nutshell, you create various threads sequentially executing tasks you need
done, and use channel objects to communicate and synchronize the state of these
threads.")
(home-page "https://github.com/zkat/chanl")
(license (list license:expat license:bsd-3)))))
(define-public cl-chanl
(sbcl-package->cl-source-package sbcl-chanl))
(define-public ecl-chanl
(let ((base (sbcl-package->ecl-package sbcl-chanl)))
(package
(inherit base)
(arguments
(substitute-keyword-arguments (package-arguments base)
;; The CHANL.ACTORS package uses the :ARGUMENTS option of
;; DEFINE-METHOD-COMBINATION, which is not implemented in ECL yet
;; (see https://gitlab.com/embeddable-common-lisp/ecl/issues/305).
;; So let's disable it for now, as it allows compiling the library
;; and using the rest of it.
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-after 'unpack 'disable-chanl-actors
(lambda _
(substitute* "chanl.asd"
(("\\(:file \"actors\"\\)") ""))
#t))))
;; Disable the tests for now, as the SEND-SEQUENCE test seems to
;; never end.
((#:tests? _ #f) #f))))))
(define-public sbcl-cl-store
(let ((commit "cd01f2610d3360dc01ab972bd9317407aaea7745")
(revision "0"))
(package
(name "sbcl-cl-store")
(version (git-version "0.8.11" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/skypher/cl-store.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"05b7kh5af2ax7vlmphpac4vbqr84j5ivppj96qzb64fxpjpqglm4"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("rt" ,sbcl-rt)))
(synopsis "Common Lisp library to serialize data")
(description
"CL-STORE is a portable serialization package which should give you the
ability to store all Common Lisp data types into streams.")
(home-page "http://www.common-lisp.net/project/cl-store/")
(license license:expat))))
(define-public cl-store
(sbcl-package->cl-source-package sbcl-cl-store))
(define-public ecl-cl-store
(sbcl-package->ecl-package sbcl-cl-store))
(define-public sbcl-cl-gobject-introspection
(let ((commit "7b703e2384945ea0ac39d9b766de434a08d81560")
(revision "0"))
(package
(name "sbcl-cl-gobject-introspection")
(version (git-version "0.3" revision commit))
(home-page "https://github.com/andy128k/cl-gobject-introspection")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1zcqd2qj14f6b38vys8gr89s6cijsp9r8j43xa8lynilwva7bwyh"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("alexandria" ,sbcl-alexandria)
("cffi" ,sbcl-cffi)
("iterate" ,sbcl-iterate)
("trivial-garbage" ,sbcl-trivial-garbage)
("glib" ,glib)
("gobject-introspection" ,gobject-introspection)))
(native-inputs
`(("fiveam" ,sbcl-fiveam)))
(arguments
;; TODO: Tests fail, see
;; https://github.com/andy128k/cl-gobject-introspection/issues/70.
'(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after (quote unpack) (quote fix-paths)
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/init.lisp"
(("libgobject-2\\.0\\.so")
(string-append (assoc-ref inputs "glib") "/lib/libgobject-2.0.so"))
(("libgirepository-1\\.0\\.so")
(string-append (assoc-ref inputs "gobject-introspection")
"/lib/libgirepository-1.0.so")))
#t)))))
(synopsis "Common Lisp bindings to GObject Introspection")
(description
"This library is a bridge between Common Lisp and GObject
Introspection, which enables Common Lisp programs to access the full interface
of C+GObject libraries without the need of writing dedicated bindings.")
(license (list license:bsd-3
;; Tests are under a different license.
license:llgpl)))))
(define-public cl-gobject-introspection
(sbcl-package->cl-source-package sbcl-cl-gobject-introspection))

8
gnu/packages/lua.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2016 doncatnip <gnopap@gmail.com> ;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
;;; Copyright © 2016, 2017, 2019 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2016, 2017, 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2016 José Miguel Sánchez García <jmi2k@openmailbox.org> ;;; Copyright © 2016 José Miguel Sánchez García <jmi2k@openmailbox.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -454,7 +454,7 @@ Grammars (PEGs).")
(define (make-lua-luv name lua) (define (make-lua-luv name lua)
(package (package
(name name) (name name)
(version "1.30.1-0") (version "1.30.1-1")
(source (origin (source (origin
;; The release tarball includes the sources of libuv but does ;; The release tarball includes the sources of libuv but does
;; not include the pkg-config files. ;; not include the pkg-config files.
@ -465,10 +465,10 @@ Grammars (PEGs).")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1lfzzyphpim28kw33k7zylcyxnf40ckhdg6hbqyzb5hszdf2hbka")))) "0b2zxrsjxzhzwfp28lchplrp272v6zkbpq1ddz7a0rf20l7dbls1"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; there are none `(#:tests? #f ; there are none
#:configure-flags #:configure-flags
'("-DWITH_LUA_ENGINE=Lua" '("-DWITH_LUA_ENGINE=Lua"
"-DWITH_SHARED_LIBUV=On" "-DWITH_SHARED_LIBUV=On"

130
gnu/packages/machine-learning.scm
View File

@ -11,6 +11,7 @@
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -33,6 +34,7 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix svn-download) #:use-module (guix svn-download)
#:use-module (guix build-system asdf)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system ocaml) #:use-module (guix build-system ocaml)
@ -58,6 +60,7 @@
#:use-module (gnu packages gstreamer) #:use-module (gnu packages gstreamer)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lisp)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (gnu packages ocaml) #:use-module (gnu packages ocaml)
@ -1921,3 +1924,130 @@ that:
@item Runs seamlessly on CPU and GPU. @item Runs seamlessly on CPU and GPU.
@end itemize\n") @end itemize\n")
(license license:expat))) (license license:expat)))
(define-public sbcl-cl-libsvm-format
(let ((commit "3300f84fd8d9f5beafc114f543f9d83417c742fb")
(revision "0"))
(package
(name "sbcl-cl-libsvm-format")
(version (git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/masatoi/cl-libsvm-format.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0284aj84xszhkhlivaigf9qj855fxad3mzmv3zfr0qzb5k0nzwrg"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("prove" ,sbcl-prove)
("prove-asdf" ,sbcl-prove-asdf)))
(inputs
`(("alexandria" ,sbcl-alexandria)))
(synopsis "LibSVM data format reader for Common Lisp")
(description
"This Common Lisp library provides a fast reader for data in LibSVM
format.")
(home-page "https://github.com/masatoi/cl-libsvm-format")
(license license:expat))))
(define-public cl-libsvm-format
(sbcl-package->cl-source-package sbcl-cl-libsvm-format))
(define-public ecl-cl-libsvm-format
(sbcl-package->ecl-package sbcl-cl-libsvm-format))
(define-public sbcl-cl-online-learning
(let ((commit "fc7a34f4f161cd1c7dd747d2ed8f698947781423")
(revision "0"))
(package
(name "sbcl-cl-online-learning")
(version (git-version "0.5" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/masatoi/cl-online-learning.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"14x95rlg80ay5hv645ki57pqvy12v28hz4k1w0f6bsfi2rmpxchq"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("prove" ,sbcl-prove)
("prove-asdf" ,sbcl-prove-asdf)))
(inputs
`(("cl-libsvm-format" ,sbcl-cl-libsvm-format)
("cl-store" ,sbcl-cl-store)))
(arguments
`(;; FIXME: Tests pass but then the check phase crashes
#:tests? #f))
(synopsis "Online Machine Learning for Common Lisp")
(description
"This library contains a collection of machine learning algorithms for
online linear classification written in Common Lisp.")
(home-page "https://github.com/masatoi/cl-online-learning")
(license license:expat))))
(define-public cl-online-learning
(sbcl-package->cl-source-package sbcl-cl-online-learning))
(define-public ecl-cl-online-learning
(sbcl-package->ecl-package sbcl-cl-online-learning))
(define-public sbcl-cl-random-forest
(let ((commit "85fbdd4596d40e824f70f1b7cf239cf544e49d51")
(revision "0"))
(package
(name "sbcl-cl-random-forest")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/masatoi/cl-random-forest.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"097xv60i1ndz68sg9p4pc7c5gvyp9i1xgw966b4wwfq3x6hbz421"))))
(build-system asdf-build-system/sbcl)
(native-inputs
`(("prove" ,sbcl-prove)
("prove-asdf" ,sbcl-prove-asdf)
("trivial-garbage" ,sbcl-trivial-garbage)))
(inputs
`(("alexandria" ,sbcl-alexandria)
("cl-libsvm-format" ,sbcl-cl-libsvm-format)
("cl-online-learning" ,sbcl-cl-online-learning)
("lparallel" ,sbcl-lparallel)))
(arguments
`(;; The tests download data from the Internet
#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'add-sb-cltl2-dependency
(lambda _
;; sb-cltl2 is required by lparallel when using sbcl, but it is
;; not loaded automatically.
(substitute* "cl-random-forest.asd"
(("\\(in-package :cl-user\\)")
"(in-package :cl-user) #+sbcl (require :sb-cltl2)"))
#t)))))
(synopsis "Random Forest and Global Refinement for Common Lisp")
(description
"CL-random-forest is an implementation of Random Forest for multiclass
classification and univariate regression written in Common Lisp. It also
includes an implementation of Global Refinement of Random Forest.")
(home-page "https://github.com/masatoi/cl-random-forest")
(license license:expat))))
(define-public cl-random-forest
(sbcl-package->cl-source-package sbcl-cl-random-forest))
(define-public ecl-cl-random-forest
(sbcl-package->ecl-package sbcl-cl-random-forest))

8
gnu/packages/mail.scm
View File

@ -491,7 +491,7 @@ It adds a large amount of new and improved features to mutt.")
(define-public gmime (define-public gmime
(package (package
(name "gmime") (name "gmime")
(version "3.2.3") (version "3.2.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/gmime/" (uri (string-append "mirror://gnome/sources/gmime/"
@ -499,7 +499,7 @@ It adds a large amount of new and improved features to mutt.")
"/gmime-" version ".tar.xz")) "/gmime-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"04bk7rqs5slpvlvqf11i6s37s8b2xn6acls8smyl9asjnpp7a23a")))) "096hh4g6z343kncw9svcrzv05d41n4v2q5k9jsm6gc40w30ag7i4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -1151,14 +1151,14 @@ which can add many functionalities to the base client.")
(define-public msmtp (define-public msmtp
(package (package
(name "msmtp") (name "msmtp")
(version "1.8.5") (version "1.8.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://marlam.de/msmtp/releases/" (uri (string-append "https://marlam.de/msmtp/releases/"
"/msmtp-" version ".tar.xz")) "/msmtp-" version ".tar.xz"))
(sha256 (sha256
(base32 "0fczpfxlr62wkr7bwhp24clxg962k5khgz14h818qyy4v77dl4qn")))) (base32 "1qa260xrm0fzlwxpjvgvq39m4dfkskjlyb7m4y2vlr8c8d3z29b6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libsecret" ,libsecret) `(("libsecret" ,libsecret)

26
gnu/packages/messaging.scm
View File

@ -1734,23 +1734,23 @@ notifications, and Python scripting support.")
(define-public libqmatrixclient (define-public libqmatrixclient
(package (package
(name "libqmatrixclient") (name "libqmatrixclient")
(version "0.4.0") (version "0.5.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/QMatrixClient/libqmatrixclient") (url "https://github.com/QMatrixClient/libqmatrixclient")
(commit (string-append "v" version)))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "1bhlqfs7251fss4icx794ka614npr6zyrpp4qwc4q5408ykfm7lr"))))
"1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("qtbase" ,qtbase))) `(("qtbase" ,qtbase)
("qtmultimedia" ,qtmultimedia)))
(arguments (arguments
`(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON") `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON")
#:tests? #f)) ; No tests #:tests? #f)) ; no tests
(home-page "https://matrix.org/docs/projects/sdk/libqmatrixclient.html") (home-page "https://matrix.org/docs/projects/sdk/libqmatrixclient.html")
(synopsis "Qt5 client library for the Matrix instant messaging protocol") (synopsis "Qt5 client library for the Matrix instant messaging protocol")
(description "libqmatrixclient is a Qt5 library to write clients for the (description "libqmatrixclient is a Qt5 library to write clients for the
@ -1762,27 +1762,27 @@ QMatrixClient project.")
(define-public quaternion (define-public quaternion
(package (package
(name "quaternion") (name "quaternion")
(version "0.0.9.3") (version "0.0.9.4c")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/QMatrixClient/Quaternion") (url "https://github.com/QMatrixClient/Quaternion")
(commit (string-append "v" version)))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "0gpv6b3nn3lsyym8809kiqkpdszfasldqjpk5s542zyn41gdlql4"))))
"1hr9zqf301rg583n9jv256vzj7y57d8qgayk7c723bfknf1s6hh3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("libqmatrixclient" ,libqmatrixclient) `(("libqmatrixclient" ,libqmatrixclient)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative" ,qtdeclarative)
("qtmultimedia" ,qtmultimedia)
("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols" ,qtquickcontrols)
("qtsvg" ,qtsvg) ("qtsvg" ,qtsvg)
("qttools" ,qttools))) ("qttools" ,qttools)))
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
@ -1804,8 +1804,8 @@ QMatrixClient project.")
messaging protocol. It uses libqmatrixclient and is its reference client messaging protocol. It uses libqmatrixclient and is its reference client
implementation. Quaternion and libqmatriclient together form the implementation. Quaternion and libqmatriclient together form the
QMatrixClient project.") QMatrixClient project.")
(license (list license:gpl3+ ; all source code (license (list license:gpl3+ ; all source code
license:lgpl3+)))) ; icons/breeze license:lgpl3+)))) ; icons/breeze
(define-public hangups (define-public hangups
(package (package

4
gnu/packages/monitoring.scm
View File

@ -152,7 +152,7 @@ etc. via a Web interface. Features include:
(define-public zabbix-agentd (define-public zabbix-agentd
(package (package
(name "zabbix-agentd") (name "zabbix-agentd")
(version "4.2.0") (version "4.2.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -161,7 +161,7 @@ etc. via a Web interface. Features include:
"/zabbix-" version ".tar.gz")) "/zabbix-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1b9wx6z15jfg8yakb7mlaqqri1ia9i12rgk58c3nparzsjdd9p2c")))) "09znh8x1sass5mw6wjrfmizjbfls8ad2c16y24ldfj40hlfxz6wx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

40
gnu/packages/music.scm
View File

@ -4582,3 +4582,43 @@ with error and volume history, and advanced features.")
;; Most of the code is under GPL2+, but some abstract or helper classes ;; Most of the code is under GPL2+, but some abstract or helper classes
;; are under LGPL2.1. ;; are under LGPL2.1.
(license (list license:gpl2+ license:lgpl2.1)))) (license (list license:gpl2+ license:lgpl2.1))))
(define-public mloop
(let ((commit "adebff98b0b4dc5872a03acb82e89c77cb29c127")
(revision "0"))
(package
(name "mloop")
(version (git-version "0.0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "http://git.fuzzle.org/mloop")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"175gxvg5slq0bllcx1c381rjlq3xpxww8c3kpiw5i2kfr4m52myz"))))
(build-system waf-build-system)
(arguments
`(#:python ,python-2
#:tests? #f)) ; no "check" target
(inputs
`(("jack" ,jack-1)
("ncurses" ,ncurses)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://fuzzle.org/~petern/mloop.html")
(synopsis "Live MIDI looper")
(description "mloop is a live MIDI looping system, using jack-midi.
Loops are recorded, optionally with beat quantization, and can then be played
back, either once or looping. A 'note cache' system is implemented to
remember which notes are pressed and their velocities. This allows for a loop
to start off with the currently pressed notes, making seamless loops much
easier to perform. Features include:
@itemize
@item Quantisation; end a loop on a beat exactly.
@item Delayed recording; wait for a MIDI event before starting a loop record.
@item Adjust tempo; Playback speed of loops can be adjusted on the fly.
@end itemize\n")
(license license:gpl2))))

4
gnu/packages/nano.scm
View File

@ -30,13 +30,13 @@
(define-public nano (define-public nano
(package (package
(name "nano") (name "nano")
(version "4.4") (version "4.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz"))
(sha256 (sha256
(base32 "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia")))) (base32 "0czmz1yq8s5qcxcmfjdxzg9nkhbmlc9q1nz04jvf57fdbs7w7mfy"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)

63
gnu/packages/networking.scm
View File

@ -30,6 +30,7 @@
;;; Copyright © 2019 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2019 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2019 Brice Waegeneire <brice@waegenei.re>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -592,14 +593,14 @@ of the same name.")
(define-public wireshark (define-public wireshark
(package (package
(name "wireshark") (name "wireshark")
(version "3.0.3") (version "3.0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.wireshark.org/download/src/wireshark-" (uri (string-append "https://www.wireshark.org/download/src/wireshark-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "0711jilp9sbgi46d105m3galw8n4wk5yncawi08031qxg2f754mg")))) (base32 "087qv7nd7zlbckvcs37fkkg7v0mw0hjd5yfbghqym764fpjgqlf5"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -2581,3 +2582,61 @@ communication.")
(description "FRRouting (FRR) is an IP routing protocol suite which includes (description "FRRouting (FRR) is an IP routing protocol suite which includes
protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ") protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ")
(license license:gpl2+))) (license license:gpl2+)))
(define-public iwd
(package
(name "iwd")
(version "0.21")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.kernel.org/pub/scm/network/wireless/iwd.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"001dikinsa6kshwscjbvwipavzwpqnpvx9fpshcn63gbvbhyd393"))))
(build-system gnu-build-system)
(inputs
`(("dbus" ,dbus)
("libtool" ,libtool)
("ell" ,ell)
("readline" ,readline)))
(native-inputs
`(("asciidoc" ,asciidoc)
("autoconf" ,autoconf)
("automake" ,automake)
("pkgconfig" ,pkg-config)
("python" ,python)
("openssl" ,openssl)))
(arguments
`(#:configure-flags
(let ((dbus (assoc-ref %outputs "out")))
(list "--disable-systemd-service"
"--enable-external-ell"
"--enable-hwsim"
"--enable-tools"
"--enable-wired"
"--enable-docs"
"--localstatedir=/var"
(string-append "--with-dbus-datadir=" dbus "/share/")
(string-append "--with-dbus-busdir="
dbus "/share/dbus-1/system-services")))
#:phases
(modify-phases %standard-phases
(add-before 'bootstrap 'pre-bootstrap
(lambda _
(substitute* "Makefile.am"
;; Test disabled because it needs the kernel module
;; 'pkcs8_key_parser' loaded.
(("unit\\/test-eapol.*? ") "")
;; Don't try to 'mkdir /var'.
(("\\$\\(MKDIR_P\\) -m 700") "true"))
#t)))))
(home-page "https://git.kernel.org/pub/scm/network/wireless/iwd.git/")
(synopsis "Internet Wireless Daemon")
(description "iwd is a wireless daemon for Linux that aims to replace WPA
Supplicant. It optimizes resource utilization by not depending on any external
libraries and instead utilizing features provided by the Linux kernel to the
maximum extent possible.")
(license license:lgpl2.1+)))

8
gnu/packages/ocaml.scm
View File

@ -1186,7 +1186,7 @@ GNU CC attributes. It provides also a C pretty printer as an example of use.")
(define-public ocaml-qcheck (define-public ocaml-qcheck
(package (package
(name "ocaml-qcheck") (name "ocaml-qcheck")
(version "0.10") (version "0.11")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1195,7 +1195,7 @@ GNU CC attributes. It provides also a C pretty printer as an example of use.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1i7axg7vmivrkzsahyg79my584myvzxv0922k4000bdwnhzd0kzh")))) (base32 "0d2wih4zxn2zm7kxd9dnf5nlp838km3vz6wv80fa3m51609fb24i"))))
(build-system dune-build-system) (build-system dune-build-system)
(arguments (arguments
`(#:test-target ".")) `(#:test-target "."))
@ -3123,7 +3123,7 @@ instead of bindings to a C library.")
(define-public ocaml-utop (define-public ocaml-utop
(package (package
(name "ocaml-utop") (name "ocaml-utop")
(version "2.4.1") (version "2.4.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3132,7 +3132,7 @@ instead of bindings to a C library.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3")))) (base32 "0z8klqwqmq5i111p4awzvlvirhm1dxp0mbfagwfiwq1wg72v6zdm"))))
(build-system dune-build-system) (build-system dune-build-system)
(arguments (arguments
`(#:jbuild? #t `(#:jbuild? #t

4
gnu/packages/perl-check.scm
View File

@ -836,14 +836,14 @@ you @code{unmock()} the subroutine.")
(define-public perl-test-mockobject (define-public perl-test-mockobject
(package (package
(name "perl-test-mockobject") (name "perl-test-mockobject")
(version "1.20180705") (version "1.20191002")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/C/CH/CHROMATIC/" (uri (string-append "mirror://cpan/authors/id/C/CH/CHROMATIC/"
"Test-MockObject-" version ".tar.gz")) "Test-MockObject-" version ".tar.gz"))
(sha256 (sha256
(base32 "06250ayzzd90vbvkpxwr9d3nlbbngl1b9nk2qk0ma4aibn6ha5j5")))) (base32 "160r36j727hw6syazh6sfq862f95dp1zcga0nil7cjlry77lqsn7"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs (native-inputs
`(("perl-cgi" ,perl-cgi) `(("perl-cgi" ,perl-cgi)

16
gnu/packages/perl.scm
View File

@ -4329,17 +4329,16 @@ and busy().")
(define-public perl-io-pager (define-public perl-io-pager
(package (package
(name "perl-io-pager") (name "perl-io-pager")
(version "0.4") (version "0.44")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-" "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-"
version version
"0.tgz")) ".tgz"))
(sha256 (sha256
(base32 (base32 "0h52gplhc3rij18xc4ngpg5kqv6mylxfzig18xll1aqda8iwa8kl"))))
"1vzdypsr7vkj8nnda9ccrksci6pqj5awwmi89l7x3mbpq36gad87"))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -7320,15 +7319,14 @@ and @code{deserialize_regexp}.")
(define-public perl-role-tiny-2 (define-public perl-role-tiny-2
(package (package
(inherit perl-role-tiny) (inherit perl-role-tiny)
(version "2.000006") (version "2.001001")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/" (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/"
"Role-Tiny-" version ".tar.gz")) "Role-Tiny-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "16yryg3cr14xw201gm8k8ci00hs60fy8lk2xhnaqa85n5m68flk8"))))))
"10p3sc639c0nj56bb77a2wg8samyyl8sqpliv3n8c0jaj2642wyc"))))))
(define-public perl-safe-isa (define-public perl-safe-isa
(package (package
@ -7897,7 +7895,7 @@ return value is the sub.")
(define-public perl-sub-quote (define-public perl-sub-quote
(package (package
(name "perl-sub-quote") (name "perl-sub-quote")
(version "2.006003") (version "2.006006")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -7905,7 +7903,7 @@ return value is the sub.")
"mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-" "mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0xl1w55qilqc3xdqvmjzs5vjnjdc0d4633yw7hh1yd9zfxpkl7xy")))) (base32 "17fq4iskrisnqs96amrz493vxikwvqbj9s7014k6vyl84gs2lkkf"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs (native-inputs
`(("perl-test-fatal" ,perl-test-fatal))) `(("perl-test-fatal" ,perl-test-fatal)))

4
gnu/packages/plotutils.scm
View File

@ -180,14 +180,14 @@ colors, styles, options and details.")
(define-public asymptote (define-public asymptote
(package (package
(name "asymptote") (name "asymptote")
(version "2.53") (version "2.55")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/asymptote/" (uri (string-append "mirror://sourceforge/asymptote/"
version "/asymptote-" version ".src.tgz")) version "/asymptote-" version ".src.tgz"))
(sha256 (sha256
(base32 (base32
"0ysj6b3ffifbraflkixh19hmdh3qjij26wyj4z66085qw17v7qkw")))) "07704k1p9bzchv7r8x6sj22gcphdyjmj6caa3y83r7gk0r9xi56c"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; Note: The 'asy' binary retains a reference to docdir for use with its ;; Note: The 'asy' binary retains a reference to docdir for use with its
;; "help" command in interactive mode, so adding a "doc" output is not ;; "help" command in interactive mode, so adding a "doc" output is not

8
gnu/packages/python-check.scm
View File

@ -110,17 +110,17 @@ interactions, which will update them to correspond to the new API.")
(define-public python-pytest-checkdocs (define-public python-pytest-checkdocs
(package (package
(name "python-pytest-checkdocs") (name "python-pytest-checkdocs")
(version "1.2.0") (version "1.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pytest-checkdocs" version)) (uri (pypi-uri "pytest-checkdocs" version))
(sha256 (sha256
(base32 (base32 "0j6j1gvj6x451y3qsx4xbaq9p1w9gg3mwk7n0w80cy8vdyjkngb0"))))
"07c27cdjcw6jph5kbgpxchrvwlps4ggwb2j6m7y64imnik0asrq8"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-importlib-metadata" ,python-importlib-metadata))) `(("python-importlib-metadata" ,python-importlib-metadata)
("python-more-itertools" ,python-more-itertools)))
(native-inputs (native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm))) `(("python-setuptools-scm" ,python-setuptools-scm)))
(home-page "https://github.com/jaraco/pytest-checkdocs") (home-page "https://github.com/jaraco/pytest-checkdocs")

60
gnu/packages/python-xyz.scm
View File

@ -394,6 +394,32 @@ certificate returned by the server to which a connection has been established,
and verifies that it matches the intended target hostname.") and verifies that it matches the intended target hostname.")
(license license:psfl))) (license license:psfl)))
(define-public python-boolean.py
(package
(name "python-boolean.py")
(version "3.6")
(source
(origin
;; There's no source tarball on PyPI.
(method git-fetch)
(uri (git-reference
(url "https://github.com/bastikr/boolean.py")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1wc89y73va58cj7dsx6c199zpxsy9q53dsffsdj6zmc90inqz6qs"))))
(build-system python-build-system)
(home-page "https://github.com/bastikr/boolean.py")
(synopsis "Boolean algebra in one Python module")
(description
"This is a small Python library that implements boolean algebra.
It defines two base elements, @code{TRUE} and @code{FALSE}, and a
@code{Symbol} class that can take on one of these two values. Calculations
are done only in terms of @code{AND}, @code{OR}, and @code{NOT}---other
compositions like @code{XOR} and @code{NAND} are emulated on top of them.
Expressions are constructed from parsed strings or directly in Python.")
(license license:bsd-2)))
(define-public python-hdf4 (define-public python-hdf4
(package (package
(name "python-hdf4") (name "python-hdf4")
@ -590,6 +616,29 @@ to users of that module.")
(define-public python2-netcdf4 (define-public python2-netcdf4
(package-with-python2 python-netcdf4)) (package-with-python2 python-netcdf4))
(define-public python-license-expression
(package
(name "python-license-expression")
(version "0.999")
(source
(origin
(method url-fetch)
(uri (pypi-uri "license-expression" version))
(sha256
(base32 "08ppb0bxbrsxazy88sgpl9yffvdsabw6dkk1nc332wcz2mphwwyf"))))
(build-system python-build-system)
(propagated-inputs
`(("python-boolean.py" ,python-boolean.py)))
(home-page "https://github.com/nexB/license-expression")
(synopsis "Apply boolean logic to license expressions")
(description
"This Python module defines a tiny language to evaluate and compare
license expressions using boolean logic. Logical combinations of licenses can
be tested for equality, containment, and equivalence. They can be normalised
and simplified. It supports SPDX license expressions as well as other naming
conventions and aliases in the same expression.")
(license license:gpl2+)))
(define-public python-lockfile (define-public python-lockfile
(package (package
(name "python-lockfile") (name "python-lockfile")
@ -5051,14 +5100,13 @@ older Python versions.")
(define-public python-importlib-metadata (define-public python-importlib-metadata
(package (package
(name "python-importlib-metadata") (name "python-importlib-metadata")
(version "0.18") (version "0.23")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "importlib_metadata" version)) (uri (pypi-uri "importlib_metadata" version))
(sha256 (sha256
(base32 (base32 "09mdqdfv5rdrwz80jh9m379gxmvk2vhjfz0fg53hid00icvxf65a"))))
"1nqj6vj2z4byi8flzf2lbldhqgicsz9mkpv4k69kjd8p8qxy4vnb"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-configparser" ,python-configparser) `(("python-configparser" ,python-configparser)
@ -5222,14 +5270,14 @@ away.")
(define-public python-traitlets (define-public python-traitlets
(package (package
(name "python-traitlets") (name "python-traitlets")
(version "4.3.2") (version "4.3.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "traitlets" version)) (uri (pypi-uri "traitlets" version))
(sha256 (sha256
(base32 (base32
"0dbq7sx26xqz5ixs711k5nc88p8a0nqyz6162pwks5dpcz9d4jww")))) "1xsrwgivpkxlbr4dfndfsi098s29yqgswgjc1qqn69yxklvfw8yh"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -5237,7 +5285,7 @@ away.")
(replace 'check (lambda _ (invoke "pytest" "-vv" "traitlets")))))) (replace 'check (lambda _ (invoke "pytest" "-vv" "traitlets"))))))
(propagated-inputs (propagated-inputs
`(("python-ipython-genutils" ,python-ipython-genutils) `(("python-ipython-genutils" ,python-ipython-genutils)
("python-decorator" ,python-decorator))) ;not needed for >4.3.2 ("python-decorator" ,python-decorator)))
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest))) `(("python-pytest" ,python-pytest)))
(properties `((python2-variant . ,(delay python2-traitlets)))) (properties `((python2-variant . ,(delay python2-traitlets))))

4
gnu/packages/screen.scm
View File

@ -38,13 +38,13 @@
(define-public screen (define-public screen
(package (package
(name "screen") (name "screen")
(version "4.6.2") (version "4.7.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/screen/screen-" (uri (string-append "mirror://gnu/screen/screen-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0fps0fsipfbh7c2cnp7rjw9n79j0ysq21mk8hzifa33a1r924s8v")))) (base32 "1h90bpy2wk304xw367y1zwz0kilrpm6h28nphykx4fvqz8l56xys"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("makeinfo" ,texinfo))) `(("makeinfo" ,texinfo)))

44
gnu/packages/serialization.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com> ;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com>
;;; Copyright © 2017 ng0 <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -138,14 +138,15 @@ serialization.")
(package (package
(name "libmpack") (name "libmpack")
(version "1.0.5") (version "1.0.5")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://github.com/tarruda/libmpack/" (method git-fetch)
"archive/" version ".tar.gz")) (uri (git-reference
(file-name (string-append name "-" version ".tar.gz")) (url "https://github.com/tarruda/libmpack.git")
(sha256 (commit version)))
(base32 (file-name (git-file-name name version))
"0ml922gv8y99lbldqb9ykpjndla0hlprdjyl79yskkhwv2ai7sac")))) (sha256
(base32 "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -167,15 +168,15 @@ that implements both the msgpack and msgpack-rpc specifications.")
(package (inherit libmpack) (package (inherit libmpack)
(name "lua-libmpack") (name "lua-libmpack")
(version "1.0.8") (version "1.0.8")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/libmpack/libmpack-lua") (uri (git-reference
(commit version))) (url "https://github.com/libmpack/libmpack-lua.git")
(file-name (git-file-name name version)) (commit version)))
(sha256 (file-name (git-file-name name version))
(base32 (sha256
"1ijvzgq5hvib03w5rghv31wi7byamwg7qdx5pawvhvnflaii8ivw")))) (base32 "1ijvzgq5hvib03w5rghv31wi7byamwg7qdx5pawvhvnflaii8ivw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(;; FIXME: tests require "busted", which is not yet available in Guix. `(;; FIXME: tests require "busted", which is not yet available in Guix.
@ -204,10 +205,9 @@ that implements both the msgpack and msgpack-rpc specifications.")
;; prerequisites are added to the inputs of the gcc invocation. ;; prerequisites are added to the inputs of the gcc invocation.
(substitute* "Makefile" (substitute* "Makefile"
(("\\$\\(MPACK\\): mpack-src") "$(MPACK): ")) (("\\$\\(MPACK\\): mpack-src") "$(MPACK): "))
(mkdir-p "mpack-src") (copy-recursively (assoc-ref inputs "libmpack")
(zero? (system* "tar" "-C" "mpack-src" "mpack-src")
"--strip-components=1" #t)))))
"-xvf" (assoc-ref inputs "libmpack"))))))))
(inputs (inputs
`(("lua" ,lua))) `(("lua" ,lua)))
(native-inputs (native-inputs

17
gnu/packages/statistics.scm
View File

@ -158,14 +158,14 @@ simulation not wholly unlike BUGS. JAGS was written with three aims in mind:
(define-public libxls (define-public libxls
(package (package
(name "libxls") (name "libxls")
(version "1.5.0") (version "1.5.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/libxls/libxls/releases/download/" (uri (string-append "https://github.com/libxls/libxls/releases/download/"
"v" version "/libxls-" version ".tar.gz")) "v" version "/libxls-" version ".tar.gz"))
(sha256 (sha256
(base32 "00j2lrcvvhclmh3z9vy7myqq1br1jnnqkz2wzgk4a1gbg8c5afn5")))) (base32 "0dam8qgbc5ykzaxmrjhpmfm8lnlcdk6cbpzyaya91qwwa80qbj1v"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://github.com/libxls/libxls") (home-page "https://github.com/libxls/libxls")
(synopsis "Read binary (.xls) Excel spreadsheet files") (synopsis "Read binary (.xls) Excel spreadsheet files")
@ -1848,14 +1848,16 @@ times.")
(define-public r-data-table (define-public r-data-table
(package (package
(name "r-data-table") (name "r-data-table")
(version "1.12.2") (version "1.12.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "data.table" version)) (uri (cran-uri "data.table" version))
(sha256 (sha256
(base32 (base32
"1x929lwhai6nkppm4zvicyw5qh5va5sizp86r30qnfkh1n7w2mfv")))) "0zdcbr4nixvl8ga4mp9pw1dfww35dzhzpb6ixajqasiri824m7i9"))))
(build-system r-build-system) (build-system r-build-system)
(inputs
`(("zlib" ,zlib)))
(home-page "https://github.com/Rdatatable/data.table/wiki") (home-page "https://github.com/Rdatatable/data.table/wiki")
(synopsis "Enhanced version of data.frame R object") (synopsis "Enhanced version of data.frame R object")
(description (description
@ -2706,14 +2708,13 @@ certain criterion, e.g., it contains a certain regular file.")
(define-public r-rmarkdown (define-public r-rmarkdown
(package (package
(name "r-rmarkdown") (name "r-rmarkdown")
(version "1.15") (version "1.16")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "rmarkdown" version)) (uri (cran-uri "rmarkdown" version))
(sha256 (sha256
(base32 (base32 "1p11g9lma604ndrhvyvriqxxp91lardc543nmvmr49n1m7309qvz"))))
"0fkfzxkvakc6bb1s2lx7sxmnfff8q1m9isihynhiyqh4x8yikcmw"))))
(properties `((upstream-name . "rmarkdown"))) (properties `((upstream-name . "rmarkdown")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -2728,7 +2729,7 @@ certain criterion, e.g., it contains a certain regular file.")
("r-xfun" ,r-xfun) ("r-xfun" ,r-xfun)
("r-yaml" ,r-yaml) ("r-yaml" ,r-yaml)
("ghc-pandoc" ,ghc-pandoc))) ("ghc-pandoc" ,ghc-pandoc)))
(home-page "http://rmarkdown.rstudio.com") (home-page "https://rmarkdown.rstudio.com")
(synopsis "Convert R Markdown documents into a variety of formats") (synopsis "Convert R Markdown documents into a variety of formats")
(description (description
"This package provides tools to convert R Markdown documents into a "This package provides tools to convert R Markdown documents into a

4
gnu/packages/sync.scm
View File

@ -264,14 +264,14 @@ over the Internet in an HTTP and CDN friendly way;
(define-public rclone (define-public rclone
(package (package
(name "rclone") (name "rclone")
(version "1.49.3") (version "1.49.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/rclone/rclone/releases/download/" (uri (string-append "https://github.com/rclone/rclone/releases/download/"
"v" version "/rclone-v" version ".tar.gz")) "v" version "/rclone-v" version ".tar.gz"))
(sha256 (sha256
(base32 "04blngspm2hzi6d37bd3v19lpcvq0wlk38a9q0a4diwfwp2ab20n")))) (base32 "1bs7b3iy39igli1jqrgjzh32zzzhp1yj8rybsx8i34p9wj2zq2h7"))))
;; FIXME: Rclone bundles some libraries Guix already provides. Need to ;; FIXME: Rclone bundles some libraries Guix already provides. Need to
;; un-bundle them. ;; un-bundle them.
(build-system go-build-system) (build-system go-build-system)

232
gnu/packages/tigervnc.scm Normal file
View File

@ -0,0 +1,232 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Todor Kondić <tk.code@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages tigervnc)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages gettext)
#:use-module (gnu packages tls)
#:use-module (gnu packages linux)
#:use-module (gnu packages xorg)
#:use-module (gnu packages fltk)
#:use-module (gnu packages image)
#:use-module (gnu packages cmake)
#:use-module (gnu packages perl)
#:use-module (gnu packages base)
#:use-module (gnu packages commencement)
#:use-module (guix build-system cmake)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:))
(define-public tigervnc-client
(package
(name "tigervnc-client")
(version "1.9.0")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/TigerVNC/tigervnc.git")
(commit (string-append "v" version))))
(sha256
(base32
"0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; Tests that do exists are not automated.
#:phases (modify-phases %standard-phases
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(with-directory-excursion "vncviewer"
(invoke "make" "install")))))))
(native-inputs
`(("autoconf" ,autoconf)
("gettext-minimal" ,gettext-minimal)
("automake" ,automake)))
(inputs
`(("zlib" ,zlib)
("gnutls" ,gnutls)
("libjpeg-turbo" ,libjpeg-turbo)
("fltk" ,fltk)
("linux-pam" ,linux-pam)
("libx11" ,libx11)
("libxext" ,libxext)
("libxtst" ,libxtst)
("libxrandr" ,libxrandr)
("libxdamage" ,libxdamage)))
(home-page "https://tigervnc.org/")
(synopsis "High-performance, platform-neutral
implementation of VNC (client)")
(description "TigerVNC is a client/server implementation of VNC (Virtual
Network Computing). It provides enough performance to run even 3D and video
applications. It also provides extensions for advanced authentication methods
and TLS encryption. This package installs only the VNC client, the
application which is needed to connect to VNC servers.")
(license license:gpl2)))
;; A VNC server is, in fact, an X server so it seems like a good idea
;; to build on the work already done for xorg-server package. This is
;; not entirely compatible with the recommendation in BUILDING.txt
;; where the client is built first, then the source code of the X
;; server is copied into a subdir of the build directory, patched with
;; VNC additions and then build and installed as Xvnc. The procedure
;; was turned around, where TigerVNC code is downloaded and built
;; inside the Guix X server build dir. Also, the VNC patching process
;; for the X server is automated in a straightforward manner.
(define-public tigervnc-server
(package
(inherit xorg-server)
(name "tigervnc-server")
(version "1.9.0")
(native-inputs
`(("tigervnc-src" ,(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/TigerVNC/tigervnc.git")
(commit "v1.9.0")))
(sha256
(base32
"0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x"))))
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("gettext-minimal" ,gettext-minimal)
("font-util" ,font-util)
("cmake" ,cmake)
("gcc-toolchain" ,gcc-toolchain)
("perl" ,perl)
,@(package-native-inputs tigervnc-client)
,@(package-inputs tigervnc-client)
,@(package-native-inputs xorg-server)))
(inputs
`(("perl" ,perl)
("coreutils" ,coreutils)
("xauth" ,xauth)
,@(package-inputs xorg-server)))
(propagated-inputs
`(("xauth" ,xauth)
,@(package-propagated-inputs xorg-server)))
(arguments
(substitute-keyword-arguments
(package-arguments xorg-server)
((#:configure-flags flags)
`(append '("--with-pic" ; Taken from BUILDING.txt
"--without-dtrace"
"--disable-static"
"--disable-dri2"
"--disable-xinerama"
"--disable-xvfb"
"--disable-xnest"
"--disable-xorg"
"--disable-dmx"
"--disable-xwin"
"--disable-xephyr"
"--disable-kdrive"
;; "--disable-config-dbus" ; This was a warning.
"--disable-config-hal"
"--disable-config-udev"
"--disable-dri2"
;; "--enable-install-libxf86config" ; This, too, was a warning.
"--enable-glx")
(delete "--enable-xephyr" ,flags)))
((#:modules modules)
`(append '((ice-9 ftw)
(ice-9 match)
(guix build utils)
(guix build gnu-build-system))
modules))
((#:phases phases)
`(modify-phases ,phases
(delete 'check) ;)
(add-after 'unpack 'copy-tvnc-xserver
(lambda _
(let*
((tvnc-src (assoc-ref %build-inputs "tigervnc-src"))
(tvnc-xserver (string-append tvnc-src "/unix/xserver")))
(copy-recursively tvnc-xserver ".")
#t)))
(add-after 'copy-tvnc-xserver 'patch-xserver
(lambda _
(let*
((tvnc-src (assoc-ref %build-inputs "tigervnc-src"))
(xorg-server-version ,(package-version xorg-server))
(which-patch (lambda ()
(let*
((patch-num (apply string-append
(list-head (string-split xorg-server-version
#\.)
2)))
(fn (format "~a/unix/xserver~a.patch" tvnc-src patch-num)))
(when (not (file-exists? fn))
(error (format "Patch file, ~a,
corresponding to the input xorg-server version, does not exist. Installation
will fail. " fn)))
fn))) ; VNC patches for xserver have the
; form xserverXY[Y].patch, where
; X.Y[Y].Z is the Xorg server
; version.
(xserver-patch (which-patch)))
(invoke "patch" "-p1" "-i" xserver-patch)
(invoke "autoreconf" "-fiv"))))
(add-before 'build 'build-tigervnc
(lambda _
(let* ((out (assoc-ref %outputs "out"))
(tvnc-src (assoc-ref %build-inputs "tigervnc-src"))
(tvnc-build (string-append (getcwd) "/tigervnc-build")))
(mkdir-p tvnc-build)
(with-directory-excursion tvnc-build
(invoke "cmake" "-G" "Unix Makefiles"
(string-append "-DCMAKE_INSTALL_PREFIX=" out)
tvnc-src)
(invoke "make" "-j" (number->string (parallel-job-count)))))))
(replace 'build
(lambda _
(let* ((tvnc-src (assoc-ref %build-inputs "tigervnc-src"))
(tvnc-build (string-append (getcwd) "/tigervnc-build"))
(srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src))
(buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build)))
(invoke "make" srcarg buildarg "-j"
(number->string (parallel-job-count))))))
(add-before 'install 'install-tigervnc-aux
(lambda _
(let* ((out (assoc-ref %outputs 'out))
(tvnc-src (assoc-ref %build-inputs "tigervnc-src"))
(tvnc-build (string-append (getcwd) "/tigervnc-build"))
(srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src))
(buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build)))
(with-directory-excursion (string-append tvnc-build "/unix")
(invoke "make" srcarg buildarg "install")))))
(replace 'install
(lambda* _
(let* ((tvnc-src (assoc-ref %build-inputs "tigervnc-src"))
(tvnc-build (string-append (getcwd) "/tigervnc-build"))
(srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src))
(buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build)))
(invoke "make" "install" srcarg buildarg))))))))
(description "TigerVNC is a client/server implementation of VNC (Virtual
Network Computing). It provides enough performance to run even 3D and video
applications. It also provides extensions for advanced authentication methods
and TLS encryption. This package installs the VNC server, a program that will
enable users with VNC clients to log into a graphical session on the machine
where the server is installed.")))

4
gnu/packages/tls.scm
View File

@ -122,7 +122,7 @@ in intelligent transportation networks.")
(define-public p11-kit (define-public p11-kit
(package (package
(name "p11-kit") (name "p11-kit")
(version "0.23.17") (version "0.23.18.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -130,7 +130,7 @@ in intelligent transportation networks.")
"download/" version "/p11-kit-" version ".tar.gz")) "download/" version "/p11-kit-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"07kwdlw07jk9833k43kkhv0q9gkll3vmd25wwp68cpy0crfv4isl")))) "0vrwab1082f7l5sbzpb28nrs3q4d2q7wzbi8c977rpah026bvhrl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

4
gnu/packages/video.scm
View File

@ -1493,7 +1493,7 @@ projects while introducing many more.")
(define-public youtube-dl (define-public youtube-dl
(package (package
(name "youtube-dl") (name "youtube-dl")
(version "2019.09.12.1") (version "2019.09.28")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ytdl-org/youtube-dl/" (uri (string-append "https://github.com/ytdl-org/youtube-dl/"
@ -1501,7 +1501,7 @@ projects while introducing many more.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0h7v81kcxcpy82wq9b1aiz2zg6hg7rnlcfmzd13j6k8yhr7ah9yf")))) "0nrk0bk6lksnmng8lwhcpkc57iibzjjamlqz8rxjpsw6dnzxz82h"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
;; The problem here is that the directory for the man page and completion ;; The problem here is that the directory for the man page and completion

46
gnu/packages/web-browsers.scm
View File

@ -367,7 +367,7 @@ driven and does not detract you from your daily work.")
(define next-gtk-webkit (define next-gtk-webkit
(package (package
(name "next-gtk-webkit") (name "next-gtk-webkit")
(version "1.3.2") (version "1.3.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -378,7 +378,7 @@ driven and does not detract you from your daily work.")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"0863p6ch4pdrn6b81cx2abis0ld7r2n6x34v3z0ihj3jlfj21yx4")) "00iqv4xarabl98gdl1rzqkc5v0vfljx1nawsxqsx9x3a9mnxmgxi"))
(file-name (git-file-name "next" version)))) (file-name (git-file-name "next" version))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
@ -441,6 +441,40 @@ features for productive professionals.")
("prove-asdf" ,sbcl-prove-asdf))) ("prove-asdf" ,sbcl-prove-asdf)))
(synopsis "Infinitely extensible web-browser (ring)"))) (synopsis "Infinitely extensible web-browser (ring)")))
(define sbcl-next-history-tree
(package
(inherit next-gtk-webkit)
(name "sbcl-next-history-tree")
(build-system asdf-build-system/sbcl)
(arguments
`(#:tests? #t
#:asd-file "next.asd"
#:asd-system-name "next/history-tree"))
(native-inputs
`(("trivial-features" ,sbcl-trivial-features)
("prove-asdf" ,sbcl-prove-asdf)))
(synopsis "Infinitely extensible web-browser (history-tree)")))
(define sbcl-next-password-manager
(package
(inherit next-gtk-webkit)
(name "sbcl-next-password-manager")
(build-system asdf-build-system/sbcl)
(arguments
`(#:tests? #t
#:asd-file "next.asd"
#:asd-system-name "next/password-manager"))
(inputs
`(("bordeaux-threads" ,sbcl-bordeaux-threads)
("cl-annot" ,sbcl-cl-annot)
("cl-ppcre" ,sbcl-cl-ppcre)
("str" ,sbcl-cl-str)
("trivial-clipboard" ,sbcl-trivial-clipboard)))
(native-inputs
`(("trivial-features" ,sbcl-trivial-features)
("prove-asdf" ,sbcl-prove-asdf)))
(synopsis "Infinitely extensible web-browser (password manager)")))
(define-public next (define-public next
(let ((version (package-version next-gtk-webkit))) (let ((version (package-version next-gtk-webkit)))
(package (package
@ -505,12 +539,14 @@ features for productive professionals.")
`(("alexandria" ,sbcl-alexandria) `(("alexandria" ,sbcl-alexandria)
("bordeaux-threads" ,sbcl-bordeaux-threads) ("bordeaux-threads" ,sbcl-bordeaux-threads)
("cl-annot" ,sbcl-cl-annot) ("cl-annot" ,sbcl-cl-annot)
("cl-ansi-text" ,sbcl-cl-ansi-text)
("cl-css" ,sbcl-cl-css) ("cl-css" ,sbcl-cl-css)
("cl-hooks" ,sbcl-cl-hooks) ("cl-hooks" ,sbcl-cl-hooks)
("cl-json" ,sbcl-cl-json) ("cl-json" ,sbcl-cl-json)
("cl-markup" ,sbcl-cl-markup) ("cl-markup" ,sbcl-cl-markup)
("cl-ppcre" ,sbcl-cl-ppcre) ("cl-ppcre" ,sbcl-cl-ppcre)
("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode) ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode)
("cl-prevalence" ,sbcl-cl-prevalence)
("closer-mop" ,sbcl-closer-mop) ("closer-mop" ,sbcl-closer-mop)
("dbus" ,cl-dbus) ("dbus" ,cl-dbus)
("dexador" ,sbcl-dexador) ("dexador" ,sbcl-dexador)
@ -523,14 +559,16 @@ features for productive professionals.")
("quri" ,sbcl-quri) ("quri" ,sbcl-quri)
("sqlite" ,sbcl-cl-sqlite) ("sqlite" ,sbcl-cl-sqlite)
("str" ,sbcl-cl-str) ("str" ,sbcl-cl-str)
("swank" ,sbcl-slime-swank) ("swank" ,cl-slime-swank)
("trivia" ,sbcl-trivia) ("trivia" ,sbcl-trivia)
("trivial-clipboard" ,sbcl-trivial-clipboard) ("trivial-clipboard" ,sbcl-trivial-clipboard)
("unix-opts" ,sbcl-unix-opts) ("unix-opts" ,sbcl-unix-opts)
;; Local deps ;; Local deps
("next-gtk-webkit" ,next-gtk-webkit) ("next-gtk-webkit" ,next-gtk-webkit)
("next-download-manager" ,sbcl-next-download-manager) ("next-download-manager" ,sbcl-next-download-manager)
("next-ring" ,sbcl-next-ring))) ("next-ring" ,sbcl-next-ring)
("next-history-tree" ,sbcl-next-history-tree)
("next-password-manager" ,sbcl-next-password-manager)))
(native-inputs (native-inputs
`(("trivial-features" ,sbcl-trivial-features) `(("trivial-features" ,sbcl-trivial-features)
("prove-asdf" ,sbcl-prove-asdf))) ("prove-asdf" ,sbcl-prove-asdf)))

17
gnu/packages/web.scm
View File

@ -2603,14 +2603,14 @@ composed of HTML::Element style components.")
(define-public perl-html-form (define-public perl-html-form
(package (package
(name "perl-html-form") (name "perl-html-form")
(version "6.04") (version "6.05")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/O/OA/OALDERS/" (uri (string-append "mirror://cpan/authors/id/O/OA/OALDERS/"
"HTML-Form-" version ".tar.gz")) "HTML-Form-" version ".tar.gz"))
(sha256 (sha256
(base32 "100090bdsr5kapv8h0wxzwlzfbfqn57rq9gzrvg9i6hvnsl5gmcw")))) (base32 "14i4ldyvdvhdhvfhh9kiq6z853q2f84biq8vcpv1k5w2r80wdiin"))))
(build-system perl-build-system) (build-system perl-build-system)
(propagated-inputs (propagated-inputs
`(("perl-html-parser" ,perl-html-parser) `(("perl-html-parser" ,perl-html-parser)
@ -3639,14 +3639,14 @@ either mocked HTTP or a locally spawned server.")
(define-public perl-test-tcp (define-public perl-test-tcp
(package (package
(name "perl-test-tcp") (name "perl-test-tcp")
(version "2.19") (version "2.21")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/T/TO/TOKUHIROM/" (uri (string-append "mirror://cpan/authors/id/K/KA/KAZUHO/"
"Test-TCP-" version ".tar.gz")) "Test-TCP-" version ".tar.gz"))
(sha256 (sha256
(base32 "14ahzklq3xgmwj58p9vdcfgpggrmh3nigq5mzqk4wakbb6fjs0fx")))) (base32 "1djnaw1yli0kcd7azchqnp59l62f6mp13q50xyrjirpaxhd51j32"))))
(build-system perl-build-system) (build-system perl-build-system)
(propagated-inputs (propagated-inputs
`(("perl-test-sharedfork" ,perl-test-sharedfork))) `(("perl-test-sharedfork" ,perl-test-sharedfork)))
@ -4021,8 +4021,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
(package-with-python2 python-feedparser)) (package-with-python2 python-feedparser))
(define-public guix-data-service (define-public guix-data-service
(let ((commit "bb94f6dd05a33135fa661b86d35d203c0c099dba") (let ((commit "8019d2e6878908f40cb6b047f60d2e4fd3c6712e")
(revision "1")) (revision "3"))
(package (package
(name "guix-data-service") (name "guix-data-service")
(version (string-append "0.0.1-" revision "." (string-take commit 7))) (version (string-append "0.0.1-" revision "." (string-take commit 7)))
@ -4034,7 +4034,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1y6s4igjvi0293z4d4hbgwifs8avcam71qhis9z4f8mjz6w7vcpb")))) "06xv43az1aklrdb5y0if17xdqc80qnfdlyjiww8zmv4m3qnvj607"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; TODO Tests require PostgreSQL '(#:tests? #f ; TODO Tests require PostgreSQL
@ -4081,6 +4081,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
(,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))) (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))
'("guix-data-service" '("guix-data-service"
"guix-data-service-process-branch-updated-email" "guix-data-service-process-branch-updated-email"
"guix-data-service-process-branch-updated-mbox"
"guix-data-service-process-job" "guix-data-service-process-job"
"guix-data-service-process-jobs" "guix-data-service-process-jobs"
"guix-data-service-query-build-servers")) "guix-data-service-query-build-servers"))

33
gnu/packages/wm.scm
View File

@ -22,6 +22,7 @@
;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com> ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2019 Kyle Andrews <kyle.c.andrews@gmail.com> ;;; Copyright © 2019 Kyle Andrews <kyle.c.andrews@gmail.com>
;;; Copyright © 2019 Ingo Ruhnke <grumbel@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -999,6 +1000,34 @@ Keybinder works with GTK-based applications using the X Window System.")
(home-page "https://github.com/kupferlauncher/keybinder") (home-page "https://github.com/kupferlauncher/keybinder")
(license license:gpl2+))) (license license:gpl2+)))
(define-public keybinder-3.0
(package
(name "keybinder-3.0")
(version "0.3.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/kupferlauncher/keybinder"
"/releases/download/" name "-v" version "/" name "-"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0830ihwnalw59pp1xzrp37dn58n8vwb8zasnm4a1h81v3x7dxqz6"))))
(build-system gnu-build-system)
(inputs
`(("gtk+" ,gtk+)
("gobject-introspection" ,gobject-introspection)))
(native-inputs
`(("gtk-doc" ,gtk-doc)
("pkg-config" ,pkg-config)))
(synopsis "Library for registering global keyboard shortcuts, Gtk3 version")
(description
"Keybinder is a library for registering global keyboard shortcuts.
Keybinder works with GTK-based applications using the X Window System.")
(home-page "https://github.com/kupferlauncher/keybinder")
(license license:x11)))
(define-public spectrwm (define-public spectrwm
(package (package
(name "spectrwm") (name "spectrwm")
@ -1386,7 +1415,7 @@ modules for building a Wayland compositor.")
(define-public waybar (define-public waybar
(package (package
(name "waybar") (name "waybar")
(version "0.6.8") (version "0.8.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1395,7 +1424,7 @@ modules for building a Wayland compositor.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0wyp1p9r1k8jnjq8clp2fx8xa3f4lfrgbp67fxrjh9718p4br0ab")))) (base32 "0s8ck7qxka0l91ayma6amp9sc8cidi43byqgzcavi3a6id983r1z"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags

802
gnu/packages/xfce.scm
View File

@ -10,6 +10,7 @@
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com> ;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;; Copyright © 2019 L p R n d n <guix@lprndn.info> ;;; Copyright © 2019 L p R n d n <guix@lprndn.info>
;;; Copyright © 2019 Ingo Ruhnke <grumbel@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -61,7 +62,9 @@
#:use-module (gnu packages photo) #:use-module (gnu packages photo)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages popt) #:use-module (gnu packages popt)
#:use-module (gnu packages pulseaudio)) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages xml)
#:use-module (gnu packages wm))
(define-public gtk-xfce-engine (define-public gtk-xfce-engine
(package (package
@ -1198,3 +1201,800 @@ A plugin for the Xfce panel is also available.")
"Xfce Screensaver is a screen saver and locker that aims to have simple, "Xfce Screensaver is a screen saver and locker that aims to have simple,
sane, secure defaults and be well integrated with the Xfce desktop. ") sane, secure defaults and be well integrated with the Xfce desktop. ")
(license gpl2+))) (license gpl2+)))
(define-public xfce4-volumed-pulse
(package
(name "xfce4-volumed-pulse")
(version "0.2.3")
(source (origin
(method url-fetch)
(uri (string-append "https://archive.xfce.org/src/apps/"
name "/" (version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"1q639iwwj7q2plgz0wdgdbi5wkgaq177ca9rnnlrnbdmid5z5fqk"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("xfconf" ,xfconf)
("libnotify" ,libnotify)
("pulseaudio" ,pulseaudio)
("keybinder-3.0" ,keybinder-3.0)
("gtk+" ,gtk+)))
(home-page "https://goodies.xfce.org/projects/applications/xfce4-volumed")
(synopsis "XFCE volume keys daemon")
(description
"This is a volume keys control daemon for Xfce Desktop environment. It controls
the volume using multimedia keys. It also provides volume change notifications.")
(license gpl3+)))
(define-public xfce4-cpugraph-plugin
(package
(name "xfce4-cpugraph-plugin")
(version "1.1.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-cpugraph-plugin/"
(version-major+minor version)
"/xfce4-cpugraph-plugin-" version ".tar.bz2"))
(sha256
(base32
"193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin")
(synopsis "Display CPU load as a graph in the Xfce panel")
(description "This panel plugin offers multiple display
modes (LED, gradient, fire, etc…) to show the current CPU load of the
system. Various appearance options, like colors or size, are
customizable.
On multi core or multi CPU systems, CPU Graph can either track and
display all of them at once, or at the user's option only a specific
core or CPU.")
(license gpl2+)))
(define-public xfce4-eyes-plugin
(package
(name "xfce4-eyes-plugin")
(version "4.5.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-eyes-plugin/"
(version-major+minor version)
"/xfce4-eyes-plugin-" version ".tar.bz2"))
(sha256
(base32
"17gj6fbvvrdzvz61czmia8hqynllsnmhk61fs4aml443cc1h1bpx"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin")
(synopsis "Display a pair of eyes for the Xfce panel")
(description "Eyes is a toy Xfce panel plugin that adds eyes which
watch your every step.")
(license gpl2+)))
(define-public xfce4-equake-plugin
(package
(name "xfce4-equake-plugin")
(version "1.3.8")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-equake-plugin/"
(version-major+minor version)
"/xfce4-equake-plugin-" version ".tar.bz2"))
(sha256
(base32
"09b9k0n5xm115k44x74w4ad0xqklilyfh0hglsps7zj97pd7a5a3"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("gtk+-2" ,gtk+-2)
("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-equake-plugin")
(synopsis "Earthquake monitor for the Xfce panel")
(description "Equake is a panel plugin for the XFCE desktop
environment. Equake monitors earthquakes and will display an update
each time a new earthquake occurs.")
(license gpl2+)))
(define-public xfce4-datetime-plugin
(package
(name "xfce4-datetime-plugin")
(version "0.8.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-datetime-plugin/"
(version-major+minor version)
"/xfce4-datetime-plugin-" version ".tar.bz2"))
(sha256
(base32
"1m7bmpvbmiz2xdffpg675qn80zx2n0cnlf842ppvh1q7zz18ndfd"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin")
(synopsis "Display date and time inside the Xfce panel")
(description "This plugin shows the date and time in the panel,
and a calendar appears when you left-click on it.")
(license gpl2+)))
(define-public xfce4-calculator-plugin
(package
(name "xfce4-calculator-plugin")
(version "0.7.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-calculator-plugin/"
(version-major+minor version)
"/xfce4-calculator-plugin-" version ".tar.bz2"))
(sha256
(base32
"1scx7z5ijg2fpcqrzv1nxhpj9vrqic7pyghig70f2n5hgaaanl3v"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-calculator-plugin")
(synopsis "Calculator for the Xfce panel")
(description "This plugin is a calculator for the Xfce4 panel. It
supports common mathematical operators (+, -, *, /, ^) with usual
precedence rules, and the following functions and common constants.")
(license gpl2+)))
(define-public xfce4-cpufreq-plugin
(package
(name "xfce4-cpufreq-plugin")
(version "1.2.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-cpufreq-plugin/"
(version-major+minor version)
"/xfce4-cpufreq-plugin-" version ".tar.bz2"))
(sha256
(base32
"1dgmx3ygil51s1az298ly0gybcw8ln1dz8q8y9k207a0vk049q65"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin")
(synopsis "Xfce panel plugin for displaying CPU frequency")
(description "This panel plugin shows information about the CPU
governor and frequencies supported and used by your system.")
(license gpl2+)))
(define-public xfce4-diskperf-plugin
(package
(name "xfce4-diskperf-plugin")
(version "2.6.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-diskperf-plugin/"
(version-major+minor version)
"/xfce4-diskperf-plugin-" version ".tar.bz2"))
(sha256
(base32
"0i4nrsvwcn15g5gmnba9p07sad3c96x517l2lybdw8jqv91rhbpx"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin")
(synopsis "Display disk performance in the Xfce panel")
(description "This Xfce panel plugin displays instant disk/partition
performance (bytes transfered per second).")
(license gpl2+)))
(define-public xfce4-embed-plugin
(package
(name "xfce4-embed-plugin")
(version "1.6.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-embed-plugin/"
(version-major+minor version)
"/xfce4-embed-plugin-" version ".tar.bz2"))
(sha256
(base32
"0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)
("gtk+-2" ,gtk+-2)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin")
(synopsis "Embed arbitary applications inside the Xfce panel")
(description "This plugin enables the embedding of arbitrary
application windows into the Xfce panel. The window is resized into
the panel space available, and the associated program can be
automatically launched if it is not open.
Example uses include embedding an instant messaging buddy list, a mail
client's new mail ticker, a simple media application, or a fancy clock
or timer. Combining with Xfce's ability to auto-hide panels can make
this very convenient.")
(license gpl2+)))
(define-public xfce4-fsguard-plugin
(package
(name "xfce4-fsguard-plugin")
(version "1.1.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-fsguard-plugin/"
(version-major+minor version)
"/xfce4-fsguard-plugin-" version ".tar.bz2"))
(sha256
(base32
"05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin")
(synopsis "Xfce panel plugin to monitor free disk space")
(description "The panel plugin checks free space on a chosen mount
point frequently and displays a message when a limit is reached. There
are two limits: a warning limit where only the icon changes, and an
urgent limit that advise the user with a message. The icon button can
be clicked to open the chosen mount point.")
(license bsd-2)))
(define-public xfce4-genmon-plugin
(package
(name "xfce4-genmon-plugin")
(version "4.0.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-genmon-plugin/"
(version-major+minor version)
"/xfce4-genmon-plugin-" version ".tar.bz2"))
(sha256
(base32
"1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin")
(synopsis "Generic program output monitor for the Xfce panel")
(description "This plugin cyclically spawns the indicated
script/program, captures its output (stdout) and displays the
resulting string into the panel.
The string can also contain markup to displayed an image, a bar, a
button and a personalized tooltip.")
(license gpl2+)))
(define-public xfce4-kbdleds-plugin
(package
(name "xfce4-kbdleds-plugin")
(version "0.0.6")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-kbdleds-plugin/"
(version-major+minor version)
"/xfce4-kbdleds-plugin-" version ".tar.bz2"))
(sha256
(base32
"1k810asjjxwix1c7ixl7bqr97zc4j2mw7797gk49rjvv43bhla3d"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("gtk+-2" ,gtk+-2)
("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin")
(synopsis "Display keyboard LEDs in the Xfce panel")
(description "This plugin shows the state of your keyboard LEDs:
Caps, Scroll and Num Lock in Xfce panel.")
(license gpl2+)))
(define-public xfce4-mailwatch-plugin
(package
(name "xfce4-mailwatch-plugin")
(version "1.2.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-mailwatch-plugin/"
(version-major+minor version)
"/xfce4-mailwatch-plugin-" version ".tar.bz2"))
(sha256
(base32
"1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("gtk+-2" ,gtk+-2)
("libxfce4ui" ,libxfce4ui)
("exo" ,exo)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin")
(synopsis "Mail watch plugin for the Xfce panel")
(description "The Xfce4 Mailwatch Plugin is a multi-protocol,
multi-mailbox mail watcher. Currently, the protocols supported are:
@itemize
@item IMAP (SSL/TLS and cleartext, CRAM-MD5)
@item POP3 (SSL/TLS and cleartext, CRAM-MD5)
@item Mbox mail spool (local)
@item Maildir mail spool (local)
@item MH-Maildir mail spool (local)
@item Google Mail (GMail) mailbox (remote) (requires gnutls)
@end itemize")
(license gpl2)))
(define-public xfce4-mpc-plugin
(package
(name "xfce4-mpc-plugin")
(version "0.5.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-mpc-plugin/"
(version-major+minor version)
"/xfce4-mpc-plugin-" version ".tar.bz2"))
(sha256
(base32
"0q3pysdp85b3c7g3b59y3c69g4nw6bvbf518lnri4lxrnsvpizpf"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin")
(synopsis "Music Player Daemon plugin for the Xfce panel")
(description "This is a simple client plugin for Music Player Daemon.
Features:
@itemize
@item send Play/Stop/Next/Previous command to MPD.
@item uses media icons names from icon-naming-spec (at least nuvola,
tango and rodent themes provides these icons)
@item decrease/increase volume using the mouse wheel.
@item show the current volume, status and title as a tooltip when
hovering the mouse over the plugin.
@item show a simple playlist window upon middle-click, permitting to
select a track to play
@item configurable MPD host/port/password.
@item toggles repeat/random features + enable/disable MPD outputs in
the right-click menu.
@item launch configurable client (gmpc, xterm -e ncmpc,..) through
right-click menu
@item configurable markup for tooltip and playlist, using a gmpc-like markup
@end itemize")
(license isc)))
(define-public xfce4-mount-plugin
(package
(name "xfce4-mount-plugin")
(version "1.1.3")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-mount-plugin/"
(version-major+minor version)
"/xfce4-mount-plugin-" version ".tar.bz2"))
(sha256
(base32
"07lijjhimjrcyrhasr2299km6wm22xcd3fazdfpqvisbk1mvvrda"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin")
(synopsis "Mount/unmount plugin for the Xfce panel")
(description "The plugin will display a list of items representing
your various devices. If you click on an unmounted devices it will
mount it and vice versa. There is a warning in case a device can't be
mounted or when unmounting fails.")
(license gpl2+)))
(define-public xfce4-netload-plugin
(package
(name "xfce4-netload-plugin")
(version "1.3.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-netload-plugin/"
(version-major+minor version)
"/xfce4-netload-plugin-" version ".tar.bz2"))
(sha256
(base32
"0p91875n6s8n88l7wb4w9prqly3wvkyilnr7zq0ppq71rwjh9r12"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin")
(synopsis "Netload plugin for the Xfce Panel")
(description "This plugin displays the current load of the network
interfaces of your choice in the panel.")
(license gpl2+)))
(define-public xfce4-places-plugin
(package
(name "xfce4-places-plugin")
(version "1.8.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-places-plugin/"
(version-major+minor version)
"/xfce4-places-plugin-" version ".tar.bz2"))
(sha256
(base32
"1chac4ki70axgvkmhw94m0srsv0pwiwqrqbh8di0y9n90fgj24gj"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("desktop-file-utils" ,desktop-file-utils)
("gtk+-2" ,gtk+-2)
("exo" ,exo)
("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin")
(synopsis "Gnome-like Places menu for the Xfce panel")
(description "This plugin provides a menu with quick access to folders,
documents, and removable media. The places plugin brings much of the
functionality of GNOME's Places menu to Xfce.
The plugin puts a simple button on the panel. Clicking on this button
opens up a menu with the following:
@itemize
@item System-defined directories (home folder, trash, desktop, file system)
@item Removable media (using thunar-vfs)
@item User-defined bookmarks (reads @file{~/.gtk-bookmarks})
@item Search program launcher (optional)
@item Recent documents submenu
@end itemize")
(license gpl2+)))
(define-public xfce4-smartbookmark-plugin
(package
(name "xfce4-smartbookmark-plugin")
(version "0.5.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-smartbookmark-plugin/"
(version-major+minor version)
"/xfce4-smartbookmark-plugin-" version ".tar.bz2"))
(sha256
(base32
"001nf2bqly8vm868qvafzgihc9463c488mkim24iw9g2s9ygna1y"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin")
(synopsis "Perform custom searches in your browser from the Xfce panel")
(description "This plugin allows you to send search requests
directly to your browser, such that you can search through your
favorite search engine or bug tracker right from the Xfce panel.")
(license gpl2+)))
(define-public xfce4-statusnotifier-plugin
(package
(name "xfce4-statusnotifier-plugin")
(version "0.2.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-statusnotifier-plugin/"
(version-major+minor version)
"/xfce4-statusnotifier-plugin-" version ".tar.bz2"))
(sha256
(base32
"154b0q9pmlbjh30vvx4c48msdfxp4pq8x4mbn71mk7pibk018hsj"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)
("glib:bin" ,glib "bin")))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("libdbusmenu" ,libdbusmenu)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-statusnotifier-plugin")
(synopsis "Xfce panel plugin for status notifier items")
(description "This plugin provides a panel area for status
notifier items (application indicators). Applications may use these
items to display their status and interact with the user. This
technology is a modern alternative to systray and follows the
freedesktop.org specification.")
(license gpl2+)))
(define-public xfce4-stopwatch-plugin
(package
(name "xfce4-stopwatch-plugin")
(version "0.3.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-stopwatch-plugin/"
(version-major+minor version)
"/xfce4-stopwatch-plugin-" version ".tar.bz2"))
(sha256
(base32
"07dadvgivly44w7qj74i2w60nk01h8567paxrli8vzmhb3p6xi2h"))))
(build-system gnu-build-system)
(arguments
;; test fails in po/ directory
`(#:tests? #f))
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-stopwatch-plugin")
(synopsis "Stopwatch plugin for the Xfce panel")
(description "This Xfce panel plugin keeps track of elapsed time.")
(license bsd-2)))
(define-public xfce4-systemload-plugin
(package
(name "xfce4-systemload-plugin")
(version "1.2.3")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-systemload-plugin/"
(version-major+minor version)
"/xfce4-systemload-plugin-" version ".tar.bz2"))
(sha256
(base32
"0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin")
(synopsis "System load display plugin for the Xfce panel")
(description "A system load plugin for the Xfce4 desktop
environment. It displays the current CPU load, the memory in use, the
swap space and the system uptime in the Xfce4 panel.")
(license bsd-2)))
(define-public xfce4-time-out-plugin
(package
(name "xfce4-time-out-plugin")
(version "1.0.3")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-time-out-plugin/"
(version-major+minor version)
"/xfce4-time-out-plugin-" version ".tar.bz2"))
(sha256
(base32
"0sqggsnkj40337v0c9vgakyh1zjzri6if38l85gcrnc39rlx973z"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("gtk+-2" ,gtk+-2)
("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin")
(synopsis "Xfce panel plugin that encourages periodical breaks")
(description "This plugin encourages to take periodical
breaks from the computer every X minutes. During breaks it locks your
screen. It optionally allows you to postpone breaks for a certain
time.")
(license gpl2+)))
(define-public xfce4-timer-plugin
(package
(name "xfce4-timer-plugin")
(version "1.7.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-timer-plugin/"
(version-major+minor version)
"/xfce4-timer-plugin-" version ".tar.bz2"))
(sha256
(base32
"16vypwwjwfk7nn4n16rfgn0z78jqrmbgxmc1r46269lrwd1m6kif"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin")
(synopsis "Simple countdown and alarm plugin for the Xfce panel")
(description "This is a simple plugin that lets the user run an
alarm at a specified time or at the end of a specified countdown
period.")
(license gpl2+)))
(define-public xfce4-verve-plugin
(package
(name "xfce4-verve-plugin")
(version "2.0.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-verve-plugin/"
(version-major+minor version)
"/xfce4-verve-plugin-" version ".tar.bz2"))
(sha256
(base32
"1ljcmgc8ixrbz134ggxbbh4zzdnp7mhi9ay6s5hgrz28djx10rcy"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin")
(synopsis "Command line for the Xfce panel")
(description "The Verve plugin provides a comfortable command line
for the Xfce panel. It supports several features, such as:
@itemize
@item Opens URLs, e-mail addresses, directories, and programs
@item Command history
@item Auto-completion (including command history)
@item Focus grabbing via D-BUS (so you can bind a shortcut to it)
@item Custom input field width
@end itemize")
(license gpl2+)))
(define-public xfce4-wavelan-plugin
(package
(name "xfce4-wavelan-plugin")
(version "0.6.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-wavelan-plugin/"
(version-major+minor version)
"/xfce4-wavelan-plugin-" version ".tar.bz2"))
(sha256
(base32
"05zdiq1igr1fcvnwlivg8g3szvxmlr3yc7jfj3bwgqrs0vm827zl"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("libxfce4ui" ,libxfce4ui)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin")
(synopsis "Show stats from WLAN interface in Xfce panel")
(description "This plugin is used to display stats from a wireless
lan interface (signal state, signal quality, network name (SSID)).")
(license bsd-2)))
(define-public xfce4-weather-plugin
(package
(name "xfce4-weather-plugin")
(version "0.10.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
"xfce4-weather-plugin/"
(version-major+minor version)
"/xfce4-weather-plugin-" version ".tar.bz2"))
(sha256
(base32
"0wlm80panxyn86l9qm3mbliqj7gkf2zyzak3w041zz9hg31a08s4"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("gtk+" ,gtk+)
("libsoup" ,libsoup)
("libxfce4ui" ,libxfce4ui)
("libxml2" ,libxml2)
("xfce4-panel" ,xfce4-panel)))
(home-page
"https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin")
(synopsis "Show information about local weather in the Xfce panel")
(description "This Xfce panel plugin shows information about your
local weather in the panel, using forecast data provided by the
@uref{https://met.no, Norwegian Meteorological Institute}.")
(license gpl2+)))

4
gnu/packages/xml.scm
View File

@ -1245,14 +1245,14 @@ files. It is designed to be fast and to handle large input files.")
(define-public python-defusedxml (define-public python-defusedxml
(package (package
(name "python-defusedxml") (name "python-defusedxml")
(version "0.5.0") (version "0.6.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "defusedxml" version)) (uri (pypi-uri "defusedxml" version))
(sha256 (sha256
(base32 (base32
"1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4")))) "1xbp8fivl3wlbyg2jrvs4lalaqv1xp9a9f29p75wdx2s2d6h717n"))))
(build-system python-build-system) (build-system python-build-system)
(home-page "https://bitbucket.org/tiran/defusedxml") (home-page "https://bitbucket.org/tiran/defusedxml")
(synopsis "XML bomb protection for Python stdlib modules") (synopsis "XML bomb protection for Python stdlib modules")

171
gnu/services/base.scm
View File

@ -947,36 +947,38 @@ the message of the day, among other things."
(define (default-serial-port) (define (default-serial-port)
"Return a gexp that determines a reasonable default serial port "Return a gexp that determines a reasonable default serial port
to use as the tty. This is primarily useful for headless systems." to use as the tty. This is primarily useful for headless systems."
#~(begin (with-imported-modules (source-module-closure
;; console=device,options '((gnu build linux-boot))) ;for 'find-long-options'
;; device: can be tty0, ttyS0, lp0, ttyUSB0 (serial). #~(begin
;; options: BBBBPNF. P n|o|e, N number of bits, ;; console=device,options
;; F flow control (r RTS) ;; device: can be tty0, ttyS0, lp0, ttyUSB0 (serial).
(let* ((not-comma (char-set-complement (char-set #\,))) ;; options: BBBBPNF. P n|o|e, N number of bits,
(command (linux-command-line)) ;; F flow control (r RTS)
(agetty-specs (find-long-options "agetty.tty" command)) (let* ((not-comma (char-set-complement (char-set #\,)))
(console-specs (filter (lambda (spec) (command (linux-command-line))
(and (string-prefix? "tty" spec) (agetty-specs (find-long-options "agetty.tty" command))
(not (or (console-specs (filter (lambda (spec)
(string-prefix? "tty0" spec) (and (string-prefix? "tty" spec)
(string-prefix? "tty1" spec) (not (or
(string-prefix? "tty2" spec) (string-prefix? "tty0" spec)
(string-prefix? "tty3" spec) (string-prefix? "tty1" spec)
(string-prefix? "tty4" spec) (string-prefix? "tty2" spec)
(string-prefix? "tty5" spec) (string-prefix? "tty3" spec)
(string-prefix? "tty6" spec) (string-prefix? "tty4" spec)
(string-prefix? "tty7" spec) (string-prefix? "tty5" spec)
(string-prefix? "tty8" spec) (string-prefix? "tty6" spec)
(string-prefix? "tty9" spec))))) (string-prefix? "tty7" spec)
(find-long-options "console" command))) (string-prefix? "tty8" spec)
(specs (append agetty-specs console-specs))) (string-prefix? "tty9" spec)))))
(match specs (find-long-options "console" command)))
(() #f) (specs (append agetty-specs console-specs)))
((spec _ ...) (match specs
;; Extract device name from first spec. (() #f)
(match (string-tokenize spec not-comma) ((spec _ ...)
((device-name _ ...) ;; Extract device name from first spec.
device-name))))))) (match (string-tokenize spec not-comma)
((device-name _ ...)
device-name))))))))
(define agetty-shepherd-service (define agetty-shepherd-service
(match-lambda (match-lambda
@ -1486,7 +1488,7 @@ information on the configuration file syntax."
(module "pam_limits.so") (module "pam_limits.so")
(arguments '("conf=/etc/security/limits.conf"))))) (arguments '("conf=/etc/security/limits.conf")))))
(if (member (pam-service-name pam) (if (member (pam-service-name pam)
'("login" "su" "slim")) '("login" "su" "slim" "gdm-password"))
(pam-service (pam-service
(inherit pam) (inherit pam)
(session (cons pam-limits (session (cons pam-limits
@ -2002,64 +2004,67 @@ item of @var{packages}."
(requirement '(root-file-system)) (requirement '(root-file-system))
(documentation "Populate the /dev directory, dynamically.") (documentation "Populate the /dev directory, dynamically.")
(start #~(lambda () (start
(define udevd (with-imported-modules (source-module-closure
;; 'udevd' from eudev. '((gnu build linux-boot)))
#$(file-append udev "/sbin/udevd")) #~(lambda ()
(define udevd
;; 'udevd' from eudev.
#$(file-append udev "/sbin/udevd"))
(define (wait-for-udevd) (define (wait-for-udevd)
;; Wait until someone's listening on udevd's control ;; Wait until someone's listening on udevd's control
;; socket. ;; socket.
(let ((sock (socket AF_UNIX SOCK_SEQPACKET 0))) (let ((sock (socket AF_UNIX SOCK_SEQPACKET 0)))
(let try () (let try ()
(catch 'system-error (catch 'system-error
(lambda () (lambda ()
(connect sock PF_UNIX "/run/udev/control") (connect sock PF_UNIX "/run/udev/control")
(close-port sock)) (close-port sock))
(lambda args (lambda args
(format #t "waiting for udevd...~%") (format #t "waiting for udevd...~%")
(usleep 500000) (usleep 500000)
(try)))))) (try))))))
;; Allow udev to find the modules. ;; Allow udev to find the modules.
(setenv "LINUX_MODULE_DIRECTORY" (setenv "LINUX_MODULE_DIRECTORY"
"/run/booted-system/kernel/lib/modules") "/run/booted-system/kernel/lib/modules")
;; The first one is for udev, the second one for eudev. ;; The first one is for udev, the second one for eudev.
(setenv "UDEV_CONFIG_FILE" #$udev.conf) (setenv "UDEV_CONFIG_FILE" #$udev.conf)
(setenv "EUDEV_RULES_DIRECTORY" (setenv "EUDEV_RULES_DIRECTORY"
#$(file-append rules "/lib/udev/rules.d")) #$(file-append rules "/lib/udev/rules.d"))
(let* ((kernel-release (let* ((kernel-release
(utsname:release (uname))) (utsname:release (uname)))
(linux-module-directory (linux-module-directory
(getenv "LINUX_MODULE_DIRECTORY")) (getenv "LINUX_MODULE_DIRECTORY"))
(directory (directory
(string-append linux-module-directory "/" (string-append linux-module-directory "/"
kernel-release)) kernel-release))
(old-umask (umask #o022))) (old-umask (umask #o022)))
;; If we're in a container, DIRECTORY might not exist, ;; If we're in a container, DIRECTORY might not exist,
;; for instance because the host runs a different ;; for instance because the host runs a different
;; kernel. In that case, skip it; we'll just miss a few ;; kernel. In that case, skip it; we'll just miss a few
;; nodes like /dev/fuse. ;; nodes like /dev/fuse.
(when (file-exists? directory) (when (file-exists? directory)
(make-static-device-nodes directory)) (make-static-device-nodes directory))
(umask old-umask)) (umask old-umask))
(let ((pid (fork+exec-command (list udevd)))) (let ((pid (fork+exec-command (list udevd))))
;; Wait until udevd is up and running. This appears to ;; Wait until udevd is up and running. This appears to
;; be needed so that the events triggered below are ;; be needed so that the events triggered below are
;; actually handled. ;; actually handled.
(wait-for-udevd) (wait-for-udevd)
;; Trigger device node creation. ;; Trigger device node creation.
(system* #$(file-append udev "/bin/udevadm") (system* #$(file-append udev "/bin/udevadm")
"trigger" "--action=add") "trigger" "--action=add")
;; Wait for things to settle down. ;; Wait for things to settle down.
(system* #$(file-append udev "/bin/udevadm") (system* #$(file-append udev "/bin/udevadm")
"settle") "settle")
pid))) pid))))
(stop #~(make-kill-destructor)) (stop #~(make-kill-destructor))
;; When halting the system, 'udev' is actually killed by ;; When halting the system, 'udev' is actually killed by
@ -2067,7 +2072,7 @@ item of @var{packages}."
;; Thus, make sure it is not respawned. ;; Thus, make sure it is not respawned.
(respawn? #f) (respawn? #f)
;; We need additional modules. ;; We need additional modules.
(modules `((gnu build linux-boot) (modules `((gnu build linux-boot) ;'make-static-device-nodes'
,@%default-modules)) ,@%default-modules))
(actions (list (shepherd-action (actions (list (shepherd-action

71
gnu/services/shepherd.scm
View File

@ -255,6 +255,22 @@ stored."
#~(#$name #$doc #$proc))) #~(#$name #$doc #$proc)))
(shepherd-service-actions service)))))))) (shepherd-service-actions service))))))))
(define (scm->go file)
"Compile FILE, which contains code to be loaded by shepherd's config file,
and return the resulting '.go' file."
(with-extensions (list shepherd)
(computed-file (string-append (basename (scheme-file-name file) ".scm")
".go")
#~(begin
(use-modules (system base compile))
;; Do the same as the Shepherd's 'load-in-user-module'.
(let ((env (make-fresh-user-module)))
(module-use! env (resolve-interface '(oop goops)))
(module-use! env (resolve-interface '(shepherd service)))
(compile-file #$file #:output-file #$output
#:env env))))))
(define (shepherd-configuration-file services) (define (shepherd-configuration-file services)
"Return the shepherd configuration file for SERVICES." "Return the shepherd configuration file for SERVICES."
(assert-valid-graph services) (assert-valid-graph services)
@ -269,36 +285,37 @@ stored."
;; than a kernel panic. ;; than a kernel panic.
(call-with-error-handling (call-with-error-handling
(lambda () (lambda ()
(apply register-services (map primitive-load '#$files)) (apply register-services
(map load-compiled '#$(map scm->go files)))))
;; guix-daemon 0.6 aborts if 'PATH' is undefined, so work around ;; guix-daemon 0.6 aborts if 'PATH' is undefined, so work around
;; it. ;; it.
(setenv "PATH" "/run/current-system/profile/bin") (setenv "PATH" "/run/current-system/profile/bin")
(format #t "starting services...~%") (format #t "starting services...~%")
(for-each (lambda (service) (for-each (lambda (service)
;; In the Shepherd 0.3 the 'start' method can raise ;; In the Shepherd 0.3 the 'start' method can raise
;; '&action-runtime-error' if it fails, so protect ;; '&action-runtime-error' if it fails, so protect
;; against it. (XXX: 'action-runtime-error?' is not ;; against it. (XXX: 'action-runtime-error?' is not
;; exported is 0.3, hence 'service-error?'.) ;; exported is 0.3, hence 'service-error?'.)
(guard (c ((service-error? c) (guard (c ((service-error? c)
(format (current-error-port) (format (current-error-port)
"failed to start service '~a'~%" "failed to start service '~a'~%"
service))) service)))
(start service))) (start service)))
'#$(append-map shepherd-service-provision '#$(append-map shepherd-service-provision
(filter shepherd-service-auto-start? (filter shepherd-service-auto-start?
services))) services)))
;; Hang up stdin. At this point, we assume that 'start' methods ;; Hang up stdin. At this point, we assume that 'start' methods
;; that required user interaction on the console (e.g., ;; that required user interaction on the console (e.g.,
;; 'cryptsetup open' invocations, post-fsck emergency REPL) have ;; 'cryptsetup open' invocations, post-fsck emergency REPL) have
;; completed. User interaction becomes impossible after this ;; completed. User interaction becomes impossible after this
;; call; this avoids situations where services wrongfully lead ;; call; this avoids situations where services wrongfully lead
;; PID 1 to read from stdin (the console), which users may not ;; PID 1 to read from stdin (the console), which users may not
;; have access to (see <https://bugs.gnu.org/23697>). ;; have access to (see <https://bugs.gnu.org/23697>).
(redirect-port (open-input-file "/dev/null") (redirect-port (open-input-file "/dev/null")
(current-input-port)))))) (current-input-port))))
(scheme-file "shepherd.conf" config))) (scheme-file "shepherd.conf" config)))

2
gnu/services/web.scm
View File

@ -438,7 +438,7 @@
addresses-and-ports addresses-and-ports
contents) contents)
`(,(string-append `(,(string-append
"<VirtualHost " addresses-and-ports ">\n") "\n<VirtualHost " addresses-and-ports ">\n")
,@contents ,@contents
"\n</VirtualHost>\n")) "\n</VirtualHost>\n"))
((? string? x) ((? string? x)

7
gnu/system.scm
View File

@ -829,7 +829,12 @@ use 'plain-file' instead~%")
(file-append inetutils "/bin/ping6") (file-append inetutils "/bin/ping6")
(file-append sudo "/bin/sudo") (file-append sudo "/bin/sudo")
(file-append sudo "/bin/sudoedit") (file-append sudo "/bin/sudoedit")
(file-append fuse "/bin/fusermount")))) (file-append fuse "/bin/fusermount")
;; To allow mounts with the "user" option, "mount" and "umount" must
;; be setuid-root.
(file-append util-linux "/bin/mount")
(file-append util-linux "/bin/umount"))))
(define %sudoers-specification (define %sudoers-specification
;; Default /etc/sudoers contents: 'root' and all members of the 'wheel' ;; Default /etc/sudoers contents: 'root' and all members of the 'wheel'

49
guix/gexp.scm
View File

@ -1504,24 +1504,37 @@ are searched for in PATH. Return #f when MODULES and EXTENSIONS are empty."
#:module-path path #:module-path path
#:system system #:system system
#:target target))) #:target target)))
(return (gexp (eval-when (expand load eval) (return
(set! %load-path (gexp (eval-when (expand load eval)
(cons (ungexp modules) ;; Augment the load paths and delete duplicates. Do that
(append (map (lambda (extension) ;; without loading (srfi srfi-1) or anything.
(string-append extension (let ((extensions '((ungexp-native-splicing extensions)))
"/share/guile/site/" (prepend (lambda (items lst)
(effective-version))) ;; This is O(N²) but N is typically small.
'((ungexp-native-splicing extensions))) (let loop ((items items)
%load-path))) (lst lst))
(set! %load-compiled-path (if (null? items)
(cons (ungexp compiled) lst
(append (map (lambda (extension) (loop (cdr items)
(string-append extension (cons (car items)
"/lib/guile/" (delete (car items) lst))))))))
(effective-version) (set! %load-path
"/site-ccache")) (prepend (cons (ungexp modules)
'((ungexp-native-splicing extensions))) (map (lambda (extension)
%load-compiled-path))))))))) (string-append extension
"/share/guile/site/"
(effective-version)))
extensions))
%load-path))
(set! %load-compiled-path
(prepend (cons (ungexp compiled)
(map (lambda (extension)
(string-append extension
"/lib/guile/"
(effective-version)
"/site-ccache"))
extensions))
%load-compiled-path)))))))))
(define* (gexp->script name exp (define* (gexp->script name exp
#:key (guile (default-guile)) #:key (guile (default-guile))

29
guix/import/crate.scm
View File

@ -40,6 +40,7 @@
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:export (crate->guix-package #:export (crate->guix-package
guix-package->crate-name guix-package->crate-name
crate-recursive-import
%crate-updater)) %crate-updater))
@ -218,16 +219,24 @@ latest version of CRATE-NAME."
(cargo-development-inputs (cargo-development-inputs
(sort (map crate-dependency-id dev-dep-crates) (sort (map crate-dependency-id dev-dep-crates)
string-ci<?))) string-ci<?)))
(make-crate-sexp #:name crate-name (values
#:version (crate-version-number version*) (make-crate-sexp #:name crate-name
#:cargo-inputs cargo-inputs #:version (crate-version-number version*)
#:cargo-development-inputs cargo-development-inputs #:cargo-inputs cargo-inputs
#:home-page (or (crate-home-page crate) #:cargo-development-inputs cargo-development-inputs
(crate-repository crate)) #:home-page (or (crate-home-page crate)
#:synopsis (crate-description crate) (crate-repository crate))
#:description (crate-description crate) #:synopsis (crate-description crate)
#:license (and=> (crate-version-license version*) #:description (crate-description crate)
string->license))))) #:license (and=> (crate-version-license version*)
string->license))
(append cargo-inputs cargo-development-inputs)))))
(define (crate-recursive-import crate-name)
(recursive-import crate-name #f
#:repo->guix-package (lambda (name repo)
(crate->guix-package name))
#:guix-name crate-name->package-name))
(define (guix-package->crate-name package) (define (guix-package->crate-name package)
"Return the crate name of PACKAGE." "Return the crate name of PACKAGE."

4
guix/inferior.scm
View File

@ -136,8 +136,8 @@ it's an old Guix."
(object->string (object->string
`(begin `(begin
(primitive-load ,(search-path %load-path (primitive-load ,(search-path %load-path
"guix/scripts/repl.scm")) "guix/repl.scm"))
((@ (guix scripts repl) machine-repl)))))) ((@ (guix repl) machine-repl))))))
pipe))) pipe)))
(define* (port->inferior pipe #:optional (close close-port)) (define* (port->inferior pipe #:optional (close close-port))

19
guix/scripts/environment.scm
View File

@ -453,7 +453,7 @@ regexps in WHITE-LIST."
(define* (launch-environment/container #:key command bash user user-mappings (define* (launch-environment/container #:key command bash user user-mappings
profile manifest link-profile? network? profile manifest link-profile? network?
map-cwd?) map-cwd? (white-list '()))
"Run COMMAND within a container that features the software in PROFILE. "Run COMMAND within a container that features the software in PROFILE.
Environment variables are set according to the search paths of MANIFEST. Environment variables are set according to the search paths of MANIFEST.
The global shell is BASH, a file name for a GNU Bash binary in the The global shell is BASH, a file name for a GNU Bash binary in the
@ -462,7 +462,10 @@ USER-MAPPINGS, a list of file system mappings, contains the user-specified
host file systems to mount inside the container. If USER is not #f, each host file systems to mount inside the container. If USER is not #f, each
target of USER-MAPPINGS will be re-written relative to '/home/USER', and USER target of USER-MAPPINGS will be re-written relative to '/home/USER', and USER
will be used for the passwd entry. LINK-PROFILE? creates a symbolic link from will be used for the passwd entry. LINK-PROFILE? creates a symbolic link from
~/.guix-profile to the environment profile." ~/.guix-profile to the environment profile.
Preserve environment variables whose name matches the one of the regexps in
WHILE-LIST."
(define (optional-mapping->fs mapping) (define (optional-mapping->fs mapping)
(and (file-exists? (file-system-mapping-source mapping)) (and (file-exists? (file-system-mapping-source mapping))
(file-system-mapping->bind-mount mapping))) (file-system-mapping->bind-mount mapping)))
@ -488,6 +491,11 @@ will be used for the passwd entry. LINK-PROFILE? creates a symbolic link from
(group-entry (gid 65534) ;the overflow GID (group-entry (gid 65534) ;the overflow GID
(name "overflow")))) (name "overflow"))))
(home-dir (password-entry-directory passwd)) (home-dir (password-entry-directory passwd))
(environ (filter (match-lambda
((variable . value)
(find (cut regexp-exec <> variable)
white-list)))
(get-environment-variables)))
;; Bind-mount all requisite store items, user-specified mappings, ;; Bind-mount all requisite store items, user-specified mappings,
;; /bin/sh, the current working directory, and possibly networking ;; /bin/sh, the current working directory, and possibly networking
;; configuration files within the container. ;; configuration files within the container.
@ -556,6 +564,12 @@ will be used for the passwd entry. LINK-PROFILE? creates a symbolic link from
(override-user-dir user home cwd) (override-user-dir user home cwd)
home-dir)) home-dir))
;; Set environment variables that match WHITE-LIST.
(for-each (match-lambda
((variable . value)
(setenv variable value)))
environ)
(primitive-exit/status (primitive-exit/status
;; A container's environment is already purified, so no need to ;; A container's environment is already purified, so no need to
;; request it be purified again. ;; request it be purified again.
@ -759,6 +773,7 @@ message if any test fails."
#:user-mappings mappings #:user-mappings mappings
#:profile profile #:profile profile
#:manifest manifest #:manifest manifest
#:white-list white-list
#:link-profile? link-prof? #:link-profile? link-prof?
#:network? network? #:network? network?
#:map-cwd? (not no-cwd?)))) #:map-cwd? (not no-cwd?))))

36
guix/scripts/import/crate.scm
View File

@ -28,6 +28,7 @@
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-11) #:use-module (srfi srfi-11)
#:use-module (srfi srfi-37) #:use-module (srfi srfi-37)
#:use-module (srfi srfi-41)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 format) #:use-module (ice-9 format)
#:export (guix-import-crate)) #:export (guix-import-crate))
@ -43,6 +44,9 @@
(define (show-help) (define (show-help)
(display (G_ "Usage: guix import crate PACKAGE-NAME (display (G_ "Usage: guix import crate PACKAGE-NAME
Import and convert the crate.io package for PACKAGE-NAME.\n")) Import and convert the crate.io package for PACKAGE-NAME.\n"))
(display (G_ "
-r, --recursive import packages recursively"))
(newline)
(display (G_ " (display (G_ "
-h, --help display this help and exit")) -h, --help display this help and exit"))
(display (G_ " (display (G_ "
@ -59,6 +63,9 @@ Import and convert the crate.io package for PACKAGE-NAME.\n"))
(option '(#\V "version") #f #f (option '(#\V "version") #f #f
(lambda args (lambda args
(show-version-and-exit "guix import crate"))) (show-version-and-exit "guix import crate")))
(option '(#\r "recursive") #f #f
(lambda (opt name arg result)
(alist-cons 'recursive #t result)))
%standard-import-options)) %standard-import-options))
@ -79,22 +86,31 @@ Import and convert the crate.io package for PACKAGE-NAME.\n"))
(let* ((opts (parse-options)) (let* ((opts (parse-options))
(args (filter-map (match-lambda (args (filter-map (match-lambda
(('argument . value) (('argument . value)
value) value)
(_ #f)) (_ #f))
(reverse opts)))) (reverse opts))))
(match args (match args
((spec) ((spec)
(define-values (name version) (define-values (name version)
(package-name->name+version spec)) (package-name->name+version spec))
(let ((sexp (crate->guix-package name version))) (if (assoc-ref opts 'recursive)
(unless sexp (map (match-lambda
(leave (G_ "failed to download meta-data for package '~a'~%") ((and ('package ('name name) . rest) pkg)
(if version `(define-public ,(string->symbol name)
(string-append name "@" version) ,pkg))
name))) (_ #f))
sexp)) (reverse
(stream->list
(crate-recursive-import name))))
(let ((sexp (crate->guix-package name version)))
(unless sexp
(leave (G_ "failed to download meta-data for package '~a'~%")
(if version
(string-append name "@" version)
name)))
sexp)))
(() (()
(leave (G_ "too few arguments~%"))) (leave (G_ "too few arguments~%")))
((many ...) ((many ...)

2
guix/scripts/pull.scm
View File

@ -314,7 +314,7 @@ to display."
(removed (removed
(let ((count (length removed))) (let ((count (length removed)))
(format (current-error-port) (format (current-error-port)
(N_ " ~*One channel removed:~%" (N_ " ~a channel removed:~%"
" ~a channels removed:~%" count) " ~a channels removed:~%" count)
count) count)
(for-each display-channel removed)))) (for-each display-channel removed))))

5
tests/guix-environment-container.sh
View File

@ -44,6 +44,11 @@ else
test $? = 42 test $? = 42
fi fi
# Make sure '--preserve' is honored.
result="`FOOBAR=42; export FOOBAR; guix environment -C --ad-hoc --bootstrap \
guile-bootstrap -E ^FOO -- guile -c '(display (getenv \"FOOBAR\"))'`"
test "$result" = "42"
# By default, the UID inside the container should be the same as outside. # By default, the UID inside the container should be the same as outside.
uid="`id -u`" uid="`id -u`"
inner_uid="`guix environment -C --ad-hoc --bootstrap guile-bootstrap \ inner_uid="`guix environment -C --ad-hoc --bootstrap guile-bootstrap \