me/guix
Archived
1
0
Fork 0
Code Activity

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2019-10-13 23:04:06 +02:00
commit 378ebc048c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
55 changed files with 3082 additions and 2249 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/guix.texi
View file

@ -6405,9 +6405,11 @@ tool. This build system runs @code{scons} to build the package,
the package. the package.
Additional flags to be passed to @code{scons} can be specified with the Additional flags to be passed to @code{scons} can be specified with the
@code{#:scons-flags} parameter. The version of Python used to run SCons @code{#:scons-flags} parameter. The default build and install targets
can be specified by selecting the appropriate SCons package with the can be overridden with @code{#:build-targets} and
@code{#:scons} parameter. @code{#:install-targets} respectively. The version of Python used to
run SCons can be specified by selecting the appropriate SCons package
with the @code{#:scons} parameter.
@end defvr @end defvr
@defvr {Scheme Variable} haskell-build-system @defvr {Scheme Variable} haskell-build-system

5
gnu/local.mk
View file

@ -261,6 +261,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/imagemagick.scm \ %D%/packages/imagemagick.scm \
%D%/packages/inklingreader.scm \ %D%/packages/inklingreader.scm \
%D%/packages/inkscape.scm \ %D%/packages/inkscape.scm \
%D%/packages/installers.scm \
%D%/packages/ipfs.scm \ %D%/packages/ipfs.scm \
%D%/packages/irc.scm \ %D%/packages/irc.scm \
%D%/packages/iso-codes.scm \ %D%/packages/iso-codes.scm \
@ -973,6 +974,7 @@ dist_patch_DATA = \
%D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \
%D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/id3lib-UTF16-writing-bug.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/ilmbase-openexr-pkg-config.patch \ %D%/packages/patches/ilmbase-openexr-pkg-config.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \
@ -1144,6 +1146,7 @@ dist_patch_DATA = \
%D%/packages/patches/nfs-utils-missing-headers.patch \ %D%/packages/patches/nfs-utils-missing-headers.patch \
%D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \
%D%/packages/patches/nm-plugin-path.patch \ %D%/packages/patches/nm-plugin-path.patch \
%D%/packages/patches/nsis-env-passthru.patch \
%D%/packages/patches/nss-freebl-stubs.patch \ %D%/packages/patches/nss-freebl-stubs.patch \
%D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \
%D%/packages/patches/nss-pkgconfig.patch \ %D%/packages/patches/nss-pkgconfig.patch \
@ -1184,7 +1187,6 @@ dist_patch_DATA = \
%D%/packages/patches/p7zip-CVE-2016-9296.patch \ %D%/packages/patches/p7zip-CVE-2016-9296.patch \
%D%/packages/patches/p7zip-CVE-2017-17969.patch \ %D%/packages/patches/p7zip-CVE-2017-17969.patch \
%D%/packages/patches/p7zip-remove-unused-code.patch \ %D%/packages/patches/p7zip-remove-unused-code.patch \
%D%/packages/patches/parted-glibc-compat.patch \
%D%/packages/patches/patchelf-page-size.patch \ %D%/packages/patches/patchelf-page-size.patch \
%D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchelf-rework-for-arm.patch \
%D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patchutils-test-perms.patch \
@ -1324,7 +1326,6 @@ dist_patch_DATA = \
%D%/packages/patches/sooperlooper-build-with-wx-30.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \
%D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \
%D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/steghide-fixes.patch \
%D%/packages/patches/strace-ipc-tests.patch \
%D%/packages/patches/streamlink-update-test.patch \ %D%/packages/patches/streamlink-update-test.patch \
%D%/packages/patches/stumpwm-fix-broken-read-one-line.patch \ %D%/packages/patches/stumpwm-fix-broken-read-one-line.patch \
%D%/packages/patches/supercollider-boost-1.70-build-fix.patch \ %D%/packages/patches/supercollider-boost-1.70-build-fix.patch \

4
gnu/packages/assembly.scm
View file

@ -117,14 +117,14 @@ debugging information in STABS, DWARF 2, and CodeView 8 formats.")
(define-public lightning (define-public lightning
(package (package
(name "lightning") (name "lightning")
(version "2.1.2") (version "2.1.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/lightning/lightning-" (uri (string-append "mirror://gnu/lightning/lightning-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0sbs2lm8b9in2m8d52zf0x9gpp40x6r7sl6sha92yq3pr78rwa4v")))) "1jgxbq2cm51dzi3zhz38mmgwdcgs328mfl8iviw8dxn6dn36p1gd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("zlib" ,zlib))) (native-inputs `(("zlib" ,zlib)))
(synopsis "Library for generating assembly code at runtime") (synopsis "Library for generating assembly code at runtime")

16
gnu/packages/audio.scm
View file

@ -1109,7 +1109,7 @@ follower.")
(define-public fluidsynth (define-public fluidsynth
(package (package
(name "fluidsynth") (name "fluidsynth")
(version "2.0.6") (version "2.0.7")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1118,7 +1118,7 @@ follower.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0nas9pp9r8rnziznxm65x2yzf1ryg98zr3946g0br3s38sjf8l3a")))) "1h1dj3wmjwzny2hgr41k3p67w4kxvzn365kkqwyfd6yk0v3rahic"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; no check target '(#:tests? #f ; no check target
@ -2771,22 +2771,14 @@ conversion. It may be used, for example, to resample PCM-encoded audio.")
(define-public twolame (define-public twolame
(package (package
(name "twolame") (name "twolame")
(version "0.3.13") (version "0.4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/twolame/twolame/" version (uri (string-append "mirror://sourceforge/twolame/twolame/" version
"/twolame-" version ".tar.gz")) "/twolame-" version ".tar.gz"))
(sha256 (sha256
(base32 "0ahiqqng5pidwhj1wzph4vxxgxxgcfa3gl0gywipzx2ii7s35wwq")) (base32 "0zf8sxqb02w07ah55b1y7ab643zmpbhn62spa9pqra0rc17l4dfc"))))
(modules '((guix build utils)))
;; The tests break with Perl 5.24:
;; https://github.com/njh/twolame/issues/21
;; TODO: Remove this snippet when upgrading twolame.
(snippet
'(begin
(substitute* "tests/test.pl" (("\\(@_\\)") "($_[0])"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libsndfile" ,libsndfile))) `(("libsndfile" ,libsndfile)))

35
gnu/packages/check.scm
View file

@ -354,6 +354,25 @@ a CxxTest testing library, it employs no advanced features of C++ (e.g. RTTI)
and it supports a very flexible form of test discovery.") and it supports a very flexible form of test discovery.")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public doctest
(package
(name "doctest")
(version "2.3.5")
(home-page "https://github.com/onqtam/doctest")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0rddlzhnv0f5036q0m0p019pismka7sx6x8cnzk65sk77b1dsbhg"))))
(build-system cmake-build-system)
(synopsis "C++ test framework")
(description
"doctest is a single-header testing framework for C++11 and later. It
has been designed to be fast, light and unintrusive.")
(license license:expat)))
(define-public go-gopkg.in-check.v1 (define-public go-gopkg.in-check.v1
(let ((commit "788fd78401277ebd861206a03c884797c6ec5541") (let ((commit "788fd78401277ebd861206a03c884797c6ec5541")
(revision "1")) (revision "1"))
@ -816,6 +835,22 @@ supports coverage of subprocesses.")
(define-public python2-pytest-runner (define-public python2-pytest-runner
(package-with-python2 python-pytest-runner)) (package-with-python2 python-pytest-runner))
;; python-bleach 3.1.0 requires this ancient version of pytest-runner.
;; Remove once no longer needed.
(define-public python-pytest-runner-2
(package/inherit
python-pytest-runner
(version "2.12.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "pytest-runner" version))
(sha256
(base32
"11ivjj9hfphkv4yfb2g74av4yy86y8gcbf7gbif0p1hcdfnxg3w6"))))))
(define-public python2-pytest-runner-2
(package-with-python2 python-pytest-runner-2))
(define-public python-pytest-mock (define-public python-pytest-mock
(package (package
(name "python-pytest-mock") (name "python-pytest-mock")

448
gnu/packages/commencement.scm
View file

File diff suppressed because it is too large Load diff

30
gnu/packages/cpp.scm
View file

@ -206,7 +206,7 @@ as ordering relation.")
(define-public json-modern-cxx (define-public json-modern-cxx
(package (package
(name "json-modern-cxx") (name "json-modern-cxx")
(version "3.1.2") (version "3.7.0")
(home-page "https://github.com/nlohmann/json") (home-page "https://github.com/nlohmann/json")
(source (source
(origin (origin
@ -215,30 +215,34 @@ as ordering relation.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"1mpr781fb2dfbyscrr7nil75lkxsazg4wkm749168lcf2ksrrbfi")) "0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
(delete-file-recursively "./third_party") ;; Delete bundled software. Preserve doctest_compatibility.h, which
(delete-file-recursively "./test/thirdparty") ;; is a wrapper library added by this package.
(delete-file-recursively "./benchmarks/thirdparty") (install-file "./test/thirdparty/doctest/doctest_compatibility.h" "/tmp")
;; Splits catch and fifo_map (for-each delete-file-recursively
'("./third_party" "./test/thirdparty" "./benchmarks/thirdparty"))
(install-file "/tmp/doctest_compatibility.h" "./test/thirdparty/doctest")
;; Adjust for the unbundled fifo_map and doctest.
(substitute* "./test/thirdparty/doctest/doctest_compatibility.h"
(("#include \"doctest\\.h\"")
"#include <doctest/doctest.h>"))
(with-directory-excursion "test/src" (with-directory-excursion "test/src"
(let ((files (find-files "." ".*\\.cpp"))) (let ((files (find-files "." "\\.cpp$")))
(substitute* files
(("#include ?\"(catch.hpp)\"" all catch-hpp)
(string-append "#include <catch/" catch-hpp ">")))
(substitute* files (substitute* files
(("#include ?\"(fifo_map.hpp)\"" all fifo-map-hpp) (("#include ?\"(fifo_map.hpp)\"" all fifo-map-hpp)
(string-append (string-append
"#include <fifo_map/" fifo-map-hpp ">"))))) "#include <fifo_map/" fifo-map-hpp ">")))))
#t)))) #t))))
(native-inputs (native-inputs
`(("amalgamate" ,amalgamate))) `(("amalgamate" ,amalgamate)
("doctest" ,doctest)))
(inputs (inputs
`(("catch2" ,catch-framework2) `(("fifo-map" ,fifo-map)))
("fifo-map" ,fifo-map)))
(build-system cmake-build-system) (build-system cmake-build-system)
(synopsis "JSON parser and printer library for C++") (synopsis "JSON parser and printer library for C++")
(description "JSON for Modern C++ is a C++ JSON library that provides (description "JSON for Modern C++ is a C++ JSON library that provides

15
gnu/packages/curl.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org> ;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
@ -51,6 +51,7 @@
(package (package
(name "curl") (name "curl")
(version "7.65.3") (version "7.65.3")
(replacement curl-7.66.0)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-" (uri (string-append "https://curl.haxx.se/download/curl-"
@ -142,6 +143,18 @@ tunneling, and so on.")
"See COPYING in the distribution.")) "See COPYING in the distribution."))
(home-page "https://curl.haxx.se/"))) (home-page "https://curl.haxx.se/")))
(define curl-7.66.0
(package
(inherit curl)
(version "7.66.0")
(source (origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
"1hcqxpibhknhjy56wcxz5vd6m9ggx3ykwp3wp5wx05ih36481d6v"))))))
(define-public kurly (define-public kurly
(package (package
(name "kurly") (name "kurly")

12
gnu/packages/disk.scm
View file

@ -78,26 +78,25 @@
(define-public parted (define-public parted
(package (package
(name "parted") (name "parted")
(version "3.2") (version "3.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/parted/parted-" (uri (string-append "mirror://gnu/parted/parted-"
version ".tar.xz")) version ".tar.xz"))
(patches (search-patches "parted-glibc-compat.patch"))
(sha256 (sha256
(base32 (base32
"1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5")))) "0i1xp367wpqw75b20c3jnism3dg3yqj4a7a22p2jb1h1hyyv9qjp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after (add-after 'unpack 'fix-locales-and-python
'unpack 'fix-locales-and-python
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "tests/t0251-gpt-unicode.sh" (substitute* "tests/t0251-gpt-unicode.sh"
(("C.UTF-8") "en_US.utf8")) ;not in Glibc locales (("C.UTF-8") "en_US.utf8")) ;not in Glibc locales
(substitute* "tests/msdos-overlap" (substitute* "tests/msdos-overlap"
(("/usr/bin/python") (which "python")))))))) (("/usr/bin/python") (which "python")))
#t)))))
(inputs (inputs
`(("lvm2" ,lvm2) `(("lvm2" ,lvm2)
("readline" ,readline) ("readline" ,readline)
@ -105,6 +104,7 @@
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
;; For the tests. ;; For the tests.
("e2fsprogs" ,e2fsprogs)
("perl" ,perl) ("perl" ,perl)
("python" ,python-2))) ("python" ,python-2)))
(home-page "https://www.gnu.org/software/parted/") (home-page "https://www.gnu.org/software/parted/")

14
gnu/packages/distributed.scm
View file

@ -18,6 +18,7 @@
(define-module (gnu packages distributed) (define-module (gnu packages distributed)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -47,8 +48,9 @@
(uri (git-reference (uri (git-reference
(url "https://github.com/boinc/boinc.git") (url "https://github.com/boinc/boinc.git")
(commit (string-append "client_release/" (commit (string-append "client_release/"
"7.16/" (version-major+minor version)
version)))) "/" version))))
(file-name (git-file-name "boinc" version))
(sha256 (sha256
(base32 (base32
"0w2qimcwyjhapk3z7zyq7jkls23hsnmm35iw7m4s4if04fp70dx0")))) "0w2qimcwyjhapk3z7zyq7jkls23hsnmm35iw7m4s4if04fp70dx0"))))
@ -72,12 +74,10 @@
(description "BOINC is a platform for high-throughput computing on a large (description "BOINC is a platform for high-throughput computing on a large
scale (thousands or millions of computers). It can be used for volunteer scale (thousands or millions of computers). It can be used for volunteer
computing (using consumer devices) or grid computing (using organizational computing (using consumer devices) or grid computing (using organizational
resources). It supports virtualized, parallel, and GPU-based applications. resources). It supports virtualized, parallel, and GPU-based applications.")
BOINC is distributed under the LGPL open source license. It can be used for
commercial purposes, and applications need not be open source.")
(home-page "https://boinc.berkeley.edu/") (home-page "https://boinc.berkeley.edu/")
(license license:gpl3+))) ;; BOINC is distributed as LGPL3+, with some individual modules under GPL3+.
(license (list license:lgpl3+ license:gpl3+))))
(define-public boinc-server (define-public boinc-server
(package (inherit boinc-client) (package (inherit boinc-client)

4
gnu/packages/django.scm
View file

@ -41,13 +41,13 @@
(define-public python-django (define-public python-django
(package (package
(name "python-django") (name "python-django")
(version "1.11.21") (version "1.11.25")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Django" version)) (uri (pypi-uri "Django" version))
(sha256 (sha256
(base32 (base32
"0adhcw8sx2mgwk9y2j760y96pqbip1ni3sf2v2ls5zxc9x93wwms")))) "0rpgx212n8gh61nwizkyldvskna808xpcvawmavk5mc5c9cfh52k"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:modules ((srfi srfi-1) '(#:modules ((srfi srfi-1)

4
gnu/packages/dns.scm
View file

@ -578,14 +578,14 @@ Extensions} (DNSSEC).")
(define-public knot (define-public knot
(package (package
(name "knot") (name "knot")
(version "2.8.2") (version "2.9.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-dns/" (uri (string-append "https://secure.nic.cz/files/knot-dns/"
"knot-" version ".tar.xz")) "knot-" version ".tar.xz"))
(sha256 (sha256
(base32 "0dx1lp4w33rpa54nns41k4vfdfin6naaskwh132r4qs0l9hl7lh0")) (base32 "18i1kdyaqaskjyhmq888wml4d2p4ic1sbjynlb6ggfxsxzm38x6z"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

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

@ -265,21 +265,28 @@ on stdout instead of using a socket as the Emacsclient does.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-magit (define-public emacs-magit
;; Version 2.90.1 has trouble loading the transient library, ;; `magit-setup-buffer' macro introduced in c761d28d and required in
;; so we use a more recent commit that fixes it. ;; `emacs-forge'.
(let ((commit "b4aec016b5577afa8d889f258b499814d1bb1d94")) (let ((commit "c761d28d49e5238037512b898db0ec9b40d85770"))
(package (package
(name "emacs-magit") (name "emacs-magit")
(version (git-version "2.90.1" "1" commit)) (version (git-version "2.90.1" "2" commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/magit/magit") (url "https://github.com/magit/magit.git")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0zl7v6z0y50pcgqsf2r8c1k3r5nwjad9ba7r6sgrnf4rc62br7jv")))) "16qx0404l05q1m6w7y5j8ck1z5nfmpinm00w0p2yh1hn5zzwy6dd"))
(modules '((guix build utils)))
(snippet
'(begin
;; Fix syntax error
(substitute* "lisp/magit-extras.el"
(("rev\\)\\)\\)\\)\\)\\)") "rev)))))"))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("texinfo" ,texinfo) (native-inputs `(("texinfo" ,texinfo)
("emacs" ,emacs-minimal))) ("emacs" ,emacs-minimal)))
@ -318,6 +325,39 @@ on stdout instead of using a socket as the Emacsclient does.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch
(lambda _
(chmod "lisp/magit-extras.el" #o644)
(emacs-batch-edit-file "lisp/magit-extras.el"
`(progn (progn
(goto-char (point-min))
(re-search-forward "(defun magit-copy-buffer-revision ()")
(forward-sexp 2)
(kill-sexp)
(insert ,(format #f "~S"
'(if (use-region-p)
(copy-region-as-kill nil nil 'region)
(when-let ((rev (cl-case major-mode
((magit-cherry-mode
magit-log-select-mode
magit-reflog-mode
magit-refs-mode
magit-revision-mode
magit-stash-mode
magit-stashes-mode)
(car magit-refresh-args))
((magit-diff-mode magit-log-mode)
(let ((r (caar magit-refresh-args)))
(if (string-match "\\.\\.\\.?\\(.+\\)" r)
(match-string 1 r)
r)))
(magit-status-mode "HEAD"))))
(when (magit-commit-p rev)
(setq rev (magit-rev-parse rev))
(push (list rev default-directory) magit-revision-stack)
(kill-new (message "%s" rev))))))))
(basic-save-buffer)))
#t))
(delete 'configure) (delete 'configure)
(add-before (add-before
'build 'patch-exec-paths 'build 'patch-exec-paths
@ -524,18 +564,21 @@ deliver data to mobile and web apps.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-ghub (define-public emacs-ghub
;; We need a newer commit to avoid problems in emacs-forge.
(let ((commit "cf0b13aeba4df3798e49c205cac2d8fefd53a137")
(revision "1"))
(package (package
(name "emacs-ghub") (name "emacs-ghub")
(version "3.2.0") (version (git-version "3.2.0" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/magit/ghub") (url "https://github.com/magit/ghub")
(commit (string-append "v" version)))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0lp52qygyavddl1lrgsyb6mq7hcf9h89dy2pzya3mb2va49f0vvl")))) "0fzayvcysk80vv4q332axcjf80x6gsnpcbl0svmpb017ii6wxhid"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -547,7 +590,6 @@ deliver data to mobile and web apps.")
`(("texinfo" ,texinfo))) `(("texinfo" ,texinfo)))
(propagated-inputs (propagated-inputs
`(("dash" ,emacs-dash) `(("dash" ,emacs-dash)
("graphql" ,emacs-graphql)
("treepy" ,emacs-treepy))) ("treepy" ,emacs-treepy)))
(home-page "https://github.com/magit/ghub") (home-page "https://github.com/magit/ghub")
(synopsis "Emacs client libraries for the APIs of various Git forges") (synopsis "Emacs client libraries for the APIs of various Git forges")
@ -556,7 +598,7 @@ deliver data to mobile and web apps.")
Emacs packages. It supports the REST APIs of Github, Github GraphQL, Gitlab, Emacs packages. It supports the REST APIs of Github, Github GraphQL, Gitlab,
Gitea, Gogs and Bitbucket. It abstracts access to API resources using only a Gitea, Gogs and Bitbucket. It abstracts access to API resources using only a
handful of functions that are not resource-specific.") handful of functions that are not resource-specific.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public emacs-scribble-mode (define-public emacs-scribble-mode
(let ((commit "217945d54de5e4bb207033f2116baa28f5c5ecf2") (let ((commit "217945d54de5e4bb207033f2116baa28f5c5ecf2")
@ -741,8 +783,8 @@ programs.")
(deprecated-package "haskell-mode" emacs-haskell-mode)) (deprecated-package "haskell-mode" emacs-haskell-mode))
(define-public emacs-dante (define-public emacs-dante
(let ((commit "a25ae9e5b5425cffdd88d498777e90ea8655fa37") (let ((commit "38b589417294c7ea44bf65b73b8046d950f9531b")
(revision "2")) (revision "3"))
(package (package
(name "emacs-dante") (name "emacs-dante")
(version (git-version "1.5" revision commit)) (version (git-version "1.5" revision commit))
@ -753,7 +795,7 @@ programs.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1ziw3snbs2z2cg8a3jbyjd48qkgrkzs4bh8lrbs0h2c87nzldvhd")) "1mnmn635552zlwd4zr68jbvdjipl6gi4mi6wiyck28fsmq8kw96h"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
@ -2946,19 +2988,25 @@ completing keywords and smart indentation.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-rspec (define-public emacs-rspec
(let ((commit "66ea7cc9699d6edc6115daa024818adbd85efc20")
(revision "1"))
(package (package
(name "emacs-rspec") (name "emacs-rspec")
(version "1.11") (version (git-version "1.11" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/pezra/rspec-mode.git") (url "https://github.com/pezra/rspec-mode.git")
(commit (string-append "v" version)))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp")))) (base32 "0b11s8r0pi7ah54km4yg4fqff8wkk409d25qnlwm1l94pdwjd1c8"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments
`(#:include (cons "^snippets\\/rspec-mode\\/" %default-include)
#:tests? #t
#:test-command '("make" "test")))
(home-page "https://github.com/pezra/rspec-mode") (home-page "https://github.com/pezra/rspec-mode")
(synopsis "Provides a rspec mode for working with RSpec") (synopsis "Provides a rspec mode for working with RSpec")
(description (description
@ -2968,7 +3016,7 @@ as moving between the spec files, and corresponding code files.
Also included are keybindings for spec files and Dired buffers, as well as Also included are keybindings for spec files and Dired buffers, as well as
snippets for yasnippet.") snippets for yasnippet.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public emacs-smart-mode-line (define-public emacs-smart-mode-line
(package (package
@ -4453,20 +4501,18 @@ started with 20 minutes. All values are customizable.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-org-sidebar (define-public emacs-org-sidebar
(let ((commit "b2a5a69b1ebbab63b55e7d1a9453f385624a642c")
(revision "2"))
(package (package
(name "emacs-org-sidebar") (name "emacs-org-sidebar")
(version (git-version "0.1" revision commit)) (version "0.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/alphapapa/org-sidebar.git") (url "https://github.com/alphapapa/org-sidebar.git")
(commit commit))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0dajwg92kj7998xl0x35dlqwdhgwjcwxa726kf4f3wgv1azpyff6")))) (base32 "106h06vjfbqfj761vbxwymd6612ds8c6fk053yzgbrqzm3hn2c03"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-dash" ,emacs-dash) `(("emacs-dash" ,emacs-dash)
@ -4482,7 +4528,7 @@ buffer (similar to the Org agenda ,but without all its features), and below
that is a list of all other non-done to-do items. If the buffer is narrowed, that is a list of all other non-done to-do items. If the buffer is narrowed,
the sidebar only shows items in the narrowed portion; this allows seeing an the sidebar only shows items in the narrowed portion; this allows seeing an
overview of tasks in a subtree.") overview of tasks in a subtree.")
(license license:gpl3+)))) (license license:gpl3+)))
(define-public emacs-org-trello (define-public emacs-org-trello
(package (package
@ -6597,18 +6643,21 @@ Dust.js, React/JSX, Angularjs, ejs, etc.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-wgrep (define-public emacs-wgrep
;; Tag is missing, so we use the commit directly.
;; https://github.com/mhayashi1120/Emacs-wgrep/issues/64
(let ((commit "379afd89ebd76f63842c8589127d66096a8bb595"))
(package (package
(name "emacs-wgrep") (name "emacs-wgrep")
(version "2.3.0") (version "2.3.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/mhayashi1120/Emacs-wgrep") (url "https://github.com/mhayashi1120/Emacs-wgrep")
(commit version))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s")))) "0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/mhayashi1120/Emacs-wgrep") (home-page "https://github.com/mhayashi1120/Emacs-wgrep")
(synopsis "Edit a grep buffer and apply those changes to the files") (synopsis "Edit a grep buffer and apply those changes to the files")
@ -6616,7 +6665,7 @@ Dust.js, React/JSX, Angularjs, ejs, etc.")
"Emacs wgrep allows you to edit a grep buffer and apply those changes "Emacs wgrep allows you to edit a grep buffer and apply those changes
to the file buffer. Several backends are supported beside the classic grep: to the file buffer. Several backends are supported beside the classic grep:
ack, ag, helm and pt.") ack, ag, helm and pt.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public emacs-helm (define-public emacs-helm
(package (package
@ -6891,14 +6940,14 @@ are pretty much the same (and SLIME served as the principle inspiration for
CIDER).") CIDER).")
(license license:gpl3+))) (license license:gpl3+)))
;; There hasn't been a tag or release since 2015, so we take the latest ;; There hasn't been a tag or release since 2016, so we take the latest
;; commit. ;; commit.
(define-public emacs-sly (define-public emacs-sly
(let ((commit "486bfbe95612bcdc0960c490207970a188e0fbb9") (let ((commit "29dccc0735283897a6dbd97e0b6828a45c2985e2")
(revision "1")) (revision "2"))
(package (package
(name "emacs-sly") (name "emacs-sly")
(version (string-append "1.0.0-" revision "." (string-take commit 9))) (version (git-version "1.0.0" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -6908,14 +6957,45 @@ CIDER).")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0ib4q4k3h3qn88pymyjjmlmnpizdn1mfg5gpk5a715nqsgxlg09l")))) "0d0skgyqn422130xn8lrdp04m5cjk3sl18w6lf2wrmrndc1crqxk"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(native-inputs
`(("texinfo" ,texinfo)))
(arguments (arguments
`(#:include (cons "^lib\\/" %default-include) `(#:include (cons* "^contrib\\/" "^lib\\/" "^slynk\\/" %default-include)
#:phases #:phases
;; The package provides autoloads. ;; The package provides autoloads.
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'make-autoloads)))) (delete 'make-autoloads)
(add-before 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(info-dir (string-append out "/share/info"))
(doc-dir (string-append out "/share/doc/"
,name "-" ,version))
(doc-files '(;; "doc/sly-refcard.pdf" ; See sly-refcard.pdf below.
"README.md" "NEWS.md" "PROBLEMS.md"
"CONTRIBUTING.md")))
(with-directory-excursion "doc"
(substitute* "Makefile"
(("infodir=/usr/local/info")
(string-append "infodir=" info-dir))
;; Don't rebuild contributors.texi since we are not in
;; the git repo.
(("contributors.texi: Makefile texinfo-tabulate.awk")
"contributors.texi:"))
(invoke "make" "html/index.html")
(invoke "make" "sly.info")
;; TODO: We need minimal texlive with "preprint" package
;; (for fullpage.sty). (invoke "make" "sly-refcard.pdf")
(install-file "sly.info" info-dir)
(copy-recursively "html" (string-append doc-dir "/html")))
(for-each (lambda (f)
(install-file f doc-dir)
(delete-file f))
doc-files)
(delete-file-recursively "doc")
#t))))))
(home-page "https://github.com/joaotavora/sly") (home-page "https://github.com/joaotavora/sly")
(synopsis "Sylvester the Cat's Common Lisp IDE") (synopsis "Sylvester the Cat's Common Lisp IDE")
(description (description
@ -6924,13 +7004,13 @@ contains the following improvements over it:
@enumerate @enumerate
@item Completely redesigned REPL based on Emacs's own full-featured @item Completely redesigned REPL based on Emacs's own full-featured
@code{comint.el} @code{comint.el}.
@item Live code annotations via a new @code{sly-stickers} contrib @item Live code annotations via a new @code{sly-stickers} contrib.
@item Consistent interactive button interface. Everything can be copied to @item Consistent interactive button interface. Everything can be copied to
the REPL. the REPL.
@item Multiple inspectors with independent history @item Multiple inspectors with independent history.
@item Regexp-capable @code{M-x sly-apropos} @item Regexp-capable @code{M-x sly-apropos}.
@item Contribs are first class SLY citizens and enabled by default @item Contribs are first class SLY citizens and enabled by default.
@item Use ASDF to loads contribs on demand. @item Use ASDF to loads contribs on demand.
@end enumerate @end enumerate
@ -6938,6 +7018,75 @@ SLY tracks SLIME's bugfixes and all its familiar features (debugger, inspector,
xref, etc...) are still available, but with better integration.") xref, etc...) are still available, but with better integration.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-sly-quicklisp
(let ((commit "01ebe3976a244309f2e277c09206831135a0b66c")
(revision "1"))
(package
(name "emacs-sly-quicklisp")
(version (git-version "0.0.0" revision commit))
(home-page "https://github.com/joaotavora/sly-quicklisp")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1vfqmvayf35g6y3ljsm3rlzv5jm50qikhh4lv2zkkswj6gkkb1cv"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-sly" ,emacs-sly)))
(arguments
`(#:include (cons* "\\.lisp$" "\\.asd$" %default-include)
#:phases
;; The package provides autoloads.
(modify-phases %standard-phases
(delete 'make-autoloads))))
(synopsis "Quicklisp support for SLY")
(description
"@command{sly-quicklisp} is an external contrib for SLY that provides a
sly-quickload command that prompts the user for a package to install. ")
(license license:gpl3+))))
(define-public emacs-sly-asdf
(let ((commit "355739e42c91b9b2339f84453292b938b6d17b0d")
(revision "1"))
(package
(name "emacs-sly-asdf")
(version (git-version "0.1.0" revision commit))
(home-page "https://github.com/mmgeorge/sly-asdf")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1plkqh4dj35c3cf8ykan8fcvqmxcdqragh4j6xg0sls27mjjz1bq"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-sly" ,emacs-sly)))
(arguments
`(#:include (cons* "\\.lisp$" "\\.asd$" %default-include)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-autoload
;; TODO: Reported upstream: https://github.com/mmgeorge/sly-asdf/pull/11
(lambda _
(substitute* "sly-asdf.el"
(("\\(add-to-list 'sly-contribs 'sly-asdf 'append\\)")
"(with-eval-after-load 'sly
(add-to-list 'sly-contribs 'sly-asdf 'append))")))))))
(synopsis "ASDF contrib for SLY")
(description
"@command{sly-asdf} is an external contrib for SLY that provides
additional support for working with ASDF projects.")
(license license:gpl3+))))
(define-public emacs-lua-mode (define-public emacs-lua-mode
(let ((commit "95c64bb5634035630e8c59d10d4a1d1003265743") (let ((commit "95c64bb5634035630e8c59d10d4a1d1003265743")
(revision "2")) (revision "2"))
@ -7009,11 +7158,11 @@ extensions.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-evil-collection (define-public emacs-evil-collection
(let ((commit "986ca7eb0b75eccd843bdad2f7fdb48f4ca6ac22") (let ((commit "bf4200a57c81c2302a3bf5b2058d74c6f90a3e6c")
(revision "10")) (revision "11"))
(package (package
(name "emacs-evil-collection") (name "emacs-evil-collection")
(version (git-version "0.0.2" revision commit)) (version (git-version "0.0.3" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -7022,10 +7171,13 @@ extensions.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"172sx5w50x5wrs5w0sb6rkbj3q22s7mmsnk4c6pwknhbz3vwlvwz")))) "01xw0m5gj14ly42y8ikvldpab5my28sylf6l9gvwd5cf909bd445"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-evil" ,emacs-evil))) `(("emacs-evil" ,emacs-evil)
("emacs-annalist" ,emacs-annalist)))
(arguments
`(#:include (cons* "^modes\\/" %default-include)))
(home-page "https://github.com/emacs-evil/evil-collection") (home-page "https://github.com/emacs-evil/evil-collection")
(synopsis "Collection of Evil bindings for many major and minor modes") (synopsis "Collection of Evil bindings for many major and minor modes")
(description "This is a collection of Evil bindings for the parts of (description "This is a collection of Evil bindings for the parts of
@ -9996,17 +10148,24 @@ It supports dired buffers and opens them in tree mode at destination.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-tiny (define-public emacs-tiny
(let ((commit "fd8a6b0b0c564d8242259e20e557ee6041f40908")
(revision "1"))
(package (package
(name "emacs-tiny") (name "emacs-tiny")
(version "0.2.1") (version (git-version "0.2.1" revision commit))
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "http://elpa.gnu.org/packages/tiny-" version ".tar")) (uri (git-reference
(url "https://github.com/abo-abo/tiny.git")
(commit commit)))
(sha256 (sha256
(base32 (base32
"1cr73a8gba549ja55x0c2s554f3zywf69zbnd7v82jz5q1k9wd2v")))) "1498j392ap2mk4zmsm2id16pfgvj78r428da9vw7hdrzzibai2cx"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments
`(#:tests? #t
#:test-command '("make" "test")))
(home-page "https://github.com/abo-abo/tiny") (home-page "https://github.com/abo-abo/tiny")
(synopsis "Quickly generate linear ranges in Emacs") (synopsis "Quickly generate linear ranges in Emacs")
(description (description
@ -10014,7 +10173,7 @@ It supports dired buffers and opens them in tree mode at destination.")
It is meant to quickly generate linear ranges, e.g. 5, 6, 7, 8. Some elisp It is meant to quickly generate linear ranges, e.g. 5, 6, 7, 8. Some elisp
proficiency is an advantage, since you can transform your numeric range with proficiency is an advantage, since you can transform your numeric range with
an elisp expression.") an elisp expression.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public emacs-emojify (define-public emacs-emojify
(package (package
@ -10652,20 +10811,22 @@ navigation with the grails mode.")
(deprecated-package "groovy-emacs-modes" emacs-groovy-modes)) (deprecated-package "groovy-emacs-modes" emacs-groovy-modes))
(define-public emacs-org-tree-slide (define-public emacs-org-tree-slide
(let ((commit "dff8f1a4a64c8dd0a1fde0b0131e2fe186747134") (let ((commit "036a36eec1cf712d3db155572aed325daa372eb5")
(revision "0")) (revision "2"))
(package (package
(name "emacs-org-tree-slide") (name "emacs-org-tree-slide")
(version (git-version "0.1" revision commit)) (version (git-version "2.8.4" revision commit))
(home-page "https://github.com/takaxp/org-tree-slide")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (url home-page) (commit commit))) (uri (git-reference
(url "https://github.com/takaxp/org-tree-slide.git")
(commit commit)))
(sha256 (sha256
(base32 (base32
"153bg0x7ypla11pq51jmsgzfjklwwnrq56xgpbfhk1j16xwz9hyf")) "1r8ncx25xmxicgciyv5przp68y8qgy40fm10ba55awvql4xcm0yk"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/takaxp/org-tree-slide")
(synopsis "Presentation tool for org-mode") (synopsis "Presentation tool for org-mode")
(description (description
"Org-tree-slide provides a slideshow mode to view org-mode files. Use "Org-tree-slide provides a slideshow mode to view org-mode files. Use
@ -11007,12 +11168,13 @@ to with quicklink-style selections.")
(version "0.8") (version "0.8")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://stable.melpa.org/packages/deft-" (uri (git-reference
version ".el")) (url "https://github.com/jrblevin/deft.git")
(commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"1vb9cjxskc7c0yyf9pvxy1fzypg1vrcgwnjz0m3hslinsgdyig58")))) "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://jblevins.org/projects/deft/") (home-page "https://jblevins.org/projects/deft/")
(synopsis "Quickly browse, filter, and edit plain text notes") (synopsis "Quickly browse, filter, and edit plain text notes")
@ -11065,25 +11227,27 @@ region of the buffer, while the latter works on rectangular selections.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-emmet-mode (define-public emacs-emmet-mode
(let ((commit "1acb821e0142136344ccf40c1e5fb664d7db2e70")
(revision "1"))
(package (package
(name "emacs-emmet-mode") (name "emacs-emmet-mode")
(version "1.0.8") (version (git-version "1.0.8" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/smihica/emmet-mode.git") (url "https://github.com/smihica/emmet-mode.git")
(commit version))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1dsa85bk33j90h1ypaz1ylqh9yp2xvlga237h3kwa5y3sb0d5ydi")))) "1p25h191bm0h5b3w5apg7wks51k7pb7h4dlww4jbl9ri4d33fzcl"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/smihica/emmet-mode") (home-page "https://github.com/smihica/emmet-mode")
(synopsis "Unofficial Emmet's support for Emacs") (synopsis "Unofficial Emmet's support for Emacs")
(description (description
"Unfold CSS-selector-like expressions to markup. It is intended to be "Unfold CSS-selector-like expressions to markup. It is intended to be
used with SGML-like languages: XML, HTML, XHTML, XSL, etc.") used with SGML-like languages: XML, HTML, XHTML, XSL, etc.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public emacs-ergoemacs-mode (define-public emacs-ergoemacs-mode
(let ((commit "3ce23bba3cb50562693860f87f3528c471d603ba") (let ((commit "3ce23bba3cb50562693860f87f3528c471d603ba")
@ -11340,19 +11504,21 @@ object @code{nil} corresponds 1:1 with @code{NULL} in the database.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-closql (define-public emacs-closql
;; Take a commit newer than 1.0.0 release because of Emacs upgrade to 26.3.
(let ((commit "70b98dbae53611d10a461d9b4a6f71086910dcef"))
(package (package
(name "emacs-closql") (name "emacs-closql")
(version "1.0.0") (version (git-version "1.0.0" "1" commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/emacscollective/closql.git") (url "https://github.com/emacscollective/closql.git")
(commit (string-append "v" version)))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1xhpfjjkjqfc1k2rj77cscclz5r7gpvv3hi202x178vdcpipjwar")))) "1wvhrihg663f61yzc7f0vha2abjdnlwbk0gjcwakdfk1bhwf5ikh"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-emacsql" ,emacs-emacsql))) `(("emacs-emacsql" ,emacs-emacsql)))
@ -11364,7 +11530,7 @@ database. SQLite is used as backend. This library imposes some restrictions
on what kind of objects can be stored; it isn't intended to store arbitrary on what kind of objects can be stored; it isn't intended to store arbitrary
objects. All objects have to share a common superclass and subclasses cannot objects. All objects have to share a common superclass and subclasses cannot
add any additional instance slots.") add any additional instance slots.")
(license license:gpl3))) (license license:gpl3))))
(define-public emacs-epkg (define-public emacs-epkg
;; The release version is to old for the current database scheme. ;; The release version is to old for the current database scheme.
@ -11602,8 +11768,8 @@ as well as functions for navigating between these headings.")
(define-public emacs-org-super-agenda (define-public emacs-org-super-agenda
;; emacs-org-sidebar depends on a newer commit than the latest release version. ;; emacs-org-sidebar depends on a newer commit than the latest release version.
(let ((commit "f0ee7ed9766d352d16a787707d35695b48cbf153") (let ((commit "a87ca11fbbe72ab6c1c4c3b55ae9e1e93ebfb8ba")
(revision "2")) (revision "3"))
(package (package
(name "emacs-org-super-agenda") (name "emacs-org-super-agenda")
(version (git-version "1.1.1" revision commit)) (version (git-version "1.1.1" revision commit))
@ -11615,7 +11781,7 @@ as well as functions for navigating between these headings.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1b1qi96x83acv2frl94i4frx46i82vipaa8mfwpzyj2gyq2bq5zf")))) "08b7babdaqblb6jff57an4kbcxk6fkhf668620fipfjgbsnqv3ff"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-org" ,emacs-org) `(("emacs-org" ,emacs-org)
@ -11737,34 +11903,50 @@ according to a parsing expression grammar.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-org-ql (define-public emacs-org-ql
(let ((commit "949a06c3ab50482b749fd2d4350837a197660d96")
(revision "3"))
(package (package
(name "emacs-org-ql") (name "emacs-org-ql")
(version "0.2.1") (version (git-version "0.3.1" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/alphapapa/org-ql") (url "https://github.com/alphapapa/org-ql")
(commit version))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1xyabg9fhpip6426za6wjrn0msnaf10c5fzzaawwagk7zmjf9b48")) "0apcg63xm0242mjgsgw0jrcda4p4iqj7fy3sgh0p7khi4hrs5ch0"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-s" ,emacs-s) `(("emacs-s" ,emacs-s)
("emacs-f" ,emacs-f)
("emacs-ov" ,emacs-ov)
("emacs-peg" ,emacs-peg)
("emacs-org-super-agenda" ,emacs-org-super-agenda)
("emacs-ts" ,emacs-ts) ("emacs-ts" ,emacs-ts)
("emacs-org" ,emacs-org) ("emacs-org" ,emacs-org)
("emacs-helm" ,emacs-helm)
("emacs-helm-org" ,emacs-helm-org)
("emacs-dash" ,emacs-dash))) ("emacs-dash" ,emacs-dash)))
(native-inputs (native-inputs
`(("emacs-buttercup" ,emacs-buttercup))) `(("emacs-buttercup" ,emacs-buttercup)))
(arguments (arguments
`(#:tests? #t `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'require-helm
(lambda _
(substitute* "helm-org-ql.el"
(("^;;;; Requirements")
";;;; Requirements\n(require 'helm)\n(require 'helm-org)"))
#t)))
#:tests? #t
#:test-command '("buttercup" "-L" "."))) #:test-command '("buttercup" "-L" ".")))
(home-page "https://github.com/alphapapa/org-ql/") (home-page "https://github.com/alphapapa/org-ql/")
(synopsis "Query language for Org buffers") (synopsis "Query language for Org buffers")
(description "This package provides a Lispy query language for Org (description "This package provides a Lispy query language for Org
files, allowing for actions to be performed based on search criteria.") files, allowing for actions to be performed based on search criteria.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public emacs-org-auto-expand (define-public emacs-org-auto-expand
(let ((commit "4938d5f6460e2f8f051ba9ac000b291bfa43ef62") (let ((commit "4938d5f6460e2f8f051ba9ac000b291bfa43ef62")
@ -13508,8 +13690,8 @@ perform regression test for packages that provide font-lock rules.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-racket-mode (define-public emacs-racket-mode
(let ((commit "5300aa004f08535c3fac99f1af78462f129aca81") (let ((commit "2a9a102a097d04fbcd2a443fec84078036c2e277")
(revision "3")) (revision "4"))
(package (package
(name "emacs-racket-mode") (name "emacs-racket-mode")
(version (git-version "0.0.2" revision commit)) (version (git-version "0.0.2" revision commit))
@ -13522,7 +13704,7 @@ perform regression test for packages that provide font-lock rules.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1gkpm4fl1ybsm9qqgrkwyjbd9znddy438x266k27fs90lkxrfray")))) "1n71dxxh62jixq20b5haapv651dxc0zyrxpl1d0yqsg8ncp726bl"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:include '("\\.el$" "\\.rkt$"))) `(#:include '("\\.el$" "\\.rkt$")))
@ -14599,20 +14781,20 @@ try completing. See @code{fish-completion-fallback-on-bash-p}.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-gif-screencast (define-public emacs-gif-screencast
(let ((commit "12b25442b97b84abae74ecb5190a9d14ff7cfe5a")) (let ((commit "248d1e158405e6cba2c65ecaed40e2c59b089cd8")
(revision "2"))
(package (package
(name "emacs-gif-screencast") (name "emacs-gif-screencast")
(version (git-version "20180616" "1" commit)) (version (git-version "1.0" revision commit))
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://gitlab.com/Ambrevar/emacs-gif-screencast/" (url "https://gitlab.com/Ambrevar/emacs-gif-screencast.git")
"repository/archive.tar.gz?ref=" (commit commit)))
commit))
(sha256 (sha256
(base32 (base32
"0lc457i78xjkn5idr2aaiadkh76zcsksj84z0qh80a9y775syrgh")))) "19xqi5mgalnnhb4hw0fh7py2s2dllldx1xxbhwhknkdpifai8hl8"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(inputs (inputs
`(("scrot" ,scrot) `(("scrot" ,scrot)
@ -14626,6 +14808,7 @@ try completing. See @code{fish-completion-fallback-on-bash-p}.")
(let ((scrot (assoc-ref inputs "scrot")) (let ((scrot (assoc-ref inputs "scrot"))
(imagemagick (assoc-ref inputs "imagemagick")) (imagemagick (assoc-ref inputs "imagemagick"))
(gifsicle (assoc-ref inputs "gifsicle"))) (gifsicle (assoc-ref inputs "gifsicle")))
(make-file-writable "gif-screencast.el")
;; Specify the absolute file names of the various ;; Specify the absolute file names of the various
;; programs so that everything works out-of-the-box. ;; programs so that everything works out-of-the-box.
(emacs-substitute-variables (emacs-substitute-variables
@ -15203,8 +15386,8 @@ Pandoc, the document-conversion tool.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public emacs-ccls (define-public emacs-ccls
(let ((commit "9061ebbf9d5ec3ee7e88dbd226c77017cf0447b1") (let ((commit "b1acc336f27d8a3bbc750c2dc3be915a4ac1afea")
(revision "2")) (revision "3"))
(package (package
(name "emacs-ccls") (name "emacs-ccls")
(version (git-version "0.1" revision commit)) (version (git-version "0.1" revision commit))
@ -15217,7 +15400,7 @@ Pandoc, the document-conversion tool.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"106jh25ivq0ydiz37p51agk5zbpai7fv91pwn6dpqzsq5g281ls7")))) "1qgfxc5d1hb32ks1fxpx7agpw7dvnkz99wydlflc9fqq75g8v142"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-dash" ,emacs-dash) `(("emacs-dash" ,emacs-dash)
@ -15546,11 +15729,11 @@ few (like NOTE).")
(define-public emacs-git-annex (define-public emacs-git-annex
;; Unreleased version has a fontification fix. ;; Unreleased version has a fontification fix.
(let ((commit "ebdb44aef1883f1b2b8058e05d30fb9315b03707") (let ((commit "1324d3f23c534fe79391a2c256bb8803054e383b")
(revision "1")) (revision "2"))
(package (package
(name "emacs-git-annex") (name "emacs-git-annex")
(version (string-append "1.1-" revision "." (string-take commit 8))) (version (git-version "1.1" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -15560,7 +15743,7 @@ few (like NOTE).")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1mzv40gj7k10h7h5s43my8msgzjpj680qprqa9pp8nbyhl49v3wh")))) "1lfky2nsrlndlbvk6vwbswnvbvkz1sxgg0n3r5q6xykdkjym0lrh"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/jwiegley/git-annex-el") (home-page "https://github.com/jwiegley/git-annex-el")
(synopsis "Emacs integration for git-annex") (synopsis "Emacs integration for git-annex")
@ -16196,9 +16379,45 @@ other frame parameters.")
(home-page "https://github.com/bookest/arduino-mode") (home-page "https://github.com/bookest/arduino-mode")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-annalist
(let ((commit "e0601539c9ac0171a684ea3ff6266d215d1d08e6")
(revision "1"))
(package
(name "emacs-annalist")
(version (git-version "1.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/noctuid/annalist.el.git")
(commit commit)))
(sha256
(base32
"10bmimdzpi6cql4sb2hbgdvrza83xbac50bi9qng4z662pfnlaam"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(native-inputs
`(("emacs-buttercup" ,emacs-buttercup)
("emacs-lispy" ,emacs-lispy)
("emacs-evil" ,emacs-evil)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'fix-makefile
(lambda _
(substitute* "Makefile"
(("cask exec ") ""))
#t)))
#:tests? #t
#:test-command '("make" "test")))
(home-page "https://github.com/noctuid/annalist.el")
(synopsis "Record and display information with Org headings and tables")
(description "This package allows for keybindings, settings, hooks, and
advice to be recorded and displayed.")
(license license:gpl3+))))
(define-public emacs-general (define-public emacs-general
(let ((commit "f032c3a77079487d0ea563b17ee3e5b2fb084611") (let ((commit "f38fb2294bd29261374b772f765730f2fa168b3e")
(revision "2")) (revision "3"))
(package (package
(name "emacs-general") (name "emacs-general")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -16209,9 +16428,24 @@ other frame parameters.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"0lgh5z17ag5wvvnqwagvam29cp1n1vd50amn6df02xln80bsbllx")) "1aqi5axkwfng6rm52sblf738c7rffp10sqs69dvkh2fv3ps8q28i"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(native-inputs
`(("emacs-buttercup" ,emacs-buttercup)
("emacs-evil" ,emacs-evil)
("emacs-which-key" ,emacs-which-key)
("emacs-use-package" ,emacs-use-package)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'fix-makefile
(lambda _
(substitute* "Makefile"
(("cask exec ") ""))
#t)))
#:tests? #t
#:test-command '("make" "test")))
(home-page "https://github.com/noctuid/general.el") (home-page "https://github.com/noctuid/general.el")
(synopsis "More convenient key definitions in emacs") (synopsis "More convenient key definitions in emacs")
(description "@code{general.el} provides a more convenient method for (description "@code{general.el} provides a more convenient method for
@ -17062,6 +17296,85 @@ command\", but because it always involves at least two commands (a prefix and
a suffix) we prefer to call it just a \"transient\".") a suffix) we prefer to call it just a \"transient\".")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-forge
(let ((commit "a6721c071226ae8da6852e9330f2bdcba92a4577"))
(package
(name "emacs-forge")
(version (git-version "0.1.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/magit/forge.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1gzr1di29a9szkzm6kjznq7c8md71cm5761pznf08nmmk63dl3zm"))))
(build-system gnu-build-system)
(native-inputs
`(("texinfo" ,texinfo)
("emacs" ,emacs-minimal)))
(propagated-inputs
`(("emacs-closql" ,emacs-closql)
("emacs-dash" ,emacs-dash)
("emacs-emacsql-sqlite" ,emacs-emacsql)
("emacs-ghub" ,emacs-ghub)
("emacs-let-alist" ,emacs-let-alist)
("emacs-magit" ,emacs-magit)
("emacs-markdown-mode" ,emacs-markdown-mode)
("emacs-transient" ,emacs-transient)))
(arguments
`(#:tests? #f ;no tests
#:modules ((srfi srfi-26)
(guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)
(guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'install)
(add-after 'unpack 'delete-doc-targets
(lambda _
(substitute* "./Makefile"
(("lisp docs") "lisp"))))
(add-after 'delete-doc-targets 'emacs-set-emacs-load-path
(assoc-ref emacs:%standard-phases 'set-emacs-load-path))
(add-after 'emacs-set-emacs-load-path 'chdir-lisp
(lambda _
(chdir "lisp")))
(add-after 'chdir-lisp 'emacs-install
(assoc-ref emacs:%standard-phases 'install))
(add-after 'emacs-install 'emacs-make-autoloads
(assoc-ref emacs:%standard-phases 'make-autoloads))
(add-after 'build 'install-elc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(el-dir (string-append
out "/share/emacs/site-lisp/guix.d/forge-"
,version)))
(for-each (cut install-file <> el-dir)
(find-files "." "\\.elc"))
#t)))
(add-after 'install-elc 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(info (string-append out "/share/info")))
(with-directory-excursion "../docs"
(invoke "makeinfo" "forge.texi")
(install-file "forge.info" info)
#t)))))))
(home-page "https://github.com/magit/ghub/")
(synopsis "Access Git forges from Magit")
(description
"Work with Git forges, such as Github and Gitlab, from the comfort of
Magit and the rest of Emacs.")
(license license:gpl3+))))
(define-public emacs-matcha (define-public emacs-matcha
(let ((commit "c7df5cf5cdac9ae369e241342389ccda0205eab9")) (let ((commit "c7df5cf5cdac9ae369e241342389ccda0205eab9"))
(package (package
@ -18742,6 +19055,34 @@ JIRA issue servers.")
keybindings for skipping from host section to host section.") keybindings for skipping from host section to host section.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-ssh-agency
(package
(name "emacs-ssh-agency")
(version "0.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/magit/ssh-agency.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0895n7bss4wdydic1gflr03f2cwdyqywl16gvb599lpn288jhwvz"))))
(build-system emacs-build-system)
(propagated-inputs
`(("dash" ,emacs-dash)))
(home-page "https://github.com/magit/ssh-agency")
(synopsis "Manage @code{ssh-agent} from Emacs")
(description
"This package provides functions to startup @code{ssh-agent}, set the
needed environment variables in Emacs, and prompt for passphrases from within
Emacs so that pushes and pulls from @code{magit} will not require entering any
passphrase.
It can also be useful on Unix-like platforms to delay having to enter your
passphrase until the first time you push to a remote.")
(license license:gpl3+)))
(define-public emacs-tao-theme (define-public emacs-tao-theme
(let ((commit "c5107fbe7e752f4e58c2d2147ff18a1ebb12937c") (let ((commit "c5107fbe7e752f4e58c2d2147ff18a1ebb12937c")
(revision "0")) (revision "0"))

6
gnu/packages/emacs.scm
View file

@ -16,6 +16,7 @@
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Jesse John Gildersleve <jessejohngildersleve@zohomail.eu>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -55,6 +56,7 @@
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages imagemagick) #:use-module (gnu packages imagemagick)
#:use-module (gnu packages linux) ; alsa-lib #:use-module (gnu packages linux) ; alsa-lib
#:use-module (gnu packages mail) ; for mailutils
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
@ -146,6 +148,10 @@
`(("gnutls" ,gnutls) `(("gnutls" ,gnutls)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
;; Avoid Emacs's limited movemail substitute that retrieves POP3 email
;; only via insecure channels. This is not needed for (modern) IMAP.
("mailutils" ,mailutils)
;; TODO: Add the optional dependencies. ;; TODO: Add the optional dependencies.
("libx11" ,libx11) ("libx11" ,libx11)
("gtk+" ,gtk+) ("gtk+" ,gtk+)

8
gnu/packages/enlightenment.scm
View file

@ -67,7 +67,7 @@
(define-public efl (define-public efl
(package (package
(name "efl") (name "efl")
(version "1.23.0") (version "1.23.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -75,7 +75,7 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1iawq5k1ggas41h3vrwc0y98hf83vr0vh3phfgw22iij3cb2b5nd")))) "0q9g4j7k10s1a8rv2ca9v9lydh7ml3zsrqvgncc4qhvdl76208nn"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("check" ,check) `(("check" ,check)
@ -365,7 +365,7 @@ embedded systems.")
(define-public python-efl (define-public python-efl
(package (package
(name "python-efl") (name "python-efl")
(version "1.22.0") (version "1.23.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -373,7 +373,7 @@ embedded systems.")
"python/python-efl-" version ".tar.xz")) "python/python-efl-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63")) "16yn6a1b9167nfmryyi44ma40m20ansfpwgrvqzfvwix7qaz9pib"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove files generated by Cython ;; Remove files generated by Cython
(snippet (snippet

6
gnu/packages/fabric-management.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Dave Love <fx@gnu.org> ;;; Copyright © 2017 Dave Love <fx@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -43,7 +43,7 @@
(define-public opensm (define-public opensm
(package (package
(name "opensm") (name "opensm")
(version "3.3.21") (version "3.3.22")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -51,7 +51,7 @@
(string-append "https://github.com/linux-rdma/opensm/releases/download/" (string-append "https://github.com/linux-rdma/opensm/releases/download/"
version "/opensm-" version ".tar.gz")) version "/opensm-" version ".tar.gz"))
(sha256 (sha256
(base32 "0j4vp118w1l47vs4had46ynybklyacxjlya0r15jg0y01l4j9l2h")))) (base32 "19scwwpwqhqsyq4hbr5cflcmypss828lalxxd36yby7mbimca38y"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)

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

@ -316,7 +316,6 @@ network. LIBNFS offers three different APIs, for different use :
(install-file "apfs-dump-quick" bin) (install-file "apfs-dump-quick" bin)
(install-file "apfs-fuse" bin) (install-file "apfs-fuse" bin)
(install-file "libapfs.a" lib) (install-file "libapfs.a" lib)
(install-file "../source/LICENSE" doc)
#t)))))) #t))))))
(inputs (inputs
`(("bzip2" ,bzip2) `(("bzip2" ,bzip2)

24
gnu/packages/freedesktop.scm
View file

@ -14,6 +14,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> ;;; Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
;;; Copyright © 2019 Reza Alizadeh Majd <r.majd@pantherx.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1414,3 +1415,26 @@ This package also contains two related utilities:
their MIME type. their MIME type.
@end itemize") @end itemize")
(license license:perl-license))) (license license:perl-license)))
(define-public uchardet
(package
(name "uchardet")
(version "0.0.6")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.freedesktop.org/software/"
name "/releases/" name "-" version ".tar.xz"))
(sha256
(base32 "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3"))))
(build-system cmake-build-system)
(home-page "https://www.freedesktop.org/wiki/Software/uchardet/")
(synopsis "Encoding detector library")
(description "uchardet is an encoding detector library, which takes a
sequence of bytes in an unknown character encoding without any additional
information, and attempts to determine the encoding of the text. Returned
encoding names are iconv-compatible.")
;; This combines code under MPL 1.1, LGPL 2.1+, and GPL 2.0+, so the
;; combination is GPL 2.0+.
(license license:gpl2+)))

32
gnu/packages/games.scm
View file

@ -2435,7 +2435,7 @@ falling, themeable graphics and sounds, and replays.")
(define-public wesnoth (define-public wesnoth
(package (package
(name "wesnoth") (name "wesnoth")
(version "1.14.7") (version "1.14.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-"
@ -2444,10 +2444,23 @@ falling, themeable graphics and sounds, and replays.")
"wesnoth-" version ".tar.bz2")) "wesnoth-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0j2yvkcggj5k0r2cqk8ndnj77m37a00srfd9qg7pdpqffbinqpj7")))) "1mhdrlflxxyknf54lwdbvs7fazlc1scf7z6vxxa3j746fks533ga"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f)) ; no check target `(#:tests? #f ;no check target
#:phases (modify-phases %standard-phases
(add-before 'configure 'treat-boost-as-system-header
(lambda* (#:key inputs #:allow-other-keys)
(let ((boost (assoc-ref inputs "boost")))
;; Ensure Boost is treated as "system headers" to
;; pacify compiler warnings induced by Boost headers.
(for-each (lambda (variable)
(setenv variable
(string-append boost "/include:"
(or (getenv variable)
""))))
'("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"))
#t))))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
@ -6815,13 +6828,12 @@ game field is extended to 4D space, which has to filled up by the gamer with
("innoextract" ,innoextract))) ("innoextract" ,innoextract)))
(home-page "https://arx-libertatis.org/") (home-page "https://arx-libertatis.org/")
(synopsis "Port of Arx Fatalis, a first-person role-playing game") (synopsis "Port of Arx Fatalis, a first-person role-playing game")
(description "Arx Libertatis is a cross-platform, open source port of Arx (description "Arx Libertatis is a cross-platform port of Arx Fatalis, a 2002
Fatalis, a 2002 first-person role-playing game / dungeon crawler developed by first-person role-playing game / dungeon crawler developed by Arkane Studios.
Arkane Studios. This port however does not include the game data, so you need This port however does not include the game data, so you need to obtain a copy
to obtain a copy of the original Arx Fatalis or its demo to play Arx of the original Arx Fatalis or its demo to play Arx Libertatis. Arx Fatalis
Libertatis. Arx Fatalis features crafting, melee and ranged combat, as well features crafting, melee and ranged combat, as well as a unique casting system
as a unique casting system where the player draws runes in real time to effect where the player draws runes in real time to effect the desired spell.")
the desired spell.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public edgar (define-public edgar

4
gnu/packages/gcc.scm
View file

@ -523,14 +523,14 @@ It also includes runtime support libraries for these languages.")))
(define-public gcc-9 (define-public gcc-9
(package (package
(inherit gcc-8) (inherit gcc-8)
(version "9.1.0") (version "9.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/gcc/gcc-" (uri (string-append "mirror://gnu/gcc/gcc-"
version "/gcc-" version ".tar.xz")) version "/gcc-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1817nc2bqdc251k0lpc51cimna7v68xjrnvqzvc50q3ax4s6i9kr")) "01mj3yk7z49i49168hg2cg7qs4bsccrrnv7pjmbdlf8j2a7z0vpa"))
(patches (search-patches "gcc-9-strmov-store-file-names.patch" (patches (search-patches "gcc-9-strmov-store-file-names.patch"
"gcc-9-asan-fix-limits-include.patch" "gcc-9-asan-fix-limits-include.patch"
"gcc-5.0-libvtv-runpath.patch")))))) "gcc-5.0-libvtv-runpath.patch"))))))

6
gnu/packages/glib.scm
View file

@ -550,7 +550,7 @@ by GDBus included in Glib.")
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("m4" ,m4))) ("m4" ,m4)))
(home-page "http://libsigc.sourceforge.net/") (home-page "https://libsigcplusplus.github.io/libsigcplusplus/")
(synopsis "Type-safe callback system for standard C++") (synopsis "Type-safe callback system for standard C++")
(description (description
"Libsigc++ implements a type-safe callback system for standard C++. It "Libsigc++ implements a type-safe callback system for standard C++. It
@ -839,7 +839,7 @@ programming language. It also contains the utility
(define-public appstream-glib (define-public appstream-glib
(package (package
(name "appstream-glib") (name "appstream-glib")
(version "0.7.15") (version "0.7.16")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://people.freedesktop.org/~hughsient/" (uri (string-append "https://people.freedesktop.org/~hughsient/"
@ -847,7 +847,7 @@ programming language. It also contains the utility
"appstream-glib-" version ".tar.xz")) "appstream-glib-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"17ram4j3cvs78si0gi1labarr91pw68zn8kam41cqbvlwdyr89vy")))) "14jr1psx5kxywdprgbqn79w309yz8lrqlsq7288hfrf87gbr1wh4"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)

69
gnu/packages/gnome.scm
View file

@ -1397,7 +1397,7 @@ library.")
(define-public librsvg-next (define-public librsvg-next
(package (package
(name "librsvg") (name "librsvg")
(version "2.44.12") (version "2.46.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -1405,7 +1405,7 @@ library.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6")))) "1la3az2af2ccm6rp86b6wh0kq7kxzl4n8pli5qxhyic1rd91xj4n"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -1423,6 +1423,7 @@ library.")
(lambda _ (lambda _
(for-each patch-shebang '("tap-driver.sh" "tap-test")) (for-each patch-shebang '("tap-driver.sh" "tap-test"))
(patch-/usr/bin/file "configure") (patch-/usr/bin/file "configure")
(patch-makefile-SHELL "po/Makefile.in.in")
#t)) #t))
(add-before 'configure 'pre-configure (add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -1460,9 +1461,9 @@ library.")
#t))))) #t)))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
;; This is the minimum supported Rust version in Librsvg 2.44. ;; This is the minimum supported Rust version in Librsvg 2.46.
("rust" ,rust-1.27) ("rust" ,rust-1.34)
("cargo" ,rust-1.27 "cargo") ("cargo" ,rust-1.34 "cargo")
("vala" ,vala) ("vala" ,vala)
("glib" ,glib "bin") ; glib-mkenums, etc. ("glib" ,glib "bin") ; glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
@ -2428,7 +2429,10 @@ selection and URL hints.")))
"10jya3jyrm18nbw3v410gbkc7677bqamax44pzgd3j15randn76d")))) "10jya3jyrm18nbw3v410gbkc7677bqamax44pzgd3j15randn76d"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
'(#:phases ;; Disable -Werror and such, to avoid build failures on compilation
;; warnings.
'(#:configure-flags '("--enable-compile-warnings=minimum")
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'install 'skip-gtk-update-icon-cache (add-before 'install 'skip-gtk-update-icon-cache
(lambda _ (lambda _
@ -2687,7 +2691,7 @@ libxml to ease remote use of the RESTful API.")
(define-public libsoup (define-public libsoup
(package (package
(name "libsoup") (name "libsoup")
(version "2.66.2") (version "2.68.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/libsoup/" (uri (string-append "mirror://gnome/sources/libsoup/"
@ -2695,7 +2699,7 @@ libxml to ease remote use of the RESTful API.")
"libsoup-" version ".tar.xz")) "libsoup-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx")))) "0crr9qprmacr626fx83cx81ggk85zsgxr4mn577kpzj6m40k1bai"))))
(build-system meson-build-system) (build-system meson-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
@ -2703,7 +2707,7 @@ libxml to ease remote use of the RESTful API.")
(guix build meson-build-system) (guix build meson-build-system)
(ice-9 popen)) (ice-9 popen))
#:configure-flags '("-Ddoc=true") #:configure-flags '("-Dgtk_doc=true")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'adjust-tests (add-after 'unpack 'adjust-tests
@ -2713,6 +2717,16 @@ libxml to ease remote use of the RESTful API.")
(substitute* "tests/socket-test.c" (substitute* "tests/socket-test.c"
((".*/sockets/unconnected.*") "")) ((".*/sockets/unconnected.*") ""))
;; These fail because "subdomain.localhost" does not resolve in
;; the build environment.
(substitute* "tests/hsts-test.c"
((".*/hsts/basic.*") "")
((".*/hsts/subdomains.*") "")
((".*/hsts/superdomain.*") "")
((".*/hsts/utf8-address.*") ""))
(substitute* "tests/hsts-db-test.c"
((".*/hsts-db/subdomains.*") ""))
;; Generate a self-signed certificate that has "localhost" as its ;; Generate a self-signed certificate that has "localhost" as its
;; 'dnsName'. Failing to do that, and starting with GnuTLS ;; 'dnsName'. Failing to do that, and starting with GnuTLS
;; 3.5.12, tests such as "ssl-tests" fail: ;; 3.5.12, tests such as "ssl-tests" fail:
@ -2781,10 +2795,12 @@ libxml to ease remote use of the RESTful API.")
("httpd" ,httpd))) ("httpd" ,httpd)))
(propagated-inputs (propagated-inputs
;; libsoup-2.4.pc refers to all these. ;; libsoup-2.4.pc refers to all these.
`(("glib" ,glib) `(("brotli" ,google-brotli)
("glib" ,glib)
("libpsl" ,libpsl) ("libpsl" ,libpsl)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("sqlite" ,sqlite))) ("sqlite" ,sqlite)
("zlib" ,zlib)))
(inputs (inputs
`(("glib-networking" ,glib-networking) `(("glib-networking" ,glib-networking)
("mit-krb5" ,mit-krb5))) ("mit-krb5" ,mit-krb5)))
@ -3392,15 +3408,15 @@ which are easy to play with the aid of a mouse.")
(define-public amtk (define-public amtk
(package (package
(name "amtk") (name "amtk")
(version "5.0.0") (version "5.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/amtk/"
(version-major+minor version) "/" (version-major+minor version) "/"
name "-" version ".tar.xz")) "amtk-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1zriix7bdwcg0868mfc7jy6zbwjwdmjwbh0ah6dbddrhiabrda8j")))) "09yy95w1s83c43mh9vha1jbb780yighf5pd2j0ygjmc68sjg871d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--enable-gtk-doc"))) '(#:configure-flags '("--enable-gtk-doc")))
@ -4131,7 +4147,7 @@ supports image conversion, rotation, and slideshows.")
;; 'XDG_DATA_DIRS' appropriately set. ;; 'XDG_DATA_DIRS' appropriately set.
(package (package
(name "eog-plugins") (name "eog-plugins")
(version "3.26.3") (version "3.26.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/eog-plugins/" (uri (string-append "mirror://gnome/sources/eog-plugins/"
@ -4139,7 +4155,7 @@ supports image conversion, rotation, and slideshows.")
"eog-plugins-" version ".tar.xz")) "eog-plugins-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"06fnjs2p18ad5vk07z685cx26sc7d3azywss00w9xvz794b2i1g3")))) "0pd7fqa4ciy5844k5s1c6rlsqkk8pxd8cchxjcjhxlsngm9lynnx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://wiki.gnome.org/Apps/EyeOfGnome/Plugins") (home-page "https://wiki.gnome.org/Apps/EyeOfGnome/Plugins")
(synopsis "Extensions for the Eye of GNOME image viewer") (synopsis "Extensions for the Eye of GNOME image viewer")
@ -4623,6 +4639,17 @@ lifting is done by packages like yelp-xsl and itstool. This package just
wraps things up in a developer-friendly way.") wraps things up in a developer-friendly way.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public yelp-tools/fixed
;; This variant fixes a python-libxml2 crash when processing UTF-8
;; sequences: <https://bugs.gnu.org/37468>. TODO: Remove this in
;; the next rebuild cycle.
(hidden-package
(package/inherit
yelp-tools
(propagated-inputs
`(("itstool" ,itstool/fixed)
,@(alist-delete "itstool" (package-propagated-inputs yelp-tools)))))))
(define-public libgee (define-public libgee
(package (package
(name "libgee") (name "libgee")
@ -4695,15 +4722,15 @@ metadata in photo and video files of various formats.")
(define-public shotwell (define-public shotwell
(package (package
(name "shotwell") (name "shotwell")
(version "0.30.4") (version "0.30.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/shotwell/"
(version-major+minor version) "/" (version-major+minor version) "/"
name "-" version ".tar.xz")) "shotwell-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1yiz3j0y2yg6985y3alb3hpkfbv68n8ibys5gpwcjdhmhf3czg5p")))) "1m9i8r4gyd2hzlxjjwfyck4kz7gdg2vz2k6l6d0ga9hdfq2l4p9l"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:glib-or-gtk? #t)) '(#:glib-or-gtk? #t))

15
gnu/packages/gnupg.scm
View file

@ -14,7 +14,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -111,6 +111,7 @@ Daemon and possibly more in the future.")
(package (package
(name "libgcrypt") (name "libgcrypt")
(version "1.8.4") (version "1.8.4")
(replacement libgcrypt-1.8.5)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
@ -143,6 +144,18 @@ generation.")
(properties '((ftp-server . "ftp.gnupg.org") (properties '((ftp-server . "ftp.gnupg.org")
(ftp-directory . "/gcrypt/libgcrypt"))))) (ftp-directory . "/gcrypt/libgcrypt")))))
(define-public libgcrypt-1.8.5
(package
(inherit libgcrypt)
(version "1.8.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
version ".tar.bz2"))
(sha256
(base32
"1hvsazms1bfd769q0ngl0r9g5i4m9mpz9jmvvrdzyzk3rfa2ljiv"))))))
(define-public libassuan (define-public libassuan
(package (package
(name "libassuan") (name "libassuan")

4
gnu/packages/gpodder.scm
View file

@ -37,7 +37,7 @@
(define-public gpodder (define-public gpodder
(package (package
(name "gpodder") (name "gpodder")
(version "3.10.10") (version "3.10.11")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -46,7 +46,7 @@
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"1phgd3xly6ddrxpx5glgfs1ya4xq2qbcx5d9l3d6i4dlhji1dmja")) "15f5z3cnch9lpzbz73l4wjykv9n74y8djz5db53la2ql4ihaxfz9"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs

116
gnu/packages/installers.scm Normal file
View file

@ -0,0 +1,116 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Carl Dong <contact@carldong.me>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages installers)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages cross-base)
#:use-module (gnu packages python-xyz)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system scons)
#:use-module (guix utils))
(define (make-nsis machine target-arch nsis-target-type)
(let ((triplet (string-append machine "-" "w64-mingw32")))
(package
(name (string-append "nsis-" machine))
(version "3.04")
(source (origin
(method url-fetch)
(uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-"
version "-src.tar.bz2"))
(sha256
(base32
"1xgllk2mk36ll2509hd31mfq6blgncmdzmwxj3ymrwshdh23d5b0"))
(patches (search-patches "nsis-env-passthru.patch"))))
(build-system scons-build-system)
(native-inputs `(("xgcc" ,(cross-gcc triplet #:libc (cross-libc triplet)))
("xbinutils" ,(cross-binutils triplet))
("mingw-w64" ,(cross-libc triplet))))
(inputs `(("zlib" ,zlib)))
(arguments
`(#:scons ,scons-python2
#:modules ((srfi srfi-1)
(guix build utils)
(guix build scons-build-system))
#:tests? #f
#:scons-flags `("UNICODE=yes"
"SKIPUTILS=MakeLangId,Makensisw,NSIS Menu,SubStart,zip2exe"
"SKIPDOC=COPYING"
"STRIP_CP=no"
,(string-append "PREFIX=" %output)
,(string-append "TARGET_ARCH=" ,target-arch)
,(string-append "XGCC_W32_PREFIX=" ,triplet "-")
,(string-append "PREFIX_PLUGINAPI_INC=" (assoc-ref %build-inputs "mingw-w64") "/include/")
,(string-append "PREFIX_PLUGINAPI_LIB=" (assoc-ref %build-inputs "mingw-w64") "/lib/"))
#:build-targets '("makensis"
"stubs"
"plugins"
"utils")
#:install-targets '("install-stubs"
"install-plugins"
"install-data"
"install-utils"
"install-compiler"
"install-conf")
#:phases (modify-phases %standard-phases
(add-before 'build 'fix-env
(lambda _
(define* (filter-delimited-string delimited-string predicate #:optional (delimiter #\:))
;; Given a DELIMITED-STRING delimited by DELIMITER,
;; only keep items that satisfy PREDICATE
(string-join
(filter predicate (string-split delimited-string delimiter))
(string delimiter)))
(define (mingw-path? path)
(string-prefix? (assoc-ref %build-inputs "mingw-w64") path))
(for-each
(lambda (env-name)
(let ((env-val (getenv env-name)))
;; Remove all mingw-w64 paths from env vars meant
;; for native toolchain
(setenv env-name
(filter-delimited-string env-val (negate mingw-path?)))
;; Add the removed paths back into
;; CROSS_-prefixed version of env vars
(setenv (string-append "CROSS_" env-name)
(filter-delimited-string env-val mingw-path?))))
'("CPLUS_INCLUDE_PATH" "LIBRARY_PATH" "C_INCLUDE_PATH"))))
(add-before 'build 'fix-target-detection
(lambda _
;; NSIS target detection is screwed up, manually
;; change it ourselves
(substitute* "Source/build.cpp" (("m_target_type=TARGET_X86ANSI")
(string-append "m_target_type=" ,nsis-target-type))))))))
(home-page "http://nsis.sourceforge.net/")
(synopsis "A professional open source system to create Windows installers")
(description
"NSIS (Nullsoft Scriptable Install System) is a professional open
source system to create Windows installers. It is designed to be as small and
flexible as possible and is therefore very suitable for internet
distribution.")
(license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution.")))))
(define-public nsis-x86_64
(make-nsis "x86_64" "amd64" "TARGET_AMD64"))
(define-public nsis-i686
(make-nsis "i686" "x86" "TARGET_X86UNICODE"))

4
gnu/packages/jupyter.scm
View file

@ -118,9 +118,7 @@ launching and using Jupyter kernels.")
(replace 'install (replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(version ((@@ (guix build python-build-system) (version (python-version (assoc-ref inputs "python")))
get-python-version)
(assoc-ref inputs "python")))
(pydir (string-append out "/lib/python" (pydir (string-append out "/lib/python"
version "/site-packages/" version "/site-packages/"
"jupyter_kernel_test"))) "jupyter_kernel_test")))

4
gnu/packages/kodi.scm
View file

@ -271,7 +271,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
(define-public kodi (define-public kodi
(package (package
(name "kodi") (name "kodi")
(version "18.3") (version "18.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -280,7 +280,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"18fbl5hs3aqccrn0m3x7hp95wlafjav0yvrwmb5q3gj24mwf6jld")) "1m0295czxabdcqyqf5m94av9d88pzhnzjvyfs1q07xqq82h313p7"))
(patches (search-patches "kodi-skip-test-449.patch" (patches (search-patches "kodi-skip-test-449.patch"
"kodi-set-libcurl-ssl-parameters.patch")) "kodi-set-libcurl-ssl-parameters.patch"))
(snippet (snippet

31
gnu/packages/linux.scm
View file

@ -1090,7 +1090,7 @@ providing the system administrator with some help in common tasks.")
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"static")) ; >2 MiB of static .a libraries "static")) ;>2 MiB of static .a libraries
(arguments (arguments
`(#:configure-flags (list "--disable-use-tty-group" `(#:configure-flags (list "--disable-use-tty-group"
"--enable-fs-paths-default=/run/current-system/profile/sbin" "--enable-fs-paths-default=/run/current-system/profile/sbin"
@ -1102,8 +1102,7 @@ providing the system administrator with some help in common tasks.")
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/etc/bash_completion.d")) "/etc/bash_completion.d"))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before (add-before 'build 'set-umount-file-name
'build 'set-umount-file-name
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Tell 'eject' the right file name of 'umount'. ;; Tell 'eject' the right file name of 'umount'.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
@ -1111,8 +1110,7 @@ providing the system administrator with some help in common tasks.")
(("\"/bin/umount\"") (("\"/bin/umount\"")
(string-append "\"" out "/bin/umount\""))) (string-append "\"" out "/bin/umount\"")))
#t))) #t)))
(add-before (add-before 'check 'pre-check
'check 'pre-check
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(net (assoc-ref inputs "net-base"))) (net (assoc-ref inputs "net-base")))
@ -1121,8 +1119,7 @@ providing the system administrator with some help in common tasks.")
(("/etc/services") (("/etc/services")
(string-append net "/etc/services"))) (string-append net "/etc/services")))
#t))) #t)))
(add-after (add-after 'install 'move-static-libraries
'install 'move-static-libraries
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(static (assoc-ref outputs "static"))) (static (assoc-ref outputs "static")))
@ -1279,7 +1276,7 @@ slabtop, and skill.")
(define-public e2fsprogs (define-public e2fsprogs
(package (package
(name "e2fsprogs") (name "e2fsprogs")
(version "1.45.2") (version "1.45.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1288,7 +1285,7 @@ slabtop, and skill.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"02g0cm72sgz709s9pkg4mvj56m7bgs7rwnyc2cp7cvg3j6pcjlj9")))) "00nwl1ppjalxbnx40dsm895r3q793p8nni6n81saj7faj2szdyk5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("util-linux" ,util-linux))) (inputs `(("util-linux" ,util-linux)))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
@ -1459,18 +1456,15 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
(define-public strace (define-public strace
(package (package
(name "strace") (name "strace")
(version "5.2") (version "5.3")
(home-page "https://strace.io") (home-page "https://strace.io")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append home-page "/files/" version (uri (string-append home-page "/files/" version
"/strace-" version ".tar.xz")) "/strace-" version ".tar.xz"))
;; XXX Remove the 'regenerate-tests' phase below when
;; "strace-ipc-tests.patch" is no longer applied.
(patches (search-patches "strace-ipc-tests.patch"))
(sha256 (sha256
(base32 (base32
"1li49i75wrdw91hchyyd8spnzfcmxcfyfb5g9zbaza89aq4bq4ym")))) "0ix06z4vnc49mv76f22kixz8dsh7daqv9mpgwcgl0mlnfjc124vc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -1479,14 +1473,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.")
(lambda _ (lambda _
(substitute* "strace.c" (substitute* "strace.c"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
#t)) #t)))
(add-before 'configure 'regenerate-tests
;; XXX Remove this phase when "strace-ipc-tests.patch" is no longer
;; applied in the 'source' field above. This phase is needed to
;; regenerate many other files from tests/gen_tests.in, which is
;; modified by the aforementioned patch.
(lambda _
(invoke "tests/gen_tests.sh"))))
;; Don't fail if the architecture doesn't support different personalities. ;; Don't fail if the architecture doesn't support different personalities.
#:configure-flags '("--enable-mpers=check") #:configure-flags '("--enable-mpers=check")
;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32459>. ;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32459>.

22
gnu/packages/machine-learning.scm
View file

@ -109,9 +109,9 @@
(home-page "http://leenissen.dk/fann/wp/") (home-page "http://leenissen.dk/fann/wp/")
(synopsis "Fast Artificial Neural Network") (synopsis "Fast Artificial Neural Network")
(description (description
"FANN is a free open source neural network library, which implements "FANN is a neural network library, which implements multilayer
multilayer artificial neural networks in C with support for both fully artificial neural networks in C with support for both fully connected and
connected and sparsely connected networks.") sparsely connected networks.")
(license license:lgpl2.1)))) (license license:lgpl2.1))))
(define-public libsvm (define-public libsvm
@ -794,7 +794,7 @@ computing environments.")
(define-public python-scikit-learn (define-public python-scikit-learn
(package (package
(name "python-scikit-learn") (name "python-scikit-learn")
(version "0.20.3") (version "0.20.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -804,7 +804,7 @@ computing environments.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"08aaby5zphfxy83mggg35bwyka7wk91l2qijh8kk0bl08dikq8dl")))) "08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1306,12 +1306,12 @@ Python.")
("python" ,python-wrapper))) ("python" ,python-wrapper)))
(home-page "https://grpc.io") (home-page "https://grpc.io")
(synopsis "High performance universal RPC framework") (synopsis "High performance universal RPC framework")
(description "gRPC is a modern open source high performance @dfn{Remote (description "gRPC is a modern high performance @dfn{Remote Procedure Call}
Procedure Call} (RPC) framework that can run in any environment. It can (RPC) framework that can run in any environment. It can efficiently connect
efficiently connect services in and across data centers with pluggable support services in and across data centers with pluggable support for load balancing,
for load balancing, tracing, health checking and authentication. It is also tracing, health checking and authentication. It is also applicable in last
applicable in last mile of distributed computing to connect devices, mobile mile of distributed computing to connect devices, mobile applications and
applications and browsers to backend services.") browsers to backend services.")
(license license:asl2.0))) (license license:asl2.0)))
;; Note that Tensorflow includes a "third_party" directory, which seems to not ;; Note that Tensorflow includes a "third_party" directory, which seems to not

8
gnu/packages/mail.scm
View file

@ -140,14 +140,14 @@
(define-public mailutils (define-public mailutils
(package (package
(name "mailutils") (name "mailutils")
(version "3.6") (version "3.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/mailutils/mailutils-" (uri (string-append "mirror://gnu/mailutils/mailutils-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"07phzpwrnkdclx6jvirljk9zcavl8wh02kpx3mfba9msr99kpqj6")))) "1gwajsl39f1dkzrjld0dm9px8hrj7l7rwzazz00h5rwghk9mhwhq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -1919,7 +1919,7 @@ Authentication-Results header seen in the wild.")
(define-public perl-mail-dkim (define-public perl-mail-dkim
(package (package
(name "perl-mail-dkim") (name "perl-mail-dkim")
(version "0.55") (version "0.57")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1928,7 +1928,7 @@ Authentication-Results header seen in the wild.")
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"18nsh1ff6fkns4xk3y2ixmzmadgggydj11qkzj6nlnq2hzqxsafz")))) "0fmfhwn4sh98w62rc8j584l23vlhr7vii8glm2njx14f81a56lvb"))))
(build-system perl-build-system) (build-system perl-build-system)
(propagated-inputs (propagated-inputs
`(("perl-crypt-openssl-rsa" ,perl-crypt-openssl-rsa) `(("perl-crypt-openssl-rsa" ,perl-crypt-openssl-rsa)

4
gnu/packages/mate.scm
View file

@ -565,7 +565,7 @@ assorted menu related utility programs.")
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("intltool" ,intltool) ("intltool" ,intltool)
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("yelp-tools" ,yelp-tools) ("yelp-tools" ,yelp-tools/fixed)
("scrollkeeper" ,scrollkeeper) ("scrollkeeper" ,scrollkeeper)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("docbook-xml" ,docbook-xml) ("docbook-xml" ,docbook-xml)
@ -1279,7 +1279,7 @@ can be used as backgrounds in the MATE Desktop environment.")
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("scrollkeeper" ,scrollkeeper) ("scrollkeeper" ,scrollkeeper)
("xorgproto" ,xorgproto) ("xorgproto" ,xorgproto)
("yelp-tools" ,yelp-tools))) ("yelp-tools" ,yelp-tools/fixed)))
(inputs (inputs
`(("atk" ,atk) `(("atk" ,atk)
("cairo" ,cairo) ("cairo" ,cairo)

6
gnu/packages/maths.scm
View file

@ -4305,9 +4305,9 @@ reduction.")
(version "201908.0") (version "201908.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.mcrl2.org/download/devel/mcrl2-" (uri (string-append
version "https://www.mcrl2.org/download/release/mcrl2-"
".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1i4xgl2d5fgiz1mwi50cyfkrrcpm8nxfayfjgmhq7chs58wlhfsz")))) "1i4xgl2d5fgiz1mwi50cyfkrrcpm8nxfayfjgmhq7chs58wlhfsz"))))

27
gnu/packages/mes.scm
View file

@ -159,16 +159,16 @@ Guile.")
(version "0.5.2")) (version "0.5.2"))
(package (package
(name "mescc-tools") (name "mescc-tools")
(version (string-append version "-" revision "." (string-take commit 7))) (version (git-version version revision commit))
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/" (url "https://git.savannah.nongnu.org/r/mescc-tools.git")
name "-" commit (commit commit)))
".tar.gz")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1h6j57wyf91i42b26f8msbv6451cw3nm4nmpl1fckp9c7vi8mwkh")))) "1nc6rnax66vmhqsjg0kgx23pihdcxmww6v325ywf59vsq1jqjvff"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(arguments (arguments
@ -191,15 +191,14 @@ get_machine.")
(name "mescc-tools") (name "mescc-tools")
(version "0.6.1") (version "0.6.1")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/" (url "https://git.savannah.nongnu.org/r/mescc-tools.git")
name "-Release_" version (commit (string-append "Release_" version))))
".tar.gz")) (file-name (string-append "mescc-tools-" version "-checkout"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"06jpvq6xfjzn2al6b4rdwd3zv3h4cvilc4n9gqcnjr9cr6wjpw2n")))) "1cgxcdza6ws725x84i31la7jxmlk5a3nsij5shz1zljg0i36kj99"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments mescc-tools-0.5.2) (substitute-keyword-arguments (package-arguments mescc-tools-0.5.2)
((#:make-flags _) ((#:make-flags _)

5
gnu/packages/mp3.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2017, 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -123,7 +123,8 @@ versions of ID3v2.")
(modules '((guix build utils))) (modules '((guix build utils)))
;; Don't use bundled zlib ;; Don't use bundled zlib
(snippet '(begin (delete-file-recursively "zlib") #t)) (snippet '(begin (delete-file-recursively "zlib") #t))
(patches (search-patches "id3lib-CVE-2007-4460.patch")))) (patches (search-patches "id3lib-CVE-2007-4460.patch"
"id3lib-UTF16-writing-bug.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
(arguments (arguments

4
gnu/packages/mpi.scm
View file

@ -161,7 +161,7 @@ bind processes, and much more.")
(define-public openmpi (define-public openmpi
(package (package
(name "openmpi") (name "openmpi")
(version "4.0.1") (version "4.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -169,7 +169,7 @@ bind processes, and much more.")
(version-major+minor version) (version-major+minor version)
"/downloads/openmpi-" version ".tar.bz2")) "/downloads/openmpi-" version ".tar.bz2"))
(sha256 (sha256
(base32 "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc")))) (base32 "0ms0zvyxyy3pnx9qwib6zaljyp2b3ixny64xvq3czv3jpr8zf2wh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("hwloc" ,hwloc "lib") `(("hwloc" ,hwloc "lib")

63
gnu/packages/music.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2016 Al McElrath <hello@yrns.org> ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
@ -11,7 +11,7 @@
;;; Copyright © 2017 ng0 <ng0@n0.is> ;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017 Rodger Fox <thylakoid@openmailbox.org> ;;; Copyright © 2017 Rodger Fox <thylakoid@openmailbox.org>
;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017, 2018 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2017, 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 nee <nee.git@hidamari.blue> ;;; Copyright © 2018 nee <nee.git@hidamari.blue>
@ -593,12 +593,17 @@ enable professional yet simple and intuitive pattern-based drum programming.")
"prefix=~@*~a~@ "prefix=~@*~a~@
libdir=${prefix}/lib~@ libdir=${prefix}/lib~@
includedir=${prefix}/include~@ includedir=${prefix}/include~@
Name: libid3tag~@
Description:~@
Version:~@
Libs: -L${libdir} -lid3tag -lz~@ Libs: -L${libdir} -lid3tag -lz~@
Cflags: -I${includedir}~%" Cflags: -I${includedir}~%"
libid3tag))) libid3tag)))
(setenv "PKG_CONFIG_PATH" (setenv "PKG_CONFIG_PATH"
(string-append (getenv "PKG_CONFIG_PATH") (string-append (getenv "PKG_CONFIG_PATH")
":" (getcwd) "/pkgconfig"))))) ":" (getcwd) "/pkgconfig"))
#t)))
(add-after 'unpack 'patch-makefile (add-after 'unpack 'patch-makefile
(lambda _ (lambda _
(substitute* "Makefile.in" (substitute* "Makefile.in"
@ -606,7 +611,8 @@ enable professional yet simple and intuitive pattern-based drum programming.")
;; script with /bin/sh hard-coded. ;; script with /bin/sh hard-coded.
(("/bin/sh") (which "sh")) (("/bin/sh") (which "sh"))
;; Don't create 'icon-theme.cache'. ;; Don't create 'icon-theme.cache'.
(("gtk-update-icon-cache") "true"))))))) (("gtk-update-icon-cache") "true"))
#t)))))
(home-page "https://wiki.gnome.org/Apps/EasyTAG") (home-page "https://wiki.gnome.org/Apps/EasyTAG")
(synopsis "Simple application for viewing and editing tags in audio files") (synopsis "Simple application for viewing and editing tags in audio files")
(description (description
@ -4622,3 +4628,52 @@ easier to perform. Features include:
@item Adjust tempo; Playback speed of loops can be adjusted on the fly. @item Adjust tempo; Playback speed of loops can be adjusted on the fly.
@end itemize\n") @end itemize\n")
(license license:gpl2)))) (license license:gpl2))))
(define-public pragha
(package
(name "pragha")
(version "1.3.4")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/pragha-music-player/pragha/"
"releases/download/v" version "/pragha-" version
".tar.bz2"))
(sha256
(base32
"19kbhq99bkimx3aqrdzln0vlr4slkpx6kq66j731jvqyq76nlkp5"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("glib" ,glib)
("grilo" ,grilo)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good)
("gtk+" ,gtk+)
("libcddb" ,libcddb)
("libcdio" ,libcdio)
("libcdio-paranoia" ,libcdio-paranoia)
("libgudev" ,libgudev)
("libnotify" ,libnotify)
("libpeas" ,libpeas)
("libsoup" ,libsoup)
("sqlite" ,sqlite)
("taglib" ,taglib)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
(wrap-program (string-append out "/bin/pragha")
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))
#t))))))
(home-page "https://pragha-music-player.github.io")
(synopsis "Music player")
(description "Pragha is a lightweight music player based on Gtk and
sqlite. It is constructed to be fast, light, and simultaneously tries to be
complete without obstructing your daily work.")
(license license:gpl3+)))

5
gnu/packages/networking.scm
View file

@ -551,14 +551,15 @@ and up to 1 Mbit/s downstream.")
(define-public whois (define-public whois
(package (package
(name "whois") (name "whois")
(version "5.5.1") (version "5.5.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://debian/pool/main/w/whois/" (uri (string-append "mirror://debian/pool/main/w/whois/"
"whois_" version ".tar.xz")) "whois_" version ".tar.xz"))
(sha256 (sha256
(base32 "10mc7iqhdnvd1kk8gnnhihd5ga2rw3sz69n3nd6x8fb65qpq13gf")))) (base32
"1h55zs3cj4w9b0hq0x3z7s2mn46v0jyc39gz320ra4hwr0xlsnf0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no test suite `(#:tests? #f ; no test suite

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

@ -110,8 +110,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to ;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this. ;; start precisely like this.
(let ((version "1.0.1") (let ((version "1.0.1")
(commit "0ed97e69805253656df929a6ad678016aa81f08a") (commit "fc1fe722a05318ac05a71a0b127f231631e2843f")
(revision 6)) (revision 7))
(package (package
(name "guix") (name "guix")
@ -127,7 +127,7 @@
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1h2qlbbdqi72jslx17gp2cak5494nbm8j44rz57lnplnfcn6iwaw")) "0yx19hxvmkr6ar65ym87xd83n6hz02mr7ibwis7i8wah85ypfq26"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -175,23 +175,32 @@
(lambda* (#:key system inputs #:allow-other-keys) (lambda* (#:key system inputs #:allow-other-keys)
;; Copy the bootstrap guile tarball in the store used ;; Copy the bootstrap guile tarball in the store used
;; by the test suite. ;; by the test suite.
(define (intern tarball) (define (intern file recursive?)
(let ((base (strip-store-file-name tarball))) (let ((base (strip-store-file-name file)))
(copy-file tarball base) ;; Note: don't use 'guix download' here because we
(invoke "./test-env" "guix" "download" ;; need to set the 'recursive?' argument.
(string-append "file://" (getcwd) (invoke "./test-env" "guile" "-c"
"/" base)) (object->string
(delete-file base))) `(begin
(use-modules (guix))
(with-store store
(add-to-store store ,base ,recursive?
"sha256" ,file)))))))
(intern (assoc-ref inputs "boot-guile") #f)
(intern (assoc-ref inputs "boot-guile"))
;; On x86_64 some tests need the i686 Guile. ;; On x86_64 some tests need the i686 Guile.
,@(if (and (not (%current-target-system)) ,@(if (and (not (%current-target-system))
(string=? (%current-system) (string=? (%current-system)
"x86_64-linux")) "x86_64-linux"))
'((intern (assoc-ref inputs "boot-guile/i686"))) '((intern (assoc-ref inputs "boot-guile/i686") #f))
'()) '())
;; Copy the bootstrap executables.
(for-each (lambda (input)
(intern (assoc-ref inputs input) #t))
'("bootstrap/bash" "bootstrap/mkdir"
"bootstrap/tar" "bootstrap/xz"))
#t)) #t))
(add-after 'unpack 'disable-failing-tests (add-after 'unpack 'disable-failing-tests
;; XXX FIXME: These tests fail within the build container. ;; XXX FIXME: These tests fail within the build container.
@ -278,16 +287,23 @@
("guile" ,guile-2.2) ("guile" ,guile-2.2)
;; Some of the tests use "unshare" when it is available.
("util-linux" ,util-linux)
;; Many tests rely on the 'guile-bootstrap' package, which is why we ;; Many tests rely on the 'guile-bootstrap' package, which is why we
;; have it here. ;; have it here.
("boot-guile" ,(bootstrap-guile-origin (%current-system))) ("boot-guile" ,(bootstrap-guile-origin (%current-system)))
;; Some of the tests use "unshare" when it is available.
("util-linux" ,util-linux)
,@(if (and (not (%current-target-system)) ,@(if (and (not (%current-target-system))
(string=? (%current-system) "x86_64-linux")) (string=? (%current-system) "x86_64-linux"))
`(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux"))) `(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux")))
'()) '())
;; Tests also rely on these bootstrap executables.
("bootstrap/bash" ,(bootstrap-executable "bash" (%current-system)))
("bootstrap/mkdir" ,(bootstrap-executable "mkdir" (%current-system)))
("bootstrap/tar" ,(bootstrap-executable "tar" (%current-system)))
("bootstrap/xz" ,(bootstrap-executable "xz" (%current-system)))
("glibc-utf8-locales" ,glibc-utf8-locales))) ("glibc-utf8-locales" ,glibc-utf8-locales)))
(propagated-inputs (propagated-inputs
`(("gnutls" ,gnutls) `(("gnutls" ,gnutls)
@ -770,6 +786,90 @@ on top of GNU Guix.")
;; and the fonts included in this package are licensed OFL1.1. ;; and the fonts included in this package are licensed OFL1.1.
(license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-jupyter
(package
(name "guix-jupyter")
(version "0.1.0")
(home-page "https://gitlab.inria.fr/guix-hpc/guix-kernel")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page)
(commit (string-append "v" version))))
(sha256
(base32
"01z7jjkc7r7lj6637rcgpz40v8xqqyfp6871h94yvcnwm7zy9h1n"))
(file-name (string-append "guix-jupyter-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((srfi srfi-26)
(ice-9 match)
(ice-9 popen)
(ice-9 rdelim)
(guix build utils)
(guix build gnu-build-system))
#:phases
(modify-phases %standard-phases
(add-after 'install 'sed-kernel-json
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(guix (assoc-ref inputs "guix"))
(guile (assoc-ref inputs "guile"))
(json (assoc-ref inputs "guile-json"))
(git (assoc-ref inputs "guile-git"))
(bs (assoc-ref inputs "guile-bytestructures"))
(s-zmq (assoc-ref inputs "guile-simple-zmq"))
(gcrypt (assoc-ref inputs "guile-gcrypt"))
(deps (list out s-zmq guix json git bs gcrypt))
(effective
(read-line
(open-pipe* OPEN_READ
(string-append guile "/bin/guile")
"-c" "(display (effective-version))")))
(path (map (cut string-append "-L\", \"" <>
"/share/guile/site/"
effective)
deps))
(gopath (map (cut string-append "-C\", \"" <>
"/lib/guile/" effective
"/site-ccache")
deps))
(kernel-dir (string-append out "/share/jupyter/kernels/guix/")))
(substitute* (string-append kernel-dir "kernel.json")
(("-s")
(string-join
(list (string-join path "\",\n\t\t\"")
(string-join gopath "\",\n\t\t\"")
"-s")
"\",\n\t\t\""))
(("guix-jupyter-kernel.scm")
(string-append out "/share/guile/site/2.2/"
"guix-jupyter-kernel.scm")))
#t))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)
;; For testing.
("jupyter" ,jupyter)
("python-ipython" ,python-ipython)
("python-ipykernel" ,python-ipykernel)))
(inputs
`(("guix" ,guix)
("guile" ,guile-2.2)))
(propagated-inputs
`(("guile-json" ,guile-json-3)
("guile-simple-zmq" ,guile-simple-zmq)
("guile-gcrypt" ,guile-gcrypt)))
(synopsis "Guix kernel for Jupyter")
(description
"Guix-Jupyter is a Jupyter kernel. It allows you to annotate notebooks
with information about their software dependencies, such that code is executed
in the right software environment. Guix-Jupyter spawns the actual kernels
such as @code{python-ipykernel} on behalf of the notebook user and runs them
in an isolated environment, in separate namespaces.")
(license license:gpl3+)))
(define-public gcab (define-public gcab
(package (package
(name "gcab") (name "gcab")

39
gnu/packages/patches/id3lib-UTF16-writing-bug.patch Normal file
View file

@ -0,0 +1,39 @@
diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
--- id3lib-3.8.3.orig/ChangeLog 2003-03-02 01:23:00.000000000 +0100
+++ id3lib-3.8.3/ChangeLog 2006-02-22 00:33:59.946214472 +0100
@@ -1,3 +1,8 @@
+2006-02-17 Jerome Couderc
+
+ * Patch from Spoon to fix UTF-16 writing bug
+ http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
+
2003-03-02 Sunday 17:38 Thijmen Klok <thijmen@id3lib.org>
* THANKS (1.20): added more people
diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp
--- id3lib-3.8.3.orig/src/io_helpers.cpp 2003-03-02 01:23:00.000000000 +0100
+++ id3lib-3.8.3/src/io_helpers.cpp 2006-02-22 00:35:02.926639992 +0100
@@ -363,11 +363,22 @@
// Write the BOM: 0xFEFF
unicode_t BOM = 0xFEFF;
writer.writeChars((const unsigned char*) &BOM, 2);
+ // Patch from Spoon : 2004-08-25 14:17
+ // http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
+ // Wrong code
+ //for (size_t i = 0; i < size; i += 2)
+ //{
+ // unicode_t ch = (data[i] << 8) | data[i+1];
+ // writer.writeChars((const unsigned char*) &ch, 2);
+ //}
+ // Right code
+ unsigned char *pdata = (unsigned char *) data.c_str();
for (size_t i = 0; i < size; i += 2)
{
- unicode_t ch = (data[i] << 8) | data[i+1];
+ unicode_t ch = (pdata[i] << 8) | pdata[i+1];
writer.writeChars((const unsigned char*) &ch, 2);
}
+ // End patch
}
return writer.getCur() - beg;
}

12
gnu/packages/patches/nsis-env-passthru.patch Normal file
View file

@ -0,0 +1,12 @@
--- nsis-3.04-src/SConstruct 2019-05-30 14:53:30.276775332 -0400
+++ nsis-3.04-src/SConstruct 2019-05-30 14:54:17.901232914 -0400
@@ -77,6 +77,9 @@
if not toolset and not path:
defenv = Environment(TARGET_ARCH = arch)
+import os;
+defenv['ENV'] = os.environ
+
Export('defenv')
######################################################################

17
gnu/packages/patches/parted-glibc-compat.patch
View file

@ -1,17 +0,0 @@
Include <sys/sysmacros.h> for "major" and "minor".
Taken from upstream:
https://git.savannah.gnu.org/cgit/parted.git/commit/?id=ba5e0451b51c983e40afd123b6e0d3eddb55e610
diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index 31b98ab..7e86b51 100644
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -41,6 +41,7 @@
#include <sys/utsname.h> /* for uname() */
#include <scsi/scsi.h>
#include <assert.h>
+#include <sys/sysmacros.h>
#ifdef ENABLE_DEVICE_MAPPER
#include <libdevmapper.h>
#endif

30
gnu/packages/patches/strace-ipc-tests.patch
View file

@ -1,30 +0,0 @@
Fix a test failure on some systems.
Taken from upstream:
https://github.com/strace/strace/commit/4377e3a1535a0ec3a42da8a1366ad6943f4efa0e
diff --git a/tests/gen_tests.in b/tests/gen_tests.in
index 4a506b94c..4fdf4722c 100644
--- a/tests/gen_tests.in
+++ b/tests/gen_tests.in
@@ -168,16 +168,16 @@ ipc_msg-Xabbrev +ipc.sh -Xabbrev -a26
ipc_msg-Xraw +ipc.sh -Xraw -a16
ipc_msg-Xverbose +ipc.sh -Xverbose -a34
ipc_msgbuf-Xabbrev +ipc_msgbuf.test -Xabbrev
-ipc_msgbuf-Xraw +ipc_msgbuf.test -Xraw -a22
+ipc_msgbuf-Xraw +ipc_msgbuf.test -Xraw -a20
ipc_msgbuf-Xverbose +ipc_msgbuf.test -Xverbose
ipc_sem +ipc.sh -a29
ipc_sem-Xabbrev +ipc.sh -Xabbrev -a29
ipc_sem-Xraw +ipc.sh -Xraw -a19
ipc_sem-Xverbose +ipc.sh -Xverbose -a36
-ipc_shm +ipc.sh -a29
-ipc_shm-Xabbrev +ipc.sh -Xabbrev -a29
+ipc_shm +ipc.sh -a26
+ipc_shm-Xabbrev +ipc.sh -Xabbrev -a26
ipc_shm-Xraw +ipc.sh -Xraw -a19
-ipc_shm-Xverbose +ipc.sh -Xverbose -a36
+ipc_shm-Xverbose +ipc.sh -Xverbose -a34
kcmp -a22
kcmp-y -a22 -y -e trace=kcmp
kern_features -a16

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

@ -232,21 +232,18 @@ Python interface around SSH networking concepts.")
(define-public python-ecdsa (define-public python-ecdsa
(package (package
(name "python-ecdsa") (name "python-ecdsa")
(version "0.13") (version "0.13.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "ecdsa" version)) (uri (pypi-uri "ecdsa" version))
(sha256 (sha256
(base32 (base32 "0k9xxklf865g6x43gkfarwb25ffrkmpvkzkh71rylqx7cjq80g0n"))))
"1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4"))))
(build-system python-build-system) (build-system python-build-system)
(inputs (inputs
`(("openssl" ,openssl))) `(("openssl" ,openssl)))
(home-page (home-page "https://github.com/warner/python-ecdsa")
"https://github.com/warner/python-ecdsa") (synopsis "ECDSA cryptographic signature library (pure python)")
(synopsis
"ECDSA cryptographic signature library (pure python)")
(description (description
"This is an easy-to-use implementation of ECDSA cryptography (Elliptic "This is an easy-to-use implementation of ECDSA cryptography (Elliptic
Curve Digital Signature Algorithm), implemented purely in Python. With this Curve Digital Signature Algorithm), implemented purely in Python. With this

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

@ -2197,14 +2197,14 @@ somewhat intelligible.")
(define-public python-pyjwt (define-public python-pyjwt
(package (package
(name "python-pyjwt") (name "python-pyjwt")
(version "1.5.3") (version "1.7.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "PyJWT" version)) (uri (pypi-uri "PyJWT" version))
(sha256 (sha256
(base32 (base32
"1rxsg14i33vm2i6lz0my628108c81k43v10n4h3p0gx62xdyf2sh")) "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -7742,20 +7742,21 @@ Jupyter Notebook format and Python APIs for working with notebooks.")
(define-public python-bleach (define-public python-bleach
(package (package
(name "python-bleach") (name "python-bleach")
(version "1.4.3") (version "3.1.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "bleach" version)) (uri (pypi-uri "bleach" version))
(sha256 (sha256
(base32 (base32
"0jvg3jxrvnx7xmm9gj262v60ib452xlnwlb0navyp7jsvcd0d4qj")))) "1yhrgrhkln8bd6gn3imj69g1h4xqah9gaz9q26crqr6gmmvpzprz"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-html5lib" ,python-html5lib-0.9) `(("python-webencodings" ,python-webencodings)
("python-six" ,python-six))) ("python-six" ,python-six)))
(native-inputs (native-inputs
`(("python-nose" ,python-nose))) `(("python-pytest" ,python-pytest)
("python-pytest-runner" ,python-pytest-runner-2)))
(home-page "https://github.com/jsocol/bleach") (home-page "https://github.com/jsocol/bleach")
(synopsis "Whitelist-based HTML-sanitizing tool") (synopsis "Whitelist-based HTML-sanitizing tool")
(description "Bleach is an easy whitelist-based HTML-sanitizing tool.") (description "Bleach is an easy whitelist-based HTML-sanitizing tool.")
@ -10972,6 +10973,16 @@ hardware-accelerated multitouch applications.")
(base32 (base32
"0qc006986rb6bcbmiymwgcl1mns2jphr1j7sr7nk41nlr7gh359m")))) "0qc006986rb6bcbmiymwgcl1mns2jphr1j7sr7nk41nlr7gh359m"))))
(build-system python-build-system) (build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-tests
(lambda _
;; TypeError: binary() got an unexpected keyword argument
;; 'average_size'.
(substitute* "tests/test_check.py"
(("average_size=512") ""))
#t)))))
(propagated-inputs (propagated-inputs
`(("python-chardet" ,python-chardet) `(("python-chardet" ,python-chardet)
("python-hypothesis" ,python-hypothesis))) ("python-hypothesis" ,python-hypothesis)))
@ -13746,10 +13757,15 @@ ignoring formatting changes.")
"Make loops show a progress bar on the console by just wrapping any "Make loops show a progress bar on the console by just wrapping any
iterable with @code{|tqdm(iterable)|}. Offers many options to define iterable with @code{|tqdm(iterable)|}. Offers many options to define
design and layout.") design and layout.")
(license (list license:mpl2.0 license:expat)))) (license (list license:mpl2.0 license:expat))
(properties `((python2-variant . ,(delay python2-tqdm))))))
(define-public python2-tqdm (define-public python2-tqdm
(package-with-python2 python-tqdm)) (let ((tqdm (package-with-python2
(strip-python2-variant python-tqdm))))
(package (inherit tqdm)
(native-inputs `(("python2-functools32" ,python2-functools32)
,@(package-native-inputs tqdm))))))
(define-public python-pkginfo (define-public python-pkginfo
(package (package

6
gnu/packages/re2c.scm
View file

@ -26,15 +26,15 @@
(define-public re2c (define-public re2c
(package (package
(name "re2c") (name "re2c")
(version "1.1.1") (version "1.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/skvadrik/" name (uri (string-append "https://github.com/skvadrik/" name
"/releases/download/" version "/" "/releases/download/" version "/"
name "-" version ".tar.gz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1ksifjn18v6nra935dpqllmvkqgcdsggfjgmj77282x0gqrrfrc5")))) "05xq0571mkgr20v827jm63nhsirr8arghg4fszzswrmrnl3dfk0s"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://re2c.org/") (home-page "http://re2c.org/")
(synopsis "Lexer generator for C/C++") (synopsis "Lexer generator for C/C++")

2
gnu/packages/speech.scm
View file

@ -69,6 +69,8 @@
(string-append "LDFLAGS=-Wl,-rpath=" (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib") "/lib")
;; The package fails to build with newer C++ standards.
"CXXFLAGS=-std=c++98"
"AUDIO=pulseaudio") "AUDIO=pulseaudio")
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases #:phases

4
gnu/packages/tbb.scm
View file

@ -28,7 +28,7 @@
(define-public tbb (define-public tbb
(package (package
(name "tbb") (name "tbb")
(version "2019_U8") (version "2019_U9")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -37,7 +37,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0z0kh1a5g28gckcxlv3x7qqskh5fsl8knf2ypbbvk7z9ln9k3wfq")) "1a39nflw7b2n51jfp3fdprnkpgzaspzww1dckfvaigflfli9s8rj"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

2
gnu/packages/tcl.scm
View file

@ -81,7 +81,7 @@
;; likely related to name resolution), but that doesn't cause ;; likely related to name resolution), but that doesn't cause
;; `make' to fail. ;; `make' to fail.
#:test-target "test")) #:test-target "test"))
(home-page "http://www.tcl.tk/") (home-page "https://www.tcl.tk/")
(synopsis "The Tcl scripting language") (synopsis "The Tcl scripting language")
(description "The Tcl (Tool Command Language) scripting language.") (description "The Tcl (Tool Command Language) scripting language.")
(license license:tcl/tk))) (license license:tcl/tk)))

7
gnu/packages/terminals.scm
View file

@ -15,6 +15,7 @@
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -665,15 +666,15 @@ eye-candy, customizable, and reasonably lightweight.")
(define-public sakura (define-public sakura
(package (package
(name "sakura") (name "sakura")
(version "3.6.0") (version "3.7.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://launchpad.net/" name "/trunk/" (uri (string-append "https://launchpad.net/" name "/trunk/"
version "/+download/" name "-" version version "/+download/" name "-" version
".tar.bz2")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1q463qm41ym7jb3kbzjz7b6x549vmgkb70arpkhsf86yxly1y5m1")))) "15gskj5yv5qs3cj4ps43735kfx2nzjlhq4dk9ghirl8lvhhxsm5m"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f)) ; no check phase '(#:tests? #f)) ; no check phase

22
gnu/packages/tls.scm
View file

@ -392,6 +392,7 @@ required structures.")
(inherit openssl) (inherit openssl)
(name "openssl") (name "openssl")
(version "1.0.2s") (version "1.0.2s")
(replacement openssl-1.0.2t)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://www.openssl.org/source/openssl-" (uri (list (string-append "https://www.openssl.org/source/openssl-"
@ -473,6 +474,27 @@ required structures.")
,version "/misc")) ,version "/misc"))
#t))))))))) #t)))))))))
(define openssl-1.0.2t
(package
(inherit openssl)
(version "1.0.2t")
(source (origin
(inherit (package-source openssl-1.0))
(uri (list (string-append "https://www.openssl.org/source/openssl-"
version ".tar.gz")
(string-append "ftp://ftp.openssl.org/source/"
"openssl-" version ".tar.gz")
(string-append "ftp://ftp.openssl.org/source/old/"
(string-trim-right version char-set:letter)
"/openssl-" version ".tar.gz")))
(sha256
(base32
"1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql"))))
(arguments
(substitute-keyword-arguments (package-arguments openssl-1.0)
;; Parallel build is not supported in 1.0.x.
((#:parallel-build? _ #f) #f)))))
(define-public libressl (define-public libressl
(package (package
(name "libressl") (name "libressl")

24
gnu/packages/web.scm
View file

@ -439,7 +439,15 @@ APIs.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests included `(#:tests? #f ; no tests included
#:make-flags (list "CC=gcc"))) #:make-flags (list "CC=gcc")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-CFLAGS
;; Remove broken options unconditionally added to CFLAGS.
(lambda _
(substitute* "configure.ac"
((" -Werror") ""))
#t)))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -6553,6 +6561,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
(package (package
(name "nghttp2") (name "nghttp2")
(version "1.39.1") (version "1.39.1")
(replacement nghttp2-1.39.2)
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -6630,6 +6639,19 @@ compressed JSON header blocks.
@end itemize\n") @end itemize\n")
(license license:expat))) (license license:expat)))
(define nghttp2-1.39.2
(package
(inherit nghttp2)
(version "1.39.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/nghttp2/nghttp2/"
"releases/download/v" version "/"
"nghttp2-" version ".tar.xz"))
(sha256
(base32
"12yfsjghbaypp4w964d45ih9vs38g6anih80wbsflaxx192idlm2"))))))
(define-public hpcguix-web (define-public hpcguix-web
(let ((commit "f39c90b35e99e4122b0866ec4337020d61c81508") (let ((commit "f39c90b35e99e4122b0866ec4337020d61c81508")
(revision "4")) (revision "4"))

26
gnu/packages/xiph.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015, 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; ;;;
@ -27,6 +27,7 @@
(define-module (gnu packages xiph) (define-module (gnu packages xiph)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
@ -41,6 +42,7 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:export (libogg #:export (libogg
libvorbis libvorbis
@ -185,15 +187,17 @@ work from the @code{speex} codec.")
(define ao (define ao
(package (package
(name "ao") (name "ao")
(version "1.2.0") ;; We need a few commits on top of 1.2.2 to fix CVE-2017-11548.
(source (version "1.2.2-5-g20dc8ed")
(origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://downloads.xiph.org/releases/ao/libao-" (uri (git-reference
version ".tar.gz")) (url "https://git.xiph.org/libao.git")
(commit version)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83")))) "1d1b3g2a7jd43c32242yq6nfysqsmp7rjslhvbrmpgk119l5fnbj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; FIXME: Add further backends, see the summary printed after configure. ;; FIXME: Add further backends, see the summary printed after configure.
;; XXX: Should back-ends be pushed to different outputs? For instance, ;; XXX: Should back-ends be pushed to different outputs? For instance,
@ -203,7 +207,10 @@ work from the @code{speex} codec.")
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("pulseaudio" ,pulseaudio))) ("pulseaudio" ,pulseaudio)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(synopsis "Cross platform audio library") (synopsis "Cross platform audio library")
(description (description
"Libao is a cross-platform audio library that allows programs to "Libao is a cross-platform audio library that allows programs to
@ -230,6 +237,7 @@ It currently supports:
@end enumerate @end enumerate
") ")
(license license:gpl2+) (license license:gpl2+)
(properties '((cpe-name . "libao")))
(home-page "https://www.xiph.org/ao/"))) (home-page "https://www.xiph.org/ao/")))
(define flac (define flac

20
gnu/packages/xml.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2017 ng0 <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
@ -67,6 +67,7 @@
(package (package
(name "expat") (name "expat")
(version "2.2.7") (version "2.2.7")
(replacement expat-2.2.9)
(source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c)))) (source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c))))
(origin (origin
(method url-fetch) (method url-fetch)
@ -88,6 +89,23 @@ stream-oriented parser in which an application registers handlers for
things the parser might find in the XML document (like start tags).") things the parser might find in the XML document (like start tags).")
(license license:expat))) (license license:expat)))
(define expat-2.2.9
(package
(inherit expat)
(version "2.2.9")
(source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c))))
(origin
(method url-fetch)
(uri (list (string-append "mirror://sourceforge/expat/expat/"
version "/expat-" version ".tar.xz")
(string-append
"https://github.com/libexpat/libexpat/releases/download/R_"
(string-map dot->underscore version)
"/expat-" version ".tar.xz")))
(sha256
(base32
"1960mmgbb4cm64n1p0nz3hrs1pw03hkrfcw8prmnn4622mdrd9hy")))))))
(define-public libebml (define-public libebml
(package (package
(name "libebml") (name "libebml")

4
guix/build-system/scons.scm
View file

@ -76,7 +76,9 @@
#:key #:key
(tests? #t) (tests? #t)
(scons-flags ''()) (scons-flags ''())
(build-targets ''())
(test-target "test") (test-target "test")
(install-targets ''("install"))
(phases '(@ (guix build scons-build-system) (phases '(@ (guix build scons-build-system)
%standard-phases)) %standard-phases))
(outputs '("out")) (outputs '("out"))
@ -101,8 +103,10 @@ provides a 'SConstruct' file as its build system."
source)) source))
#:scons-flags ,scons-flags #:scons-flags ,scons-flags
#:system ,system #:system ,system
#:build-targets ,build-targets
#:test-target ,test-target #:test-target ,test-target
#:tests? ,tests? #:tests? ,tests?
#:install-targets ,install-targets
#:phases ,phases #:phases ,phases
#:outputs %outputs #:outputs %outputs
#:search-paths ',(map search-path-specification->sexp #:search-paths ',(map search-path-specification->sexp

9
guix/build/scons-build-system.scm
View file

@ -29,7 +29,7 @@
;; ;;
;; Code: ;; Code:
(define* (build #:key outputs (scons-flags '()) (parallel-build? #t) #:allow-other-keys) (define* (build #:key outputs (build-targets '()) (scons-flags '()) (parallel-build? #t) #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(mkdir-p out) (mkdir-p out)
(apply invoke "scons" (apply invoke "scons"
@ -37,7 +37,8 @@
(list "-j" (number->string (list "-j" (number->string
(parallel-job-count))) (parallel-job-count)))
(list)) (list))
scons-flags)))) scons-flags
build-targets))))
(define* (check #:key tests? test-target (scons-flags '()) #:allow-other-keys) (define* (check #:key tests? test-target (scons-flags '()) #:allow-other-keys)
"Run the test suite of a given SCons application." "Run the test suite of a given SCons application."
@ -46,9 +47,9 @@
(format #t "test suite not run~%")) (format #t "test suite not run~%"))
#t) #t)
(define* (install #:key outputs (scons-flags '()) #:allow-other-keys) (define* (install #:key outputs (install-targets '("install")) (scons-flags '()) #:allow-other-keys)
"Install a given SCons application." "Install a given SCons application."
(apply invoke "scons" "install" scons-flags)) (apply invoke "scons" (append scons-flags install-targets)))
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases