TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2020-11-22 23:36:09 +01:00
parent 84d1b500f0 1ca0c34867
commit a485a98ca8
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
106 changed files with 3322 additions and 1007 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/guix.texi
View file

@ -17500,16 +17500,17 @@ CUPS service will generate a self-signed certificate if needed, for
secure connections to the print server.
Suppose you want to enable the Web interface of CUPS and also add
support for Epson printers @i{via} the @code{escpr} package and for HP
printers @i{via} the @code{hplip-minimal} package. You can do that directly,
like this (you need to use the @code{(gnu packages cups)} module):
support for Epson printers @i{via} the @code{epson-inkjet-printer-escpr}
package and for HP printers @i{via} the @code{hplip-minimal} package.
You can do that directly, like this (you need to use the
@code{(gnu packages cups)} module):
@lisp
(service cups-service-type
(cups-configuration
(web-interface? #t)
(extensions
(list cups-filters escpr hplip-minimal))))
(list cups-filters epson-inkjet-printer-escpr hplip-minimal))))
@end lisp
Note: If you wish to use the Qt5 based GUI which comes with the hplip
@ -17538,7 +17539,7 @@ Available @code{cups-configuration} fields are:
The CUPS package.
@end deftypevr
@deftypevr {@code{cups-configuration} parameter} package-list extensions (default: @code{(list escpr hplip-minimal foomatic-filters)})
@deftypevr {@code{cups-configuration} parameter} package-list extensions (default: @code{(list epson-inkjet-printer-escpr hplip-minimal foomatic-filters splix)})
Drivers and other extensions to the CUPS package.
@end deftypevr

13
gnu/build/linux-initrd.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -39,8 +39,9 @@ (define* (write-cpio-archive output directory
#:key
(compress? #t)
(gzip "gzip"))
"Write a cpio archive containing DIRECTORY to file OUTPUT. When
COMPRESS? is true, compress it using GZIP. On success, return OUTPUT."
"Write a cpio archive containing DIRECTORY to file OUTPUT, with reset
timestamps in the archive. When COMPRESS? is true, compress it using GZIP.
On success, return OUTPUT."
;; Note: as per `ramfs-rootfs-initramfs.txt', always add directory entries
;; before the files that are inside of it: "The Linux kernel cpio
@ -141,12 +142,6 @@ (define* (build-initrd output
(symlink (string-append guile "/bin/guile") "proc/self/exe")
(readlink "proc/self/exe")
;; Reset the timestamps of all the files that will make it in the initrd.
(for-each (lambda (file)
(unless (eq? 'symlink (stat:type (lstat file)))
(utime file 0 0 0 0)))
(find-files "." ".*"))
(write-cpio-archive output "." #:gzip gzip))
;; Make sure directories are writable so we can delete files.

4
gnu/ci.scm
View file

@ -57,6 +57,7 @@ (define-module (gnu ci)
#:use-module (gnu system install)
#:use-module (gnu system images hurd)
#:use-module (gnu system images pine64)
#:use-module (gnu system images pinebook-pro)
#:use-module (gnu tests)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
@ -205,7 +206,8 @@ (define %guix-system-supported-systems
(define %guix-system-images
(list hurd-barebones-qcow2-image
pine64-barebones-raw-image))
pine64-barebones-raw-image
pinebook-pro-barebones-raw-image))
(define (image-jobs store system)
"Return a list of jobs that build images for SYSTEM."

3
gnu/local.mk
View file

@ -652,6 +652,7 @@ GNU_SYSTEM_MODULES = \
\
%D%/system/images/hurd.scm \
%D%/system/images/pine64.scm \
%D%/system/images/pinebook-pro.scm \
\
%D%/machine.scm \
\
@ -989,6 +990,7 @@ dist_patch_DATA = \
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
%D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/fuse-overlapping-headers.patch \
%D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \
%D%/packages/patches/ganeti-deterministic-manual.patch \
%D%/packages/patches/ganeti-disable-version-symlinks.patch \
%D%/packages/patches/ganeti-drbd-compat.patch \
@ -1717,7 +1719,6 @@ dist_patch_DATA = \
%D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \
%D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \
%D%/packages/patches/xpra-4.0.1-systemd-run.patch \
%D%/packages/patches/xpra-4.0.4-norequests.patch \
%D%/packages/patches/xsane-fix-memory-leak.patch \
%D%/packages/patches/xsane-fix-pdf-floats.patch \
%D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \

2
gnu/packages/admin.scm
View file

@ -4131,7 +4131,7 @@ (define-public nmrpflash
(method git-fetch)
(uri
(git-reference
(url "https://github.com/jclehner/nmrpflash.git")
(url "https://github.com/jclehner/nmrpflash")
(commit (string-append "v" version))))
(sha256
(base32 "1fdjrxhjs96rdclbkld57xarf592slhkp79h46z833npxpn12ck1"))

2
gnu/packages/aidc.scm
View file

@ -50,7 +50,7 @@ (define-public zxing-cpp
(method git-fetch)
(uri
(git-reference
(url "https://github.com/nu-book/zxing-cpp.git")
(url "https://github.com/nu-book/zxing-cpp")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256

4
gnu/packages/algebra.scm
View file

@ -1005,7 +1005,7 @@ (define-public symengine
(define-public eigen
(package
(name "eigen")
(version "3.3.7")
(version "3.3.8")
(source (origin
(method url-fetch)
(uri (list
@ -1015,7 +1015,7 @@ (define-public eigen
version ".orig.tar.bz2")))
(sha256
(base32
"1km3fyfzyqfdvmnl79drps3fjwnz3zbh0c7l34mfbqyvvs8cy4wz"))
"1vxrsncfnkyq6gwxpsannpryp12mk7lc8f42ybvz3saf7icwc582"))
(file-name (string-append name "-" version ".tar.bz2"))
(patches (search-patches "eigen-stabilise-sparseqr-test.patch"))
(modules '((guix build utils)))

2
gnu/packages/assembly.scm
View file

@ -444,7 +444,7 @@ (define-public intel-xed
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/intelxed/mbuild.git")
(url "https://github.com/intelxed/mbuild")
(commit "5304b94361fccd830c0e2417535a866b79c1c297")))
(sha256
(base32

6
gnu/packages/audio.scm
View file

@ -140,7 +140,7 @@ (define-public opensles
(method git-fetch)
(uri
(git-reference
(url "https://github.com/KhronosGroup/OpenSL-ES-Registry.git")
(url "https://github.com/KhronosGroup/OpenSL-ES-Registry")
(commit "ea5104bf37bf525c25e6ae2386586048179d0fda")))
(file-name (git-file-name name version))
(sha256
@ -202,7 +202,7 @@ (define-public wildmidi
(method git-fetch)
(uri
(git-reference
(url "https://github.com/Mindwerks/wildmidi.git")
(url "https://github.com/Mindwerks/wildmidi")
(commit (string-append name "-" version))))
(file-name (git-file-name name version))
(sha256
@ -277,7 +277,7 @@ (define-public tinyalsa
(method git-fetch)
(uri
(git-reference
(url "https://github.com/tinyalsa/tinyalsa.git")
(url "https://github.com/tinyalsa/tinyalsa")
(commit version)))
(file-name (git-file-name name version))
(sha256

6
gnu/packages/browser-extensions.scm
View file

@ -53,7 +53,7 @@ (define uassets
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/uBlockOrigin/uAssets.git")
(url "https://github.com/uBlockOrigin/uAssets")
(commit commit)))
(file-name (git-file-name "uAssets" (string-take commit 9)))
(sha256
@ -63,7 +63,7 @@ (define uassets
(define ublock-origin
(package
(name "ublock-origin")
(version "1.30.6")
(version "1.31.0")
(home-page "https://github.com/gorhill/uBlock")
(source (origin
(method git-fetch)
@ -71,7 +71,7 @@ (define ublock-origin
(file-name (git-file-name name version))
(sha256
(base32
"10arx4r4s8125g9zlh3bcjpcb4qh2wzfmvqc2x8nly5fbxvxvns3"))))
"1wfg1g061l83fqwllp8q1jr1kvwxy2kbbzfk6ynlf18kjng9v3h5"))))
(build-system gnu-build-system)
(outputs '("xpi" "firefox" "chromium"))
(arguments

6
gnu/packages/check.scm
View file

@ -119,7 +119,7 @@ (define-public mutest
(method git-fetch)
(uri
(git-reference
(url "https://github.com/ebassi/mutest.git")
(url "https://github.com/ebassi/mutest")
(commit "e6246c9")))
(file-name (git-file-name name version))
(sha256
@ -1427,14 +1427,14 @@ (define-public python2-testresources
(define-public python-subunit-bootstrap
(package
(name "python-subunit-bootstrap")
(version "1.3.0")
(version "1.4.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "python-subunit" version))
(sha256
(base32
"1fsw8rsn1s3nklx06mayrg5rn2zbky6wwjc5z07s7rf1wjzfs1wn"))))
"0j0ymmnc5nfxi1qzvy59j27viqca7l7xd0y9x29g7yr0h693j804"))))
(build-system python-build-system)
(propagated-inputs
`(("python-extras" ,python-extras)

22
gnu/packages/clojure.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Jesse Gibbons <jgibbons2357+guix@gmail.com>
;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
@ -21,6 +22,7 @@
(define-module (gnu packages clojure)
#:use-module (gnu packages)
#:use-module (gnu packages java)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
@ -78,6 +80,8 @@ (define-public clojure
(sha256
(base32 "1kcyv2836acs27vi75hvf3r773ahv2nlh9b3j9xa9m9sdanz1h83")))))
(build-system ant-build-system)
(inputs
`(("jre" ,icedtea)))
(arguments
`(#:imported-modules ((guix build clojure-utils)
(guix build guile-build-system)
@ -114,7 +118,23 @@ (define (extract-library name)
(add-after 'install-license-files 'install-doc
(cut install-doc #:doc-dirs '("doc/clojure/") <...>))
(add-after 'install-doc 'install-javadoc
(install-javadoc "target/javadoc/")))))
(install-javadoc "target/javadoc/"))
(add-after 'install 'make-wrapper
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(wrapper (string-append out "/bin/clojure")))
(mkdir-p (string-append out "/bin"))
(with-output-to-file wrapper
(lambda _
(display
(string-append
"#!"
(which "sh")
"\n\n"
(assoc-ref inputs "jre") "/bin/java -jar "
out "/share/java/clojure.jar \"$@\"\n"))))
(chmod wrapper #o555))
#t)))))
(native-inputs libraries)
(home-page "https://clojure.org/")
(synopsis "Lisp dialect running on the JVM")

2
gnu/packages/compression.scm
View file

@ -1302,7 +1302,7 @@ (define-public unshield
(source
(origin (method git-fetch)
(uri (git-reference
(url "http://github.com/twogood/unshield.git")
(url "http://github.com/twogood/unshield")
(commit version)))
(file-name (git-file-name name version))
(sha256

2
gnu/packages/coq.scm
View file

@ -522,7 +522,7 @@ (define-public coq-autosubst
(source (origin
(method git-fetch)
(uri (git-reference
(url "git://github.com/uds-psl/autosubst.git")
(url "git://github.com/uds-psl/autosubst")
(commit commit)))
(file-name (git-file-name name version))
(sha256

27
gnu/packages/crates-graphics.scm
View file

@ -183,20 +183,12 @@ (define-public rust-aom-sys-0.1
(arguments
`(#:cargo-inputs
(("rust-bindgen" ,rust-bindgen-0.53)
("rust-metadeps" ,rust-metadeps-1.1))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-environmental-variable
(lambda* (#:key inputs #:allow-other-keys)
(let ((clang (assoc-ref inputs "libclang")))
(setenv "LIBCLANG_PATH"
(string-append clang "/lib")))
#t)))))
("rust-metadeps" ,rust-metadeps-1.1))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("libaom" ,libaom)
("libclang" ,clang)
("clang" ,clang)
("llvm" ,llvm)))
(home-page "https://github.com/rust-av/aom-rs")
(synopsis "FFI bindings to aom")
@ -402,19 +394,12 @@ (define-public rust-dav1d-sys-0.3
(arguments
`(#:cargo-inputs
(("rust-bindgen" ,rust-bindgen-0.54)
("rust-metadeps" ,rust-metadeps-1.1))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-environmental-variable
(lambda* (#:key inputs #:allow-other-keys)
(let ((clang (assoc-ref inputs "libclang")))
(setenv "LIBCLANG_PATH"
(string-append clang "/lib")))
#t)))))
("rust-metadeps" ,rust-metadeps-1.1))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("dav1d" ,dav1d)
("pkg-config" ,pkg-config)
("libclang" ,clang)
("clang" ,clang)
("llvm" ,llvm)))
(home-page "https://github.com/rust-av/dav1d-rs")
(synopsis "FFI bindings to dav1d")

1393
gnu/packages/crates-io.scm
View file

File diff suppressed because it is too large Load diff

35
gnu/packages/cups.scm
View file

@ -744,10 +744,10 @@ (define-public foo2zjs
(license (list license:expat ; icc2ps/*.[ch]
license:gpl2+)))) ; everything else
(define-public escpr
(define-public epson-inkjet-printer-escpr
(package
(name "escpr")
(version "1.7.7")
(name "epson-inkjet-printer-escpr")
(version "1.7.8")
;; XXX: This currently works. But it will break as soon as a newer
;; version is available since the URLs for older versions are not
;; preserved. An alternative source will be added as soon as
@ -755,15 +755,19 @@ (define-public escpr
(source
(origin
(method url-fetch)
(uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/10/49/18/"
"f3016be6120a7271a6d9cb64872f817bce1920b8/"
"epson-inkjet-printer-escpr-1.7.7-1lsb3.2.tar.gz"))
(uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/12/04/32/"
"1a455ef8618def65700ca4e446311c2fb43cd839/"
"epson-inkjet-printer-escpr-1.7.8-1lsb3.2.tar.gz"))
(sha256
(base32 "0khdf2a9iwh9aplj2gzyzl53yyfnfv0kszk3p018jnirl5l475ld"))))
(base32 "1pygg2bd2gh27dc65h3dzwrpvi6bq5c87wl0ldchqlc2b3blsx6p"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
`(,(string-append "--prefix="
`(#:modules
((srfi srfi-26)
,@%gnu-build-system-modules)
#:configure-flags
`("--disable-static"
,(string-append "--prefix="
(assoc-ref %outputs "out"))
,(string-append "--with-cupsfilterdir="
(assoc-ref %outputs "out") "/lib/cups/filter")
@ -781,7 +785,13 @@ (define-public escpr
(string-append match "aclocal"))
(("^(AUTOMAKE=).*" _ match)
(string-append match "automake")))
#t)))))
#t))
(add-after 'install 'compress-PPDs
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(with-directory-excursion out
(for-each (cut invoke "gzip" "-9" <>)
(find-files "share/cups" "\\.ppd$")))))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)))
@ -793,9 +803,12 @@ (define-public escpr
System} that offers high-quality printing with Seiko@tie{}Epson color ink jet
printers. It can be used only with printers that support the Epson@tie{}ESC/P-R
language.")
(home-page "http://download.ebz.epson.net/dsc/search/01/search")
(home-page "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX")
(license license:gpl2+)))
(define-public escpr
(deprecated-package "escpr" epson-inkjet-printer-escpr))
(define-public splix
;; Last released in 2009 <https://sourceforge.net/projects/splix/files/>.
;; Last SVN commit was 2013 <https://svn.code.sf.net/p/splix/code/splix/>.

2
gnu/packages/dictionaries.scm
View file

@ -242,7 +242,7 @@ (define-public translate-shell
(origin
(method git-fetch)
(uri (git-reference
(url"https://github.com/soimort/translate-shell.git")
(url"https://github.com/soimort/translate-shell")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256

2
gnu/packages/disk.scm
View file

@ -1052,7 +1052,7 @@ (define-public memkind
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/memkind/memkind.git")
(url "https://github.com/memkind/memkind")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256

5
gnu/packages/django.scm
View file

@ -862,14 +862,13 @@ (define-public python-django-rq
(define-public python-django-q
(package
(name "python-django-q")
(version "1.3.3")
(version "1.3.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "django-q" version))
(sha256
(base32
"1fs29767940akbsn3vdzw2rqnn9v77b0b55bi7fvydny1rk7fw6y"))))
(base32 "03z1pf6wlf47i7afr79a8fiiidfk1vq19yaqnv0m4qdny7f58gaj"))))
(build-system python-build-system)
;; FIXME: Tests require disque, Redis, MongoDB, Docker.
(arguments '(#:tests? #f))

112
gnu/packages/djvu.scm
View file

@ -27,12 +27,17 @@ (define-module (gnu packages djvu)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages linux)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pdf)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
@ -51,6 +56,9 @@ (define-public djvulibre
(base32
"0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"))))
(build-system gnu-build-system)
(inputs
`(("libjpeg-turbo" ,libjpeg-turbo)
("libtiff" ,libtiff)))
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'reproducible
@ -160,3 +168,107 @@ (define-public pdf2djvu
@end itemize\n")
(home-page "https://jwilk.net/software/pdf2djvu")
(license license:gpl2)))
(define-public djvu2pdf
(package
(name "djvu2pdf")
(version "0.9.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://0x2a.at/site/projects/djvu2pdf/djvu2pdf-"
version ".tar.gz"))
(sha256
(base32 "0v2ax30m7j1yi4m02nzn9rc4sn4vzqh5vywdh96r64j4pwvn5s5g"))))
(build-system gnu-build-system)
(inputs
`(("djvulibre" ,djvulibre)
("gawk" ,gawk)
("ghostscript" ,ghostscript)
("grep" ,grep)
("ncurses" ,ncurses)
("which" ,which)))
(arguments
`(#:tests? #f ; No test suite
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((djvulibre (assoc-ref inputs "djvulibre"))
(gawk (assoc-ref inputs "gawk"))
(ghostscript (assoc-ref inputs "ghostscript"))
(grep (assoc-ref inputs "grep"))
(ncurses (assoc-ref inputs "ncurses"))
(which (assoc-ref inputs "which")))
(substitute* "djvu2pdf"
(("awk")
(string-append gawk "/bin/awk"))
(("ddjvu")
(string-append djvulibre "/bin/ddjvu"))
(("djvudump")
(string-append djvulibre "/bin/djvudump"))
(("grep")
(string-append grep "/bin/grep"))
(("gs")
(string-append ghostscript "/bin/gs"))
(("tput ")
(string-append ncurses "/bin/tput "))
(("which")
(string-append which "/bin/which"))))
#t))
(delete 'configure)
(delete 'build)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref %outputs "out")))
(install-file "djvu2pdf"
(string-append out "/bin"))
(install-file "djvu2pdf.1.gz"
(string-append out "/share/man/man1"))
#t))))))
(synopsis "DjVu to PDF converter")
(description "This is a small tool to convert DjVu files to PDF files.")
(home-page "https://0x2a.at/site/projects/djvu2pdf/")
(license license:gpl2+)))
(define-public minidjvu
(package
(name "minidjvu")
(version "0.8")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/minidjvu/minidjvu/"
version "/minidjvu-" version ".tar.gz"))
(sha256
(base32 "0jmpvy4g68k6xgplj9zsl6brg6vi81mx3nx2x9hfbr1f4zh95j79"))))
(build-system gnu-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)))
(inputs
`(("libjpeg-turbo" ,libjpeg-turbo)
("libtiff" ,libtiff)
("zlib" ,zlib)))
(arguments
'(#:configure-flags '("--disable-static")
#:parallel-build? #f
#:tests? #f ; No test suite
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda _
(substitute* "Makefile.in"
(("/usr/bin/gzip")
"gzip"))
#t))
(add-before 'install 'make-lib-directory
(lambda* (#:key outputs #:allow-other-keys)
(mkdir-p (string-append (assoc-ref outputs "out") "/lib"))
#t)))))
(synopsis "Black and white DjVu encoder")
(description
"@code{minidjvu} is a multipage DjVu encoder and single page
encoder/decoder. It doesn't support colors or grayscales, just black
and white.")
(home-page "https://sourceforge.net/projects/minidjvu/")
(license license:gpl2)))

6
gnu/packages/docker.scm
View file

@ -70,11 +70,11 @@ (define-public python-docker
(inputs
`(("python-requests" ,python-requests-2.20)
("python-six" ,python-six)
("python-urllib3" ,python-urllib3-1.24)
("python-websocket-client" ,python-websocket-client)))
("python-urllib3" ,python-urllib3-1.24)))
(propagated-inputs
`(("python-docker-pycreds" ,python-docker-pycreds)
("python-paramiko" ,python-paramiko))) ; adds SSH support
("python-paramiko" ,python-paramiko) ;adds SSH support
("python-websocket-client" ,python-websocket-client)))
(home-page "https://github.com/docker/docker-py/")
(synopsis "Python client for Docker")
(description "Docker-Py is a Python client for the Docker container

2
gnu/packages/documentation.scm
View file

@ -63,7 +63,7 @@ (define-public latex2html
(method git-fetch)
(uri
(git-reference
(url "https://github.com/latex2html/latex2html.git")
(url "https://github.com/latex2html/latex2html")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256

354
gnu/packages/emacs-xyz.scm
View file

@ -2238,7 +2238,7 @@ (define-public emacs-chronometrist
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/contrapunctus-1/chronometrist.git")
(url "https://github.com/contrapunctus-1/chronometrist")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -3048,6 +3048,32 @@ (define-public emacs-undo-tree
allows easily move between them.")
(license license:gpl3+)))
(define-public emacs-undo-fu
;; There are no tagged releases upstream on gitlab, instead we are using
;; the most recent commit.
(let ((commit "c0806c1903c5a0e4c69b6615cdc3366470a9b8ca")
(revision "0"))
(package
(name "emacs-undo-fu")
(version (git-version "0.4" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/ideasman42/emacs-undo-fu")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1n594aakmcgyl7qbda86v4wsx8clm62ypiv3h559xz3x72h7mr3j"))))
(build-system emacs-build-system)
(home-page "https://gitlab.com/ideasman42/emacs-undo-fu")
(synopsis "Simple, stable linear undo with redo for Emacs")
(description
"This is a light weight wrapper for Emacs built-in undo system,
adding convenient undo/redo without losing access to the full undo history,
allowing you to visit all previous states of the document if you need.")
(license license:gpl3+))))
(define-public emacs-s
(package
(name "emacs-s")
@ -3920,8 +3946,8 @@ (define-public emacs-litable
(license license:gpl3+))))
(define-public emacs-literate-calc-mode
(let ((commit "e855bd718fa7d0d70b8f43264e10664369dd3a37")
(revision "0"))
(let ((commit "a50e897a816cb5580ad6ec867eeaae212e0e4798")
(revision "1"))
(package
(name "emacs-literate-calc-mode")
(version (git-version "0.1" revision commit))
@ -3933,7 +3959,7 @@ (define-public emacs-literate-calc-mode
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0mk4cig8g8ibz97mvyan79fkypyanh7r0h7h20ibafq09nb0mw01"))))
(base32 "0z6y5f1rj28lbr30m6g4a9l6ahs66whi8861g4cx9xzhs84nwv5g"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-s" ,emacs-s)))
@ -4564,7 +4590,7 @@ (define-public emacs-flycheck-ledger
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/purcell/flycheck-ledger.git")
(url "https://github.com/purcell/flycheck-ledger")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -7044,29 +7070,33 @@ (define-public emacs-realgud
(license license:gpl3+)))
(define-public emacs-request
(package
(name "emacs-request")
(version "0.3.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tkf/emacs-request")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1djywhvvb6kwdj0nd3axjvb7k2g06dzkc6hsf29w9rsk96vr8ryl"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #f)) ; requires network access.
(propagated-inputs
`(("emacs-deferred" ,emacs-deferred)))
(home-page "https://github.com/tkf/emacs-request")
(synopsis "Package for speaking HTTP in Emacs Lisp")
(description "This package provides a HTTP request library with multiple
;; We prefer a more recent commit that has support for auth-source,
;; which makes authentication more convenient for users and maintainers.
(let ((commit "d02d1347ffdf138cffd380cbeac62ac8732036ef")
(revision "0"))
(package
(name "emacs-request")
(version (git-version "0.3.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tkf/emacs-request")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1rkpakzish2d470ca15yq3k0m1j7a2lrkvvddcyvc2rx0sncsdjs"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #f)) ; requires network access.
(propagated-inputs
`(("emacs-deferred" ,emacs-deferred)))
(home-page "https://github.com/tkf/emacs-request")
(synopsis "Package for speaking HTTP in Emacs Lisp")
(description "This package provides a HTTP request library with multiple
backends. It supports url.el which is shipped with Emacs and the curl command
line program.")
(license license:gpl3+)))
(license license:gpl3+))))
(define-public emacs-rudel
(package
@ -7122,6 +7152,35 @@ (define-public emacs-hydra
automatically.")
(license license:gpl3+)))
(define-public emacs-pretty-hydra
(package
(name "emacs-pretty-hydra")
(version "0.2.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jerrypnz/major-mode-hydra.el")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"08a15knkdq35pzjq82imff016fbfdib5q4glg2xmdy2b5fnk7jqa"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-hydra" ,emacs-hydra)
("emacs-s" ,emacs-s)))
(arguments
`(#:exclude (cons "^major-mode-hydra\\.el" %default-exclude)))
(home-page "https://github.com/jerrypnz/major-mode-hydra.el")
(synopsis "Major mode keybindings managed by Hydra")
(description
"This package offers an hydra-based method of managing major
mode-specific key bindings. It is intended for use as a library only; see
package @code{emacs-major-mode-hydra} for a user-friendly interface.")
(license license:gpl3+)))
(define-public emacs-interleave
(package
(name "emacs-interleave")
@ -7144,6 +7203,20 @@ (define-public emacs-interleave
by side to an Org buffer with your notes relevant to the current page.")
(license license:gpl3+)))
(define-public emacs-major-mode-hydra
(package
(inherit emacs-pretty-hydra)
(name "emacs-major-mode-hydra")
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-pretty-hydra" ,emacs-pretty-hydra)))
(arguments
`(#:exclude (cons "^pretty-hydra\\.el" %default-exclude)))
(synopsis "Create nice-looking hydras")
(description
"This package provides the macro @code{pretty-hydra-define} to define
hydras with one column per group of heads.")))
(define-public emacs-ivy
(package
(name "emacs-ivy")
@ -7662,7 +7735,7 @@ (define-public emacs-counsel-notmuch
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fuxialexander/counsel-notmuch.git")
(url "https://github.com/fuxialexander/counsel-notmuch")
(commit commit)))
(file-name (git-file-name name version))
(sha256
@ -12239,14 +12312,14 @@ (define-public emacs-json-mode
(define-public emacs-jsonrpc
(package
(name "emacs-jsonrpc")
(version "1.0.12")
(version "1.0.14")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"jsonrpc-" version ".el"))
(sha256
(base32 "0cqp05awikbrn88ifld3vwnv6cxgmr83wlnsvxw8bqb96djz70ad"))))
(base32 "069l0sqkambam4ikj9id36kdw1jdjna8v586d51m64hiz96rmvm6"))))
(build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/jsonrpc.html")
(synopsis "JSON-RPC library")
@ -12544,7 +12617,7 @@ (define-public emacs-openwith
(define-public emacs-org-edit-latex
(package
(name "emacs-org-edit-latex")
(version "0.8.0")
(version "0.8.3")
(source
(origin
(method git-fetch)
@ -12553,18 +12626,16 @@ (define-public emacs-org-edit-latex
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842"))))
(base32 "1w0lyz71dq8x28ira4hig1b70bqn1dr53w3k5dgch9szcf6xa86y"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-auctex" ,emacs-auctex)
;; The version of org in Emacs 25.2 is not sufficient, because the
;; `org-latex-make-preamble' function is required.
("emacs-org" ,emacs-org)))
(home-page "https://github.com/et2010/org-edit-latex")
(synopsis "Edit a latex fragment just like editing a src block")
(description "@code{emacs-org-edit-latex} is an extension for org-mode.
It lets you edit a latex fragment in a dedicated buffer just like editing a
src block.")
(synopsis "Edit a LaTeX fragment just like editing a source block")
(description
"Org Edit LaTeX is an extension for Org mode. It lets you edit a LaTeX
fragment in a dedicated buffer just like editing a source block.")
(license license:gpl3+)))
(define-public emacs-emamux
@ -12635,31 +12706,29 @@ (define-public emacs-lcr
(license license:gpl3+)))
(define-public emacs-attrap
(let ((commit "18cd1f7832870a36c404e872fa83a271fe8e688d")
(revision "2"))
(package
(name "emacs-attrap")
(version (git-version "1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jyp/attrap")
(commit commit)))
(sha256
(base32
"078391949h0fgmshin8f79a1a595m06ig577rkgjqgngcp0d61l9"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-f" ,emacs-f)
("emacs-flycheck" ,emacs-flycheck)
("emacs-s" ,emacs-s)))
(home-page "https://github.com/jyp/attrap")
(synopsis "Fix coding error at point")
(description "This package provides a command to fix the Flycheck error
(package
(name "emacs-attrap")
(version "1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jyp/attrap")
(commit version)))
(sha256
(base32 "0wqc7bqx9rvk8r7fd3x84h8p01v97s6w2jf29nnjb59xakwp22i7"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-f" ,emacs-f)
("emacs-flycheck" ,emacs-flycheck)
("emacs-s" ,emacs-s)))
(home-page "https://github.com/jyp/attrap")
(synopsis "Fix coding error at point")
(description "This package provides a command to fix the Flycheck error
at point.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public emacs-git-messenger
(package
@ -13268,16 +13337,16 @@ (define-public emacs-transmission
(define-public emacs-polymode
(package
(name "emacs-polymode")
(version "0.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/polymode/polymode")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"04v0gnzfsjb50bgly6kvpryx8cyzwjaq2llw4qv9ijw1l6ixmq3b"))))
(version "0.2.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/polymode/polymode")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn"))))
(build-system emacs-build-system)
(home-page "https://github.com/polymode/polymode")
(synopsis "Framework for multiple Emacs modes based on indirect buffers")
@ -13290,33 +13359,30 @@ (define-public emacs-polymode
(license license:gpl3+)))
(define-public emacs-polymode-ansible
(let ((commit "b26094d029e25dc797b94254f797e7807a57e4c8"))
(package
(name "emacs-polymode-ansible")
;; No upstream version release yet.
(version (git-version "0.1" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/mavit/poly-ansible")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"055shddqibib3hx2ykwdz910nrqws40cd407mq946l2bf6v87gj6"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ansible-doc" ,emacs-ansible-doc)
("emacs-jinja2-mode" ,emacs-jinja2-mode)
("emacs-polymode" ,emacs-polymode)
("emacs-yaml-mode" ,emacs-yaml-mode)))
(properties '((upstream-name . "poly-ansible")))
(home-page "https://gitlab.com/mavit/poly-ansible/")
(synopsis "Polymode for Ansible - Jinja2 in YAML")
(description
"Edit YAML files for Ansible containing embedded Jinja2 templating.")
(license license:gpl3+))))
(package
(name "emacs-polymode-ansible")
(version "0.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/mavit/poly-ansible")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0f0yq6gmkp194nxk90ipprglf1xkmxrgz1rkgrhfslvxq4q2l81h"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-ansible-doc" ,emacs-ansible-doc)
("emacs-jinja2-mode" ,emacs-jinja2-mode)
("emacs-polymode" ,emacs-polymode)
("emacs-yaml-mode" ,emacs-yaml-mode)))
(properties '((upstream-name . "poly-ansible")))
(home-page "https://gitlab.com/mavit/poly-ansible/")
(synopsis "Polymode for Ansible - Jinja2 in YAML")
(description
"Edit YAML files for Ansible containing embedded Jinja2 templating.")
(license license:gpl3+)))
(define-public emacs-powershell
;; Tagged branch 0.1 is outdated (2015).
@ -13345,7 +13411,7 @@ (define-public emacs-powershell
(define-public emacs-polymode-org
(package
(name "emacs-polymode-org")
(version "0.2")
(version "0.2.2")
(source
(origin
(method git-fetch)
@ -13354,8 +13420,7 @@ (define-public emacs-polymode-org
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"04x6apjad4kg30456z1j4ipp64yjgkcaim6hqr6bb0rmrianqhck"))))
(base32 "1srnwcsn2bh8gqzxixkhffk7gbnk66kd4dgvxbnps5nxqc6v0qhc"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-polymode" ,emacs-polymode)))
@ -13363,10 +13428,9 @@ (define-public emacs-polymode-org
(home-page "https://github.com/polymode/poly-org")
(synopsis "Polymode definitions for Org mode buffers")
(description
"Provides definitions for @code{emacs-polymode} to support
@code{emacs-org} buffers. Edit source blocks in an Org mode buffer using the
native modes of the blocks' languages while remaining inside the primary Org
buffer.")
"This package provides definitions for Polymode to support Org buffers.
It edits source blocks in an Org buffer using the native modes of the blocks'
languages while remaining inside the primary Org buffer.")
(license license:gpl3+)))
(define-public eless
@ -17339,7 +17403,7 @@ (define-public emacs-dts-mode
(base32
"1k8lljdbc90nd29xrhdrsscxavzdq532wq2mg7ljc94krj7538b1"))))
(build-system emacs-build-system)
(home-page "https://github.com/bgamari/dts-mode.git")
(home-page "https://github.com/bgamari/dts-mode")
(synopsis "Emacs minor mode for editing device tree files")
(description
"This package provides an Emacs minor mode for highlighting
@ -19291,7 +19355,7 @@ (define-public emacs-spaceline-next
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/TheBB/spaceline.git")
(url "https://github.com/TheBB/spaceline")
(commit commit)))
(sha256
(base32 "11lwckqcgzsahrkkm5wk1ph4kc7d4yz05r7251g8c9f0q6vdj9dp"))
@ -19370,7 +19434,7 @@ (define-public emacs-helm-slime
(define-public emacs-helm-sly
(package
(name "emacs-helm-sly")
(version "0.5.0")
(version "0.5.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -19379,7 +19443,7 @@ (define-public emacs-helm-sly
(file-name (git-file-name name version))
(sha256
(base32
"1690rxwwg69jbcjhi51nyjlx3gziaiaa8ssyal71gmc6schq2592"))))
"13s2dj09mcdwlibjlahyyq2dxjkjlpxs88dbdyvcd64249jmahsx"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-helm" ,emacs-helm)
@ -19885,7 +19949,7 @@ (define-public emacs-leetcode
(package
(name "emacs-leetcode")
(version (git-version "0" "1" commit))
(home-page "https://github.com/ginqi7/leetcode-emacs.git")
(home-page "https://github.com/ginqi7/leetcode-emacs")
(source (origin
(method git-fetch)
(uri (git-reference
@ -20957,10 +21021,10 @@ (define-public emacs-transient
(license license:gpl3+))))
(define-public emacs-forge
(let ((commit "09bf8adc9c9afb492632e612f51f39e1cc15fca0"))
(let ((commit "05ef02913004826165c383bd6d2ff6574542b76c"))
(package
(name "emacs-forge")
(version (git-version "0.1.0" "4" commit))
(version (git-version "0.1.0" "5" commit))
(source
(origin
(method git-fetch)
@ -20970,7 +21034,7 @@ (define-public emacs-forge
(file-name (git-file-name name version))
(sha256
(base32
"148h1rvmfmxyrfy2q5l0vzblr7lpsyw1si30hfwhzsj8fvj21qcr"))))
"1vv7xlawj2zmwqk69qlsqflhh0lbyqm5xf4x8l4v2069g0k8mmx1"))))
(build-system emacs-build-system)
(native-inputs
`(("texinfo" ,texinfo)))
@ -22675,14 +22739,14 @@ (define-public emacs-mastodon
(define-public emacs-ebdb
(package
(name "emacs-ebdb")
(version "0.6.20")
(version "0.6.21")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"ebdb-" version ".tar"))
(sha256
(base32 "1rhmnz2g4nmk893gzxm1hfwqf5nan20yss5mxilfpza2jh4368h3"))))
(base32 "0pp190wr6z98kggmw9ls486f9vxfimdjdbqsp263qiyi21ws98if"))))
(build-system emacs-build-system)
(home-page "https://github.com/girzel/ebdb")
(synopsis "EIEIO port of BBDB, Emacs's contact-management package")
@ -24915,7 +24979,7 @@ (define-public emacs-org-generate
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/conao3/org-generate.el.git")
(url "https://github.com/conao3/org-generate.el")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -25208,7 +25272,7 @@ (define-public emacs-highlight
(define-public emacs-org-webring
(package
(name "emacs-org-webring")
(version "1.9.8-rc4")
(version "2.0.0")
(source
(origin
(method git-fetch)
@ -25218,7 +25282,7 @@ (define-public emacs-org-webring
(file-name (git-file-name name version))
(sha256
(base32
"0z2q29i9ng2vkzb6qbwb0dzvz8yv44p0kg07lx59pcdbv7mznjmc"))))
"1si0jah7n2gvlvghjy5dpannqpkxni5rczfp1x2a4z6ydalr3bn5"))))
(build-system emacs-build-system)
(arguments
`(#:phases
@ -25473,3 +25537,57 @@ (define-public emacs-nord-theme
uncluttered design pattern to achieve optimal focus and readability for code
syntax highlighting and UI components.")
(license license:expat)))
(define-public emacs-janet-mode
(let ((commit "2f5bcabcb6953e1ed1926ba6a2328c453e8b4ac7"))
(package
(name "emacs-janet-mode")
(version (git-version "0.1.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ALSchwalm/janet-mode")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0qj0gpycv2f3z1dgz1a27bjn983hrr3ppvrp7csl34lagnmp89rz"))))
(build-system emacs-build-system)
(home-page "https://github.com/ALSchwalm/janet-mode")
(synopsis "Emacs major mode for the Janet programming language")
(description
"This package provides an Emacs major mode for editing Janet files.")
(license license:gpl3))))
(define-public emacs-inf-janet
(let ((commit "df46651d3aad32593b2195c80ca91fb64d571fb7"))
(package
(name "emacs-inf-janet")
(version (git-version "0.1.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/velkyel/inf-janet")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0g0y7q62667j0p32md1h6zb2cap9fga9qgdg7138xwjqnk0328v7"))))
(build-system emacs-build-system)
(propagated-inputs
`(("janet-mode" ,emacs-janet-mode)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-program-name
(lambda _
(make-file-writable "inf-janet.el")
(emacs-substitute-variables "inf-janet.el"
("inf-janet-program" "janet"))
#t)))))
(home-page "https://github.com/velkyel/inf-janet")
(synopsis "Run an external Janet process in an Emacs buffer")
(description
"This Emacs package provides a Janet REPL to evaluate @code{janet-mode}
s-expression.")
(license license:expat))))

4
gnu/packages/embedded.scm
View file

@ -1379,7 +1379,7 @@ (define-public ebusd
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/john30/ebusd.git")
(url "https://github.com/john30/ebusd")
(commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout"))
(sha256
@ -1407,7 +1407,7 @@ (define-public ebusd
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/john30/ebusd-configuration.git")
(url "https://github.com/john30/ebusd-configuration")
(commit "666c0f6b9c4d7545eff7f43ab28a1c7baeab7913")))
(file-name "config-checkout")
(sha256

2
gnu/packages/enchant.scm
View file

@ -49,7 +49,7 @@ (define-public nuspell
(method git-fetch)
(uri
(git-reference
(url "https://github.com/nuspell/nuspell.git")
(url "https://github.com/nuspell/nuspell")
(commit
(string-append "v" version))))
(file-name

74
gnu/packages/file-systems.scm
View file

@ -68,6 +68,7 @@ (define-module (gnu packages file-systems)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages version-control)
#:use-module (gnu packages xml))
(define-public autofs
@ -182,6 +183,79 @@ (define-public bindfs
@end itemize ")
(license license:gpl2+)))
(define-public davfs2
(package
(name "davfs2")
(version "1.6.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.savannah.nongnu.org/releases/"
"davfs2/davfs2-" version ".tar.gz"))
(sha256
(base32 "0l1vnv5lfigciwg17p10zxwhzj4qw2d9kw30prr7g4dxhmb6fsrf"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--sysconfdir=/etc" ; so man pages & binaries contain /etc
(string-append "--docdir=" (assoc-ref %outputs "out")
"/share/doc/" ,name "-" ,version)
(string-append "ssbindir=" (assoc-ref %outputs "out") "/sbin")
;; The default ‘davfs2’ user and group don't exist on most systems.
"dav_user=nobody"
"dav_group=nogroup")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'omit-redundancy
;; Don't install redundant copies of /etc examples into /share.
(lambda _
(substitute* "etc/Makefile.in"
(("(dist_pkgdata_DATA =.*) davfs2.conf secrets(.*)"
_ prefix suffix)
(string-append prefix suffix)))
#t))
(add-after 'unpack 'patch-file-names
(lambda _
;; Don't auto-load the FUSE kernel module. That's up to root.
;; XXX If/when we restore the previous behaviour, make sure not
;; to introduce a security hole when mount.davfs is setuid.
(substitute* "src/kernel_interface.c"
(("/sbin/modprobe") "/modprobe/disabled"))
#t))
(replace 'install
(lambda* (#:key make-flags outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(apply invoke "make" "install"
(string-append "pkgsysconfdir=" out "/etc")
make-flags)))))))
(inputs
`(("neon" ,neon)
;; Neon requires but doesn't propagate zlib, nor would we want that.
;; XZ as well, but that's already present in the build environment.
("zlib" ,zlib)))
(home-page "https://savannah.nongnu.org/projects/davfs2")
(synopsis "Mount remote WebDAV resources in the local file system")
(description
"The @acronym{WebDAV, Web Distributed Authoring and Versioning} extension
to the HTTP protocol defines a standard way to author resources on a remote Web
server. Davfs2 exposes such resources as a typical filesystem which can be used
by standard applications with no built-in support for WebDAV, such as the GNU
coreutils (@command{cp}, @command{mv}, etc.) or a graphical word processor.
Davfs2 works with most WebDAV servers with no or little configuration. It
supports TLS (HTTPS), HTTP proxies, HTTP basic and digest authentication, and
client certificates. It performs extensive caching to avoid unnecessary network
traffic, stay responsive even over slow or unreliable connections, and prevent
data loss. It aims to make use by unprivileged users as easy and secure as
possible.
However, davfs2 is not a full-featured WebDAV client. The file system interface
and the WebDAV protocol are quite different. Translating between the two is not
always possible.")
(license (list license:bsd-2 ; src/fuse_kernel.h
license:gpl3+)))) ; everything else
(define-public fsarchiver
(package
(name "fsarchiver")

2
gnu/packages/fontutils.scm
View file

@ -283,7 +283,7 @@ (define-public woff2
(method git-fetch)
(uri
(git-reference
(url "https://github.com/google/woff2.git")
(url "https://github.com/google/woff2")
(commit (string-append "v" version))))
(file-name
(git-file-name name version))

4
gnu/packages/game-development.scm
View file

@ -444,7 +444,7 @@ (define-public python-xsge
(define-public tiled
(package
(name "tiled")
(version "1.4.2")
(version "1.4.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -453,7 +453,7 @@ (define-public tiled
(file-name (git-file-name name version))
(sha256
(base32
"0nhmv5rnmlnnmkiz95l3iy62f3754d98dm1wyh1m47xb3nbnl05b"))))
"14bx4gywfzr2f07ldqk3la82g5ag1agj21f7ccrxip12ydmpx0xb"))))
(build-system gnu-build-system)
(inputs
`(("qtbase" ,qtbase)

4
gnu/packages/games.scm
View file

@ -4436,7 +4436,7 @@ (define-public einstein
(define-public powwow
(package
(name "powwow")
(version "1.2.19")
(version "1.2.22")
(source (origin
(method url-fetch)
(uri (string-append
@ -4444,7 +4444,7 @@ (define-public powwow
version ".tar.gz"))
(sha256
(base32
"10rjl63hmf62qslyhzqrbw3i2zf09dgxv65avhj0iiz0m4pbc9wy"))))
"12i11b8zxg8vdb9d6ims8qy2lmwwr42rcqbwq3vsa1x94s51bcbp"))))
(inputs
`(("ncurses" ,ncurses)))
(build-system gnu-build-system)

2
gnu/packages/geo.scm
View file

@ -112,7 +112,7 @@ (define-public memphis
(method git-fetch)
(uri
(git-reference
(url "https://github.com/jiuka/memphis.git")
(url "https://github.com/jiuka/memphis")
(commit version)))
(file-name (git-file-name name version))
(sha256

2
gnu/packages/gimp.scm
View file

@ -139,7 +139,7 @@ (define-public mrg
(method git-fetch)
(uri
(git-reference
(url "https://github.com/hodefoting/mrg.git")
(url "https://github.com/hodefoting/mrg")
(commit version)))
(file-name
(git-file-name name version))

2
gnu/packages/gnome-xyz.scm
View file

@ -131,7 +131,7 @@ (define-public gnome-shell-extension-appindicator
(method git-fetch)
(uri (git-reference
(url
"https://github.com/ubuntu/gnome-shell-extension-appindicator.git")
"https://github.com/ubuntu/gnome-shell-extension-appindicator")
(commit (string-append "v" version))))
(sha256
(base32

8
gnu/packages/gnome.scm
View file

@ -10406,9 +10406,9 @@ (define-public cheese
(native-inputs
`(("docbook-xsl" ,docbook-xsl)
("docbook-xml" ,docbook-xml-4.3)
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gtk-doc" ,gtk-doc)
("intltool" ,intltool)
("itstool" ,itstool)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
@ -11676,7 +11676,7 @@ (define-public parlatype
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gkarsay/parlatype.git")
(url "https://github.com/gkarsay/parlatype")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -11915,7 +11915,7 @@ (define-public gnome-builder
(define-public komikku
(package
(name "komikku")
(version "0.22.1")
(version "0.23.0")
(source
(origin
(method git-fetch)
@ -11925,7 +11925,7 @@ (define-public komikku
(file-name (git-file-name name version))
(sha256
(base32
"0ds4j542zprbyh36qyii1c9mb7kj14cvrfk5miqjvp8y4b5i6mdi"))))
"1xh3qmf2pk80qxj528lajjcwg7mps72s1zz8cj388av58p8l3hyw"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t

8
gnu/packages/gnuzilla.scm
View file

@ -1161,11 +1161,11 @@ (define-public icecat
(cpe-version . ,(first (string-split version #\-)))))))
;; Update this together with icecat!
(define %icedove-build-id "20201111000000") ;must be of the form YYYYMMDDhhmmss
(define %icedove-build-id "20201117000000") ;must be of the form YYYYMMDDhhmmss
(define-public icedove
(package
(name "icedove")
(version "78.4.3")
(version "78.5.0")
(source icecat-source)
(properties
`((cpe-name . "thunderbird_esr")))
@ -1445,7 +1445,7 @@ (define-public icedove
;; in the Thunderbird release tarball. We don't use the release
;; tarball because it duplicates the Icecat sources and only adds the
;; "comm" directory, which is provided by this repository.
,(let ((changeset "6ee1d79f9e77c90f0f165b9315b5b437a220b665"))
,(let ((changeset "92abc26b9c80383e974fb0234f22e06fea793be2"))
(origin
(method hg-fetch)
(uri (hg-reference
@ -1454,7 +1454,7 @@ (define-public icedove
(file-name (string-append "thunderbird-" version "-checkout"))
(sha256
(base32
"0m6isazpirmviv14kjav8jn3w3gm3mls0qwyf1n87hj00bj6z6jc")))))
"0468k3qrqs9w1vva2fdxvwqdsypqpsdy5iixgx58dqivchg4qlf9")))))
("autoconf" ,autoconf-2.13)
("cargo" ,rust-1.41 "cargo")
("clang" ,clang)

4
gnu/packages/golang.scm
View file

@ -1145,7 +1145,7 @@ (define-public go-github-com-tv42-httpunix
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tv42/httpunix.git")
(url "https://github.com/tv42/httpunix")
(commit commit)))
(file-name (git-file-name name version))
(sha256
@ -1714,7 +1714,7 @@ (define-public go-github-com-ayufan-golang-kardianos-service
(method git-fetch)
(uri (git-reference
(url
"https://github.com/ayufan/golang-kardianos-service.git")
"https://github.com/ayufan/golang-kardianos-service")
(commit commit)))
(file-name (git-file-name name version))
(sha256

10
gnu/packages/graphics.scm
View file

@ -121,7 +121,7 @@ (define-public eglexternalplatform
(method git-fetch)
(uri
(git-reference
(url "https://github.com/NVIDIA/eglexternalplatform.git")
(url "https://github.com/NVIDIA/eglexternalplatform")
(commit version)))
(file-name
(git-file-name name version))
@ -172,7 +172,7 @@ (define-public egl-wayland
(method git-fetch)
(uri
(git-reference
(url "https://github.com/NVIDIA/egl-wayland.git")
(url "https://github.com/NVIDIA/egl-wayland")
(commit version)))
(file-name
(git-file-name name version))
@ -202,7 +202,7 @@ (define-public mmm
(method git-fetch)
(uri
(git-reference
(url "https://github.com/hodefoting/mmm.git")
(url "https://github.com/hodefoting/mmm")
(commit version)))
(file-name
(git-file-name name version))
@ -231,7 +231,7 @@ (define-public directfb
(method git-fetch)
(uri
(git-reference
(url "https://github.com/deniskropp/DirectFB.git")
(url "https://github.com/deniskropp/DirectFB")
(commit "DIRECTFB_1_7_7")))
(file-name (git-file-name name version))
(sha256
@ -301,7 +301,7 @@ (define-public flux
(method git-fetch)
(uri
(git-reference
(url "https://github.com/deniskropp/flux.git")
(url "https://github.com/deniskropp/flux")
(commit "e45758a")))
(file-name (git-file-name name version))
(sha256

8
gnu/packages/gstreamer.scm
View file

@ -95,7 +95,7 @@ (define-public openni2
(method git-fetch)
(uri
(git-reference
(url "https://github.com/occipital/OpenNI2.git")
(url "https://github.com/occipital/OpenNI2")
(commit (string-append "v" version "-debian"))))
(file-name (git-file-name name version))
(sha256
@ -167,7 +167,7 @@ (define-public ccextractor
(method git-fetch)
(uri
(git-reference
(url "https://github.com/CCExtractor/ccextractor.git")
(url "https://github.com/CCExtractor/ccextractor")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -220,7 +220,7 @@ (define-public libvisual
(method git-fetch)
(uri
(git-reference
(url "https://github.com/Libvisual/libvisual.git")
(url "https://github.com/Libvisual/libvisual")
(commit (string-append name "-" version))))
(file-name (git-file-name name version))
(sha256
@ -268,7 +268,7 @@ (define-public libvisual-plugins
(method git-fetch)
(uri
(git-reference
(url "https://github.com/Libvisual/libvisual.git")
(url "https://github.com/Libvisual/libvisual")
(commit (string-append name "-" version))))
(file-name (git-file-name name version))
(sha256

10
gnu/packages/guile-xyz.scm
View file

@ -966,8 +966,8 @@ (define-public guile-aa-tree
(license license:gpl3+)))
(define-public guile-simple-zmq
(let ((commit "68bedb6679716214fb9d3472da57544526f7a618")
(revision "3"))
(let ((commit "5fc3b7190d31c258ce969c2a5d2ad38c66a09d09")
(revision "4"))
(package
(name "guile-simple-zmq")
(version (git-version "0.0.0" revision commit))
@ -979,7 +979,7 @@ (define-public guile-simple-zmq
(commit commit)))
(sha256
(base32
"1ad3xg69qqviy1f6dnlw0ysmfdbmp1jq65rfqb8nfd8dsrq2syli"))
"0inhvl5jssvbw3nd129wdahfwyvy1iciq403wzf0algbvl1fqs7z"))
(file-name (git-file-name name version))))
(build-system guile-build-system)
(arguments
@ -2973,7 +2973,7 @@ (define-public guile-srfi-180
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/scheme-requests-for-implementation/srfi-180.git")
(url "https://github.com/scheme-requests-for-implementation/srfi-180")
(commit commit)))
(sha256
(base32
@ -3734,7 +3734,7 @@ (define-public guile-torrent
(source (origin (method git-fetch)
(uri (git-reference
(url
"https://github.com/o-nly/torrent.git")
"https://github.com/o-nly/torrent")
(commit version)))
(file-name (git-file-name name version))
(sha256

43
gnu/packages/haskell-web.scm
View file

@ -10,6 +10,7 @@
;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@gmail.com>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@member.fsf.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -417,6 +418,48 @@ (define-public ghc-http-conduit
which allow you to avoid direct usage of conduits.")
(license license:bsd-3)))
(define-public ghc-http-reverse-proxy
(package
(name "ghc-http-reverse-proxy")
(version "0.6.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/http-reverse-proxy/"
"http-reverse-proxy-" version ".tar.gz"))
(sha256
(base32
"1a6i5njf85b2lhg8m83njagcf09wih5q2irnyb2890s724qr277v"))))
(build-system haskell-build-system)
(inputs
`(("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-http-types" ,ghc-http-types)
("ghc-word8" ,ghc-word8)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-http-client" ,ghc-http-client)
("ghc-wai" ,ghc-wai)
("ghc-network" ,ghc-network)
("ghc-conduit" ,ghc-conduit)
("ghc-conduit-extra" ,ghc-conduit-extra)
("ghc-wai-logger" ,ghc-wai-logger)
("ghc-resourcet" ,ghc-resourcet)
("ghc-unliftio" ,ghc-unliftio)
("ghc-streaming-commons" ,ghc-streaming-commons)))
(native-inputs
`(("ghc-hspec" ,ghc-hspec)
("ghc-warp" ,ghc-warp)
("ghc-http-conduit" ,ghc-http-conduit)))
(home-page
"https://github.com/fpco/http-reverse-proxy")
(synopsis
"Reverse proxy HTTP requests, either over raw sockets or with WAI")
(description
"Provides a simple means of reverse-proxying HTTP requests. The raw
approach uses the same technique as leveraged by keter, whereas the WAI
approach performs full request/response parsing via WAI and http-conduit.")
(license license:bsd-3)))
(define-public ghc-wai
(package
(name "ghc-wai")

34
gnu/packages/heads.scm
View file

@ -19,6 +19,7 @@
(define-module (gnu packages heads)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
@ -161,3 +162,36 @@ (define (install-file* source-key destination-directory
(synopsis "Musl-cross gcc 5 toolchain")
(description "Musl-cross toolchain: binutils, gcc 5 and musl.")
(license license:isc))))
;; This package provides a "dev.cpio" file usable as a base for booting Heads.
(define-public heads-dev-cpio
(package
(name "heads-dev-cpio")
(version "0.1")
(source #f)
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils)
(guix cpio))
#:builder (begin
(use-modules (guix build utils)
(guix cpio)
(srfi srfi-26))
(mkdir-p "dev") ; input directory.
(let* ((out (assoc-ref %outputs "out"))
(libexec (string-append out "/libexec")))
(mkdir-p libexec)
(call-with-output-file (string-append libexec "/dev.cpio")
(lambda (port)
(write-cpio-archive '("dev" "dev/console") port
#:file->header
(lambda (name)
(if (string=? "dev/console" name)
(special-file->cpio-header* name 'char-special 5 1 #o600)
(file->cpio-header* name))))))
#t))))
(synopsis "@file{dev.cpio} for Heads")
(description "This package provides a @file{dev.cpio} file usable as a
base for heads' initrd.")
(home-page "http://osresearch.net/")
(license license:bsd-2)))

2
gnu/packages/image.scm
View file

@ -791,7 +791,7 @@ (define-public openjpeg-data
(method git-fetch)
(uri
(git-reference
(url "https://github.com/uclouvain/openjpeg-data.git")
(url "https://github.com/uclouvain/openjpeg-data")
(commit "c5c4a8c")))
(file-name (git-file-name name version))
(sha256

18
gnu/packages/irc.scm
View file

@ -62,6 +62,7 @@ (define-module (gnu packages irc)
#:use-module (gnu packages openldap)
#:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages password-utils)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@ -499,7 +500,7 @@ (define-public epic5
(define-public inspircd
(package
(name "inspircd")
(version "3.7.0")
(version "3.8.1")
(source
(origin
(method git-fetch)
@ -508,13 +509,13 @@ (define-public inspircd
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1npzp23c3ac7m1grkm39i1asj04rs4i0jwf5w0c0j0hmnwslnz7a"))))
(base32 "1i30649dw84iscxa5as81g96f393mn1i883aq4za5ypdinr5x65g"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (map (lambda (module)
(string-append "--enable-extras=" module))
'("m_geo_maxmind.cpp"
'("m_argon2.cpp"
"m_geo_maxmind.cpp"
"m_ldap.cpp"
"m_mysql.cpp"
"m_pgsql.cpp"
@ -550,16 +551,17 @@ (define-public inspircd
(string-append "--config-dir=" out-etc name)))
#t)))))
(native-inputs
`(("gnutls" ,gnutls)
("libgcrypt" ,libgcrypt)
`(("pkg-config" ,pkg-config)))
(inputs
`(("argon2" ,argon2)
("gnutls" ,gnutls)
("libmaxminddb" ,libmaxminddb)
("mysql" ,mysql)
("mbedtls-apache" ,mbedtls-apache)
("mysql" ,mysql)
("openldap" ,openldap)
("openssl" ,openssl)
("pcre" ,pcre "bin")
("perl" ,perl)
("pkg-config" ,pkg-config)
("postgresql" ,postgresql)
("re2" ,re2)
("sqlite" ,sqlite)

2
gnu/packages/java.scm
View file

@ -2723,7 +2723,7 @@ (define-public javacc-3
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/javacc/javacc.git")
(url "https://github.com/javacc/javacc")
(commit "release_32")))
(file-name (string-append "javacc-" version "-checkout"))
(sha256

4
gnu/packages/language.scm
View file

@ -62,7 +62,7 @@ (define-public liblouis
(method git-fetch)
(uri
(git-reference
(url "https://github.com/liblouis/liblouis.git")
(url "https://github.com/liblouis/liblouis")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -115,7 +115,7 @@ (define-public liblouisutdml
(method git-fetch)
(uri
(git-reference
(url "https://github.com/liblouis/liblouisutdml.git")
(url "https://github.com/liblouis/liblouisutdml")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256

58
gnu/packages/lego.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2019 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -35,6 +35,8 @@ (define-public nqc
(name "nqc")
(version "3.1.r6")
(source (origin
;; XXX Using url-fetch/tarbomb results in failure:
;; Error: could not create compiler/rcx1_nqh.h
(method url-fetch)
(uri (string-append "http://bricxcc.sourceforge.net/nqc/release/"
"nqc-" version ".tgz"))
@ -44,24 +46,48 @@ (define-public nqc
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)
("flex" ,flex)))
("flex" ,flex)
("add-usb-tcp-support.patch"
,(origin
(method url-fetch)
(uri (string-append "https://sourceforge.net/p/bricxcc/patches/"
"_discuss/thread/00b427dc/b84b/attachment/"
"nqc-01-Linux_usb_and_tcp.diff"))
(sha256
(base32 "0z5gx55ra1kamhhqxz08lvvwslfl36pbmwdd566rhmbgmyhlykbr"))))
("debian-writable-swap-inst-len.patch"
,(origin
(method url-fetch)
(uri (string-append "https://sources.debian.org/data/main/n/nqc/"
"3.1.r6-7/debian/patches/"
"writable-swap-inst-len.patch"))
(sha256
(base32 "1kr7j057aa5i0kxmlfpbfcsif5yq2lrmjw4sljn400ijaq4mys3v"))))))
(arguments
'(#:tests? #f ;no tests
#:make-flags (list (string-append "PREFIX=" %output))
#:phases (modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'rm-generated
;; Regenerating compiler/lexer.cpp avoids an 'undefined
;; reference to `isatty(int)'' error.
(lambda _
(for-each delete-file
'("compiler/lexer.cpp"
"compiler/parse.cpp"))
#t))
(add-after 'unpack 'deal-with-tarbomb
(lambda _
(chdir "..") ;tarbomb
#t)))))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'rm-generated
;; Regenerating compiler/lexer.cpp avoids an 'undefined
;; reference to `isatty(int)'' error.
(lambda _
(for-each delete-file
'("compiler/lexer.cpp"
"compiler/parse.cpp"))
#t))
(add-after 'unpack 'deal-with-tarbomb
(lambda _
(chdir "..") ;tarbomb
#t))
(add-after 'deal-with-tarbomb 'patch
(lambda* (#:key inputs #:allow-other-keys)
(for-each (lambda (patch)
(invoke "patch" "-Np1" "-i"
(assoc-ref inputs patch)))
(list "add-usb-tcp-support.patch"
"debian-writable-swap-inst-len.patch")))))))
(home-page "http://bricxcc.sourceforge.net/nqc/")
(synopsis "C-like language for Lego's MINDSTORMS")
(description

4
gnu/packages/libusb.scm
View file

@ -564,7 +564,7 @@ (define-public gmtp
(define-public hidapi
(package
(name "hidapi")
(version "0.9.0")
(version "0.10.0")
(source
(origin
(method git-fetch)
@ -573,7 +573,7 @@ (define-public hidapi
(commit (string-append "hidapi-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1p4g8lgwj4rki6lbn5l6rvwj0xlbn1xfh4d255bg5pvgczmwmc4i"))))
(base32 "1n3xn1zvxgyzb84cjpw3i5alw0gkbrps11r4ijxzyqxqym0khagr"))))
(build-system gnu-build-system)
(inputs
`(("libusb" ,libusb)

113
gnu/packages/linux.scm
View file

@ -352,15 +352,15 @@ (define (%upstream-linux-source version hash)
;; The current "stable" kernel. That is, the most recently released major
;; version.
(define-public linux-libre-5.9-version "5.9.8")
(define-public linux-libre-5.9-version "5.9.9")
(define deblob-scripts-5.9
(linux-libre-deblob-scripts
linux-libre-5.9-version
(base32 "1l0iw2lp6alk0a8nvdafklyks83iiyw4b2r5xif84z47qfbydsis")
(base32 "0wp0mx5d2qhv7brc595qj34phiaxz9z5gf26w5369nh9mll5cbw6")))
(base32 "0yb04a4j2wq3mwvks3cj7kcm2pscmfs29lrz3falkxpbvjxbbgq2")))
(define-public linux-libre-5.9-pristine-source
(let ((version linux-libre-5.9-version)
(hash (base32 "19l67gzk97higd2cbggipcb0wi21pv0ag0mc4qh6cqk564xp6mkn")))
(hash (base32 "1b8zysy0br131ydhc7ycxhh8d88r44xrmkf2q2lffy0jmy3d60m3")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.9)))
@ -368,7 +368,7 @@ (define-public linux-libre-5.9-pristine-source
;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-5.4-version "5.4.77")
(define-public linux-libre-5.4-version "5.4.78")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
linux-libre-5.4-version
@ -376,12 +376,12 @@ (define deblob-scripts-5.4
(base32 "167zcfkw62pm6nv1xdvvhxw0ca724sywcywnv3z00189f8f8p3vg")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "1xyvml0mps7bsa11bgpa4l0w8x6pasdz9yab2z4ds394f1lkxq53")))
(hash (base32 "0z8skj0w9jfrz9pfxaqfzqh82l13bz5lhza2wjsxk02cyhhnm226")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.157")
(define-public linux-libre-4.19-version "4.19.158")
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
linux-libre-4.19-version
@ -389,12 +389,12 @@ (define deblob-scripts-4.19
(base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf")))
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "0mgpgv2ny49bb7kgaygy2ay6ckjgw7mg091viivi66jw4mjs7p3n")))
(hash (base32 "0p5pim9izcscnk1a1kdlxbvyvxnnq9lqr1kwl86kfskr7yqy8n6n")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.206")
(define-public linux-libre-4.14-version "4.14.207")
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
linux-libre-4.14-version
@ -402,12 +402,12 @@ (define deblob-scripts-4.14
(base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky")))
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(hash (base32 "1b46f0s15xnlam43cmw8w41rrvcwrhm6km0278lq6f86lpx3w8qw")))
(hash (base32 "0a804hwh7cwbdd2gnr5n9i32b4s6gppd8iqihah4sn4q1nbm79vq")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.243")
(define-public linux-libre-4.9-version "4.9.244")
(define deblob-scripts-4.9
(linux-libre-deblob-scripts
linux-libre-4.9-version
@ -415,12 +415,12 @@ (define deblob-scripts-4.9
(base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2")))
(define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version)
(hash (base32 "111rlzx6z4kf8zwxncib96d9wy6qmkbs0cq3dhnybipwlyf1iank")))
(hash (base32 "02givxp0y04qma5nlqbpyxdcl7xdb41p3gw7kgj2rmwdanhzaylr")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.9)))
(define-public linux-libre-4.4-version "4.4.243")
(define-public linux-libre-4.4-version "4.4.244")
(define deblob-scripts-4.4
(linux-libre-deblob-scripts
linux-libre-4.4-version
@ -428,7 +428,7 @@ (define deblob-scripts-4.4
(base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf")))
(define-public linux-libre-4.4-pristine-source
(let ((version linux-libre-4.4-version)
(hash (base32 "1daqbmj9ka9wdkkym625hqwqaxq5n11y7c4yc9ln3xkjpnv4dplm")))
(hash (base32 "0brdj6z7flchig80ja0dhzcrpl743lh74s4r4r6prbgkksif9ahp")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.4)))
@ -1043,39 +1043,45 @@ (define-public linux-libre-with-bpf
;;;
(define-public acpi-call-linux-module
(let ((commit "70b9c80bd700e6a4d10797eaac9fd34b7e8cbd4a")
(revision "0"))
(package
(name "acpi-call-linux-module")
(version (git-version "3.17" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/teleshoes/acpi_call")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "09c1vw6vcrkqxbwhpgfgpj4d1grzn4qq6ka8pwwzm7cvm405xj7x"))))
(build-system linux-module-build-system)
(arguments
`(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-after 'install 'install-documentation
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name "-" ,version)))
(for-each (lambda (file)
(let ((target (string-append doc "/" file)))
(mkdir-p (dirname target))
(copy-recursively file target)))
(list "README.md" "examples"))
#t))))))
(home-page "https://github.com/teleshoes/acpi_call")
(synopsis "Linux kernel module to perform ACPI method calls")
(description
"This simple Linux kernel module allows calls from user space to any
(package
(name "acpi-call-linux-module")
(version "1.2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nix-community/acpi_call")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0mr4rjbv6fj4phf038addrgv32940bphghw2v9n1z4awvw7wzkbg"))))
(build-system linux-module-build-system)
(arguments
`(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(add-before 'install 'patch-shebangs-harder
;; The (only) shebangs in examples/ don't justify a reference.
;; However, do substitute a more portable one than the original.
(lambda _
(substitute* (find-files "examples" ".")
(("^(#! *)/[^ ]*/" _ shebang)
(string-append shebang "/usr/bin/env ")))
#t))
(add-after 'install 'install-documentation
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/" ,name "-" ,version)))
(for-each (lambda (file)
(let ((target (string-append doc "/" file)))
(mkdir-p (dirname target))
(copy-recursively file target)))
(list "README.md" "examples"))
#t))))))
(home-page "https://github.com/teleshoes/acpi_call")
(synopsis "Linux kernel module to perform ACPI method calls")
(description
"This simple Linux kernel module allows calls from user space to any
@acronym{ACPI, Advanced Configuration and Power Interface} method provided by
your computer's firmware, by writing to @file{/proc/acpi/call}. You can pass
any number of parameters of types @code{ACPI_INTEGER}, @code{ACPI_STRING},
@ -1083,7 +1089,7 @@ (define-public acpi-call-linux-module
It grants direct and undocumented access to your hardware that may cause damage
and should be used with caution, especially on untested models.")
(license license:gpl3+)))) ; see README.md (no licence headers)
(license license:gpl3+))) ; see README.md (no licence headers)
(define-public rtl8812au-aircrack-ng-linux-module
(let ((commit "df2b8dfd8cb7d9f6cfeb55abaeab8a5372011fc9")
@ -1367,7 +1373,7 @@ (define-public python-pamela
;; Tests not distributed in pypi release.
(method git-fetch)
(uri (git-reference
(url "https://github.com/minrk/pamela.git")
(url "https://github.com/minrk/pamela")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -5822,7 +5828,7 @@ (define-public mtd-utils
(define-public libseccomp
(package
(name "libseccomp")
(version "2.5.0")
(version "2.5.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/seccomp/libseccomp/"
@ -5830,7 +5836,7 @@ (define-public libseccomp
"/libseccomp-" version ".tar.gz"))
(sha256
(base32
"1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz"))))
"0m8dlg1v7kflcxvajs4p76p275qwsm2abbf5mfapkakp7hw7wc7f"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")
@ -7523,7 +7529,7 @@ (define-public bcc
(define-public bpftrace
(package
(name "bpftrace")
(version "0.10.0")
(version "0.11.4")
(source
(origin
(method git-fetch)
@ -7532,8 +7538,7 @@ (define-public bpftrace
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"023ardywbw5w8815j2ny9rrp2xlpxndqaa7v2njjm8109p7ilsdn"))
(base32 "0y4qgm2cpccrsm20rnh92hqplddqsc5q5zhw9nqn2igm3h9i0z7h"))
(patches (search-patches "bpftrace-disable-bfd-disasm.patch"))))
(build-system cmake-build-system)
(native-inputs
@ -7575,7 +7580,7 @@ (define-public ttyebus-linux-module
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/eBUS/ttyebus.git")
(url "https://github.com/eBUS/ttyebus")
(commit "fe4332a2281cf79804ef4d8516aa848ca1c58d1f")))
(file-name (git-file-name name version))
(sha256

6
gnu/packages/lisp-xyz.scm
View file

@ -2549,10 +2549,10 @@ (define-public ecl-cl-cffi-gtk
(sbcl-package->ecl-package sbcl-cl-cffi-gtk))
(define-public sbcl-cl-webkit
(let ((commit "04bb5703b68f4db9de71529b81896cc428ef54e1"))
(let ((commit "aecd76a2bcc7bfee049c91d94cc75f893800bf37"))
(package
(name "sbcl-cl-webkit")
(version (git-version "2.4" "8" commit))
(version (git-version "2.4" "9" commit))
(source
(origin
(method git-fetch)
@ -2562,7 +2562,7 @@ (define-public sbcl-cl-webkit
(file-name (git-file-name "cl-webkit" version))
(sha256
(base32
"12dzqgkvgwi97r8dbflslj7nsx7p6iavx82fs48nj9wf7ln1c87s"))))
"1j2wvn19kz0bcg17qr9pc4xp6fgjy8zngdnnp5rpfxd25sli62yc"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cffi" ,sbcl-cffi)

37
gnu/packages/lisp.scm
View file

@ -1011,3 +1011,40 @@ (define-public picolisp
(package
(inherit picolisp32)
(name "picolisp")))))
(define-public janet
(package
(name "janet")
(version "1.12.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/janet-lang/janet")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0if514zdmbjvvrsa9x5yfvg2b14sz53yaka12g3yhwkq8ls3qk0c"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list
(string-append "DESTDIR=" (assoc-ref %outputs "out"))
(string-append "PREFIX=")
(string-append "CC=" (assoc-ref %build-inputs "gcc")
"/bin/gcc"))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'check
(lambda _
(invoke "make" "test"))))))
(home-page "https://janet-lang.org/")
(synopsis "Functional, imperative and embeddable programming language")
(description
"Janet is a functional and imperative programming language. It can be
used for rapid prototyping, dynamic systems, and other domains where dynamic
languages shine. You can also add Janet scripting to an application by
embedding a single C file and two headers. It can be easily ported to new
platforms. The entire language (core library, interpreter, compiler,
assembler, PEG) is less than 1MB.")
(license license:expat)))

2
gnu/packages/lxqt.scm
View file

@ -1330,7 +1330,7 @@ (define-public lxqt-connman-applet
(origin
(method git-fetch)
(uri (git-reference
(url (string-append "https://github.com/lxqt/" name ".git"))
(url (string-append "https://github.com/lxqt/" name))
(commit commit)))
(file-name (git-file-name name version))
(sha256 (base32 "0br4bxfrl8k7lq84aq4grznlk8xzzjgkmd19bf9mwjr0a87gg72v"))))

2
gnu/packages/mail.scm
View file

@ -1447,7 +1447,7 @@ (define-public libetpan
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/dinhviethoa/libetpan.git")
(url "https://github.com/dinhviethoa/libetpan")
(commit version)))
(file-name (git-file-name name version))
(sha256

2
gnu/packages/man.scm
View file

@ -83,7 +83,7 @@ (define-public ronn
(method git-fetch)
(uri
(git-reference
(url "https://github.com/rtomayko/ronn.git")
(url "https://github.com/rtomayko/ronn")
(commit version)))
(file-name
(git-file-name name version))

60
gnu/packages/messaging.scm
View file

@ -743,7 +743,8 @@ (define-public gajim
(version-major+minor version)
"/gajim-" version ".tar.gz"))
(sha256
(base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"))))
(base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"))
(patches (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch"))))
(build-system python-build-system)
(arguments
`(#:imported-modules
@ -756,16 +757,6 @@ (define-public gajim
(guix build utils))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'add-plugin-dirs
(lambda _
(substitute* "gajim/common/configpaths.py"
(("_paths\\['PLUGINS_USER'\\]\\]")
"_paths['PLUGINS_USER']] + \
([os.getenv('GAJIM_PLUGIN_PATH')] \
if os.getenv('GAJIM_PLUGIN_PATH') \
and Path(os.getenv('GAJIM_PLUGIN_PATH')).is_dir() \
else [])"))
#t))
(replace 'check
(lambda _
;; Tests require a running X server.
@ -859,7 +850,7 @@ (define-public gajim
(define-public gajim-omemo
(package
(name "gajim-omemo")
(version "2.7.9")
(version "2.6.80")
(source
(origin
(method url-fetch/zipbomb)
@ -868,7 +859,7 @@ (define-public gajim-omemo
"https://ftp.gajim.org/plugins_releases/omemo_"
version ".zip"))
(sha256
(base32 "19si2v5yrxpn2m0f684npsg0iiyl2h3r5hbxyrxv4k3acmfmhb3z"))))
(base32 "179hgx091c12258335znn1540jhp4z3n3wv5ksrgqq7l3jgc93d7"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
@ -897,7 +888,7 @@ (define-public gajim-omemo
(define-public gajim-openpgp
(package
(name "gajim-openpgp")
(version "1.3.5")
(version "1.2.14")
(source
(origin
(method url-fetch/zipbomb)
@ -906,7 +897,7 @@ (define-public gajim-openpgp
"https://ftp.gajim.org/plugins_releases/openpgp_"
version ".zip"))
(sha256
(base32 "1jvpl2gjl5xxvsgxpmvh3mn2mm142dg2hknakkc32swb7l1fqx5m"))))
(base32 "0wdjpf1i4pvl4ha4plfpywwi9aw5n2mhrpv8mmbidpawxqfbd94b"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
@ -932,19 +923,19 @@ (define-public dino
(package
(name "dino")
(version "0.2.0")
(outputs '("out" "debug"))
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/dino/dino/releases/download/v"
version "/dino-" version ".tar.gz"))
(uri
(string-append "https://github.com/dino/dino/releases/download/v"
version "/dino-" version ".tar.gz"))
(sha256
(base32
"0iigh7bkil6prf02dqcl6lmd89jxz685h8lqr3ni4x39zkcransn"))))
(base32 "0iigh7bkil6prf02dqcl6lmd89jxz685h8lqr3ni4x39zkcransn"))))
(build-system cmake-build-system)
(outputs '("out" "debug"))
(arguments
`(#:tests? #f
#:parallel-build? #f ; not supported
#:parallel-build? #f ; not supported
#:modules ((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
@ -955,10 +946,21 @@ (define-public dino
(modify-phases %standard-phases
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(native-inputs
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gtk+:bin" ,gtk+ "bin")
("pkg-config" ,pkg-config)
("vala" ,vala)))
(inputs
`(("libgee" ,libgee)
("libsignal-protocol-c" ,libsignal-protocol-c)
`(("glib" ,glib)
("glib-networking" ,glib-networking)
("gpgme" ,gpgme)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+)
("libgcrypt" ,libgcrypt)
("libgee" ,libgee)
("libsignal-protocol-c" ,libsignal-protocol-c)
("libsoup" ,libsoup)
("qrencode" ,qrencode)
("sqlite" ,sqlite)
@ -966,15 +968,11 @@ (define-public dino
("gtk+" ,gtk+)
("glib-networking" ,glib-networking)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin")
("vala" ,vala)
("gettext" ,gettext-minimal)))
(synopsis "Graphical Jabber/XMPP Client using GTK+/Vala")
(description "Dino is a chat client for the desktop. It focuses on providing
a minimal yet reliable Jabber/XMPP experience and having encryption enabled by
default.")
(home-page "https://dino.im")
(synopsis "Graphical Jabber (XMPP) client")
(description "Dino is a Jabber (XMPP) client which aims to fit well into
a graphical desktop environment like GNOME.")
(license license:gpl3+)))
(define-public prosody

59
gnu/packages/music.scm
View file

@ -31,6 +31,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2019 Riku Viitanen <riku.viitanen0@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -944,6 +945,60 @@ (define-public klick
you to define complex tempo maps for entire songs or performances.")
(license license:gpl2+)))
(define-public glyr
(package
(name "glyr")
(version "1.0.10")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sahib/glyr")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DTEST=true")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-tests
(lambda _
(substitute* "spec/capi/check_api.c"
(("fail_unless \\(c != NULL,\"Could not load www.google.de\"\\);")
""))
#t))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; capi tests
(invoke "bin/check_api")
;; (invoke "bin/check_opt") TODO Very dependent on the network
(invoke "bin/check_dbc"))
;; TODO Work out how to run the spec/providers Python tests
#t)))))
(inputs
`(("glib" ,glib)
("curl" ,curl)
("sqlite" ,sqlite)))
(native-inputs
`(("pkg-config" ,pkg-config)
("check" ,check)))
(home-page "https://github.com/sahib/glyr")
(synopsis "Search engine for music related metadata")
(description
"Glyr comes both in a command-line interface tool (@command{glyrc}) and
as a C library (libglyr).
The sort of metadata glyr is searching (and downloading) is usually the data
you see in your musicplayer. And indeed, originally it was written to serve
as internally library for a musicplayer, but has been extended to work as a
standalone program which is able to download cover art, lyrics, photos,
biographies, reviews and more.")
(license license:lgpl3+)))
(define-public gtklick
(package
(name "gtklick")
@ -1328,7 +1383,7 @@ (define-public tascam-gtk
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/onkelDead/tascam-gtk.git")
(url "https://github.com/onkelDead/tascam-gtk")
(commit commit)))
(file-name (git-file-name name version))
(sha256
@ -5097,7 +5152,7 @@ (define-public artyfx
(method git-fetch)
(uri (git-reference
(url
"https://github.com/openAVproductions/openAV-ArtyFX.git")
"https://github.com/openAVproductions/openAV-ArtyFX")
(commit (string-append "release-" version))))
(file-name (git-file-name name version))
(sha256

10
gnu/packages/networking.scm
View file

@ -349,7 +349,7 @@ (define-public srt
(method git-fetch)
(uri
(git-reference
(url "https://github.com/Haivision/srt.git")
(url "https://github.com/Haivision/srt")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -386,7 +386,7 @@ (define-public srt-1.4.1
(method git-fetch)
(uri
(git-reference
(url "https://github.com/Haivision/srt.git")
(url "https://github.com/Haivision/srt")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -402,7 +402,7 @@ (define-public lksctp-tools
(method git-fetch)
(uri
(git-reference
(url "https://github.com/sctp/lksctp-tools.git")
(url "https://github.com/sctp/lksctp-tools")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -458,7 +458,7 @@ (define-public nng
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nanomsg/nng.git")
(url "https://github.com/nanomsg/nng")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -501,7 +501,7 @@ (define-public nanomsg
(method git-fetch)
(uri
(git-reference
(url "https://github.com/nanomsg/nanomsg.git")
(url "https://github.com/nanomsg/nanomsg")
(commit version)))
(file-name (git-file-name name version))
(sha256

8
gnu/packages/ocaml.scm
View file

@ -5802,7 +5802,9 @@ (define-public ocaml-cairo2
"0wzysis9fa850s68qh8vrvqc6svgllhwra3kzll2ibv0wmdqrich"))))
(build-system dune-build-system)
(arguments
`(;; FIXME: (got signal SEGV) #44725
`(;; NOTE: GC reclaims bigarrays packed into a custom structure
;; regardless of their refcounts. Affects OCaml >= 4.10.x
;; https://github.com/ocaml/ocaml/issues/9360
#:tests? #f
#:test-target "tests"))
(inputs
@ -5822,7 +5824,7 @@ (define-public ocaml-cairo2
(define-public lablgtk3
(package
(name "lablgtk")
(version "3.0.beta8")
(version "3.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -5831,7 +5833,7 @@ (define-public lablgtk3
(file-name (git-file-name name version))
(sha256
(base32
"08pgwnia240i2rw1rbgiahg673kwa7b6bvhsg3z4b47xr5sh9pvz"))))
"11qfc39cmwfwfpwmjh6wh98zwdv6p73bv8hqwcsss869vs1r7gmn"))))
(build-system dune-build-system)
(arguments
`(#:tests? #t

223
gnu/packages/openstack.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -26,6 +27,7 @@ (define-module (gnu packages openstack)
#:use-module (gnu packages check)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages python)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
@ -45,47 +47,64 @@ (define-module (gnu packages openstack)
(define-public python-bandit
(package
(name "python-bandit")
(version "1.4.0")
(version "1.6.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "bandit" version))
(sha256
(base32
"1m5bm42120zyazky4k0lp3d9r0jwhjmp6sb108xfr0vz952p15yb"))))
"0rb034c99pyhb4a60z7f2kz40cjydhm8m9v2blaal1rmhlam7rs1"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(delete 'check)
(add-after 'install 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Tests require the 'bandit' executable in PATH.
;; It's only built during install time.
(add-installed-pythonpath inputs outputs)
(setenv "PATH" (string-append (assoc-ref outputs "out")
"/bin:" (getenv "PATH")))
(invoke "python" "setup.py" "testr"))))))
;; The tests are disabled to avoid a circular dependency with
;; python-stestr.
`(#:tests? #f))
(propagated-inputs
`(("python-gitpython" ,python-gitpython)
("python-pyyaml" ,python-pyyaml)
("python-six" ,python-six)
("python-stevedore" ,python-stevedore)))
`(("python-gitpython" ,python-gitpython)
("python-pyyaml" ,python-pyyaml)
("python-six" ,python-six)
("python-stevedore" ,python-stevedore)))
(native-inputs
`(;; Tests.
("python-beautifulsoup4" ,python-beautifulsoup4)
("python-fixtures" ,python-fixtures)
("python-mock" ,python-mock)
("python-subunit" ,python-subunit)
("python-testrepository" ,python-testrepository)
("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools)))
`(("python-pbr" ,python-pbr)))
(home-page "https://github.com/PyCQA/bandit")
(synopsis "Security oriented static analyser for python code")
(description
"Bandit is a tool designed to find common security issues in Python code.
To do this Bandit processes each file, builds an AST from it, and runs
appropriate plugins against the AST nodes. Once Bandit has finished scanning
all the files it generates a report.")
(description "Bandit is a tool designed to find common security issues in
Python code. To do this Bandit processes each file, builds an AST from it,
and runs appropriate plugins against the AST nodes. Once Bandit has finished
scanning all the files it generates a report.")
(license asl2.0)))
(define-public python-cliff
(package
(name "python-cliff")
(version "3.5.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cliff" version))
(sha256
(base32
"0n8pzr0mnn9lq2mykds69ij2xrn0fsirh4ndmkx0mzydbx5niysv"))))
(build-system python-build-system)
(arguments
`(#:tests? #f))
(native-inputs
`(("python-pbr" ,python-pbr)))
(propagated-inputs
`(("python-cmd2" ,python-cmd2)
("python-prettytable" ,python-prettytable)
("python-pyparsing" ,python-pyparsing)
("python-pyyaml" ,python-pyyaml)
("python-bandit" ,python-bandit)
("python-stevedore" ,python-stevedore)))
(home-page "https://opendev.org/openstack/cliff")
(synopsis "Framework for building command line programs")
(description "The @code{cliff} framework allows creating multi-level
commands such as those of @command{subversion} and @command{git}, where the
main program handles some basic argument parsing and then invokes a
sub-command to do the work. It uses plugins to define sub-commands, output
formatters, and other extensions.")
(license asl2.0)))
(define-public python-debtcollector
@ -131,39 +150,30 @@ (define-public python2-debtcollector
(define-public python-hacking
(package
(name "python-hacking")
(version "1.1.0")
(version "4.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "hacking" version))
(sha256
(base32
"1vlgh81v4vsw3q3cf7qggsp043vq16knp203lrll82h7l7rhd8r3"))))
"062rvbkvbavqqz55f7q00ikwipkn5j0rdls1rrajdbfwgckjcrsm"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'delete-broken-test
(lambda _
;; TODO: Just one test fails:
;; hacking.tests.test_doctest.HackingTestCase.test_pycodestyle
;; (H403-hacking_docstring_multiline_end-line-5)
(delete-file "hacking/tests/test_doctest.py")
#t)))))
(propagated-inputs
`(("python-flake8" ,python-flake8-2.6)
("python-mccabe-0.2.1" ,python-mccabe-0.2.1)
("python-pbr" ,python-pbr)
("python-pep8-1.5.7" ,python-pep8-1.5.7)
("python-pyflakes-1.2" ,python-pyflakes-1.2)
("python-six" ,python-six)))
(propagated-inputs
`(("python-flake8" ,python-flake8)))
(native-inputs
`( ;; Tests
("python-coverage" ,python-coverage)
("python-ddt" ,python-ddt)
("python-dnspython" ,python-dnspython)
("python-fixtures" ,python-fixtures)
("python-eventlet" ,python-eventlet)
("python-mock" ,python-mock)
("python-reno" ,python-reno)
("python-testrepository" ,python-testrepository)
("python-testscenarios" ,python-testscenarios)))
("python-monotonic" ,python-monotonic)
("python-subunit" ,python-subunit)
("python-stestr" ,python-stestr)
("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools)))
(home-page "https://github.com/openstack-dev/hacking")
(synopsis "OpenStack hacking guideline enforcement")
(description
@ -172,9 +182,6 @@ (define-public python-hacking
guidelines}.")
(license asl2.0)))
(define-public python2-hacking
(package-with-python2 python-hacking))
(define-public python-mox3
(package
(name "python-mox3")
@ -310,22 +317,21 @@ (define-public python2-os-testr
(define-public python-stevedore
(package
(name "python-stevedore")
(version "1.28.0")
(version "3.2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "stevedore" version))
(sha256
(base32
"02ynfgwma84g59834dmvzr39mcppy5s229zf1w23c0qngf753izi"))))
"1w11lm293afzb73iq0ba9wnmr2rjwymnhr92km4a4xrs7a5qcigq"))))
(build-system python-build-system)
(propagated-inputs
`(("python-pbr" ,python-pbr)
("python-six" ,python-six)))
(arguments
;; The tests are disabled to avoid a circular dependency with
;; python-stestr.
`(#:tests? #f))
(native-inputs
`(("python-mock" ,python-mock)
("python-sphinx" ,python-sphinx)
("python-testrepository" ,python-testrepository)))
`(("python-pbr" ,python-pbr)))
(home-page "https://github.com/dreamhost/stevedore")
(synopsis "Manage dynamic plugins for Python applications")
(description
@ -427,22 +433,33 @@ (define-public python-oslo.config
(define-public python-oslo.context
(package
(name "python-oslo.context")
(version "2.20.0")
(version "3.1.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "oslo.context" version))
(sha256
(base32
"0iiq9rpwg6wrdqnhf3d8z8g0g7fjhs5zn6qw6igvxplz2c3rbvvx"))))
"1l2z186rkd9acrb2ygf53yrdc1lgf7cy1akbhm21kgkzind4p2r6"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
(substitute* "test-requirements.txt"
(("hacking>=3.0.1,<3.1.0")
"hacking>=3.0.1"))
#t)))))
(propagated-inputs
`(("python-debtcollector" ,python-debtcollector)
("python-pbr" ,python-pbr)))
`(("python-debtcollector" ,python-debtcollector)))
(native-inputs
`(("python-fixtures" ,python-fixtures)
`(("python-bandit" ,python-bandit)
("python-coverage" ,python-coverage)
("python-fixtures" ,python-fixtures)
("python-hacking" ,python-hacking)
("python-oslotest" ,python-oslotest)))
("python-oslotest" ,python-oslotest)
("python-pbr" ,python-pbr)
("python-stestr" ,python-stestr)))
(home-page "https://launchpad.net/oslo")
(synopsis "Oslo context library")
(description
@ -600,70 +617,62 @@ (define-public python2-reno
(define-public python-oslosphinx
(package
(name "python-oslosphinx")
(version "4.10.0")
(version "4.18.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "oslosphinx" version))
(sha256
(base32
"09mxqyabi68f3s3arvdhlhq0mn38vf74jbsfcg84151hcj6czhnl"))))
"1xm41857vzrzjmnyi6bqirg4i5qa61v7wxcsdc4q1nzgr3ndgz5k"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(add-after 'unpack 'relax-requirements
(lambda _
;; Note: Upstream tests would have also built the release notes.
;; That only would work if we were in a git checkout.
;; Therefore, we don't do it here.
(invoke "python" "setup.py" "build_sphinx"))))))
(substitute* "test-requirements.txt"
(("hacking!=0.13.0,<0.14,>=0.12.0")
"hacking!=0.13.0,>=0.12.0"))
#t)))))
(propagated-inputs
`(("python-requests" ,python-requests)))
`(("python-requests" ,python-requests)))
(native-inputs
`(("python-pbr" ,python-pbr)
("python-docutils" ,python-docutils)
("python-hacking" ,python-hacking)
("python-sphinx" ,python-sphinx)))
`(("python-hacking" ,python-hacking)
("python-openstackdocstheme" ,python-openstackdocstheme)
("python-pbr" ,python-pbr)
("python-reno" ,python-reno)
("python-sphinx" ,python-sphinx)))
(home-page "https://www.openstack.org/")
(synopsis "OpenStack sphinx extensions and theme")
(description
"This package provides themes and extensions for Sphinx documentation
from the OpenStack project.")
(description "This package provides themes and extensions for Sphinx
documentation from the OpenStack project.")
(license asl2.0)))
(define-public python2-oslosphinx
(package-with-python2 python-oslosphinx))
(define-public python-oslotest
(package
(name "python-oslotest")
(version "3.4.0")
(version "4.4.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "oslotest" version))
(sha256
(base32
"1pp8lq61d548cxcqi451czvrz5i5b3hyi2ry00wmngdgiswcqj1h"))))
(origin
(method url-fetch)
(uri (pypi-uri "oslotest" version))
(sha256
(base32
"0r50sz55m8ljv2vk1k7sp88iz1iqq4p9w6kb8hn8g8c50r9zdi5i"))))
(build-system python-build-system)
(arguments
;; The tests are disabled to avoid a circular dependency with oslo.config.
`(#:tests? #f))
(propagated-inputs
`(("python-fixtures" ,python-fixtures)
("python-mock" ,python-mock)
("python-mox3" ,python-mox3)
("python-os-client-config" ,python-os-client-config)
("python-six" ,python-six)
("python-subunit" ,python-subunit)
("python-testrepository" ,python-testrepository)
("python-testtools" ,python-testtools)))
(native-inputs
`(("python-pbr" ,python-pbr)
("python-testscenarios" ,python-testscenarios)))
`(("python-fixtures" ,python-fixtures)
("python-six" ,python-six)
("python-subunit" ,python-subunit)
("python-testtools" ,python-testtools)))
(home-page "https://launchpad.net/oslo")
(synopsis "Oslo test framework")
(description
"The Oslo Test framework provides common fixtures, support for debugging,
and better support for mocking results.")
(description "The Oslo Test framework provides common fixtures, support
for debugging, and better support for mocking results.")
(license asl2.0)))
(define-public python2-oslotest

10
gnu/packages/package-management.scm
View file

@ -130,8 +130,8 @@ (define-public guix
;; Latest version of Guix, which may or may not correspond to a release.
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "1.2.0rc1")
(commit "3ba6ffd0dd092ae879d014e4971989f231eaa56d")
(let ((version "1.2.0rc2")
(commit "0d4b1afb6bfa4bdeade2cb6409ece9467d513e39")
(revision 1))
(package
(name "guix")
@ -148,7 +148,7 @@ (define-public guix
(commit commit)))
(sha256
(base32
"1wa67gdipmzqr400hp0cw5ih0rlfvj345h65rqbk9s4g3bkg38hm"))
"1d0pifzrr14f1n0fn21rlh0hzfjvfsavf9as1vcjga47bdjjvrpp"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@ -1273,7 +1273,7 @@ (define-public msitools
(define-public libostree
(package
(name "libostree")
(version "2020.7")
(version "2020.8")
(source
(origin
(method url-fetch)
@ -1281,7 +1281,7 @@ (define-public libostree
"https://github.com/ostreedev/ostree/releases/download/v"
(version-major+minor version) "/libostree-" version ".tar.xz"))
(sha256
(base32 "0clriq2ypz1fycd6mpjyrhzid44svzpzw0amnank593h69b216ax"))))
(base32 "16v73v63h16ika73kgh2cvgm0v27r2d48m932mbj3xm6s295kapx"))))
(build-system gnu-build-system)
(arguments
'(#:phases

4
gnu/packages/parallel.scm
View file

@ -55,14 +55,14 @@ (define-module (gnu packages parallel)
(define-public parallel
(package
(name "parallel")
(version "20200822")
(version "20201022")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/parallel/parallel-"
version ".tar.bz2"))
(sha256
(base32 "02dy46g6f05p7s2qs8h6yg20p1zl3flxxf77n5jw74l3h1m24m4n"))))
(base32 "0qgh3947l854nvh2ylykbyzsflixd2zdi17vmwqm6azn9a32kzim"))))
(build-system gnu-build-system)
(arguments
`(#:phases

11
gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/gajim/common/configpaths.py 2020-11-19 12:12:02.004414323 +0100
+++ a/gajim/common/configpaths.py 2020-11-19 15:34:52.211476895 +0100
@@ -47,7 +47,7 @@
return [Path(_paths['PLUGINS_BASE']),
Path('/app/plugins')]
return [Path(_paths['PLUGINS_BASE']),
- Path(_paths['PLUGINS_USER'])]
+ Path(_paths['PLUGINS_USER'])] + ([Path(os.getenv('GAJIM_PLUGIN_PATH'))] if os.getenv('GAJIM_PLUGIN_PATH') and Path(os.getenv('GAJIM_PLUGIN_PATH')).is_dir() else [])
def get_paths(type_: PathType) -> Generator[str, None, None]:

39
gnu/packages/patches/xpra-4.0.4-norequests.patch
View file

@ -1,39 +0,0 @@
Remove python-requests dependency, r27626 upstream.
--- a/xpra/net/websockets/common.py (revision 27625)
+++ b/xpra/net/websockets/common.py (revision 27626)
@@ -7,7 +7,6 @@
import uuid
from hashlib import sha1
from base64 import b64encode
-from requests.structures import CaseInsensitiveDict
from xpra.os_util import strtobytes, bytestostr, monotonic_time
from xpra.log import Logger
@@ -77,7 +76,7 @@
for line in lines:
parts = line.split(b": ", 1)
if len(parts)==2:
- headers[parts[0]] = parts[1]
+ headers[parts[0].lower()] = parts[1]
return headers
def verify_response_headers(headers, key):
@@ -84,14 +83,13 @@
log("verify_response_headers(%s)", headers)
if not headers:
raise Exception("no http headers found in response")
- headers = CaseInsensitiveDict(headers)
- upgrade = headers.get(b"Upgrade", b"")
+ upgrade = headers.get(b"upgrade", b"")
if upgrade!=b"websocket":
raise Exception("invalid http upgrade: '%s'" % upgrade)
- protocol = headers.get(b"Sec-WebSocket-Protocol", b"")
+ protocol = headers.get(b"sec-websocket-protocol", b"")
if protocol!=b"binary":
raise Exception("invalid websocket protocol: '%s'" % protocol)
- accept_key = headers.get(b"Sec-WebSocket-Accept", b"")
+ accept_key = headers.get(b"sec-websocket-accept", b"")
if not accept_key:
raise Exception("websocket accept key is missing")
expected_key = make_websocket_accept_hash(key)

67
gnu/packages/python-check.scm
View file

@ -28,6 +28,7 @@
(define-module (gnu packages python-check)
#:use-module (gnu packages)
#:use-module (gnu packages check)
#:use-module (gnu packages openstack)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages web)
@ -82,6 +83,39 @@ (define-public python-coveralls
nosetests, etc...) in Python projects.")
(license license:expat)))
(define-public python-junit-xml
;; XXX: There are no tags or PyPI releases, so take the latest commit
;; and use the version defined in setup.py.
(let ((version "1.9")
(commit "4bd08a272f059998cedf9b7779f944d49eba13a6")
(revision "0"))
(package
(name "python-junit-xml")
(version (git-version version revision commit))
(home-page "https://github.com/kyrus/python-junit-xml")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0b8kbjhk3j10rk0vcniy695m3h43yip6y93h1bd6jjh0cp7s09c7"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda _
(invoke "pytest" "-vv"))))))
(native-inputs
`(("python-pytest" ,python-pytest)))
(propagated-inputs
`(("python-six" ,python-six)))
(synopsis "Create JUnit XML test results")
(description
"This package provides a Python module for creating JUnit XML test
result documents that can be read by tools such as Jenkins or Bamboo.")
(license license:expat))))
(define-public python-vcrpy
(package
(name "python-vcrpy")
@ -1078,3 +1112,36 @@ (define-public python-robber
(description "Robber is a Python assertion library for test-driven and
behavior-driven development (TDD and BDD).")
(license license:expat)))
(define-public python-stestr
(package
(name "python-stestr")
(version "3.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "stestr" version))
(sha256
(base32
"0adhqp9c9338wlvlq776k57k04lyxp38bv591afdm9gjsn2qn1zm"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;to avoid circular dependencies
(native-inputs
`(("python-pbr" ,python-pbr)))
(propagated-inputs
`(("python-cliff" ,python-cliff)
("python-fixtures" ,python-fixtures)
("python-future" ,python-future)
("python-pyyaml" ,python-pyyaml)
("python-subunit" ,python-subunit)
("python-testtools" ,python-testtools)
("python-voluptuous" ,python-voluptuous)))
(home-page "https://stestr.readthedocs.io/en/latest/")
(synopsis "Parallel Python test runner")
(description "This package provides the @command{stestr} command, a
parallel Python test runner built around @code{subunit}. It is designed to
execute @code{unittest} test suites using multiple processes to split up
execution of a test suite. It will also store a history of all test runs to
help in debugging failures and optimizing the scheduler to improve speed.")
(license license:asl2.0)))

2
gnu/packages/python-crypto.scm
View file

@ -74,7 +74,7 @@ (define-public python-potr
(method git-fetch)
(uri
(git-reference
(url "https://github.com/python-otr/pure-python-otr.git")
(url "https://github.com/python-otr/pure-python-otr")
(commit version)))
(file-name
(git-file-name name version))

391
gnu/packages/python-web.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2020 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2017, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017, 2020 Julien Lepiller <julien@lepiller.eu>
@ -68,6 +68,7 @@ (define-module (gnu packages python-web)
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages django)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages groff)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libffi)
@ -76,6 +77,7 @@ (define-module (gnu packages python-web)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sphinx)
@ -276,6 +278,158 @@ (define-public python-css-html-js-minify
;; looks like the user can choose a license.
(license (list license:gpl3+ license:lgpl3+ license:expat))))
(define-public python-aws-sam-translator
(package
(name "python-aws-sam-translator")
(version "1.30.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "aws-sam-translator" version))
(sha256
(base32
"0d9ppd94x2kw404m49ajswmmxgdngbs4p5ajyrdvnlivfzqbv7dx"))))
(build-system python-build-system)
(arguments
`(;; XXX: Tests are not distributed with the PyPI archive, and would
;; introduce a circular dependency on python-cfn-lint.
#:tests? #f
#:phases (modify-phases %standard-phases
(add-after 'unpack 'loosen-requirements
(lambda _
;; The package needlessly specifies exact versions
;; of dependencies, when it works fine with others.
(substitute* "requirements/base.txt"
(("(.*)(~=[0-9\\.]+)" all package version)
package))
#t)))))
(propagated-inputs
`(("python-boto3" ,python-boto3)
("python-jsonschema" ,python-jsonschema)
("python-six" ,python-six)))
(home-page "https://github.com/awslabs/serverless-application-model")
(synopsis "Transform AWS SAM templates into AWS CloudFormation templates")
(description
"AWS SAM Translator is a library that transform @dfn{Serverless Application
Model} (SAM) templates into AWS CloudFormation templates.")
(license license:asl2.0)))
(define-public python-aws-xray-sdk
(package
(name "python-aws-xray-sdk")
(version "2.6.0")
(home-page "https://github.com/aws/aws-xray-sdk-python")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"12fzr0ylpa1lx3xr1x2f1jx8iiyzcr6g57fb9jign0j0lxdlbzpv"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'disable-tests
(lambda _
(for-each delete-file
'(;; These tests require packages not yet in Guix.
"tests/ext/aiobotocore/test_aiobotocore.py"
"tests/ext/aiohttp/test_middleware.py"
"tests/ext/pg8000/test_pg8000.py"
"tests/ext/psycopg2/test_psycopg2.py"
"tests/ext/pymysql/test_pymysql.py"
"tests/ext/pynamodb/test_pynamodb.py"
"tests/test_async_recorder.py"
;; FIXME: Why is this failing?
"tests/test_patcher.py"
;; TODO: How to configure Django for these tests.
"tests/ext/django/test_db.py"
"tests/ext/django/test_middleware.py"
;; These tests want to access httpbin.org.
"tests/ext/requests/test_requests.py"
"tests/ext/httplib/test_httplib.py"
"tests/ext/aiohttp/test_client.py"))))
(replace 'check
(lambda _
(setenv "PYTHONPATH"
(string-append "./build/lib:.:"
(getenv "PYTHONPATH")))
(invoke "pytest" "-vv" "tests"))))))
(native-inputs
`(;; These are required for the test suite.
("python-bottle" ,python-bottle)
("python-flask" ,python-flask)
("python-flask-sqlalchemy" ,python-flask-sqlalchemy)
("python-pymysql" ,python-pymysql)
("python-pytest" ,python-pytest)
("python-pytest-aiohttp" ,python-pytest-aiohttp)
("python-requests" ,python-requests)
("python-sqlalchemy" ,python-sqlalchemy)
("python-webtest" ,python-webtest)))
(propagated-inputs
`(("python-aiohttp" ,python-aiohttp)
("python-botocore" ,python-botocore)
("python-future" ,python-future)
("python-jsonpickle" ,python-jsonpickle)
("python-urllib3" ,python-urllib3)
("python-wrapt" ,python-wrapt)))
(synopsis "Profile applications on AWS X-Ray")
(description
"The AWS X-Ray SDK for Python enables Python developers to record and
emit information from within their applications to the AWS X-Ray service.")
(license license:asl2.0)))
(define-public python-cfn-lint
(package
(name "python-cfn-lint")
(version "0.41.0")
(home-page "https://github.com/aws-cloudformation/cfn-python-lint")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0nqs0fmj3hd7pnd9hkb4z57jvi2iv82hh6n3xxba6i6p8zgx75q4"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; Remove test for the documentation update scripts
;; to avoid a dependency on 'git'.
(delete-file
"test/unit/module/maintenance/test_update_documentation.py")
(setenv "PYTHONPATH"
(string-append "./build/lib:"
(getenv "PYTHONPATH")))
(setenv "PATH" (string-append out "/bin:"
(getenv "PATH")))
(invoke "python" "-m" "unittest" "discover"
"-s" "test")))))))
(native-inputs
`(("python-pydot" ,python-pydot)
("python-mock" ,python-mock)))
(propagated-inputs
`(("python-aws-sam-translator" ,python-aws-sam-translator)
("python-jsonpatch" ,python-jsonpatch)
("python-jsonschema" ,python-jsonschema)
("python-junit-xml" ,python-junit-xml)
("python-networkx" ,python-networkx)
("python-pyyaml" ,python-pyyaml)
("python-six" ,python-six)))
(synopsis "Validate CloudFormation templates")
(description
"This package lets you validate CloudFormation YAML/JSON templates against
the CloudFormation spec and additional checks. Includes checking valid values
for resource properties and best practices.")
(license license:expat)))
(define-public python-falcon
(package
(name "python-falcon")
@ -460,14 +614,14 @@ (define-public httpie
(define-public python-html2text
(package
(name "python-html2text")
(version "2019.8.11")
(version "2020.1.16")
(source
(origin
(method url-fetch)
(uri (pypi-uri "html2text" version))
(sha256
(base32
"0ppgjplg06kmv9sj0x8p7acczcq2mcfgk1jdjwm4w5w40b0vj5pm"))))
"1fvv4z6dblii2wk1x82981ag8yhxbim1v2ksgywxsndh2s7335p2"))))
(build-system python-build-system)
(arguments
'(#:phases
@ -485,7 +639,94 @@ (define-public python-html2text
(license license:gpl3+)))
(define-public python2-html2text
(package-with-python2 python-html2text))
(let ((base (package-with-python2 python-html2text)))
(package
(inherit base)
;; This is the last version with support for Python 2.
(version "2019.8.11")
(source (origin
(method url-fetch)
(uri (pypi-uri "html2text" version))
(sha256
(base32
"0ppgjplg06kmv9sj0x8p7acczcq2mcfgk1jdjwm4w5w40b0vj5pm")))))))
(define-public python-jose
(package
(name "python-jose")
(version "3.2.0")
(home-page "http://github.com/mpdavis/python-jose")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1xmnf8whzv2gnkkdv0fqcn9qwmcc7y647p4kw9fi3lvcp9kch8vi"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(if tests?
(invoke "pytest" "-vv")
(format #t "test suite not run~%"))
#t)))))
(native-inputs
`(;; All native inputs are for tests.
("python-pyasn1" ,python-pyasn1)
("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov)
("python-pytest-runner" ,python-pytest-runner)))
(propagated-inputs
`(("python-cryptography" ,python-cryptography)
("python-rsa" ,python-rsa)
("python-six" ,python-six)))
(synopsis "JOSE implementation in Python")
(description
"The @dfn{JavaScript Object Signing and Encryption} (JOSE) technologies
- JSON Web Signature (JWS), JSON Web Encryption (JWE), JSON Web Key (JWK), and
JSON Web Algorithms (JWA) - collectively can be used to encrypt and/or sign
content using a variety of algorithms.")
(license license:expat)))
(define-public python-jsonpickle
(package
(name "python-jsonpickle")
(version "1.4.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "jsonpickle" version))
(sha256
(base32
"1fn86z468hamw8njh2grw2xdhsm7g48dyxs3lw0n10nn1g6vgm78"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda _
(setenv "PYTHONPATH"
(string-append "./build/lib:"
(getenv "PYTHONPATH")))
(invoke "pytest" "-vv"
;; Prevent running the flake8 and black
;; pytest plugins, which only tests style
;; and frequently causes harmless failures.
"-o" "addopts=''"))))))
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)
("python-toml" ,python-toml) ;XXX: for setuptools_scm[toml]
;; For tests.
("python-numpy" ,python-numpy)
("python-pandas" ,python-pandas)
("python-pytest" ,python-pytest)))
(home-page "https://jsonpickle.github.io/")
(synopsis "Serialize object graphs into JSON")
(description
"This package provides a Python library for serializing any arbitrary
object graph to and from JSON.")
(license license:bsd-3)))
(define-public python-mechanicalsoup
(package
@ -712,6 +953,30 @@ (define-public python-flask-babel
(define-public python2-flask-babel
(package-with-python2 python-flask-babel))
(define-public python-flask-cors
(package
(name "python-flask-cors")
(version "3.0.9")
(source (origin
(method url-fetch)
(uri (pypi-uri "Flask-Cors" version))
(sha256
(base32
"1f36hkaxc92zn12f88fkzwifdvlvsnmlp1dv3p5inpcc500c3kvb"))))
(build-system python-build-system)
(native-inputs
`(("python-flask" ,python-flask)
("python-nose" ,python-nose)
("python-packaging" ,python-packaging)))
(propagated-inputs
`(("python-six" ,python-six)))
(home-page "https://flask-cors.readthedocs.io/en/latest/")
(synopsis "Handle Cross-Origin Resource Sharing with Flask")
(description
"This package provides a Flask extension for handling @acronym{CORS,Cross
Origin Resource Sharing}, making cross-origin AJAX possible.")
(license license:expat)))
(define-public python-html5lib
(package
(name "python-html5lib")
@ -788,6 +1053,41 @@ (define-public python-html5-parser
(define-public python2-html5-parser
(package-with-python2 python-html5-parser))
(define-public python-minio
(package
(name "python-minio")
(version "6.0.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "minio" version))
(sha256
(base32
"1cxpa0m7mdvpdbc1g6wlihq6ja4g4paxkl6f3q84bbnx07zpbllp"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-before 'check 'disable-failing-tests
(lambda _
;; This test requires network access.
(delete-file "tests/unit/credentials_test.py")
#t)))))
(native-inputs
`(("python-faker" ,python-faker)
("python-mock" ,python-mock)
("python-nose" ,python-nose)))
(propagated-inputs
`(("python-certifi" ,python-certifi)
("python-configparser" ,python-configparser)
("python-dateutil" ,python-dateutil)
("python-pytz" ,python-pytz)
("python-urllib3" ,python-urllib3)))
(home-page "https://github.com/minio/minio-py")
(synopsis "Programmatically access Amazon S3 from Python")
(description
"This package provides a Python library for interacting with any
Amazon S3 compatible object storage server.")
(license license:asl2.0)))
(define-public python-pycurl
(package
(name "python-pycurl")
@ -1013,6 +1313,49 @@ (define-public python-cssselect
(define-public python2-cssselect
(package-with-python2 python-cssselect))
(define-public python-databricks-cli
(package
(name "python-databricks-cli")
(version "0.14.0")
(home-page "https://github.com/databricks/databricks-cli")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0imwpfda2pxix1rx0nlqs48v58icfw065nsv53rpg0dw4bw9x2wi"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda _
(setenv "PYTHONPATH"
(string-append "./build/lib:"
(getenv "PYTHONPATH")))
(invoke "pytest" "tests" "-vv"
;; XXX: This fails with newer Pytest
;; (upstream uses Pytest 3..).
"-k" "not test_get_request_with_list"))))))
(native-inputs
`(;; For tests.
("python-decorator" ,python-decorator)
("python-mock" ,python-mock)
("python-pytest" ,python-pytest)
("python-requests-mock" ,python-requests-mock)))
(propagated-inputs
`(("python-click" ,python-click)
("python-configparser" ,python-configparser)
("python-requests" ,python-requests)
("python-six" ,python-six)
("python-tabulate" ,python-tabulate)))
(synopsis "Command line interface for Databricks")
(description
"The Databricks Command Line Interface is a tool which provides an easy
to use interface to the Databricks platform. The CLI is built on top of the
Databricks REST APIs.")
(license license:asl2.0)))
(define-public python-openid-cla
(package
(name "python-openid-cla")
@ -1163,6 +1506,37 @@ (define-public python-hypercorn
utilise asyncio, uvloop, or trio worker types.")
(license license:expat)))
(define-public python-querystring-parser
(package
(name "python-querystring-parser")
(version "1.2.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "querystring_parser" version))
(sha256
(base32
"0qlar8a0wa003hm2z6wcpb625r6vjj0a70rsni9h8lz0zwfcwkv4"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
(lambda _
;; XXX FIXME: This test is broken with Python 3.7:
;; https://github.com/bernii/querystring-parser/issues/35
(substitute* "querystring_parser/tests.py"
(("self\\.assertEqual\\(self\\.knownValuesNormalized, result\\)")
"True"))
(invoke "python" "querystring_parser/tests.py"))))))
(propagated-inputs
`(("python-six" ,python-six)))
(home-page "https://github.com/bernii/querystring-parser")
(synopsis "QueryString parser that correctly handles nested dictionaries")
(description
"This package provides a query string parser for Python and Django
projects that correctly creates nested dictionaries from sent form/querystring
data.")
(license license:expat)))
(define-public python-tornado
(package
(name "python-tornado")
@ -2283,15 +2657,16 @@ (define-public python2-urllib3
(define-public awscli
(package
;; Note: updating awscli typically requires updating botocore as well.
(name "awscli")
(version "1.18.6")
(version "1.18.183")
(source
(origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
"0p479mfs9r0m82a217pap8156ijwvhv6r3kqa4k267gd05wgvygm"))))
"0n1pmdl33r1v8qnrcg08ihvri9zm4fvsp14605vwmlkxvs8nb7s5"))))
(build-system python-build-system)
(arguments
;; FIXME: The 'pypi' release does not contain tests.
@ -2789,13 +3164,13 @@ (define-public python2-betamax-matchers
(define-public python-s3transfer
(package
(name "python-s3transfer")
(version "0.2.0")
(version "0.3.3")
(source (origin
(method url-fetch)
(uri (pypi-uri "s3transfer" version))
(sha256
(base32
"08fhj73b1ai52hrs2q3nggshq3pswn1gq8ch3m009cb2v2vmqggj"))))
"1nzp5kwmy9669334shcz9ipg89jgpdqhrmbkgdg18r7wmvi3f6lj"))))
(build-system python-build-system)
(arguments
`(#:phases

315
gnu/packages/python-xyz.scm
View file

@ -91,6 +91,7 @@
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2020 Diego N. Barbato <dnbarbato@posteo.de>
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Kristian Trandem <kristian@devup.no>
;;;
;;; This file is part of GNU Guix.
;;;
@ -122,6 +123,7 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages crypto)
#:use-module (gnu packages databases)
#:use-module (gnu packages dbm)
#:use-module (gnu packages docker)
#:use-module (gnu packages enchant)
#:use-module (gnu packages file)
#:use-module (gnu packages fontutils)
@ -3933,6 +3935,30 @@ (define-public python-rst.linker
(define-public python2-rst.linker
(package-with-python2 python-rst.linker))
(define-public python-sshpubkeys
(package
(name "python-sshpubkeys")
(version "3.1.0")
(home-page "https://github.com/ojarva/python-sshpubkeys")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1h4gwmcfn84kkqh83km1vfz8sc5kr2g4gzgzmr8gz704jmqiv7nq"))))
(build-system python-build-system)
(propagated-inputs
`(("python-cryptography" ,python-cryptography)
("python-ecdsa" ,python-ecdsa)))
(synopsis "OpenSSH public key parser")
(description
"This package provides a library for parsing and validating OpenSSH
public key files.")
(license license:bsd-3)))
(define-public python-feedgenerator
(package
(name "python-feedgenerator")
@ -5636,14 +5662,14 @@ (define-public python2-olefile
(define-public python-pillow
(package
(name "python-pillow")
(version "6.2.1")
(version "8.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Pillow" version))
(sha256
(base32
"1c8wkzc58f5wdh006jvmwdk3wxld1xgagcbdvj7iv17qi0m9fkmz"))))
"17pv0flaqqfld9m4lz8ayxyqb11gbbmr7w04mw4ar79cn3lwdi8i"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest" ,python-pytest)))
@ -5683,12 +5709,24 @@ (define-public python-pillow
capabilities. The core image library is designed for fast access to data
stored in a few basic pixel formats. It should provide a solid foundation for
a general image processing tool.")
(properties `((python2-variant . ,(delay python2-pillow))))
(license (license:x11-style
"http://www.pythonware.com/products/pil/license.htm"
"The PIL Software License"))))
(define-public python2-pillow
(package-with-python2 python-pillow))
(package-with-python2
(package
(inherit (strip-python2-variant python-pillow))
;; Version 6 is the last series with Python 2 support.
(version "6.2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Pillow" version))
(sha256
(base32
"0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv")))))))
(define-public python-pillow-2.9
(package
@ -8148,27 +8186,6 @@ (define-public python-pyflakes
(define-public python2-pyflakes
(package-with-python2 python-pyflakes))
;; Flake8 2.6 requires an older version of pyflakes.
;; This should be removed ASAP.
(define-public python-pyflakes-1.2
(package (inherit python-pyflakes)
(version "1.2.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyflakes" version))
(sha256
(base32
"17hkw8yd44cr8fz13phy4aih3r5j2p7ild4zlvqdh2c8dmiinjif"))))
(arguments
'(#:phases
(modify-phases %standard-phases
;; This one test fails.
(replace 'check
(lambda _ (invoke "pytest" "-vv" "-k" "not test_f_string"))))))
(native-inputs
`(("python-pytest" ,python-pytest)))))
(define-public python-mccabe
(package
(name "python-mccabe")
@ -8194,39 +8211,6 @@ (define-public python-mccabe
(define-public python2-mccabe
(package-with-python2 python-mccabe))
(define-public python-mccabe-0.2.1
(package (inherit python-mccabe)
(version "0.2.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mccabe" version))
(sha256
(base32
"0fi4a81kr5bcv5p4xgibqr595hyj5dafkqgsmfk96mfy8w71fajs"))))))
(define-public python2-mccabe-0.2.1
(package-with-python2 python-mccabe-0.2.1))
;; Flake8 2.4.1 requires an older version of pep8.
;; This should be removed ASAP.
(define-public python-pep8-1.5.7
(package (inherit python-pep8)
(version "1.5.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pep8" version))
(sha256
(base32
"12b9bbdbwnspxgak14xg58c130x2n0blxzlms5jn2dszn8qj3d0m"))))
(arguments
;; XXX Tests not compatible with Python 3.5.
'(#:tests? #f))))
(define-public python2-pep8-1.5.7
(package-with-python2 python-pep8-1.5.7))
(define-public python-flake8
(package
(name "python-flake8")
@ -8273,40 +8257,6 @@ (define-public python2-flake8
("python2-typing" ,python2-typing)
,@(package-propagated-inputs base))))))
;; python-hacking requires flake8 <2.7.0.
(define-public python-flake8-2.6
(package
(inherit python-flake8)
(version "2.6.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "flake8" version))
(sha256
(base32
"0y57hzal0j84dh9i1g1g6dc4aywvrnhy2fjmmbglpv5ajihxh713"))))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'use-later-pycodestyles
(lambda __
(substitute* '("flake8.egg-info/requires.txt"
"setup.py")
(("pycodestyle >= 2.0, < 2.1")
"pycodestyle >= 2.0"))
#t))
(delete 'check)
(add-after 'install 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-v")
#t)))))
(propagated-inputs
`(("python-pep8" ,python-pep8)
("python-pycodestyle" ,python-pycodestyle)
("python-entrypoints" ,python-entrypoints)
("python-pyflakes" ,python-pyflakes-1.2)
("python-mccabe" ,python-mccabe)))))
(define-public python-flake8-bugbear
(package
(name "python-flake8-bugbear")
@ -8734,6 +8684,26 @@ (define-public python-appdirs
(define-public python2-appdirs
(package-with-python2 python-appdirs))
(define-public python-gorilla
(package
(name "python-gorilla")
(version "0.3.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "gorilla" version))
(sha256
(base32
"0b40blcp6fih4nvqbilra4qw1dfccv1ahjmr41ac4d9rjadqkcpy"))))
(build-system python-build-system)
(home-page "https://github.com/christophercrouzet/gorilla")
(synopsis "Convenient monkey patching with Python")
(description
"Gorilla is a Python library that provides a convenient approach to
monkey patching. Monkey patching is the process of modifying module and
class attributes at runtime with the purpose of replacing or extending
third-party code.")
(license license:expat)))
(define-public python-llfuse
(package
(name "python-llfuse")
@ -10922,6 +10892,73 @@ (define-public python-colorama
(define-public python2-colorama
(package-with-python2 python-colorama))
(define-public python-moto
(package
(name "python-moto")
;; XXX: Use a pre-release for compatibility with latest botocore & friends.
(version "1.3.16.dev134")
(source (origin
(method url-fetch)
(uri (pypi-uri "moto" version))
(sha256
(base32
"1pix0c7zszjwzfy88n1rpih9vkdm25nqcvz93z850xvgwb4v81bd"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-hardcoded-executable-names
(lambda _
(substitute* "moto/batch/models.py"
(("/bin/sh")
(which "sh")))
(substitute* (find-files "tests" "\\.py$")
(("#!/bin/bash")
(string-append "#!" (which "bash"))))
#t))
(replace 'check
(lambda _
(setenv "PYTHONPATH" (string-append "./build/lib:"
(getenv "PYTHONPATH")))
(invoke "pytest" "-vv" "-m" "not network"
;; These tests require Docker.
"-k" "not test_terminate_job \
and not test_invoke_function_from_sqs_exception"))))))
(native-inputs
`(("python-flask" ,python-flask)
("python-flask-cors" ,python-flask-cors)
("python-freezegun" ,python-freezegun)
("python-parameterized" ,python-parameterized)
("python-pytest" ,python-pytest)
("python-sure" ,python-sure)))
(propagated-inputs
`(("python-aws-xray-sdk" ,python-aws-xray-sdk)
("python-boto" ,python-boto)
("python-boto3" ,python-boto3)
("python-botocore" ,python-botocore)
("python-cfn-lint" ,python-cfn-lint)
("python-cryptography" ,python-cryptography)
("python-dateutil" ,python-dateutil)
("python-docker" ,python-docker)
("python-idna" ,python-idna)
("python-jinja2" ,python-jinja2)
("python-jose" ,python-jose)
("python-jsondiff" ,python-jsondiff)
("python-mock" ,python-mock)
("python-pytz" ,python-pytz)
("python-pyyaml" ,python-pyyaml)
("python-requests" ,python-requests)
("python-responses" ,python-responses)
("python-six" ,python-six)
("python-sshpubkeys" ,python-sshpubkeys)
("python-werkzeug" ,python-werkzeug)
("python-xmltodict" ,python-xmltodict)))
(home-page "https://github.com/spulec/moto")
(synopsis "Mock out the boto library")
(description
"@code{moto} is a library designed to easily mock out the
@code{boto} library.")
(license license:asl2.0)))
(define-public python-rsa
(package
(name "python-rsa")
@ -11077,32 +11114,55 @@ (define-public python-symengine
manipulation library.")
(license license:expat)))
(define-public python-boto
(package
(name "python-boto")
(version "2.49.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "boto" version))
(sha256
(base32
"0njy09c4wjx7ipxhwi6vv404nflyiasl78vwwxxpclnql903n3ga"))))
(build-system python-build-system)
(arguments
;; XXX: This package is unmaintained and has problems with newer versions
;; of Python 3 as well as test libraries. 'python-moto' still uses a
;; subset of this library, so keep it around for now, but disable tests.
'(#:tests? #f))
(propagated-inputs
`(("python-paramiko" ,python-paramiko)
("python-requests" ,python-requests)))
(home-page "https://github.com/boto/boto")
(synopsis "Python interfaces for Amazon Web Services")
(description
"This package provides various facilities for interacting with Amazon
Web Services through Python.
This software is unmaintained, and new projects should use @code{boto3} instead.")
(license license:expat)))
(define-public python-botocore
;; Note: When updating botocore, also make sure that boto3 and awscli
;; are compatible.
(package
(name "python-botocore")
(version "1.15.26")
(version "1.19.22")
(source
(origin
(method url-fetch)
(uri (pypi-uri "botocore" version))
(sha256
(base32
"1a87pbwkk5vlwz92hy1wizfnpiwn11bhaicr6bmji1i5ybwdhnr8"))))
"0iim86x7c6hqmvd61ygz6x6x9glnsfbnyzv2y67qjdcdx8jpkmw7"))))
(build-system python-build-system)
(arguments
;; FIXME: Many tests are failing.
'(#:tests? #f))
(propagated-inputs
`(("python-dateutil" ,python-dateutil)
("python-docutils" ,python-docutils)
("python-jmespath" ,python-jmespath)))
(native-inputs
`(("python-mock" ,python-mock)
("python-nose" ,python-nose)
("behave" ,behave)
("python-tox" ,python-tox)
("python-urllib3" ,python-urllib3)
("python-wheel" ,python-wheel)))
("python-jmespath" ,python-jmespath)
("python-urllib3" ,python-urllib3)))
(home-page "https://github.com/boto/botocore")
(synopsis "Low-level interface to AWS")
(description "Botocore is a Python library that provides a low-level
@ -11112,6 +11172,40 @@ (define-public python-botocore
(define-public python2-botocore
(package-with-python2 python-botocore))
(define-public python-boto3
(package
(name "python-boto3")
(version "1.16.22")
(home-page "https://github.com/boto/boto3")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0h20hgl4yfl58g75qhb6ibrdmzn47md3srgar7hask14cjmfhfy3"))))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'delete-network-tests
;; Deleting integration tests because they are trying to connect to AWS.
(lambda _
(delete-file-recursively "tests/integration")
#t)))))
(build-system python-build-system)
(native-inputs
`(("python-nose" ,python-nose)
("python-mock" ,python-mock)))
(propagated-inputs
`(("python-botocore" ,python-botocore)
("python-jmespath" ,python-jmespath)
("python-s3transfer" ,python-s3transfer)))
(synopsis "AWS SDK for Python")
(description
"Boto3 is a Python library for writing programs that interact with
@acronym{AWS,Amazon Web Services}.")
(license license:asl2.0)))
(define-public python-pyfiglet
(package
(name "python-pyfiglet")
@ -14719,22 +14813,20 @@ (define-public python2-ansi2html
(define-public python-ddt
(package
(name "python-ddt")
(version "1.1.3")
(version "1.4.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ddt" version))
(sha256
(base32
"1lw17420iimhghkgzgax85nn8d1an2d6k2cfvb7j5kwn2dqlr1vk"))))
"1niqpzc26sxdbyi46r07n4pma5fjx6crww2539vpfmsf0w6yg585"))))
(build-system python-build-system)
(native-inputs
`(("python-mock" ,python-mock)
("python-nose" ,python-nose)))
`(("python-pytest" ,python-pytest)))
(propagated-inputs
`(("python-six" ,python-six)
("python-pyyaml" ,python-pyyaml)))
(home-page "https://github.com/txels/ddt")
`(("python-pyyaml" ,python-pyyaml)))
(home-page "https://github.com/datadriventests/ddt")
(synopsis "Data-Driven Tests")
(description
"Data-Driven Tests (@dfn{DDT}) allow you to multiply one test case by
@ -14742,9 +14834,6 @@ (define-public python-ddt
cases.")
(license license:expat)))
(define-public python2-ddt
(package-with-python2 python-ddt))
(define-public python-pycountry
(package
(name "python-pycountry")
@ -16038,7 +16127,7 @@ (define-public python-jsonpatch
(base32
"0k9pff06lxama3nhsc7cdxbp83422bdy8ifs52i6xkas8hpyzfzr"))))
(build-system python-build-system)
(native-inputs
(propagated-inputs
`(("python-jsonpointer" ,python-jsonpointer)))
(home-page "https://github.com/stefankoegl/python-json-patch")
(synopsis "Applying JSON Patches in Python 2.6+ and 3.x")

2
gnu/packages/qt.scm
View file

@ -1566,7 +1566,7 @@ (define-public qtspell
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/manisandro/qtspell.git")
(url "https://github.com/manisandro/qtspell")
(commit version)))
(file-name (git-file-name name version))
(sha256

4
gnu/packages/raspberry-pi.scm
View file

@ -76,7 +76,7 @@ (define raspi-gpio
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/RPi-Distro/raspi-gpio.git")
(url "https://github.com/RPi-Distro/raspi-gpio")
(commit commit)))
(file-name (git-file-name name version))
(sha256
@ -98,7 +98,7 @@ (define %rpi-open-firmware-origin
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/librerpi/rpi-open-firmware.git")
(url "https://github.com/librerpi/rpi-open-firmware")
(commit "6be45466e0be437a1b0b3512a86f3d9627217006")))
(file-name "rpi-open-firmware-checkout")
(sha256

2
gnu/packages/rdesktop.scm
View file

@ -87,7 +87,7 @@ (define-public freerdp
(origin
(method git-fetch)
(uri (git-reference
(url "git://github.com/FreeRDP/FreeRDP.git")
(url "git://github.com/FreeRDP/FreeRDP")
(commit version)))
(file-name (git-file-name name version))
(sha256

30
gnu/packages/ruby.scm
View file

@ -1349,7 +1349,7 @@ (define-public ruby-prawn-templates
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/prawnpdf/prawn-templates.git")
(url "https://github.com/prawnpdf/prawn-templates")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -1411,7 +1411,7 @@ (define-public ruby-treetop
(origin
(method git-fetch) ;no test suite in distributed gem
(uri (git-reference
(url "https://github.com/cjheath/treetop.git")
(url "https://github.com/cjheath/treetop")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -1474,7 +1474,7 @@ (define-public ruby-gimme
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/searls/gimme.git")
(url "https://github.com/searls/gimme")
(commit commit)))
(file-name (git-file-name name version))
(sha256
@ -1535,7 +1535,7 @@ (define-public ruby-standard
(origin
(method git-fetch) ;no test suite in distributed gem
(uri (git-reference
(url "https://github.com/testdouble/standard.git")
(url "https://github.com/testdouble/standard")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -1587,7 +1587,7 @@ (define-public ruby-chunky-png
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/wvanbergen/chunky_png.git")
(url "https://github.com/wvanbergen/chunky_png")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -1705,7 +1705,7 @@ (define-public ruby-asciidoctor-pdf
(origin
(method git-fetch) ;no test suite in the distributed gem
(uri (git-reference
(url "https://github.com/asciidoctor/asciidoctor-pdf.git")
(url "https://github.com/asciidoctor/asciidoctor-pdf")
(commit commit)))
(file-name (git-file-name name version))
(sha256
@ -6824,7 +6824,7 @@ (define-public ruby-rubocop-ast
(origin
(method git-fetch) ;no test suite in distributed gem
(uri (git-reference
(url "https://github.com/rubocop-hq/rubocop-ast.git")
(url "https://github.com/rubocop-hq/rubocop-ast")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -6868,7 +6868,7 @@ (define-public ruby-rexml
(origin
(method git-fetch) ;no tests in distributed gem
(uri (git-reference
(url "https://github.com/ruby/rexml.git")
(url "https://github.com/ruby/rexml")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -6919,7 +6919,7 @@ (define-public ruby-range-compressor
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/janosch-x/range_compressor.git")
(url "https://github.com/janosch-x/range_compressor")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -6952,7 +6952,7 @@ (define-public ruby-regexp-property-values
(origin
(method git-fetch)
(uri (git-reference ;no test suite in distributed gem
(url "https://github.com/jaynetics/regexp_property_values.git")
(url "https://github.com/jaynetics/regexp_property_values")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -6983,7 +6983,7 @@ (define-public ruby-regexp-parser
(origin
(method git-fetch) ;bin/test missing from gem
(uri (git-reference
(url "https://github.com/ammar/regexp_parser.git")
(url "https://github.com/ammar/regexp_parser")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -7056,7 +7056,7 @@ (define-public ruby-rubocop
(origin
(method git-fetch) ;no tests in distributed gem
(uri (git-reference
(url "https://github.com/rubocop-hq/rubocop.git")
(url "https://github.com/rubocop-hq/rubocop")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -10536,7 +10536,7 @@ (define-public ruby-pdf-reader
(source (origin
(method git-fetch) ;no test in distributed gem archive
(uri (git-reference
(url "https://github.com/yob/pdf-reader.git")
(url "https://github.com/yob/pdf-reader")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -10576,7 +10576,7 @@ (define-public ruby-pdf-inspector
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/prawnpdf/pdf-inspector.git")
(url "https://github.com/prawnpdf/pdf-inspector")
(commit commit)))
(file-name (git-file-name name version))
(sha256
@ -10639,7 +10639,7 @@ (define-public ruby-prawn
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/prawnpdf/prawn.git")
(url "https://github.com/prawnpdf/prawn")
(commit commit)))
(file-name (git-file-name name version))
(sha256

18
gnu/packages/rust-apps.scm
View file

@ -73,13 +73,7 @@ (define-public exa
("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.4))
#:cargo-development-inputs
(("rust-datetime" ,rust-datetime-0.4))
#:phases
(modify-phases %standard-phases
(add-after 'configure 'dont-vendor-sources
(lambda* (#:key inputs #:allow-other-keys)
(let ((openssl (assoc-ref inputs "openssl")))
(setenv "OPENSSL_DIR" openssl))
#t))
;; Ignoring failing tests.
;; Reported in https://github.com/ogham/exa/issues/318
(add-before 'check 'disable-failing-tests
@ -393,18 +387,12 @@ (define-public tokei
("rust-lazy-static" ,rust-lazy-static-1)
("rust-regex" ,rust-regex-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-tempfile" ,rust-tempfile-3))
#:phases
(modify-phases %standard-phases
(add-after 'configure 'unvendor-libraries-from-crates
(lambda* (#:key inputs #:allow-other-keys)
(let ((openssl (assoc-ref inputs "openssl")))
(setenv "OPENSSL_DIR" openssl))
#t)))))
("rust-tempfile" ,rust-tempfile-3))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("libgit2" ,libgit2)
("openssl" ,openssl)
("pkg-config" ,pkg-config)
("zlib" ,zlib)))
(home-page "https://tokei.rs")
(synopsis "Count code, quickly")

2
gnu/packages/scheme.scm
View file

@ -408,7 +408,7 @@ (define-public racket
version "/racket-" version "-src.tgz")))
(sha256
(base32
"18pz6gjzqy6a62xkcmjanhr7kgxpvpmc0blrk4igz8ldcybz44if"))
"0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m"))
(patches (search-patches
"racket-store-checksum-override.patch"))))
(build-system gnu-build-system)

4
gnu/packages/shellutils.scm
View file

@ -278,7 +278,7 @@ (define-public fzy
(define-public hstr
(package
(name "hstr")
(version "2.2")
(version "2.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -287,7 +287,7 @@ (define-public hstr
(file-name (git-file-name name version))
(sha256
(base32
"07fkilqlkpygvf9kvxyvl58g3lfq0bwwdp3wczy4hk8qlbhmgihn"))))
"1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"))))
(build-system gnu-build-system)
(arguments
`(#:phases

18
gnu/packages/simulation.scm
View file

@ -684,17 +684,13 @@ (define-public fenics
(with-directory-excursion "test"
;; Note: The test test_snes_set_from_options() in the file
;; unit/nls/test_PETScSNES_solver.py fails and is ignored.
(and (invoke "py.test" "unit" "--ignore"
"unit/nls/test_PETScSNES_solver.py")
(invoke "mpirun" "-np" "3" "python" "-B" "-m"
"pytest" "unit" "--ignore"
"unit/nls/test_PETScSNES_solver.py")))
(with-directory-excursion "demo"
;; Check demos.
(invoke "python" "generate-demo-files.py")
(and (invoke "python" "-m" "pytest" "-v" "test.py")
(invoke "python" "-m" "pytest" "-v" "test.py"
"--mpiexec=mpiexec" "--num-proc=3")))
;; Limit the number of jobs to 3 as 500 MiB of memory is used
;; per process.
(invoke "mpirun" "-np" (number->string
(min 3 (parallel-job-count)))
"python" "-B" "-m"
"pytest" "unit" "--ignore"
"unit/nls/test_PETScSNES_solver.py"))
#t))
(add-after 'install 'install-demo-files
(lambda* (#:key outputs #:allow-other-keys)

4
gnu/packages/storage.scm
View file

@ -55,14 +55,14 @@ (define-module (gnu packages storage)
(define-public ceph
(package
(name "ceph")
(version "14.2.13")
(version "14.2.14")
(source (origin
(method url-fetch)
(uri (string-append "https://download.ceph.com/tarballs/ceph-"
version ".tar.gz"))
(sha256
(base32
"0gaxjs909wf00nvh4z53cin89dw67v1q47b2jvi3iibynhkahkg1"))
"10ma8qimgspz1q3lqb4yl990l9xa87iwd0r4dxl5xg89w6j7qwix"))
(patches
(search-patches "ceph-disable-cpu-optimizations.patch"))
(modules '((guix build utils)))

2
gnu/packages/syncthing.scm
View file

@ -195,7 +195,7 @@ (define-public syncthing-gtk
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/syncthing/syncthing-gtk.git")
(url "https://github.com/syncthing/syncthing-gtk")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256

8
gnu/packages/tls.scm
View file

@ -352,7 +352,13 @@ (define-public openssl
((string-prefix? "arm" target)
"linux-armv4")
((string-prefix? "aarch64" target)
"linux-aarch64")))
"linux-aarch64")
((string-prefix? "powerpc64le" target)
"linux-ppc64le")
((string-prefix? "powerpc64" target)
"linux-ppc64")
((string-prefix? "powerpc" target)
"linux-ppc")))
#t)))
'())
(replace 'configure

18
gnu/packages/video.scm
View file

@ -286,7 +286,7 @@ (define-public svt-hevc
(method git-fetch)
(uri
(git-reference
(url "https://github.com/OpenVisualCloud/SVT-HEVC.git")
(url "https://github.com/OpenVisualCloud/SVT-HEVC")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -314,7 +314,7 @@ (define-public mediasdk
(method git-fetch)
(uri
(git-reference
(url "https://github.com/Intel-Media-SDK/MediaSDK.git")
(url "https://github.com/Intel-Media-SDK/MediaSDK")
(commit (string-append "intel-" name "-" version))))
(file-name (git-file-name name version))
(sha256
@ -490,7 +490,7 @@ (define-public libvideogfx
(method git-fetch)
(uri
(git-reference
(url "https://github.com/farindk/libvideogfx.git")
(url "https://github.com/farindk/libvideogfx")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -534,7 +534,7 @@ (define-public libde265
(method git-fetch)
(uri
(git-reference
(url "https://github.com/strukturag/libde265.git")
(url "https://github.com/strukturag/libde265")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@ -575,7 +575,7 @@ (define-public tslib
(method git-fetch)
(uri
(git-reference
(url "https://github.com/libts/tslib.git")
(url "https://github.com/libts/tslib")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -2188,14 +2188,14 @@ (define-public libvpx
(define-public youtube-dl
(package
(name "youtube-dl")
(version "2020.11.17")
(version "2020.11.21.1")
(source (origin
(method url-fetch)
(uri (string-append "https://youtube-dl.org/downloads/latest/"
"youtube-dl-" version ".tar.gz"))
(sha256
(base32
"0b0vsmvnm2jn1k66jmymzly0nb34nk79z97msns0sw0cqhbld1b2"))))
"0a9livib328z5j3kfndxys2193dvfs4hh38krx0idg0k26xp7cfl"))))
(build-system python-build-system)
(arguments
;; The problem here is that the directory for the man page and completion
@ -3799,7 +3799,7 @@ (define-public atomicparsley
(define-public livemedia-utils
(package
(name "livemedia-utils")
(version "2020.11.05")
(version "2020.11.19")
(source (origin
(method url-fetch)
(uri (string-append
@ -3807,7 +3807,7 @@ (define-public livemedia-utils
version ".tar.gz"))
(sha256
(base32
"1dx5imjil5yiya5dqlvbqkvzgic5pybsfilx5jz1cpi1znkzpgc9"))))
"16w6yxdbmjdhvffnrb752dn4llf3l0wb00dgdkyia0vqsv2qqyn7"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests

44
gnu/packages/vim.scm
View file

@ -70,7 +70,7 @@ (define-module (gnu packages vim)
(define-public vim
(package
(name "vim")
(version "8.2.1980")
(version "8.2.2017")
(source (origin
(method git-fetch)
(uri (git-reference
@ -79,7 +79,7 @@ (define-public vim
(file-name (git-file-name name version))
(sha256
(base32
"1l1bb4lhlivgvj4jaxkibdkcg6rh1gk80d6ni41kphyrir7xahja"))))
"0ad0c4wv8zf28wns06k82c19rs63ilsphnglajhgw5j2a1aqplyn"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@ -110,7 +110,7 @@ (define-public vim
;; Make sure the TERM environment variable is set for the tests
(setenv "TERM" "xterm")
#t))
(add-before 'check 'skip-failing-tests
(add-before 'check 'skip-or-fix-failing-tests
(lambda _
;; This test assumes that PID 1 is run as root and that the user
;; running the test suite does not have permission to kill(1, 0)
@ -121,16 +121,36 @@ (define-public vim
(substitute* "src/testdir/test_swap.vim"
(("if !IsRoot\\(\\)") "if 0"))
;; These tests check how the terminal looks after executing some
;; actions. The path of the bash binary is shown, which results in
;; a difference being detected. Patching the expected result is
;; non-trivial due to the special format used, so skip the test.
(substitute* "src/testdir/test_terminal.vim"
((".*Test_terminal_postponed_scrollback.*" line)
(string-append line "return\n")))
;; These tests compares output against a golden ‘…/|b|i|n|/|s|h…’
;; literal. We need to match that and substitute a similarly
;; ‘spliced’ path to ‘sh’ in the store, truncated to the last
;; 44 (spliced: 88) or so characters.
;; Two of the tests we simply skip instead of patching the screen dump.
(substitute* "src/testdir/test_popupwin.vim"
((".*Test_popup_drag_termwin.*" line)
(string-append line "return\n")))
((".*Test_popupwin_term_0[1|2].*") ""))
;; We replace the external program call (!) with a scroll-back (<)
;; symbol and blindly fix some other differences based on error output.
(let ((splice (lambda (s separator)
(string-join (map string (string->list s))
separator))))
(substitute* "src/testdir/dumps/Test_terminal_from_cmd.dump"
(((splice "/bin/sh" "\\|"))
(splice (string-take-right (which "sh") 44) "|"))
(("^\\|!") "|<")
(("@37") ""))
(substitute* '("src/testdir/dumps/Test_terminal_scrollback_1.dump"
"src/testdir/dumps/Test_terminal_scrollback_2.dump")
(((splice "/bin/sh" "\\|"))
(splice (string-take-right (which "sh") 61) "|"))
(("^\\|!") "|<")
((" @55") " @1"))
(substitute* '("src/testdir/dumps/Test_terminal_scrollback_3.dump"
"src/testdir/dumps/Test_popupwin_term_03.dump"
"src/testdir/dumps/Test_popupwin_term_04.dump")
(((splice "/bin/sh" "\\|"))
(splice (string-take-right (which "sh") 62) "|"))
(("^\\|!") "|<")
(("\\]\\| @56") "]| @1")))
#t)))))
(inputs
`(("gawk" ,gawk)

4
gnu/packages/web.scm
View file

@ -1424,7 +1424,7 @@ (module "tidy")
(define-public esbuild
(package
(name "esbuild")
(version "0.8.7")
(version "0.8.11")
(source
(origin
(method git-fetch)
@ -1434,7 +1434,7 @@ (define-public esbuild
(file-name (git-file-name name version))
(sha256
(base32
"14x95dmh4jrfp93p7ln0cv917qxll04sqzlpf9rl6w01fifr2s75"))
"18cp68jds8cq58hpcwh85cgvh5vlkjfdcpwqp5h754065j896rr3"))
(modules '((guix build utils)))
(snippet
'(begin

1
gnu/packages/xfce.scm
View file

@ -787,6 +787,7 @@ (define-public xfdesktop
"/tmp/final.jpg")
(copy-file "/tmp/final.jpg" image))
'(;; "backgrounds/xfce-blue.jpg"
"backgrounds/xfce-stripes.png"
"backgrounds/xfce-teal.jpg"))
#t)))

17
gnu/packages/xml.scm
View file

@ -25,6 +25,7 @@
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2020 Edouard Klein <edk@beaver-labs.com>
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -84,7 +85,7 @@ (define-public libxmlb
(method git-fetch)
(uri
(git-reference
(url "https://github.com/hughsie/libxmlb.git")
(url "https://github.com/hughsie/libxmlb")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -218,7 +219,7 @@ (define-public libxmlplusplus
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/libxmlplusplus/libxmlplusplus.git")
(url "https://github.com/libxmlplusplus/libxmlplusplus")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -278,7 +279,7 @@ (define-public libxmlplusplus-2.6
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/libxmlplusplus/libxmlplusplus.git")
(url "https://github.com/libxmlplusplus/libxmlplusplus")
(commit version)))
(file-name (git-file-name name version))
(sha256
@ -1260,7 +1261,15 @@ (define-public xmlstarlet
(substitute* "Makefile"
(("^examples/schema1\\\\") "\\")
(("^examples/valid1\\\\") "\\"))
#t)))))
#t))
(add-after 'install 'symlink-xmlstarlet
(lambda* (#:key outputs #:allow-other-keys)
;; Other distros usually either rename or symlink the `xml' binary
;; as `xmlstarlet', let's do it as well for compatibility.
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(symlink "xml" (string-append bin "/xmlstarlet"))
#t))))))
(inputs
`(("libxslt" ,libxslt)
("libxml2" ,libxml2)))

7
gnu/packages/xorg.scm
View file

@ -6270,16 +6270,15 @@ (define-public xcompmgr
(define-public xpra
(package
(name "xpra")
(version "4.0.4")
(version "4.0.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.xpra.org/src/xpra-"
version ".tar.xz"))
(sha256
(base32 "10alqdfmgml9ixdi1nyd9xlw8a5q0j8m2sv4g9p83pd6z1a0rpv2"))
(patches (search-patches "xpra-4.0.1-systemd-run.patch"
"xpra-4.0.4-norequests.patch"))))
(base32 "11ml66z8vbc0fa567kkmp2j20l5l60aflnkrz5ay8arw3w92nmnz"))
(patches (search-patches "xpra-4.0.1-systemd-run.patch"))))
(build-system python-build-system)
;; see also http://xpra.org/trac/wiki/Dependencies
(inputs `(

3
gnu/services/base.scm
View file

@ -62,7 +62,8 @@ (define-module (gnu services base)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)
#:use-module (ice-9 format)
#:re-export (user-processes-service-type) ;backwards compatibility
#:re-export (user-processes-service-type ;backwards compatibility
%default-substitute-urls)
#:export (fstab-service-type
root-file-system-service
file-system-service-type

3
gnu/services/cups.scm
View file

@ -482,7 +482,8 @@ (define-configuration cups-configuration
(package cups)
"The CUPS package.")
(extensions
(package-list (list cups-filters escpr hplip-minimal foomatic-filters))
(package-list (list cups-filters epson-inkjet-printer-escpr
foomatic-filters hplip-minimal splix))
"Drivers and other extensions to the CUPS package.")
(files-configuration
(files-configuration (files-configuration))

2
gnu/services/sddm.scm
View file

@ -169,7 +169,7 @@ (define sddm-command
(list (shepherd-service
(documentation "SDDM display manager.")
(requirement '(user-processes))
(requirement '(user-processes elogind))
(provision '(xorg-server display-manager))
(start #~(make-forkexec-constructor #$sddm-command))
(stop #~(make-kill-destructor)))))

66
gnu/system/images/pinebook-pro.scm Normal file
View file

@ -0,0 +1,66 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.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 system images pinebook-pro)
#:use-module (gnu bootloader)
#:use-module (gnu bootloader u-boot)
#:use-module (gnu image)
#:use-module (gnu packages linux)
#:use-module (gnu services)
#:use-module (gnu services base)
#:use-module (gnu system)
#:use-module (gnu system file-systems)
#:use-module (gnu system image)
#:use-module (srfi srfi-26)
#:export (pinebook-pro-barebones-os
pinebook-pro-image-type
pinebook-pro-barebones-raw-image))
(define pinebook-pro-barebones-os
(operating-system
(host-name "viso")
(timezone "Europe/Paris")
(locale "en_US.utf8")
(bootloader (bootloader-configuration
(bootloader u-boot-pinebook-pro-rk3399-bootloader)
(target "/dev/vda")))
(initrd-modules '())
(kernel linux-libre-arm64-generic)
(file-systems (cons (file-system
(device (file-system-label "my-root"))
(mount-point "/")
(type "ext4"))
%base-file-systems))
(services (cons (service agetty-service-type
(agetty-configuration
(extra-options '("-L")) ; no carrier detect
(baud-rate "115200")
(term "vt100")
(tty "ttyS0")))
%base-services))))
(define pinebook-pro-image-type
(image-type
(name 'pinebook-pro-raw)
(constructor (cut image-with-os arm64-disk-image <>))))
(define pinebook-pro-barebones-raw-image
(image
(inherit
(os->image pinebook-pro-barebones-os #:type pinebook-pro-image-type))
(name 'pinebook-pro-barebones-raw-image)))

7
guix/build/cargo-build-system.scm
View file

@ -123,6 +123,13 @@ (define* (configure #:key inputs
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
(setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
(setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
(when (assoc-ref inputs "openssl")
(setenv "OPENSSL_DIR" (assoc-ref inputs "openssl")))
(when (assoc-ref inputs "gettext")
(setenv "GETTEXT_SYSTEM" (assoc-ref inputs "gettext")))
(when (assoc-ref inputs "clang")
(setenv "LIBCLANG_PATH"
(string-append (assoc-ref inputs "clang") "/lib")))
;; We don't use the Cargo.lock file to determine the package versions we use
;; during building, and in any case if one is not present it is created

33
guix/cpio.scm
View file

@ -27,6 +27,7 @@ (define-module (guix cpio)
make-cpio-header
file->cpio-header
file->cpio-header*
special-file->cpio-header*
write-cpio-header
read-cpio-header
@ -132,9 +133,10 @@ (define* (make-cpio-header #:key
(%make-cpio-header MAGIC
inode mode uid gid
nlink mtime
(if (= C_ISDIR (logand mode C_FMT))
0
size)
(if (or (= C_ISLNK (logand mode C_FMT))
(= C_ISREG (logand mode C_FMT)))
size
0)
major minor rmajor rminor
(+ name-size 1) ;include trailing zero
0))) ;checksum
@ -146,6 +148,8 @@ (define (mode->type mode)
(cond ((= C_ISREG fmt) 'regular)
((= C_ISDIR fmt) 'directory)
((= C_ISLNK fmt) 'symlink)
((= C_ISBLK fmt) 'block-special)
((= C_ISCHR fmt) 'char-special)
(else
(error "unsupported file type" mode)))))
@ -187,6 +191,25 @@ (define* (file->cpio-header* file
#:size (stat:size st)
#:name-size (string-length file-name))))
(define* (special-file->cpio-header* file
device-type
device-major
device-minor
permission-bits
#:optional (file-name file))
"Create a character or block device header.
DEVICE-TYPE is either 'char-special or 'block-special.
The number of hard links is assumed to be 1."
(make-cpio-header #:mode (logior (match device-type
('block-special C_ISBLK)
('char-special C_ISCHR))
permission-bits)
#:nlink 1
#:rdev (device-number device-major device-minor)
#:name-size (string-length file-name)))
(define %trailer
"TRAILER!!!")
@ -233,6 +256,10 @@ (define (dump-file file)
(put-string port target)))
((directory)
#t)
((block-special)
#t)
((char-special)
#t)
(else
(error "file type not supported")))

14
guix/import/hackage.scm
View file

@ -40,7 +40,8 @@ (define-module (guix import hackage)
#:use-module (guix upstream)
#:use-module (guix packages)
#:use-module ((guix utils) #:select (call-with-temporary-output-file))
#:export (hackage->guix-package
#:export (%hackage-url
hackage->guix-package
hackage-recursive-import
%hackage-updater
@ -92,20 +93,23 @@ (define ghc-standard-libraries
(define package-name-prefix "ghc-")
(define %hackage-url
(make-parameter "https://hackage.haskell.org"))
(define (hackage-source-url name version)
"Given a Hackage package NAME and VERSION, return a url to the source
tarball."
(string-append "https://hackage.haskell.org/package/" name
"/" name "-" version ".tar.gz"))
(string-append (%hackage-url) "/package/"
name "/" name "-" version ".tar.gz"))
(define* (hackage-cabal-url name #:optional version)
"Given a Hackage package NAME and VERSION, return a url to the corresponding
.cabal file on Hackage. If VERSION is #f or missing, the url for the latest
version is returned."
(if version
(string-append "https://hackage.haskell.org/package/"
(string-append (%hackage-url) "/package/"
name "-" version "/" name ".cabal")
(string-append "https://hackage.haskell.org/package/"
(string-append (%hackage-url) "/package/"
name "/" name ".cabal")))
(define (hackage-name->package-name name)

8
guix/import/stackage.scm
View file

@ -30,7 +30,8 @@ (define-module (guix import stackage)
#:use-module (guix memoization)
#:use-module (guix packages)
#:use-module (guix upstream)
#:export (stackage->guix-package
#:export (%stackage-url
stackage->guix-package
stackage-recursive-import
%stackage-updater))
@ -39,7 +40,8 @@ (define-module (guix import stackage)
;;; Stackage info fetcher and access functions
;;;
(define %stackage-url "https://www.stackage.org")
(define %stackage-url
(make-parameter "https://www.stackage.org"))
;; Latest LTS version compatible with GHC 8.6.5.
(define %default-lts-version "14.27")
@ -55,7 +57,7 @@ (define stackage-lts-info-fetch
;; "Retrieve the information about the LTS Stackage release VERSION."
(memoize
(lambda* (#:optional (version ""))
(let* ((url (string-append %stackage-url
(let* ((url (string-append (%stackage-url)
"/lts-" (if (string-null? version)
%default-lts-version
version)))

83
guix/lint.scm
View file

@ -10,6 +10,7 @@
;;; Copyright © 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -35,6 +36,8 @@ (define-module (guix lint)
#:use-module (guix http-client)
#:use-module (guix packages)
#:use-module (guix i18n)
#:use-module ((guix gexp)
#:select (local-file? local-file-absolute-file-name))
#:use-module (guix licenses)
#:use-module (guix records)
#:use-module (guix grafts)
@ -50,6 +53,7 @@ (define-module (guix lint)
#:use-module ((guix swh) #:hide (origin?))
#:autoload (guix git-download) (git-reference?
git-reference-url git-reference-commit)
#:use-module (guix import stackage)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)
#:use-module (ice-9 format)
@ -73,6 +77,7 @@ (define-module (guix lint)
check-inputs-should-be-native
check-inputs-should-not-be-an-input-at-all
check-patch-file-names
check-patch-headers
check-synopsis-style
check-derivation
check-home-page
@ -87,6 +92,7 @@ (define-module (guix lint)
check-formatting
check-archival
check-profile-collisions
check-haskell-stackage
lint-warning
lint-warning?
@ -712,6 +718,54 @@ (define (starts-with-package-name? file-name)
(_ #f))
patches)))))
(define (check-patch-headers package)
"Check that PACKAGE's patches start with a comment. Return a list of
warnings."
(define (blank? str)
(string-every char-set:blank str))
(define (patch-header-warnings patch)
(call-with-input-file patch
(lambda (port)
;; Read from PORT until a non-blank line is found or EOF is reached.
(let loop ()
(let ((line (read-line port)))
(cond ((eof-object? line)
(list (make-warning package
(G_ "~a: empty patch")
(list (basename patch))
#:field 'source)))
((blank? line)
(loop))
((or (string-prefix? "--- " line)
(string-prefix? "+++ " line))
(list (make-warning package
(G_ "~a: patch lacks comment and \
upstream status")
(list (basename patch))
#:field 'source)))
(else
'())))))))
(guard (c ((formatted-message? c) ;raised by 'search-patch'
(list (%make-warning package
(formatted-message-string c)
(formatted-message-arguments c)
#:field 'source))))
(let ((patches (if (origin? (package-source package))
(origin-patches (package-source package))
'())))
(append-map (lambda (patch)
;; Dismiss PATCH if it's an origin or similar.
(cond ((string? patch)
(patch-header-warnings patch))
((local-file? patch)
(patch-header-warnings
(local-file-absolute-file-name patch)))
(else
'())))
patches))))
(define (escape-quotes str)
"Replace any quote character in STR by an escaped quote character."
(list->string
@ -1234,6 +1288,25 @@ (define commit
'()
(apply throw key args))))))))
(define (check-haskell-stackage package)
"Check whether PACKAGE is a Haskell package ahead of the current
Stackage LTS version."
(match (with-networking-fail-safe
(format #f (G_ "while retrieving upstream info for '~a'")
(package-name package))
#f
(package-latest-release package (list %stackage-updater)))
((? upstream-source? source)
(if (version>? (package-version package)
(upstream-source-version source))
(list
(make-warning package
(G_ "ahead of Stackage LTS version ~a")
(list (upstream-source-version source))
#:field 'version))
'()))
(#f '())))
;;;
;;; Source code formatting.
@ -1417,6 +1490,10 @@ (define %local-checkers
(name 'patch-file-names)
(description "Validate file names and availability of patches")
(check check-patch-file-names))
(lint-checker
(name 'patch-headers)
(description "Validate patch headers")
(check check-patch-headers))
(lint-checker
(name 'formatting)
(description "Look for formatting issues in the source")
@ -1456,7 +1533,11 @@ (define %network-dependent-checkers
(lint-checker
(name 'archival)
(description "Ensure source code archival on Software Heritage")
(check check-archival))))
(check check-archival))
(lint-checker
(name 'haskell-stackage)
(description "Ensure Haskell packages use Stackage LTS versions")
(check check-haskell-stackage))))
(define %all-checkers
(append %local-checkers

13
guix/scripts/build.scm
View file

@ -181,8 +181,6 @@ (define (show-build-options-help)
-c, --cores=N allow the use of up to N CPU cores for the build"))
(display (G_ "
-M, --max-jobs=N allow at most N build jobs"))
(display (G_ "
--help-transform list package transformation options not shown here"))
(display (G_ "
--debug=LEVEL produce debugging output at LEVEL")))
@ -319,14 +317,7 @@ (define %standard-build-options
(if c
(apply values (alist-cons 'max-jobs c result) rest)
(leave (G_ "not a number: '~a' option argument: ~a~%")
name arg)))))
(option '("help-transform") #f #f
(lambda _
(format #t
(G_ "Available package transformation options:~%"))
(show-transformation-options-help)
(newline)
(exit 0)))))
name arg)))))))
;;;
@ -383,6 +374,8 @@ (define (show-help)
(newline)
(show-build-options-help)
(newline)
(show-transformation-options-help)
(newline)
(display (G_ "
-h, --help display this help and exit"))
(display (G_ "

2
guix/scripts/environment.scm
View file

@ -180,6 +180,8 @@ (define (show-help)
(newline)
(show-build-options-help)
(newline)
(show-transformation-options-help)
(newline)
(display (G_ "
-h, --help display this help and exit"))
(display (G_ "

5
guix/scripts/graph.scm
View file

@ -35,7 +35,8 @@ (define-module (guix scripts graph)
#:use-module ((guix diagnostics)
#:select (location-file formatted-message))
#:use-module ((guix transformations)
#:select (options->transformation
#:select (show-transformation-options-help
options->transformation
%transformation-options))
#:use-module ((guix scripts build)
#:select (%standard-build-options))
@ -546,6 +547,8 @@ (define (show-help)
(display (G_ "
-L, --load-path=DIR prepend DIR to the package module search path"))
(newline)
(show-transformation-options-help)
(newline)
(display (G_ "
-h, --help display this help and exit"))
(display (G_ "

2
guix/scripts/install.scm
View file

@ -39,6 +39,8 @@ (define (show-help)
(newline)
(show-build-options-help)
(newline)
(show-transformation-options-help)
(newline)
(display (G_ "
-h, --help display this help and exit"))
(display (G_ "

15
guix/scripts/lint.scm
View file

@ -10,6 +10,7 @@
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019, 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@ -47,11 +48,15 @@ (define (emit-warnings warnings)
;; provided MESSAGE.
(for-each
(lambda (lint-warning)
(let ((package (lint-warning-package lint-warning))
(loc (lint-warning-location lint-warning)))
(info loc (G_ "~a@~a: ~a~%")
(package-name package) (package-version package)
(lint-warning-message lint-warning))))
(let* ((package (lint-warning-package lint-warning))
(name (package-name package))
(version (package-version package))
(loc (lint-warning-location lint-warning))
(message (lint-warning-message lint-warning)))
(parameterize
((guix-warning-port (current-output-port)))
(info loc (G_ "~a@~a: ~a~%")
name version message))))
warnings))
(define* (run-checkers package checkers #:key store)

2
guix/scripts/pack.scm
View file

@ -1067,6 +1067,8 @@ (define (show-help)
Create a bundle of PACKAGE.\n"))
(show-build-options-help)
(newline)
(show-transformation-options-help)
(newline)
(display (G_ "
-f, --format=FORMAT build a pack in the given FORMAT"))
(display (G_ "

2
guix/scripts/package.scm
View file

@ -398,6 +398,8 @@ (define (show-help)
(newline)
(show-build-options-help)
(newline)
(show-transformation-options-help)
(newline)
(display (G_ "
-h, --help display this help and exit"))
(display (G_ "

6
guix/scripts/publish.scm
View file

@ -63,10 +63,14 @@ (define-module (guix scripts publish)
#:use-module ((guix build utils)
#:select (dump-port mkdir-p find-files))
#:use-module ((guix build syscalls) #:select (set-thread-name))
#:export (%public-key
#:export (%default-gzip-compression
%public-key
%private-key
signed-string
open-server-socket
run-publish-server
guix-publish))
(define (show-help)

Some files were not shown because too many files have changed in this diff Show more