ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 05:39:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'staging' into core-updates

Browse source
This commit is contained in:
Marius Bakke 2019-02-20 17:19:00 +01:00
commit 901236474a
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
180 changed files with 38000 additions and 7859 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
HACKING
View file

@ -2,7 +2,7 @@
#+TITLE: Hacking GNU Guix and Its Incredible Distro
Copyright © 2012, 2013, 2014, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
Copyright © 2012, 2013, 2014, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
Copyright © 2015, 2017 Mathieu Lirzin <mthl@gnu.org>
Copyright © 2017 Leo Famulari <leo@famulari.name>
Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
@ -41,8 +41,9 @@ make sure to run ‘git pull --rebase’.
All commits that are pushed to the central repository on Savannah must be
signed with an OpenPGP key, and the public key should be uploaded to your user
account on Savannah and to public key servers, such as ‘pgp.mit.edu’. To
configure Git to automatically sign commits, run:
account on Savannah and to public key servers, such as
‘pool.sks-keyservers.net’. To configure Git to automatically sign commits,
run:
git config commit.gpgsign true
git config user.signingkey CABBA6EA1DC0FF33

2
build-aux/run-system-tests.scm
View file

@ -19,7 +19,7 @@
(define-module (run-system-tests)
#:use-module (gnu tests)
#:use-module (guix store)
#:use-module (guix status)
#:use-module ((guix status) #:select (with-status-verbosity))
#:use-module (guix monads)
#:use-module (guix derivations)
#:use-module (guix ui)

1189
doc/guix.texi
View file

File diff suppressed because it is too large Load diff

2
gnu/installer/connman.scm
View file

@ -299,7 +299,7 @@ (define (connman-connect-with-auth service password-proc)
extracted from connmanctl output using a regexp. This makes the whole
procedure even more unreliable.
Raise &connman-connection-error if an error occured during connection. Raise
Raise &connman-connection-error if an error occurred during connection. Raise
&connman-password-error if the given password is incorrect."
(define connman-error-regexp (make-regexp "Error[ ]*([^\n]+)\n"))

2
gnu/installer/newt/keymap.scm
View file

@ -71,7 +71,7 @@ (define (sort-layouts layouts)
(cut append <> <>)))
(define (sort-variants variants)
"Sort VARIANTS list by putting the internation variant ahead and return it."
"Sort VARIANTS list by putting the international variant ahead and return it."
(call-with-values
(lambda ()
(partition

2
gnu/installer/newt/page.scm
View file

@ -188,7 +188,7 @@ (define* (run-listbox-selection-page #:key
'string<=' procedure (after being converted to text).
If ALLOW-DELETE? is #t, the form will return if the <DELETE> key is pressed,
otherwise nothing will happend.
otherwise nothing will happen.
Each time the listbox current item changes, call SKIP-ITEM-PROCEDURE? with the
current listbox item as argument. If it returns #t, skip the element and jump

5
gnu/installer/newt/timezone.scm
View file

@ -30,9 +30,6 @@ (define-module (gnu installer newt timezone)
#:use-module (newt)
#:export (run-timezone-page))
;; Heigth of the listbox displaying timezones.
(define timezone-listbox-heigth (make-parameter 20))
;; Information textbox width.
(define info-textbox-width (make-parameter 40))
@ -53,7 +50,7 @@ (define (all-but-last list)
(define (run-page timezone-tree)
(define (loop path)
(let ((timezones (locate-childrens timezone-tree path)))
(let ((timezones (locate-children timezone-tree path)))
(run-listbox-selection-page
#:title (G_ "Timezone")
#:info-text (G_ "Please select a timezone.")

2
gnu/installer/newt/utils.scm
View file

@ -30,7 +30,7 @@ (define screen-columns (make-parameter 0))
(define screen-rows (make-parameter 0))
(define (destroy-form-and-pop form)
"Destory the given FORM and pop the current window."
"Destroy the given FORM and pop the current window."
(destroy-form form)
(pop-window))

8
gnu/installer/newt/wifi.scm
View file

@ -100,7 +100,7 @@ (define (run-unknown-error-page service-name)
"Run a page to inform user that a connection error happened."
(run-error-page
(format #f
(G_ "An error occured while trying to connect to ~a, please retry.")
(G_ "An error occurred while trying to connect to ~a, please retry.")
service-name)
(G_ "Connection error")))
@ -160,8 +160,8 @@ (define* (fill-wifi-services listbox wifi-services)
;; Maximum length of a wifi service name.
(define service-name-max-length (make-parameter 20))
;; Heigth of the listbox displaying wifi services.
(define wifi-listbox-heigth (make-parameter 20))
;; Height of the listbox displaying wifi services.
(define wifi-listbox-height (make-parameter 20))
;; Information textbox width.
(define info-textbox-width (make-parameter 40))
@ -188,7 +188,7 @@ (define (run-wifi-page)
force a wifi scan."
(let* ((listbox (make-listbox
-1 -1
(wifi-listbox-heigth)
(wifi-listbox-height)
(logior FLAG-SCROLL FLAG-BORDER FLAG-RETURNEXIT)))
(form (make-form))
(buttons-grid (make-grid 1 1))

6
gnu/installer/parted.scm
View file

@ -677,7 +677,7 @@ (define (can-create-partition? user-part)
(define* (mkpart disk user-partition
#:key (previous-partition #f))
"Create the given USER-PARTITION on DISK. The PREVIOUS-PARTITION argument as
to be set to the partition preceeding USER-PARTITION if any."
to be set to the partition preceding USER-PARTITION if any."
(define (parse-start-end start end)
"Parse start and end strings as positions on DEVICE expressed with a unit,
@ -734,8 +734,8 @@ (define* (extend-ranges! start-range end-range
(< start-distance 3))
(+ start-sector start-offset)
start-sector)))
;; This is a hackery but parted almost always fails to create optimally
;; aligned partitions (unless specifiying percentages) because, the
;; This is a hack. Parted almost always fails to create optimally
;; aligned partitions (unless specifying percentages) because the
;; default range of 1MB centered on the start sector is not enough when
;; the optimal alignment is 2048 sectors of 512KB.
(extend-ranges! start-range end-range #:offset start-offset)

10
gnu/installer/timezone.scm
View file

@ -25,7 +25,7 @@ (define-module (gnu installer timezone)
#:use-module (srfi srfi-35)
#:use-module (ice-9 match)
#:use-module (ice-9 receive)
#:export (locate-childrens
#:export (locate-children
timezone->posix-tz
timezone-has-child?
zonetab->timezone-tree
@ -94,15 +94,15 @@ (define (remove-first lists)
(loop (remove-first same-region))
(loop other-region))))))))
(define (locate-childrens tree path)
"Return the childrens of the timezone indicated by PATH in the given
(define (locate-children tree path)
"Return the children of the timezone indicated by PATH in the given
TREE. Raise a condition if the PATH could not be found."
(let ((extract-proc (cut map car <>)))
(match path
(() (sort (extract-proc tree) string<?))
((region . rest)
(or (and=> (assoc-ref tree region)
(cut locate-childrens <> rest))
(cut locate-children <> rest))
(raise
(condition
(&message
@ -111,7 +111,7 @@ (define (locate-childrens tree path)
(define (timezone-has-child? tree timezone)
"Return #t if the given TIMEZONE any child in TREE and #f otherwise."
(not (null? (locate-childrens tree timezone))))
(not (null? (locate-children tree timezone))))
(define* (zonetab->timezone-tree zonetab)
"Return the timezone tree corresponding to the given ZONETAB file."

26
gnu/local.mk
View file

@ -100,6 +100,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/check.scm \
%D%/packages/chemistry.scm \
%D%/packages/chez.scm \
%D%/packages/chromium.scm \
%D%/packages/ci.scm \
%D%/packages/cinnamon.scm \
%D%/packages/clojure.scm \
@ -191,6 +192,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/gcc.scm \
%D%/packages/gd.scm \
%D%/packages/gdb.scm \
%D%/packages/genimage.scm \
%D%/packages/geo.scm \
%D%/packages/gettext.scm \
%D%/packages/ghostscript.scm \
@ -253,8 +255,9 @@ GNU_SYSTEM_MODULES = \
%D%/packages/jrnl.scm \
%D%/packages/jose.scm \
%D%/packages/julia.scm \
%D%/packages/kde.scm \
%D%/packages/kde.scm \
%D%/packages/kde-frameworks.scm \
%D%/packages/kde-plasma.scm \
%D%/packages/kerberos.scm \
%D%/packages/key-mon.scm \
%D%/packages/kodi.scm \
@ -294,6 +297,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/m4.scm \
%D%/packages/machine-learning.scm \
%D%/packages/man.scm \
%D%/packages/magic-wormhole.scm \
%D%/packages/mail.scm \
%D%/packages/make-bootstrap.scm \
%D%/packages/markup.scm \
@ -635,7 +639,6 @@ dist_patch_DATA = \
%D%/packages/patches/aegisub-boost68.patch \
%D%/packages/patches/agg-am_c_prototype.patch \
%D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \
%D%/packages/patches/allegro4-mesa-18.2.5-and-later.patch \
%D%/packages/patches/amule-crypto-6.patch \
%D%/packages/patches/antiword-CVE-2014-8123.patch \
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
@ -685,6 +688,7 @@ dist_patch_DATA = \
%D%/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch \
%D%/packages/patches/clang-3.8-libc-search-path.patch \
%D%/packages/patches/clang-6.0-libc-search-path.patch \
%D%/packages/patches/clang-7.0-libc-search-path.patch \
%D%/packages/patches/clang-runtime-asan-build-fixes.patch \
%D%/packages/patches/clang-runtime-esan-build-fixes.patch \
%D%/packages/patches/classpath-aarch64-support.patch \
@ -708,6 +712,7 @@ dist_patch_DATA = \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-2017-12836.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
%D%/packages/patches/dealii-mpi-deprecations.patch \
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
%D%/packages/patches/diffutils-gets-undeclared.patch \
@ -793,6 +798,8 @@ dist_patch_DATA = \
%D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch \
%D%/packages/patches/gd-CVE-2018-5711.patch \
%D%/packages/patches/gd-CVE-2018-1000222.patch \
%D%/packages/patches/gd-CVE-2019-6977.patch \
%D%/packages/patches/gd-CVE-2019-6978.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-freetype-test-failure.patch \
%D%/packages/patches/gdm-CVE-2018-14424.patch \
@ -814,6 +821,8 @@ dist_patch_DATA = \
%D%/packages/patches/glibc-CVE-2017-1000366-pt1.patch \
%D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch \
%D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch \
%D%/packages/patches/glibc-CVE-2018-11236.patch \
%D%/packages/patches/glibc-CVE-2018-11237.patch \
%D%/packages/patches/glibc-allow-kernel-2.6.32.patch \
%D%/packages/patches/glibc-boot-2.16.0.patch \
%D%/packages/patches/glibc-boot-2.2.5.patch \
@ -936,7 +945,6 @@ dist_patch_DATA = \
%D%/packages/patches/ldc-bootstrap-disable-tests.patch \
%D%/packages/patches/ldc-disable-phobos-tests.patch \
%D%/packages/patches/ledger-fix-uninitialized.patch \
%D%/packages/patches/ledger-revert-boost-python-fix.patch \
%D%/packages/patches/liba52-enable-pic.patch \
%D%/packages/patches/liba52-link-with-libm.patch \
%D%/packages/patches/liba52-set-soname.patch \
@ -1052,6 +1060,7 @@ dist_patch_DATA = \
%D%/packages/patches/mozjs38-tracelogger.patch \
%D%/packages/patches/mozjs38-version-detection.patch \
%D%/packages/patches/mrrescue-support-love-11.patch \
%D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \
%D%/packages/patches/mumble-1.2.19-abs.patch \
%D%/packages/patches/mumps-build-parallelism.patch \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
@ -1126,7 +1135,6 @@ dist_patch_DATA = \
%D%/packages/patches/pinentry-efl.patch \
%D%/packages/patches/pingus-boost-headers.patch \
%D%/packages/patches/pingus-sdl-libs-config.patch \
%D%/packages/patches/pius.patch \
%D%/packages/patches/pixman-CVE-2016-5296.patch \
%D%/packages/patches/plink-1.07-unclobber-i.patch \
%D%/packages/patches/plink-endian-detection.patch \
@ -1183,6 +1191,7 @@ dist_patch_DATA = \
%D%/packages/patches/qemu-CVE-2018-16872.patch \
%D%/packages/patches/qemu-CVE-2019-6778.patch \
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtbase-old-kernel.patch \
%D%/packages/patches/qtbase-use-TZDIR.patch \
%D%/packages/patches/qtscript-disable-tests.patch \
%D%/packages/patches/quagga-reproducible-build.patch \
@ -1199,6 +1208,7 @@ dist_patch_DATA = \
%D%/packages/patches/rct-add-missing-headers.patch \
%D%/packages/patches/readline-link-ncurses.patch \
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
%D%/packages/patches/red-eclipse-remove-gamma-name-hack.patch \
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
%D%/packages/patches/reptyr-fix-gcc-7.patch \
%D%/packages/patches/ripperx-missing-file.patch \
@ -1209,13 +1219,16 @@ dist_patch_DATA = \
%D%/packages/patches/ruby-concurrent-ignore-broken-test.patch \
%D%/packages/patches/ruby-concurrent-test-arm.patch \
%D%/packages/patches/ruby-rack-ignore-failing-test.patch \
%D%/packages/patches/ruby-safe-yaml-add-require-time.patch \
%D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
%D%/packages/patches/runc-CVE-2019-5736.patch \
%D%/packages/patches/rust-1.19-mrustc.patch \
%D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
%D%/packages/patches/rust-bootstrap-stage0-test.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \
%D%/packages/patches/rust-reproducible-builds.patch \
%D%/packages/patches/rxvt-unicode-escape-sequences.patch \
%D%/packages/patches/scalapack-blacs-mpi-deprecations.patch \
%D%/packages/patches/scheme48-tests.patch \
%D%/packages/patches/scotch-build-parallelism.patch \
%D%/packages/patches/scotch-integer-declarations.patch \
@ -1273,7 +1286,6 @@ dist_patch_DATA = \
%D%/packages/patches/tk-find-library.patch \
%D%/packages/patches/ttf2eot-cstddef.patch \
%D%/packages/patches/ttfautohint-source-date-epoch.patch \
%D%/packages/patches/tomsfastmath-constness.patch \
%D%/packages/patches/totem-meson-easy-codec.patch \
%D%/packages/patches/tuxpaint-stamps-path.patch \
%D%/packages/patches/twinkle-include-qregexpvalidator.patch \
@ -1332,7 +1344,6 @@ dist_patch_DATA = \
%D%/packages/patches/x265-arm-flags.patch \
%D%/packages/patches/xf86-video-ark-remove-mibstore.patch \
%D%/packages/patches/xf86-video-geode-glibc-2.20.patch \
%D%/packages/patches/xf86-video-i128-remove-mibstore.patch \
%D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \
%D%/packages/patches/xf86-video-savage-xorg-compat.patch \
%D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
@ -1342,8 +1353,7 @@ dist_patch_DATA = \
%D%/packages/patches/xfce4-session-fix-xflock4.patch \
%D%/packages/patches/xfce4-settings-defaults.patch \
%D%/packages/patches/xinetd-fix-fd-leak.patch \
%D%/packages/patches/xinetd-CVE-2013-4342.patch \
%D%/packages/patches/xmodmap-asprintf.patch
%D%/packages/patches/xinetd-CVE-2013-4342.patch
MISC_DISTRO_FILES = \
%D%/packages/ld-wrapper.in

53
gnu/packages.scm
View file

@ -375,34 +375,41 @@ (define (generate-package-cache directory)
(define cache-file
(string-append directory %package-cache-file))
(define (expand-cache module symbol variable result)
(define (expand-cache module symbol variable result+seen)
(match (false-if-exception (variable-ref variable))
((? package? package)
(if (hidden-package? package)
result
(cons `#(,(package-name package)
,(package-version package)
,(module-name module)
,symbol
,(package-outputs package)
,(->bool (member (%current-system)
(package-supported-systems package)))
,(->bool (package-superseded package))
,@(let ((loc (package-location package)))
(if loc
`(,(location-file loc)
,(location-line loc)
,(location-column loc))
'(#f #f #f))))
result)))
(match result+seen
((result . seen)
(if (or (vhash-assq package seen)
(hidden-package? package))
(cons result seen)
(cons (cons `#(,(package-name package)
,(package-version package)
,(module-name module)
,symbol
,(package-outputs package)
,(->bool
(member (%current-system)
(package-supported-systems package)))
,(->bool (package-superseded package))
,@(let ((loc (package-location package)))
(if loc
`(,(location-file loc)
,(location-line loc)
,(location-column loc))
'(#f #f #f))))
result)
(vhash-consq package #t seen))))))
(_
result)))
result+seen)))
(define exp
(fold-module-public-variables* expand-cache '()
(all-modules (%package-module-path)
#:warn
warn-about-load-error)))
(first
(fold-module-public-variables* expand-cache
(cons '() vlist-null)
(all-modules (%package-module-path)
#:warn
warn-about-load-error))))
(mkdir-p (dirname cache-file))
(call-with-output-file cache-file

54
gnu/packages/admin.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
@ -285,26 +285,26 @@ (define-public dfc
(define-public htop
(package
(name "htop")
(version "2.2.0")
(source (origin
(method url-fetch)
(uri (string-append "http://hisham.hm/htop/releases/"
version "/htop-" version ".tar.gz"))
(sha256
(base32
"0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"))))
(build-system gnu-build-system)
(inputs
`(("ncurses" ,ncurses)))
(native-inputs
`(("python" ,python-minimal-wrapper))) ; for scripts/MakeHeader.py
(home-page "https://hisham.hm/htop/")
(synopsis "Interactive process viewer")
(description
"This is htop, an interactive process viewer. It is a text-mode
(name "htop")
(version "2.2.0")
(source (origin
(method url-fetch)
(uri (string-append "http://hisham.hm/htop/releases/"
version "/htop-" version ".tar.gz"))
(sha256
(base32
"0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"))))
(build-system gnu-build-system)
(inputs
`(("ncurses" ,ncurses)))
(native-inputs
`(("python" ,python-wrapper))) ;for scripts/MakeHeader.py
(home-page "https://hisham.hm/htop/")
(synopsis "Interactive process viewer")
(description
"This is htop, an interactive process viewer. It is a text-mode
application (for console or X terminals) and requires ncurses.")
(license license:gpl2)))
(license license:gpl2)))
(define-public pies
(package
@ -880,7 +880,7 @@ (define-public clusterssh
(define-public rename
(package
(name "rename")
(version "1.00")
(version "1.10")
(source (origin
(method url-fetch)
(uri (string-append
@ -888,7 +888,7 @@ (define-public rename
version ".tar.gz"))
(sha256
(base32
"03yhf8nmqsb0zyliv501fdvwlp589jqfn44yqkrflmpzrbik3zxl"))))
"137m8s06r4n038ivlr5r1d9a7q9l7shmwpvnyx053r9ndhvbnkh5"))))
(build-system perl-build-system)
(arguments
`(#:phases
@ -1602,14 +1602,14 @@ (define-public graphios
(define-public ansible
(package
(name "ansible")
(version "2.7.6")
(version "2.7.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ansible" version))
(sha256
(base32
"0f7b2ghm34ql8yv90wr0ngd6w7wyvnlcxpc3snkj86kcjsnmx1bd"))))
"0l4id24jqi578xmybvwrz10sm2jhs90gk9gs1y04gfarz4vcj304"))))
(build-system python-build-system)
(native-inputs
`(("python-bcrypt" ,python-bcrypt)
@ -2715,8 +2715,9 @@ (define-public inxi-minimal
"1k9148xnfznch1443niaa3w1kmsw4vp0xpwna6npgmi7zqg06ymy"))))
(build-system trivial-build-system)
(inputs
`(("bash" ,bash)
("perl" ,perl)))
`(("bash" ,bash-minimal)
("perl" ,perl)
("procps" ,procps)))
(native-inputs
`(("gzip" ,gzip)))
(arguments
@ -2789,7 +2790,6 @@ (define-public inxi
("lm-sensors" ,lm-sensors)
("mesa-utils" ,mesa-utils)
("pciutils" ,pciutils)
("procps" ,procps)
("tar" ,tar)
("tree" ,tree)
("util-linux" ,util-linux) ; lsblk

29
gnu/packages/aidc.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2014 John Darringon <jmd@gnu.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -24,6 +24,8 @@ (define-module (gnu packages aidc)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (gnu packages autotools)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages image)
#:use-module (guix build-system gnu))
@ -75,21 +77,28 @@ (define-public qrencode
(define-public libdmtx
(package
(name "libdmtx")
(version "0.7.4")
(version "0.7.5")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/libdmtx/" name "/" version "/"
name "-" version ".tar.bz2"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/dmtx/libdmtx.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"))))
(base32 "0wk3fkxzf9ip75v8ia54v6ywx72ajp5s6777j4ay8barpbv869rj"))))
(build-system gnu-build-system)
(arguments
;; XXX Test suite is broken: https://github.com/dmtx/libdmtx/issues/22
`(#:tests? #f))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://libdmtx.sourceforge.net/")
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/dmtx")
(synopsis "Library for reading and writing Data Matrix 2D barcodes")
(description "libdmtx is software for reading and writing Data Matrix 2D
barcodes on Linux and Unix. At its core libdmtx is a shared library, allowing
barcodes of the modern ECC200 variety. libdmtx is a shared library, allowing
C/C++ programs to use its capabilities without restrictions or overhead.")
(license license:bsd-3)))

146
gnu/packages/algebra.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
@ -856,3 +856,147 @@ (define-public xtensor
@item tools to manipulate array expressions and build upon xtensor.
@end itemize")
(license license:bsd-3)))
(define-public gap
(package
(name "gap")
(version "4.10.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.gap-system.org/pub/gap/gap-"
(version-major+minor version)
"/tar.bz2/gap-"
version
".tar.bz2"))
(sha256
(base32
"1dmb8v4p7j1nnf7sx8sg54b49yln36bi9acwp7w1d3a1nxj17ird"))
(modules '((guix build utils) (ice-9 ftw) (srfi srfi-1)))
(snippet
'(begin
;; Delete the external gmp and zlib libraries
;; and a subdirectory not needed for our build.
(for-each delete-file-recursively
'("extern" "hpcgap"))
;; Delete a failing test.
;; FIXME: This might be fixed in the next release, see
;; https://github.com/gap-system/gap/issues/3292
(delete-file "tst/testinstall/dir.tst")
;; Delete all packages except for a fixed list.
(with-directory-excursion "pkg"
(for-each delete-file-recursively
(lset-difference string=? (scandir ".")
'("." ".."
;; Necessary packages.
"GAPDoc-1.6.2"
"primgrp-3.3.2"
"SmallGrp-1.3" ; artistic2.0
"transgrp" ; artistic2.0 for data,
; gpl2 or gpl3 for code
;; Recommanded package.
"io-4.5.4" ; gpl3+
;; Optional packages, searched for at start,
;; and their depedencies.
"alnuth-3.1.0"
"AutoDoc-2018.09.20"
"autpgrp-1.10"
"crisp-1.4.4" ; bsd-2
; "ctbllib" ; no explicit license, drop
"FactInt-1.6.2"
"fga"
"irredsol-1.4" ; bsd-2
"laguna-3.9.0"
"polenta-1.3.8"
"polycyclic-2.14"
"radiroot-2.8"
"resclasses-4.7.1"
"sophus-1.24"
; "tomlib-1.2.7" ; no explicit license, drop
"utils-0.59"))))
#t))))
(build-system gnu-build-system)
(inputs
`(("gmp" ,gmp)
("zlib" ,zlib)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'build 'build-packages
;; Compile all packages that have not been deleted by the
;; code snippet above.
(lambda _
(setenv "CONFIG_SHELL" (which "bash"))
(with-directory-excursion "pkg"
(invoke "../bin/BuildPackages.sh")
#t)))
(add-after 'build-packages 'build-doc
;; The documentation is bundled, but we create it from source.
(lambda _
(with-directory-excursion "doc"
(invoke "./make_doc"))
#t))
(replace 'check
(lambda _
;; "make check" is expected to appear in gap-4.10.1
(invoke "./gap" "tst/testinstall.g")
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(prog (string-append bin "/gap"))
(prog-real (string-append bin "/.gap-real"))
(share (string-append out "/share/gap"))
(include (string-append out "/include/gap")))
;; Install only the gap binary; the gac compiler is left
;; for maybe later. "Wrap" it in a shell script that calls
;; the binary with the correct parameter.
(mkdir-p bin)
(copy-file "gap" prog-real)
(call-with-output-file prog
(lambda (port)
(format port
"#!~a~%exec ~a -l ~a \"$@\"~%"
(which "bash")
prog-real
share)))
(chmod prog #o755)
;; Install the headers and the library, which are needed by
;; Sage. The Makefile targets are available in gap-4.10.0,
;; but planned to be removed in gap-4.10.1.
(invoke "make" "install-headers")
(invoke "make" "install-libgap")
(install-file "gen/config.h" include)
;; Install a certain number of files and directories to
;; SHARE, where the wrapped shell script expects them.
;; Remove information on the build directory from sysinfo.gap.
(substitute* "sysinfo.gap"
(("GAP_BIN_DIR=\".*\"") "GAP_BIN_DIR=\"\"")
(("GAP_LIB_DIR=\".*\"") "GAP_LIB_DIR=\"\"")
(("GAP_CPPFLAGS=\".*\"") "GAP_CPPFLAGS=\"\""))
(install-file "sysinfo.gap" share)
(copy-recursively "grp" (string-append share "/grp"))
(copy-recursively "pkg" (string-append share "/pkg"))
;; The following is not the C library libgap.so, but a
;; library of GAP code.
(copy-recursively "lib" (string-append share "/lib"))
;; The gap binary looks for documentation inside SHARE.
(copy-recursively "doc" (string-append share "/doc")))
#t)))))
(home-page "https://www.gap-system.org/")
(synopsis
"System for computational group theory")
(description
"GAP is a system for computational discrete algebra, with particular
emphasis on computational group theory. It provides a programming language,
a library of thousands of functions implementing algebraic algorithms
written in the GAP language as well as large data libraries of algebraic
objects.")
;; Some packages have different licenses (effectively forcing the
;; combined work to be licensed as gpl3+); if this is the case, this
;; is mentioned above next to their name.
;; Some packages have no license mentioned explicitly; supposedly this
;; means that the gpl2+ licence of GAP itself applies, but to be on the
;; safe side, we drop them for now.
(license license:gpl2+)))

12
gnu/packages/assembly.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
;;;
;;; This file is part of GNU Guix.
@ -129,7 +129,7 @@ (define-public lightning
(define-public fasm
(package
(name "fasm")
(version "1.73.06")
(version "1.73.08")
(source
(origin
(method url-fetch)
@ -137,14 +137,14 @@ (define-public fasm
version ".tgz"))
(sha256
(base32
"02wqkqxpn3p0iwcagsm92qd9cdfcnbx8a09qg03b3pjppp30hmp6"))))
"1l4my3fran06h5jiygswx4fsj53dvpfgg9ksfbdzsdg20r672997"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; No tests exist
#:strip-binaries? #f ; fasm has no sections
`(#:tests? #f ; no tests exist
#:strip-binaries? #f ; fasm has no sections
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no "configure" script exists
(delete 'configure) ; no "configure" script
(replace 'build
(lambda _
(chdir "source/Linux/")

38
gnu/packages/audio.scm
View file

@ -19,6 +19,7 @@
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Brendan Tildesley <brendan.tildesley@openmailbox.org>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1374,7 +1375,20 @@ (define-public guitarix
(list
;; Add the output lib directory to the RUNPATH.
(string-append "--ldflags=-Wl,-rpath=" %output "/lib")
"--cxxflags=-std=c++11")))
"--cxxflags=-std=c++11")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-boost-includes
(lambda _
(substitute* "src/headers/gx_internal_plugins.h"
(("namespace gx_jack" m)
(string-append "#include <boost/noncopyable.hpp>\n" m)))
(substitute* '("src/headers/gx_system.h"
"src/headers/gx_parameter.h"
"src/headers/gx_json.h")
(("namespace gx_system" m)
(string-append "#include <boost/noncopyable.hpp>\n" m)))
#t)))))
(inputs
`(("libsndfile" ,libsndfile)
("boost" ,boost)
@ -2446,18 +2460,17 @@ (define-public sratom
(define-public suil
(package
(name "suil")
(version "0.10.0")
(version "0.10.2")
(source (origin
(method url-fetch)
(uri (string-append "https://download.drobilla.net/suil-"
version ".tar.bz2"))
(sha256
(base32
"0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq"))))
"00d43m0nai63ajb7rkm9v084jcih206y17ib3160zcvzc885ji4z"))))
(build-system waf-build-system)
(arguments
`(#:tests? #f ; no check target
#:python ,python-2 ;XXX: The bundled waf does not work with Python 3.7.0.
`(#:tests? #f ; no check target
#:configure-flags
'("CXXFLAGS=-std=gnu++11")))
(inputs
@ -3207,7 +3220,7 @@ (define-public dcadec
(define-public bs1770gain
(package
(name "bs1770gain")
(version "0.5.1")
(version "0.5.2")
(source
(origin
(method url-fetch)
@ -3215,11 +3228,20 @@ (define-public bs1770gain
version "/bs1770gain-" version ".tar.gz"))
(sha256
(base32
"0r4fbajgfmnwgl63hcm56f1j8m5f135q6j5jkzdvrrhpcj39yx06"))))
"1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"))
(modules '((guix build utils)))
(snippet
'(begin
;; XXX
(substitute* "bs1770gain/bs1770gain.c"
(("\"N.*\"") "\"\""))
(substitute* "configure"
(("URL=.*$")
"https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html\n"))))))
(build-system gnu-build-system)
(inputs `(("ffmpeg" ,ffmpeg)
("sox" ,sox)))
(home-page "http://bs1770gain.sourceforge.net/")
(home-page "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html")
(synopsis "Tool to adjust loudness of media files")
(description
"BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its

26
gnu/packages/aux-files/chromium/master-preferences.json Normal file
View file

@ -0,0 +1,26 @@
{
"distribution": {
"import_bookmarks": false,
"make_chrome_default": false,
"make_chrome_default_for_user": false,
"verbose_logging": true,
"skip_first_run_ui": true,
"suppress_first_run_default_browser_prompt": true
},
"browser": {
"has_seen_welcome_page" : true,
"check_default_browser" : false
},
"dns_prefetching": {
"enabled": false
},
"alternate_error_pages": {
"enabled": false
},
"hardware": {
"audio_capture_enabled": false
},
"default_apps": "noinstall",
"hide_web_store_icon": true,
"homepage": "https://www.gnu.org/software/guix/"
}

44
gnu/packages/backup.scm
View file

@ -46,6 +46,7 @@ (define-module (gnu packages backup)
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages databases)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages dbm)
#:use-module (gnu packages dejagnu)
#:use-module (gnu packages ftp)
@ -495,14 +496,14 @@ (define-public libchop
(define-public borg
(package
(name "borg")
(version "1.1.8")
(version "1.1.9")
(source
(origin
(method url-fetch)
(uri (pypi-uri "borgbackup" version))
(sha256
(base32
"0qqvcscn1l4y83x4sh3izdpmr8zq38j8chjkpfq4q4d01i470hqb"))
"0x95nhv4h34m8cxycbwc4xdz350saaxlgh727b23bgn4ci7gh3vx"))
(modules '((guix build utils)))
(snippet
'(begin
@ -548,11 +549,6 @@ (define-public borg
;; HOME=/homeless-shelter.
(setenv "HOME" "/tmp")
#t)))
(add-after 'unpack 'remove-documentation-timestamps ; reproducibility
(lambda _
(substitute* "setup.py"
(("write\\(':Date:'.*") "\n"))
#t))
;; The tests need to be run after Borg is installed.
(delete 'check)
(add-after 'install 'check
@ -589,17 +585,12 @@ (define-public borg
'("docs/misc/create_chunker-params.txt"
"docs/misc/internals-picture.txt"
"docs/misc/prune-example.txt"))
(add-installed-pythonpath inputs outputs)
(invoke "python3" "setup.py" "build_man")
(copy-recursively "docs/man" man)
#t))))))
(native-inputs
`(("python-cython" ,python-cython)
("python-setuptools-scm" ,python-setuptools-scm)
("python-pytest" ,python-pytest)
;; For generating the documentation.
("python-sphinx" ,python-sphinx)
("python-guzzle-sphinx-theme" ,python-guzzle-sphinx-theme)))
("python-pytest" ,python-pytest)))
(inputs
`(("acl" ,acl)
("libb2" ,libb2)
@ -985,3 +976,30 @@ (define-public restic
precious backup space.
@end itemize")
(license license:bsd-2)))
(define-public burp
(package
(name "burp")
(version "2.3.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/burp/burp-" version
"/burp-" version ".tar.bz2"))
(sha256
(base32
"0in49c0ir7lb7jli0fcphdq1nh5rclhans4ngm7z7hzyxa4jrgri"))))
(build-system gnu-build-system)
(inputs
`(("librsync" ,librsync)
("openssl" ,openssl)
("uthash" ,uthash)
("zlib" ,zlib)))
(native-inputs
`(("check" ,check)
("pkg-config" ,pkg-config)))
(home-page "https://burp.grke.org")
(synopsis "Differential backup and restore")
(description "Burp is a network backup and restore program. It attempts
to reduce network traffic and the amount of space that is used by each
backup.")
(license license:agpl3)))

5
gnu/packages/base.scm
View file

@ -860,7 +860,10 @@ (define-public glibc-2.27
"glibc-versioned-locpath.patch"
"glibc-allow-kernel-2.6.32.patch"
"glibc-reinstate-prlimit64-fallback.patch"
"glibc-supported-locales.patch"))))))
"glibc-supported-locales.patch"
"glibc-CVE-2018-11236.patch"
"glibc-CVE-2018-11237.patch"))))
(properties `((lint-hidden-cve . ("CVE-2017-18269")))))) ; glibc-2.27-git-fixes
(define-public glibc-2.26
(package

23
gnu/packages/bioconductor.scm
View file

@ -27,6 +27,7 @@ (define-module (gnu packages bioconductor)
#:use-module (gnu packages bioinformatics)
#:use-module (gnu packages cran)
#:use-module (gnu packages compression)
#:use-module (gnu packages gcc)
#:use-module (gnu packages graph)
#:use-module (gnu packages maths)
#:use-module (gnu packages statistics)
@ -1176,3 +1177,25 @@ (define-public r-chipexoqual
"This package provides a quality control pipeline for ChIP-exo/nexus
sequencing data.")
(license license:gpl2+)))
(define-public r-dnacopy
(package
(name "r-dnacopy")
(version "1.56.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "DNAcopy" version))
(sha256
(base32
"04cqdqxhva66xwh1s2vffi56b9fcrqd4slcrvqasj5lp2rkjli82"))))
(properties `((upstream-name . "DNAcopy")))
(build-system r-build-system)
(native-inputs `(("gfortran" ,gfortran)))
(home-page "https://bioconductor.org/packages/DNAcopy")
(synopsis "DNA copy number data analysis")
(description
"This package implements the @dfn{circular binary segmentation} (CBS)
algorithm to segment DNA copy number data and identify genomic regions with
abnormal copy number.")
(license license:gpl2+)))

304
gnu/packages/bioinformatics.scm
View file

@ -12,6 +12,7 @@
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -612,16 +613,22 @@ (define-public bioawk
(define-public python-pybedtools
(package
(name "python-pybedtools")
(version "0.7.10")
(version "0.8.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "pybedtools" version))
(sha256
(base32
"0l2b2wrnj85azfqgr0zwr60f7j58vlla1hcgxvr9rwikpl8j72ji"))))
"1xl454ijvd4dzfvqgfahad49b49j7qy710fq9xh1rvk42z6x5ssf"))))
(build-system python-build-system)
(arguments
`(#:phases
`(#:modules ((ice-9 ftw)
(srfi srfi-1)
(srfi srfi-26)
(guix build utils)
(guix build python-build-system))
;; See https://github.com/daler/pybedtools/issues/192
#:phases
(modify-phases %standard-phases
;; See https://github.com/daler/pybedtools/issues/261
(add-after 'unpack 'disable-broken-tests
@ -631,21 +638,59 @@ (define-public python-pybedtools
(substitute* "pybedtools/test/test_scripts.py"
(("def test_venn_mpl")
"def _do_not_test_venn_mpl"))
;; Requires internet access.
(substitute* "pybedtools/test/test_helpers.py"
;; Requires internet access.
(("def test_chromsizes")
"def _do_not_test_chromsizes"))
;; FIXME: these two fail for no good reason.
(substitute* "pybedtools/test/test1.py"
(("def test_issue_157")
"def _do_not_test_issue_157")
(("def test_to_dataframe")
"def _do_not_test_to_dataframe"))
#t)))))
"def _do_not_test_chromsizes")
;; Broken as a result of the workaround used in the check phase
;; (see: https://github.com/daler/pybedtools/issues/192).
(("def test_getting_example_beds")
"def _do_not_test_getting_example_beds"))
#t))
;; TODO: Remove phase after it's part of PYTHON-BUILD-SYSTEM.
;; build system.
;; Force the Cythonization of C++ files to guard against compilation
;; problems.
(add-after 'unpack 'remove-cython-generated-files
(lambda _
(let ((cython-sources (map (cut string-drop-right <> 4)
(find-files "." "\\.pyx$")))
(c/c++-files (find-files "." "\\.(c|cpp|cxx)$")))
(define (strip-extension filename)
(string-take filename (string-index-right filename #\.)))
(define (cythonized? c/c++-file)
(member (strip-extension c/c++-file) cython-sources))
(for-each delete-file (filter cythonized? c/c++-files))
#t)))
(add-after 'remove-cython-generated-files 'generate-cython-extensions
(lambda _
(invoke "python" "setup.py" "cythonize")))
(replace 'check
(lambda _
(let* ((cwd (getcwd))
(build-root-directory (string-append cwd "/build/"))
(build (string-append
build-root-directory
(find (cut string-prefix? "lib" <>)
(scandir (string-append
build-root-directory)))))
(scripts (string-append
build-root-directory
(find (cut string-prefix? "scripts" <>)
(scandir build-root-directory)))))
(setenv "PYTHONPATH"
(string-append build ":" (getenv "PYTHONPATH")))
;; Executable scripts such as 'intron_exon_reads.py' must be
;; available in the PATH.
(setenv "PATH"
(string-append scripts ":" (getenv "PATH"))))
;; The tests need to be run from elsewhere...
(mkdir-p "/tmp/test")
(copy-recursively "pybedtools/test" "/tmp/test")
(with-directory-excursion "/tmp/test"
(invoke "pytest")))))))
(propagated-inputs
;; Tests don't pass with Bedtools 2.27.1.
;; See https://github.com/daler/pybedtools/issues/260
`(("bedtools" ,bedtools-2.26)
`(("bedtools" ,bedtools)
("samtools" ,samtools)
("python-matplotlib" ,python-matplotlib)
("python-pysam" ,python-pysam)
@ -654,9 +699,11 @@ (define-public python-pybedtools
`(("python-numpy" ,python-numpy)
("python-pandas" ,python-pandas)
("python-cython" ,python-cython)
("python-nose" ,python-nose)
("kentutils" ,kentutils) ; for bedGraphToBigWig
("python-six" ,python-six)))
("kentutils" ,kentutils) ; for bedGraphToBigWig
("python-six" ,python-six)
;; For the test suite.
("python-pytest" ,python-pytest)
("python-psutil" ,python-psutil)))
(home-page "https://pythonhosted.org/pybedtools/")
(synopsis "Python wrapper for BEDtools programs")
(description
@ -667,34 +714,7 @@ (define-public python-pybedtools
(license license:gpl2+)))
(define-public python2-pybedtools
(let ((pkg (package-with-python2 python-pybedtools)))
(package (inherit pkg)
(arguments
`(#:modules ((ice-9 ftw)
(srfi srfi-1)
(srfi srfi-26)
(guix build utils)
(guix build python-build-system))
;; See https://github.com/daler/pybedtools/issues/192
,@(substitute-keyword-arguments (package-arguments pkg)
((#:phases phases)
`(modify-phases ,phases
(replace 'check
(lambda _
(let ((cwd (getcwd)))
(setenv "PYTHONPATH"
(string-append cwd "/build/"
(find (cut string-prefix? "lib" <>)
(scandir (string-append cwd "/build")))
":" (getenv "PYTHONPATH"))))
;; The tests need to be run from elsewhere...
(mkdir-p "/tmp/test")
(copy-recursively "pybedtools/test" "/tmp/test")
(with-directory-excursion "/tmp/test"
(invoke "nosetests"
;; This test fails for unknown reasons
"--exclude=.*test_getting_example_beds"))
#t))))))))))
(package-with-python2 python-pybedtools))
(define-public python-biom-format
(package
@ -4345,130 +4365,6 @@ (define-public orfm
(home-page "https://github.com/wwood/OrfM")
(license license:lgpl3+)))
(define-public pplacer
(let ((commit "807f6f3"))
(package
(name "pplacer")
;; The commit should be updated with each version change.
(version "1.1.alpha19")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/matsen/pplacer.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "11ppbbbx20p2g9wj3ff64dhnarb12q79v7qh4rk0gj6lkbz4n7cn"))))
(build-system ocaml-build-system)
(arguments
`(#:ocaml ,ocaml-4.01
#:findlib ,ocaml4.01-findlib
#:modules ((guix build ocaml-build-system)
(guix build utils)
(ice-9 ftw))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'replace-bundled-cddlib
(lambda* (#:key inputs #:allow-other-keys)
(let* ((cddlib-src (assoc-ref inputs "cddlib-src"))
(local-dir "cddlib_guix"))
(mkdir local-dir)
(with-directory-excursion local-dir
(invoke "tar" "xvf" cddlib-src))
(let ((cddlib-src-folder
(string-append local-dir "/"
(list-ref (scandir local-dir) 2)
"/lib-src")))
(for-each make-file-writable (find-files "cdd_src" ".*"))
(for-each
(lambda (file)
(copy-file file
(string-append "cdd_src/" (basename file))))
(find-files cddlib-src-folder ".*[ch]$")))
#t)))
(add-after 'unpack 'fix-makefile
(lambda _
;; Remove system calls to 'git'.
(substitute* "Makefile"
(("^DESCRIPT:=pplacer-.*")
(string-append
"DESCRIPT:=pplacer-$(shell uname)-v" ,version "\n")))
(substitute* "myocamlbuild.ml"
(("git describe --tags --long .*\\\" with")
(string-append
"echo -n v" ,version "-" ,commit "\" with")))
#t))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(copy-recursively "bin" bin))
#t)))))
(native-inputs
`(("zlib" ,zlib)
("gsl" ,gsl)
("ocaml-ounit" ,ocaml4.01-ounit)
("ocaml-batteries" ,ocaml4.01-batteries)
("ocaml-camlzip" ,ocaml4.01-camlzip)
("ocaml-csv" ,ocaml4.01-csv)
("ocaml-sqlite3" ,ocaml4.01-sqlite3)
("ocaml-xmlm" ,ocaml4.01-xmlm)
("ocaml-mcl" ,ocaml4.01-mcl)
("ocaml-gsl" ,ocaml4.01-gsl)
("cddlib-src" ,(package-source cddlib))))
(propagated-inputs
`(("pplacer-scripts" ,pplacer-scripts)))
(synopsis "Phylogenetic placement of biological sequences")
(description
"Pplacer places query sequences on a fixed reference phylogenetic tree
to maximize phylogenetic likelihood or posterior probability according to a
reference alignment. Pplacer is designed to be fast, to give useful
information about uncertainty, and to offer advanced visualization and
downstream analysis.")
(home-page "http://matsen.fhcrc.org/pplacer")
(license license:gpl3))))
;; This package is installed alongside 'pplacer'. It is a separate package so
;; that it can use the python-build-system for the scripts that are
;; distributed alongside the main OCaml binaries.
(define pplacer-scripts
(package
(inherit pplacer)
(name "pplacer-scripts")
(build-system python-build-system)
(arguments
`(#:python ,python-2
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enter-scripts-dir
(lambda _ (chdir "scripts") #t))
(replace 'check
(lambda _ (invoke "python" "-m" "unittest" "discover" "-v") #t))
(add-after 'install 'wrap-executables
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(let ((path (string-append
(assoc-ref inputs "hmmer") "/bin:"
(assoc-ref inputs "infernal") "/bin")))
(display path)
(wrap-program (string-append bin "/refpkg_align.py")
`("PATH" ":" prefix (,path))))
(let ((path (string-append
(assoc-ref inputs "hmmer") "/bin")))
(wrap-program (string-append bin "/hrefpkg_query.py")
`("PATH" ":" prefix (,path)))))
#t)))))
(inputs
`(("infernal" ,infernal)
("hmmer" ,hmmer)))
(propagated-inputs
`(("python-biopython" ,python2-biopython)
("taxtastic" ,taxtastic)))
(synopsis "Pplacer Python scripts")))
(define-public python2-pbcore
(package
(name "python2-pbcore")
@ -11172,7 +11068,7 @@ (define-public sambamba
(native-inputs
`(("ldc" ,ldc)
("rdmd" ,rdmd)
("python" ,python-minimal)
("python" ,python)
("biod"
,(let ((commit "4f1a7d2fb7ef3dfe962aa357d672f354ebfbe42e"))
(origin
@ -14441,3 +14337,69 @@ (define-public nanopolish
assembly, detect base modifications, call SNPs (Single nucleotide
polymorphisms) and indels with respect to a reference genome and more.")
(license license:expat))))
(define-public cnvkit
(package
(name "cnvkit")
(version "0.9.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/etal/cnvkit.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0g2f78k68yglmj4fsfmgs8idqv3di9aj53fg0ld0hqljg8chhh82"))))
(build-system python-build-system)
(propagated-inputs
`(("python-biopython" ,python-biopython)
("python-future" ,python-future)
("python-matplotlib" ,python-matplotlib)
("python-numpy" ,python-numpy)
("python-reportlab" ,python-reportlab)
("python-pandas" ,python-pandas)
("python-pysam" ,python-pysam)
("python-pyfaidx" ,python-pyfaidx)
("python-scipy" ,python-scipy)
;; R packages
("r-dnacopy" ,r-dnacopy)))
(home-page "https://cnvkit.readthedocs.org/")
(synopsis "Copy number variant detection from targeted DNA sequencing")
(description
"CNVkit is a Python library and command-line software toolkit to infer
and visualize copy number from high-throughput DNA sequencing data. It is
designed for use with hybrid capture, including both whole-exome and custom
target panels, and short-read sequencing platforms such as Illumina and Ion
Torrent.")
(license license:asl2.0)))
(define-public python-pyfit-sne
(package
(name "python-pyfit-sne")
(version "1.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KlugerLab/pyFIt-SNE.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "13wh3qkzs56azmmgnxib6xfr29g7xh09sxylzjpni5j0pp0rc5qw"))))
(build-system python-build-system)
(propagated-inputs
`(("python-numpy" ,python-numpy)))
(inputs
`(("fftw" ,fftw)))
(native-inputs
`(("python-cython" ,python-cython)))
(home-page "https://github.com/KlugerLab/pyFIt-SNE")
(synopsis "FFT-accelerated Interpolation-based t-SNE")
(description
"t-Stochastic Neighborhood Embedding (t-SNE) is a highly successful
method for dimensionality reduction and visualization of high dimensional
datasets. A popular implementation of t-SNE uses the Barnes-Hut algorithm to
approximate the gradient at each iteration of gradient descent. This package
is a Cython wrapper for FIt-SNE.")
(license license:bsd-4)))

22
gnu/packages/bittorrent.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2016, 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2018 Nam Nguyen <namn@berkeley.edu>
@ -426,16 +426,16 @@ (define-public libtorrent-rasterbar
(define-public qbittorrent
(package
(name "qbittorrent")
(version "4.1.3")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/qbittorrent/qBittorrent/archive/release-"
version ".tar.gz"))
(file-name (string-append name "-release-" version ".tar.gz"))
(sha256
(base32
"00zrpnwanq9f7maky2z4wnzw08xy902s77scm2gcvxxxankr4j92"))))
(version "4.1.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/qbittorrent/qBittorrent.git")
(commit (string-append "release-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "09zcygaxfv9g6av0vsvlyzv4v65wvj766xyfx31yz5ig3xan6ak1"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags

12
gnu/packages/bootloaders.scm
View file

@ -7,7 +7,7 @@
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 nee <nee@cock.li>
;;;
;;; This file is part of GNU Guix.
@ -773,7 +773,7 @@ (define-public vboot-utils
(define-public os-prober
(package
(name "os-prober")
(version "1.76")
(version "1.77")
(source
(origin
(method url-fetch)
@ -781,15 +781,15 @@ (define-public os-prober
version ".tar.xz"))
(sha256
(base32
"1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk"))))
"0pvhrw4h05n21zw7ig3a3bi8aqdh6zxs0x1znz4g7vhspsps93ld"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
(ice-9 regex) ; for string-match
(srfi srfi-26)) ; for cut
(ice-9 regex) ; for string-match
(srfi srfi-26)) ; for cut
#:make-flags (list "CC=gcc")
#:tests? #f ; no tests
#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(replace 'configure

6
gnu/packages/busybox.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
@ -108,7 +108,7 @@ (define-public busybox
(define-public toybox
(package
(name "toybox")
(version "0.7.8")
(version "0.8.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -116,7 +116,7 @@ (define-public toybox
version ".tar.gz"))
(sha256
(base32
"1mlqv5hsvy8ii6m698hq6rc316klwv44jlr034knwg6bk1lf2qj9"))))
"0mirj977zxsxnfaiqndwgsn9calgg312d817fi1hkfbd8kcyrk73"))))
(build-system gnu-build-system)
(arguments
'(#:phases

32
gnu/packages/check.scm
View file

@ -16,7 +16,7 @@
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
@ -286,7 +286,7 @@ (define-public cmocka
(define-public cppcheck
(package
(name "cppcheck")
(version "1.86")
(version "1.87")
(source (origin
(method git-fetch)
(uri (git-reference
@ -294,7 +294,7 @@ (define-public cppcheck
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0jr4aah72c7wy94a8vlj3k050rx6pmc7m9nvmll1jwbscxj5f7ff"))))
(base32 "1xiy54rz99nzbpwj35jiyssd2nc6k5k0lw5ml6nh2qnmbfkl8swl"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DBUILD_TESTS=ON")))
@ -694,23 +694,22 @@ (define-public python2-pytest-bootstrap
(define-public python-pytest-cov
(package
(name "python-pytest-cov")
(version "2.6.0")
(version "2.6.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-cov" version))
(sha256
(base32
"0qnpp9y3ygx4jk4pf5ad71fh2skbvnr6gl54m7rg5qysnx4g0q73"))))
(base32 "0cyxbbghx2l4p60w10k00j1j74q1ngfiffr0pxn73ababjr69dha"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
;; options taken from tox.ini
;; Options taken from tox.ini.
;; TODO: make "--restructuredtext" tests pass. They currently fail
;; with "Duplicate implicit target name"
;; with "Duplicate implicit target name".
(invoke "python" "./setup.py" "check"
"--strict" "--metadata"))))))
(propagated-inputs
@ -755,14 +754,14 @@ (define-public python2-pytest-runner
(define-public python-pytest-mock
(package
(name "python-pytest-mock")
(version "1.10.0")
(version "1.10.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-mock" version))
(sha256
(base32
"1h6lgpmsvs9s8j2s80v06f9f3iaw1n1rc51mbrxk1f12sw4q56nq"))))
"1i5mg3ff1qk0wqfcxfz60hwy3q5dskdp36i10ckigkzffg8hc3ad"))))
(build-system python-build-system)
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)))
@ -1905,14 +1904,13 @@ (define-public python2-rednose
(define-public python-nose-randomly
(package
(name "python-nose-randomly")
(version "1.2.5")
(version "1.2.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "nose-randomly" version))
(sha256
(base32
"1cw9dlr1zh3w4i438kin7z0rm8092ki52hayisyc43h9pcplq7rn"))))
(base32 "0z662rqhfk4bjmg806mn4frb8nz4gbh7mrddsrhfffp1g4yklj3y"))))
(build-system python-build-system)
(native-inputs
`(("python-nose" ,python-nose)
@ -2140,7 +2138,7 @@ (define-public libfaketime
(define-public umockdev
(package
(name "umockdev")
(version "0.11.3")
(version "0.12.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/martinpitt/umockdev/"
@ -2148,7 +2146,7 @@ (define-public umockdev
"umockdev-" version ".tar.xz"))
(sha256
(base32
"1in2hdan1g62wpvgjlj8mci85551ipr1964j2b9j06gm3blpihcx"))))
"1hx5jm9afng6hw9wyp524z8nwdp6w053pca0w2c0gqpgrmvjxvd2"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@ -2161,8 +2159,8 @@ (define-public umockdev
#t)))))
(native-inputs
`(("vala" ,vala)
("python" ,python) ; for tests
("which" ,which) ; for tests
("python" ,python) ; for tests
("which" ,which) ; for tests
("gtk-doc" ,gtk-doc)
("pkg-config" ,pkg-config)))
(inputs

155
gnu/packages/chez.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -42,22 +42,22 @@ (define-module (gnu packages chez)
(define nanopass
(let ((version "1.9"))
(origin
(method url-fetch)
(uri (string-append
"https://github.com/nanopass/nanopass-framework-scheme/archive"
"/v" version ".tar.gz"))
(sha256 (base32 "11pwyy4jiwhcl2am3a4ciczacjbjkyvdizqzdglb3l1hj2gj6nv2"))
(file-name (string-append "nanopass-" version ".tar.gz")))))
(method git-fetch)
(uri (git-reference
(url "https://github.com/nanopass/nanopass-framework-scheme.git")
(commit (string-append "v" version))))
(sha256 (base32 "0lrngdna6w7v9vlp1a873hgwrwsz2p0pgkccswa4smzvdyhgfsri"))
(file-name (git-file-name "nanopass" version)))))
(define stex
(let ((version "1.2.1"))
(origin
(method url-fetch)
(uri (string-append
"https://github.com/dybvig/stex/archive"
"/v" version ".tar.gz"))
(sha256 (base32 "03pl3f668h24dn51vccr1sj5lsba9zq3j37bnxjvdadcdaj4qy5z"))
(file-name (string-append "stex-" version ".tar.gz")))))
(method git-fetch)
(uri (git-reference
(url "https://github.com/dybvig/stex.git")
(commit (string-append "v" version))))
(sha256 (base32 "1jiawhhqnsj42hzmlbq5xby3iarhf8vhiqs0kg1a0zg5jsn6cf8n"))
(file-name (git-file-name "stex" version)))))
(define-public chez-scheme
(package
@ -65,12 +65,13 @@ (define-public chez-scheme
(version "9.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/cisco/ChezScheme/archive/"
"v" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/cisco/ChezScheme.git")
(commit (string-append "v" version))))
(sha256
(base32 "135991hspq0grf26pvl2lkwhp92yz204h6rgiwyym0x6v0xzknd1"))
(file-name (string-append "chez-scheme-" version ".tar.gz"))
(base32 "132fal5hwiq0bqzvfhjsqr4d11cfdh1670f6286ks29xxj1c04zq"))
(file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet
;; Fix compilation with glibc >= 2.26, which removed xlocale.h.
@ -122,7 +123,8 @@ (define-public chez-scheme
;; next one; see <https://github.com/cisco/ChezScheme/issues/209>.
(substitute* "csug/copyright.stex"
(("\\\\INSERTREVISIONMONTHSPACEYEAR" )
"October 2017")))) ; tarball release date
"October 2017")) ; tarball release date
#t))
;; Adapt the custom 'configure' script.
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
@ -140,9 +142,9 @@ (define-public chez-scheme
(apply unpack (list #:source src))
(apply patch-source-shebangs (list #:source src)))
(delete-file-recursively new-name)
(system* "mv" orig-name new-name)))
`((,nanopass "nanopass-framework-scheme-1.9" "nanopass")
(,stex "stex-1.2.1" "stex")))
(invoke "mv" orig-name new-name)))
`((,nanopass "source" "nanopass")
(,stex "source" "stex")))
;; The Makefile wants to download and compile "zlib". We patch
;; it to use the one from our 'zlib' package.
(substitute* "configure"
@ -174,23 +176,24 @@ (define-public chez-scheme
(("/bin/true") (which "true")))
(substitute* "stex/Makefile"
(("PREFIX=/usr") (string-append "PREFIX=" out)))
(zero? (system* "./configure" "--threads"
(string-append "--installprefix=" out))))))
(invoke "./configure" "--threads"
(string-append "--installprefix=" out)))))
;; Installation of the documentation requires a running "chez".
(add-after 'install 'install-doc
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))
(doc (string-append (assoc-ref outputs "doc")
(let ((doc (string-append (assoc-ref outputs "doc")
"/share/doc/" ,name "-" ,version)))
(setenv "HOME" (getcwd))
(setenv "PATH" (string-append (getenv "PATH") ":" bin))
(with-directory-excursion "stex"
(system* "make" (string-append "BIN=" bin)))
(system* "make" "docs")
(invoke "make" "docs")
(with-directory-excursion "csug"
(substitute* "Makefile"
(("/tmp/csug9") doc))
(system* "make" "install")
;; The ‘installdir=’ can't be overruled on the command line.
(("/tmp/csug9") doc)
;; $m is the ‘machine type’, e.g. ‘ta6le’ on x86_64, but is
;; set incorrectly for some reason, e.g. to ‘a6le’ on x86_64.
;; Avoid the whole mess by running the (machine-independent)
;; ‘installsh’ script at its original location.
(("\\$m/installsh") "makefiles/installsh"))
(invoke "make" "install")
(install-file "csug.pdf" doc))
(with-directory-excursion "release_notes"
(install-file "release_notes.pdf" doc))
@ -237,13 +240,13 @@ (define-public chez-srfi
(version "1.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/fedeinthemix/chez-srfi/archive"
"/v" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/fedeinthemix/chez-srfi.git")
(commit (string-append "v" version))))
(sha256
(base32 "17i4wly7bcr5kb5hf04ljpbvv4r5hsr9xsmw650fj43z9jr303gs"))
(file-name (string-append name "-" version ".tar.gz"))))
(base32 "1vgn984mj2q4w6r2q66h7qklp2hrh85wwh4k9yisga5fi0ps7myf"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
`(("chez-scheme" ,chez-scheme)))
@ -264,16 +267,15 @@ (define-public chez-web
(revision "1"))
(package
(name "chez-web")
;; release 2.0 is different and doesn't work.
(version (string-append "2.0-" revision "."
(string-take commit 7)))
;; Release 2.0 is different and doesn't work.
(version (git-version "2.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/arcfide/ChezWEB.git")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(file-name (git-file-name name version))
(sha256
(base32 "1dq25qygyncbfq4kwwqqgyyakfqjwhp5q23vrf3bff1p66nyfl3b"))))
(build-system gnu-build-system)
@ -318,7 +320,8 @@ (define-public chez-web
(("\\./chezweave" all)
(string-append "chez-scheme --program " all)))
(substitute* "installit"
(("-g \\$GROUP -o \\$OWNER") "")))))))
(("-g \\$GROUP -o \\$OWNER") ""))
#t)))))
(home-page "https://github.com/arcfide/ChezWEB")
(synopsis "Hygienic Literate Programming for Chez Scheme")
(description "ChezWEB is a system for doing Knuthian style WEB
@ -330,15 +333,14 @@ (define-public chez-sockets
(revision "1"))
(package
(name "chez-sockets")
(version (string-append "0.0-" revision "."
(string-take commit 7)))
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/arcfide/chez-sockets.git")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(file-name (git-file-name name version))
(sha256
(base32 "1n5fbwwz51fdzvjackgmnsgh363g9inyxv7kmzi0469cwavwcx5m"))))
(build-system gnu-build-system)
@ -435,11 +437,13 @@ (define-public chez-matchable
(home-page "https://github.com/fedeinthemix/chez-matchable")
(source
(origin
(method url-fetch)
(uri (string-append home-page "/archive" "/v" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(sha256
(base32 "0cl4vc6487pikjq159pj4n5ghyaax31nywb5n4yn1682h3ir1hs0"))
(file-name (string-append name "-" version ".tar.gz"))))
(base32 "02qn7x348p23z1x5lwhkyj7i8z6mgwpzpnwr8dyina0yzsdkr71s"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
`(("chez-srfi" ,chez-srfi))) ; for tests
@ -462,13 +466,13 @@ (define-public chez-irregex
(version "0.9.4")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/fedeinthemix/chez-irregex/archive"
"/v" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/fedeinthemix/chez-irregex.git")
(commit (string-append "v" version))))
(sha256
(base32 "0ywy5syaw549a58viz68dmgnv756ic705rcnlqxgjq27lnaim53b"))
(file-name (string-append name "-" version ".tar.gz"))))
(base32 "0jh6piylw545j81llay9wfivgpv6lcnwd81gm4w17lkasslir50q"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
`(("chez-matchable" ,chez-matchable))) ; for tests
@ -514,10 +518,10 @@ (define-public chez-fmt
(replace 'configure ,chez-configure)
(replace 'build
(lambda* (#:key (make-flags '()) #:allow-other-keys)
(zero? (apply system* "make" "chez-build" make-flags))))
(apply invoke "make" "chez-build" make-flags)))
(replace 'install
(lambda* (#:key (make-flags '()) #:allow-other-keys)
(zero? (apply system* "make" "chez-install" make-flags)))))))
(apply invoke "make" "chez-install" make-flags))))))
(home-page "http://synthcode.com/scheme/fmt")
(synopsis "Combinator formatting library for Chez Scheme")
(description "This package provides a library of procedures for
@ -534,14 +538,16 @@ (define-public chez-mit
(home-page "https://github.com/fedeinthemix/chez-mit")
(source
(origin
(method url-fetch)
(uri (string-append home-page "/archive/v" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(sha256
(base32 "1p11q061znwxzxrxg3vw4dbsnpv1dav12hjhnkrjnzyyjvvdm2kn"))
(file-name (string-append name "-" version ".tar.gz"))))
(base32 "0c7i3b6i90xk96nmxn1pc9272a4yal4v40dm1a4ybdi87x53zkk0"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
`(("chez-srfi" ,chez-srfi))) ; for tests
`(("chez-srfi" ,chez-srfi))) ; for tests
(native-inputs
`(("chez-scheme" ,chez-scheme)))
(arguments
@ -562,14 +568,16 @@ (define-public chez-scmutils
(home-page "https://github.com/fedeinthemix/chez-scmutils")
(source
(origin
(method url-fetch)
(uri (string-append home-page "/archive/v" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(sha256
(base32 "1a5j61pggaiwl1gl6m038rcy5n8r2sj5nyjmz86jydx97mm5i8hj"))
(file-name (string-append name "-" version ".tar.gz"))))
(base32 "0lb05wlf8qpgg8y0gdsyaxg1nbfx1qbaqdjvygrp64ndn8fnhq7l"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
`(("chez-srfi" ,chez-srfi))) ; for tests
`(("chez-srfi" ,chez-srfi))) ; for tests
(native-inputs
`(("chez-scheme" ,chez-scheme)))
(propagated-inputs
@ -577,7 +585,7 @@ (define-public chez-scmutils
("chez-srfi" ,chez-srfi)))
(arguments
`(#:make-flags ,(chez-make-flags name version)
#:tests? #f ; no test suite
#:tests? #f ; no test suite
#:phases
(modify-phases %standard-phases
(replace 'configure ,chez-configure)
@ -589,7 +597,7 @@ (define-public chez-scmutils
(delete 'build)
(add-after 'install 'install-src
(lambda* (#:key (make-flags '()) #:allow-other-keys)
(zero? (apply system* "make" "install-src" make-flags))))
(apply invoke "make" "install-src" make-flags)))
(add-after 'install-src 'absolute-path-in-scm-files
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@ -609,12 +617,13 @@ (define-public chez-scmutils
(let* ((out (assoc-ref outputs "out"))
(mk-file (car (find-files out "Makefile"))))
(with-directory-excursion (dirname mk-file)
(zero? (apply system* "make" "build" make-flags))))))
(apply invoke "make" "build" make-flags)))))
(add-after 'build 'clean-up
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
(for-each delete-file
(find-files out "Makefile|compile-all\\.ss"))))))))
(find-files out "Makefile|compile-all\\.ss"))
#t))))))
(synopsis "Port of MIT/GNU Scheme Scmutils to Chez Scheme")
(description "This package provides a port of the MIT/GNU Scheme
Scmutils program to Chez Scheme. The port consists of a set of

705
gnu/packages/chromium.scm Normal file
View file

@ -0,0 +1,705 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages chromium)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix store)
#:use-module (guix monads)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages assembly)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages compression)
#:use-module (gnu packages cups)
#:use-module (gnu packages curl)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnuzilla)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages ninja)
#:use-module (gnu packages node)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages regex)
#:use-module (gnu packages serialization)
#:use-module (gnu packages speech)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages vulkan)
#:use-module (gnu packages video)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg))
(define %preserved-third-party-files
'("base/third_party/dmg_fp" ;X11-style
"base/third_party/dynamic_annotations" ;BSD-2
"base/third_party/icu" ;Unicode, X11-style
"base/third_party/superfasthash" ;BSD-3
"base/third_party/symbolize" ;BSD-3
"base/third_party/xdg_mime" ;LGPL2.0+ or Academic 2.0
"base/third_party/xdg_user_dirs" ;Expat
"chrome/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
"courgette/third_party/bsdiff" ;BSD-2, BSD protection license
"courgette/third_party/divsufsort" ;Expat
"net/third_party/http2" ;BSD-3
"net/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
"net/third_party/nss" ;MPL-2.0
"net/third_party/quic" ;BSD-3
"net/third_party/spdy" ;BSD-3
"net/third_party/uri_template" ;ASL2.0
"third_party/abseil-cpp" ;ASL2.0
"third_party/adobe/flash/flapper_version.h" ;no license, trivial
"third_party/angle" ;BSD-3
"third_party/angle/src/common/third_party/base" ;BSD-3
"third_party/angle/src/common/third_party/smhasher" ;Public domain
"third_party/angle/src/common/third_party/xxhash" ;BSD-2
"third_party/angle/src/third_party/compiler" ;BSD-2
"third_party/angle/src/third_party/libXNVCtrl" ;Expat
"third_party/angle/src/third_party/trace_event" ;BSD-3
"third_party/angle/third_party/glslang" ;BSD-3
"third_party/angle/third_party/spirv-headers" ;Expat
"third_party/angle/third_party/spirv-tools" ;Expat
"third_party/angle/third_party/vulkan-headers" ;ASL2.0
"third_party/angle/third_party/vulkan-loader" ;ASL2.0
"third_party/angle/third_party/vulkan-tools" ;ASL2.0
"third_party/angle/third_party/vulkan-validation-layers" ;ASL2.0
"third_party/apple_apsl" ;APSL2.0
"third_party/blink" ;BSD-3, LGPL2+
"third_party/boringssl" ;OpenSSL/ISC (Google additions are ISC)
"third_party/boringssl/src/third_party/fiat" ;Expat
"third_party/breakpad" ;BSD-3
"third_party/brotli" ;Expat
"third_party/cacheinvalidation" ;ASL2.0
"third_party/catapult" ;BSD-3
"third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0
"third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0
"third_party/catapult/third_party/polymer" ;BSD-3
"third_party/catapult/tracing/third_party/d3" ;BSD-3
"third_party/catapult/tracing/third_party/gl-matrix" ;Expat
"third_party/catapult/tracing/third_party/jszip" ;Expat or GPL3
"third_party/catapult/tracing/third_party/mannwhitneyu" ;Expat
"third_party/catapult/tracing/third_party/oboe" ;BSD-2
"third_party/catapult/tracing/third_party/pako" ;Expat
"third_party/ced" ;BSD-3
"third_party/cld_3" ;ASL2.0
"third_party/crashpad" ;ASL2.0
"third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib
"third_party/crc32c" ;BSD-3
"third_party/cros_system_api" ;BSD-3
"third_party/dom_distiller_js" ;BSD-3
"third_party/fips181" ;BSD-3
"third_party/flatbuffers" ;ASL2.0
"third_party/google_input_tools" ;ASL2.0
"third_party/google_input_tools/third_party/closure_library" ;ASL2.0
"third_party/google_input_tools/third_party/closure_library/third_party/closure" ;Expat
"third_party/googletest" ;BSD-3
"third_party/hunspell" ;MPL1.1/GPL2+/LGPL2.1+
"third_party/iccjpeg" ;IJG
"third_party/inspector_protocol" ;BSD-3
"third_party/jinja2" ;BSD-3
"third_party/jstemplate" ;ASL2.0
"third_party/khronos" ;Expat, SGI
"third_party/leveldatabase" ;BSD-3
"third_party/libXNVCtrl" ;Expat
"third_party/libaddressinput" ;ASL2.0
"third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0"
"third_party/libaom/source/libaom/third_party/vector" ;Expat
"third_party/libaom/source/libaom/third_party/x86inc" ;ISC
"third_party/libjingle_xmpp" ;BSD-3
"third_party/libphonenumber" ;ASL2.0
"third_party/libsecret" ;LGPL2.1+
"third_party/libsrtp" ;BSD-3
"third_party/libsync" ;ASL2.0
"third_party/libudev" ;LGPL2.1+
"third_party/libwebm" ;BSD-3
"third_party/libxml/chromium" ;BSD-3
"third_party/libyuv" ;BSD-3
"third_party/lss" ;BSD-3
"third_party/markupsafe" ;BSD-3
"third_party/mesa_headers" ;Expat, SGI
"third_party/metrics_proto" ;BSD-3
"third_party/modp_b64" ;BSD-3
"third_party/nasm" ;BSD-2
"third_party/node" ;Expat
"third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2" ;BSD-2
"third_party/ots" ;BSD-3
"third_party/pdfium" ;BSD-3
"third_party/pdfium/third_party/agg23" ;Expat
"third_party/pdfium/third_party/base" ;BSD-3
"third_party/pdfium/third_party/bigint" ;Public domain, BSD-3
"third_party/pdfium/third_party/skia_shared" ;BSD-3
"third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
"third_party/ply" ;BSD-3
"third_party/polymer" ;BSD-3
"third_party/protobuf" ;BSD-3
"third_party/protobuf/third_party/six" ;Expat
"third_party/pyjson5" ;ASL2.0
"third_party/qcms" ;Expat
"third_party/rnnoise" ;BSD-3
"third_party/s2cellid" ;ASL2.0
"third_party/sfntly" ;ASL2.0
"third_party/skia" ;BSD-3
"third_party/skia/third_party/gif" ;MPL1.1/GPL2+/LGPL2.1+
"third_party/skia/third_party/skcms" ;BSD-3
"third_party/skia/third_party/vulkan" ;BSD-3
"third_party/smhasher" ;Expat, public domain
"third_party/speech-dispatcher" ;GPL2+
"third_party/spirv-headers" ;ASL2.0
"third_party/SPIRV-Tools" ;ASL2.0
"third_party/sqlite" ;Public domain
"third_party/ungoogled" ;BSD-3
"third_party/usb_ids" ;BSD-3
"third_party/usrsctp" ;BSD-2
"third_party/web-animations-js" ;ASL2.0
"third_party/webdriver" ;ASL2.0
"third_party/webrtc" ;BSD-3
"third_party/webrtc/common_audio/third_party/fft4g" ;Non-copyleft
"third_party/webrtc/common_audio/third_party/spl_sqrt_floor" ;Public domain
"third_party/webrtc/modules/third_party/fft" ;Non-copyleft
"third_party/webrtc/modules/third_party/g711" ;Public domain
"third_party/webrtc/modules/third_party/g722" ;Public domain
"third_party/webrtc/rtc_base/third_party/base64" ;Non-copyleft
"third_party/webrtc/rtc_base/third_party/sigslot" ;Public domain
"third_party/widevine/cdm/widevine_cdm_version.h" ;BSD-3
"third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3
"third_party/woff2" ;ASL2.0
"third_party/xdg-utils" ;Expat
"third_party/yasm/run_yasm.py" ;BSD-2 or BSD-3
"third_party/zlib/google" ;BSD-3
"url/third_party/mozilla" ;BSD-3, MPL1.1/GPL2+/LGPL2.1+
"v8/src/third_party/utf8-decoder" ;Expat
"v8/src/third_party/valgrind" ;BSD-4
"v8/third_party/inspector_protocol" ;BSD-3
"v8/third_party/v8/builtins")) ;PSFL
(define* (computed-origin-method gexp-promise hash-algo hash
#:optional (name "source")
#:key (system (%current-system))
(guile (default-guile)))
"Return a derivation that executes the G-expression that results
from forcing GEXP-PROMISE."
(mlet %store-monad ((guile (package->derivation guile system)))
(gexp->derivation (or name "computed-origin")
(force gexp-promise)
#:system system
#:guile-for-build guile)))
(define %chromium-version "72.0.3626.109")
(define %ungoogled-revision "a58db880c15e5077e881cad7b07d1a277ecd463a")
;; This is a "computed" origin that does the following:
;; 1) Runs the Ungoogled scripts on a pristine Chromium tarball.
;; 2) Prunes all third_party folders that are not explicitly preserved.
;; 3) Adjusts "GN" build files such that system libraries are preferred.
(define ungoogled-chromium-source
(let* ((chromium-source
(origin
(method url-fetch)
(uri (string-append "https://commondatastorage.googleapis.com"
"/chromium-browser-official/chromium-"
%chromium-version ".tar.xz"))
(sha256
(base32
"0bcc0iksk2v30drwd5zbw7v6sfbw16jqllc12ks2nifrvh058jjp"))))
(ungoogled-source
(origin
(method git-fetch)
(uri (git-reference (url "https://github.com/Eloston/ungoogled-chromium")
(commit %ungoogled-revision)))
(file-name (git-file-name "ungoogled-chromium"
(string-take %ungoogled-revision 7)))
(sha256
(base32
"19w60b71rcccp32b7rcpw75kfg4sw2xfr32rfk0hcyaj5rq0mm69")))))
(origin
(method computed-origin-method)
(file-name (string-append "ungoogled-chromium-" %chromium-version ".tar.xz"))
(sha256 #f)
(uri
(delay
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils))
(let ((chromium-dir (string-append "chromium-" #$%chromium-version))
(preserved-files (list #$@%preserved-third-party-files)))
(set-path-environment-variable
"PATH" '("bin")
(list #+(canonical-package patch)
#+(canonical-package xz)
#+(canonical-package tar)
#+python-2
#+python))
(copy-recursively #+ungoogled-source "/tmp/ungoogled")
(with-directory-excursion "/tmp/ungoogled"
;; Create a custom "bundle" that inherits from linux_rooted
;; and adds an additional patch.
(format #t "Creating Guix config bundle...~%")
(force-output)
(mkdir-p "config_bundles/guix")
(call-with-output-file "config_bundles/guix/bundlemeta.ini"
(lambda (port)
(format port
"[bundle]
display_name = GNU Guix
depends = linux_rooted\n")))
(call-with-output-file "config_bundles/guix/patch_order.list"
(lambda (port)
(format port "debian_buster/system/openjpeg.patch\n")))
(format #t "Unpacking chromium tarball...~%")
(force-output)
(invoke "tar" "xf" #+chromium-source)
(format #t "Ungooglifying...~%")
(force-output)
(invoke "python3" "run_buildkit_cli.py" "prune"
"-b" "config_bundles/guix" chromium-dir)
(invoke "python3" "run_buildkit_cli.py" "patches" "apply"
"-b" "config_bundles/guix" chromium-dir)
(invoke "python3" "run_buildkit_cli.py" "domains" "apply"
"-b" "config_bundles/linux_rooted"
"-c" "/tmp/domainscache.tar.gz" chromium-dir)
(with-directory-excursion chromium-dir
(format #t "Pruning third party files...~%")
(force-output)
(apply invoke "python"
"build/linux/unbundle/remove_bundled_libraries.py"
"--do-remove" preserved-files)
(format #t "Replacing GN files...~%")
(force-output)
(invoke "python3" "build/linux/unbundle/replace_gn_files.py"
"--system-libraries" "ffmpeg" "flac" "fontconfig"
"freetype" "harfbuzz-ng" "icu" "libdrm" "libevent"
"libjpeg" "libpng" "libvpx" "libwebp" "libxml"
"libxslt" "openh264" "opus" "re2" "snappy" "yasm"
"zlib"))
(format #t (string-append "Packing new ungoogled tarball ...~%"))
(force-output)
(invoke "tar" "cvfa" #$output
;; Avoid non-determinism in the archive.
"--mtime=@0"
"--owner=root:0"
"--group=root:0"
"--sort=name"
chromium-dir)
#t)))))))))
(define opus+custom
(package/inherit opus
(name "opus+custom")
(arguments
(substitute-keyword-arguments (package-arguments opus)
((#:configure-flags flags ''())
;; Opus Custom is an optional extension of the Opus
;; specification that allows for unsupported frame
;; sizes. Chromium requires that this is enabled.
`(cons "--enable-custom-modes"
,flags))))))
(define-public ungoogled-chromium
(package
(name "ungoogled-chromium")
(version %chromium-version)
(synopsis "Graphical web browser")
(source ungoogled-chromium-source)
(build-system gnu-build-system)
(arguments
`(#:tests? #f
;; FIXME: Chromiums RUNPATH lacks entries for some libraries, so
;; we have to disable validation and add a wrapper below.
#:validate-runpath? #f
#:modules ((guix build gnu-build-system)
(guix build utils)
(ice-9 ftw)
(ice-9 regex)
(srfi srfi-26))
#:configure-flags
;; See tools/gn/docs/cookbook.md and
;; https://www.chromium.org/developers/gn-build-configuration
;; for usage. Run "./gn args . --list" in the Release
;; directory for an exhaustive list of supported flags.
;; (Note: The 'configure' phase will do that for you.)
(list "is_debug=false"
"use_gold=false"
"use_lld=false"
"linux_use_bundled_binutils=false"
"use_custom_libcxx=false"
"use_sysroot=false"
"enable_precompiled_headers=false"
"goma_dir=\"\""
"enable_nacl=false"
"enable_nacl_nonsfi=false"
"use_allocator=\"none\""
"use_unofficial_version_number=false"
"treat_warnings_as_errors=false"
"use_official_google_api_keys=false"
"fieldtrial_testing_like_official_build=true"
"safe_browsing_mode=0"
"enable_mdns=false"
"enable_one_click_signin=false"
"enable_reading_list=false"
"enable_remoting=false"
"enable_reporting=false"
"enable_service_discovery=false"
"enable_swiftshader=false"
;; Disable type-checking for the Web UI to avoid a Java dependency.
"closure_compile=false"
;; Define a custom toolchain that simply looks up CC, AR and
;; friends from the environment.
"custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
"host_toolchain=\"//build/toolchain/linux/unbundle:default\""
;; Don't assume it's clang.
"is_clang=false"
;; Disable debugging features to save space. These are normally
;; pulled in by "is_official_build", but that requires "is_clang".
"blink_symbol_level=0"
"enable_iterator_debugging=false"
"exclude_unwind_tables=true"
;; Optimize for building everything at once, as opposed to
;; incrementally for development. See "docs/jumbo.md".
"use_jumbo_build=true"
;; Prefer system libraries.
"use_system_freetype=true"
"use_system_harfbuzz=true"
"use_system_lcms2=true"
"use_system_libdrm=true"
"use_system_libjpeg=true"
"use_system_libpng=true"
"use_system_zlib=true"
"use_gnome_keyring=false" ;deprecated by libsecret
"use_openh264=true"
"use_pulseaudio=true"
"link_pulseaudio=true"
"use_vaapi=true"
;; Don't arbitrarily restrict formats supported by system ffmpeg.
"proprietary_codecs=true"
"ffmpeg_branding=\"Chrome\""
;; WebRTC stuff.
"rtc_use_h264=true"
;; Don't use bundled sources.
"rtc_build_json=false"
"rtc_build_libevent=false"
"rtc_build_libvpx=false"
"rtc_build_opus=false"
"rtc_build_ssl=false"
"rtc_build_libsrtp=true" ;FIXME: fails to find headers
"rtc_build_usrsctp=true" ;TODO: package this
(string-append "rtc_jsoncpp_root=\""
(assoc-ref %build-inputs "jsoncpp")
"/include/jsoncpp/json\"")
(string-append "rtc_ssl_root=\""
(assoc-ref %build-inputs "openssl")
"/include/openssl\""))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-stuff
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "printing/cups_config_helper.py"
(("cups_config =.*")
(string-append "cups_config = '" (assoc-ref inputs "cups")
"/bin/cups-config'\n")))
(substitute*
'("base/process/launch_posix.cc"
"base/third_party/dynamic_annotations/dynamic_annotations.c"
"sandbox/linux/seccomp-bpf/sandbox_bpf.cc"
"sandbox/linux/services/credentials.cc"
"sandbox/linux/services/namespace_utils.cc"
"sandbox/linux/services/syscall_wrappers.cc"
"sandbox/linux/syscall_broker/broker_host.cc")
(("include \"base/third_party/valgrind/") "include \"valgrind/"))
(for-each (lambda (file)
(substitute* file
;; Fix opus include path.
;; Do not substitute opus_private.h.
(("#include \"opus\\.h\"")
"#include \"opus/opus.h\"")
(("#include \"opus_custom\\.h\"")
"#include \"opus/opus_custom.h\"")
(("#include \"opus_defines\\.h\"")
"#include \"opus/opus_defines.h\"")
(("#include \"opus_multistream\\.h\"")
"#include \"opus/opus_multistream.h\"")
(("#include \"opus_types\\.h\"")
"#include \"opus/opus_types.h\"")))
(find-files (string-append "third_party/webrtc/modules"
"/audio_coding/codecs/opus")))
(substitute* "chrome/common/chrome_paths.cc"
(("/usr/share/chromium/extensions")
;; TODO: Add ~/.guix-profile.
"/run/current-system/profile/share/chromium/extensions"))
;; XXX: Should be unnecessary when use_system_lcms2=true.
(substitute* "third_party/pdfium/core/fxcodec/codec/ccodec_iccmodule.h"
(("include \"third_party/lcms/include/lcms2\\.h\"")
"include \"lcms2.h\""))
(substitute*
"third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h"
(("include \"third_party/curl") "include \"curl"))
(substitute* "third_party/webrtc/rtc_base/strings/json.h"
(("#include \"third_party/jsoncpp/") "#include \"json/"))
(substitute* "media/base/decode_capabilities.cc"
(("third_party/libvpx/source/libvpx/") ""))
(substitute* "ui/gfx/skia_util.h"
(("third_party/vulkan/include/") ""))
;; Building chromedriver embeds some files using the ZIP
;; format which doesn't support timestamps before
;; 1980. Therefore, advance the timestamps of the files
;; which are included so that building chromedriver
;; works.
(let ((circa-1980 (* 10 366 24 60 60)))
(for-each (lambda (file)
(utime file circa-1980 circa-1980))
'("chrome/test/chromedriver/extension/background.js"
"chrome/test/chromedriver/extension/manifest.json")))
#t))
(add-before 'configure 'prepare-build-environment
(lambda* (#:key inputs #:allow-other-keys)
;; Make sure the right build tools are used.
(setenv "AR" "ar") (setenv "NM" "nm")
(setenv "CC" "gcc") (setenv "CXX" "g++")
;; Work around <https://bugs.gnu.org/30756>.
(unsetenv "C_INCLUDE_PATH")
(unsetenv "CPLUS_INCLUDE_PATH")
;; TODO: pre-compile instead. Avoids a race condition.
(setenv "PYTHONDONTWRITEBYTECODE" "1")
;; XXX: How portable is this.
(mkdir-p "third_party/node/linux/node-linux-x64")
(symlink (string-append (assoc-ref inputs "node") "/bin")
"third_party/node/linux/node-linux-x64/bin")
#t))
(replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys)
(let ((args (string-join configure-flags " ")))
;; Generate ninja build files.
(invoke "gn" "gen" "out/Release"
(string-append "--args=" args))
;; Print the full list of supported arguments as well as
;; their current status for convenience.
(format #t "Dumping configure flags...\n")
(invoke "gn" "args" "out/Release" "--list"))))
(replace 'build
(lambda* (#:key outputs #:allow-other-keys)
(invoke "ninja" "-C" "out/Release"
"-j" (number->string (parallel-job-count))
"chrome"
"chromedriver")))
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(exe (string-append bin "/chromium"))
(lib (string-append out "/lib"))
(man (string-append out "/share/man/man1"))
(applications (string-append out "/share/applications"))
(install-regexp (make-regexp "\\.(bin|pak)$"))
(locales (string-append lib "/locales"))
(resources (string-append lib "/resources"))
(preferences (assoc-ref inputs "master-preferences"))
(gtk+ (assoc-ref inputs "gtk+"))
(mesa (assoc-ref inputs "mesa"))
(nss (assoc-ref inputs "nss"))
(udev (assoc-ref inputs "udev"))
(sh (which "sh")))
(substitute* '("chrome/app/resources/manpage.1.in"
"chrome/installer/linux/common/desktop.template")
(("@@MENUNAME@@") "Chromium")
(("@@PACKAGE@@") "chromium")
(("/usr/bin/@@USR_BIN_SYMLINK_NAME@@") exe))
(mkdir-p man)
(copy-file "chrome/app/resources/manpage.1.in"
(string-append man "/chromium.1"))
(mkdir-p applications)
(copy-file "chrome/installer/linux/common/desktop.template"
(string-append applications "/chromium.desktop"))
(mkdir-p lib)
(copy-file preferences (string-append lib "/master_preferences"))
(with-directory-excursion "out/Release"
(for-each (lambda (file)
(install-file file lib))
(scandir "." (cut regexp-exec install-regexp <>)))
(copy-file "chrome" (string-append lib "/chromium"))
;; TODO: Install icons from "../../chrome/app/themes" into
;; "out/share/icons/hicolor/$size".
(install-file
"product_logo_48.png"
(string-append out "/share/icons/48x48/chromium.png"))
(copy-recursively "locales" locales)
(copy-recursively "resources" resources)
(mkdir-p bin)
(symlink "../lib/chromium" exe)
(install-file "chromedriver" bin)
(wrap-program exe
;; TODO: Get these in RUNPATH.
`("LD_LIBRARY_PATH" ":" prefix
(,(string-append lib ":" nss "/lib/nss:" mesa "/lib:"
udev "/lib")))
;; Avoid file manager crash. See <https://bugs.gnu.org/26593>.
`("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share"))))
#t)))))))
(native-inputs
`(("bison" ,bison)
("gcc" ,gcc-8)
("gn" ,gn)
("gperf" ,gperf)
("ninja" ,ninja)
("node" ,node)
("pkg-config" ,pkg-config)
("which" ,which)
("yasm" ,yasm)
;; This file contains defaults for new user profiles.
("master-preferences" ,(local-file "aux-files/chromium/master-preferences.json"))
("python-beautifulsoup4" ,python2-beautifulsoup4)
("python-html5lib" ,python2-html5lib)
("python" ,python-2)))
(inputs
`(("alsa-lib" ,alsa-lib)
("atk" ,atk)
("cups" ,cups)
("curl" ,curl)
("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
("expat" ,expat)
("flac" ,flac)
("ffmpeg" ,ffmpeg)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib)
("gtk+" ,gtk+)
("harfbuzz" ,harfbuzz)
("icu4c" ,icu4c)
("jsoncpp" ,jsoncpp)
("lcms" ,lcms)
("libevent" ,libevent)
("libffi" ,libffi)
("libjpeg-turbo" ,libjpeg-turbo)
("libpng" ,libpng)
("libva" ,libva)
("libvpx" ,libvpx)
("libwebp" ,libwebp)
("libx11" ,libx11)
("libxcb" ,libxcb)
("libxcomposite" ,libxcomposite)
("libxcursor" ,libxcursor)
("libxdamage" ,libxdamage)
("libxext" ,libxext)
("libxfixes" ,libxfixes)
("libxi" ,libxi)
("libxml2" ,libxml2)
("libxrandr" ,libxrandr)
("libxrender" ,libxrender)
("libxscrnsaver" ,libxscrnsaver)
("libxslt" ,libxslt)
("libxtst" ,libxtst)
("mesa" ,mesa)
("minizip" ,minizip)
("mit-krb5" ,mit-krb5)
("nss" ,nss)
("openh264" ,openh264)
("openjpeg" ,openjpeg) ;PDFium only
("openssl" ,openssl)
("opus" ,opus+custom)
("pango" ,pango)
("pciutils" ,pciutils)
("pulseaudio" ,pulseaudio)
("re2" ,re2)
("snappy" ,snappy)
("speech-dispatcher" ,speech-dispatcher)
("udev" ,eudev)
("valgrind" ,valgrind)
("vulkan-headers" ,vulkan-headers)))
(home-page "https://github.com/Eloston/ungoogled-chromium")
(description
"Ungoogled-Chromium is the Chromium web browser, with some functionality
disabled in order to protect the users privacy.")
;; Chromium is developed as BSD-3, but bundles a large number of third-party
;; components with other licenses. For full information, see chrome://credits.
(license (list license:bsd-3
license:bsd-2
license:expat
license:asl2.0
license:mpl1.1
license:mpl2.0
license:public-domain
license:isc
(license:non-copyleft "chrome://credits"
"See chrome://credits for more information.")
license:lgpl2.1+))))

77
gnu/packages/compression.scm
View file

@ -10,7 +10,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018 Marius Bakke <mbakke@fastmail.com>
@ -557,14 +557,14 @@ (define-public lzip
(define-public lziprecover
(package
(name "lziprecover")
(version "1.20")
(version "1.21")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/lzip/" name "/"
name "-" version ".tar.gz"))
(uri (string-append "mirror://savannah/lzip/lziprecover/"
"lziprecover-" version ".tar.gz"))
(sha256
(base32
"0fpnmdxayvd1ff0rk9606dvr431ji6b1v71km4ww244rih1rmmzz"))))
"094w2z8fz41yaq0gkyr61cl7pb1d7kchpl5dka7rvm3qvbb7ncd2"))))
(build-system gnu-build-system)
(home-page "https://www.nongnu.org/lzip/lziprecover.html")
(synopsis "Recover and decompress data from damaged lzip files")
@ -1278,7 +1278,7 @@ (define-public zpaq
(define-public unshield
(package
(name "unshield")
(version "1.4.2")
(version "1.4.3")
(source
(origin (method url-fetch)
(uri (string-append "http://github.com/twogood/unshield/archive/"
@ -1286,25 +1286,36 @@ (define-public unshield
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0x7ps644yp5dka2zhb8w0ifqmw3d255jafpzfwv8xbcpgq6fmm2x"))))
"1avv5c11jbmzwizq10pwvlh1dmyna8ccvpgacv95h4gbq26rg35a"))))
(build-system cmake-build-system)
(inputs
`(("zlib" ,zlib)
("openssl" ,openssl)
;; test data that is otherwise downloaded with curl
;; Test data that is otherwise downloaded with curl.
("unshield-avigomanager11b22.zip"
,(origin
(method url-fetch)
(uri (string-append "https://www.dropbox.com/s/8r4b6752swe3nhu/"
"unshield-avigomanager11b22.zip?dl=1"))
(uri (string-append
"https://www.dropbox.com/s/8r4b6752swe3nhu/"
"unshield-avigomanager11b22.zip?dl=1"))
(sha256
(base32 "0fwq7lih04if68wpwpsk5wjqyvh32db76a41sq6gbx4dn1lc3ddn"))
(file-name "unshield-avigomanager11b22.zip")))
("unshield-baldurs_gate_patch_v1_1_4315_international.zip"
,(origin
(method url-fetch)
(uri (string-append
"https://www.dropbox.com/s/9ruil8oi6amjbbk/"
"unshield-baldurs_gate_patch_v1_1_4315_international.zip?dl=1"))
(sha256
(base32 "0spaxf6dardlhqxz3ys09fzamj007q3nfyw4xng6gh3qp9780maj"))
(file-name "unshield-baldurs_gate_patch_v1_1_4315_international.zip")))
("unshield-the-feeble-files-spanish.zip"
,(origin
(method url-fetch)
(uri (string-append "https://www.dropbox.com/s/1ng0z9kfxc7eb1e/"
"unshield-the-feeble-files-spanish.zip?dl=1"))
(uri (string-append
"https://www.dropbox.com/s/1ng0z9kfxc7eb1e/"
"unshield-the-feeble-files-spanish.zip?dl=1"))
(sha256
(base32 "1k5cw6vnpja8yjlnhx5124xrw9i8s1l539hfdqqrqz3l5gn0bnyd"))
(file-name "unshield-the-feeble-files-spanish.zip")))))
@ -1320,6 +1331,7 @@ (define-public unshield
(copy-file (assoc-ref inputs i)
(string-append "test/v0/" i)))
'("unshield-avigomanager11b22.zip"
"unshield-baldurs_gate_patch_v1_1_4315_international.zip"
"unshield-the-feeble-files-spanish.zip"))
(substitute* (find-files "test/" "/*\\.sh")
;; Tests expect the unshield binary in a specific
@ -1332,7 +1344,12 @@ (define-public unshield
(substitute* "test/v0/avigomanager.sh"
(("test.zip")
(string-append (getcwd)
"/test/v0/unshield-avigomanager11b22.zip")))
"/test/v0/unshield-avigomanager11b22.zip")))
(substitute* "test/v0/baldurs_gate_patch_v1_1_4315_international.sh"
(("test.zip")
(string-append
(getcwd)
"/test/v0/unshield-baldurs_gate_patch_v1_1_4315_international.zip")))
(substitute* "test/v0/the-feeble-files-spanish.sh"
(("test.zip")
(string-append (getcwd)
@ -1623,14 +1640,14 @@ (define-public atool
(define-public lunzip
(package
(name "lunzip")
(version "1.10")
(version "1.11")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/lzip/"
name "/" name "-" version ".tar.gz"))
(uri (string-append "mirror://savannah/lzip/lunzip/"
"lunzip-" version ".tar.gz"))
(sha256
(base32 "1iw59br6nsxs7l1p875h8w3vxwr04xfhg5zyal64crvamhxkj5kl"))))
(base32 "19zq3gmlbia2krq4k4zs1j0xjdv7nsdzqvfb0pyca5n53h2mzb91"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -1650,14 +1667,14 @@ (define-public lunzip
(define-public clzip
(package
(name "clzip")
(version "1.10")
(version "1.11")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/lzip/"
name "/" name "-" version ".tar.gz"))
(uri (string-append "mirror://savannah/lzip/clzip/"
"clzip-" version ".tar.gz"))
(sha256
(base32 "03xcmhl3dya4jrwmsqh09ikimpb36fr3vkh2bwfzz1sbcns0cdg3"))))
(base32 "1h14dmc9fi10gcdpdpbgq1bwvcxvivppilj64pf720x8mw915mfr"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -1676,17 +1693,15 @@ (define-public clzip
(define-public lzlib
(package
(name "lzlib")
(version "1.10")
(version "1.11")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/lzip/"
name "/" name "-" version ".tar.gz"))
(uri (string-append "mirror://savannah/lzip/lzlib/"
"lzlib-" version ".tar.gz"))
(sha256
(base32 "0hqhnj2lzqacdbmmnpy91lsm1rd9zlngs1q6s9pyahsv1a0bfshx"))))
(base32 "0djdj4sg33rzi4k84cygvnp09bfsv6i8wy2k7i67rayib63myp3c"))))
(build-system gnu-build-system)
;; The included minilzip binary is only ~16 smaller than the ‘real’ lzip.
;; It's used during the test suite, but don't be tempted to install it.
(arguments
`(#:configure-flags
(list "CC=gcc"
@ -1704,14 +1719,14 @@ (define-public lzlib
(define-public plzip
(package
(name "plzip")
(version "1.7")
(version "1.8")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://savannah/lzip/"
name "/" name "-" version ".tar.gz"))
(uri (string-append "mirror://savannah/lzip/plzip/"
"plzip-" version ".tar.gz"))
(sha256
(base32 "1dzjp9r7krwpsn224bhcqbzd5aj5b4556sdi9yzl2bzbk3fjrqlm"))))
(base32 "04indil809qgfmz776imb3dnhkysh7zk28jcv3mw0ahl2lyaxbzd"))))
(build-system gnu-build-system)
(inputs
`(("lzlib" ,lzlib)))

18
gnu/packages/conky.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@ -24,6 +25,7 @@ (define-module (gnu packages conky)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages curl)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages image)
#:use-module (gnu packages lua)
@ -34,15 +36,17 @@ (define-module (gnu packages conky)
(define-public conky
(package
(name "conky")
(version "1.10.8")
(home-page "https://github.com/brndnmtthws/conky")
(version "1.11.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/brndnmtthws/conky/archive/v"
version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url home-page)
(commit (string-append "v" version))))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0mw8xbnxr0a7yq2smzi2nln2b5n0q571vdrq6mhvs5n84xd6bg9f"))))
(base32 "0yalcpwx85smh6nnvxxsgqi344nk7jzlkkam7yjghm87df4v7xmx"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are no tests
@ -73,10 +77,10 @@ (define-public conky
("libxft" ,libxft)
("libxinerama" ,libxinerama)
("lua" ,lua)
("ncurses" ,ncurses)))
("ncurses" ,ncurses)
("curl" ,curl)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://github.com/brndnmtthws/conky")
(synopsis "Lightweight system monitor for X")
(description
"Conky is a lightweight system monitor for X that displays operating

81
gnu/packages/coq.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Dan Frumin <dfrumin@cs.ru.nl>
;;;
;;; This file is part of GNU Guix.
@ -42,14 +43,15 @@ (define-public coq
(package
(name "coq")
(version "8.8.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/coq/coq/archive/V"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0i2hs0i6rp27cy8zd0mx7jscqw5cx2y0diw0pxgij66s3yr47y7r"))))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/coq/coq.git")
(commit (string-append "V" version))))
(file-name (git-file-name name version))
(sha256
(base32 "03v8b57mz3ivsijwxy51avzwiyhla5ijaf98a5a2q29yabdq8dkp"))))
(native-search-paths
(list (search-path-specification
(variable "COQPATH")
@ -63,6 +65,10 @@ (define-public coq
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'make-git-checkout-writable
(lambda _
(for-each make-file-writable (find-files "."))
#t))
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@ -279,20 +285,22 @@ (define-public coq-mathcomp
(package
(name "coq-mathcomp")
(version "1.7.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/math-comp/math-comp/archive/mathcomp-"
version ".tar.gz"))
(sha256
(base32
"05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"))))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/math-comp/math-comp.git")
(commit (string-append "mathcomp-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1cdzi67jj440xkdpxm10aly80zpn56vjzj2ygb67iq3xpljlv95h"))))
(build-system gnu-build-system)
(native-inputs
`(("ocaml" ,ocaml)
("which" ,which)
("coq" ,coq)))
(arguments
`(#:tests? #f; No need to test formally-verified programs :)
`(#:tests? #f ; no need to test formally-verified programs :)
#:phases
(modify-phases %standard-phases
(delete 'configure)
@ -492,3 +500,44 @@ (define-public coq-autosubst
sigma-calculus by Abadi et al. The library is completely written in Coq and
uses Ltac to synthesize the substitution operation.")
(license license:bsd-3))))
(define-public coq-equations
(package
(name "coq-equations")
(version "1.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mattam82/Coq-Equations.git")
(commit (string-append "v" version "-8.8"))))
(file-name (git-file-name name version))
(sha256
(base32
"129rxsdsf88vjcw0xhm74yax1hmnk6f8n9ksg0hcyyjq1ijddiwa"))))
(build-system gnu-build-system)
(native-inputs
`(("ocaml" ,ocaml)
("coq" ,coq)
("camlp5" ,camlp5)))
(arguments
`(#:test-target "test-suite"
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(invoke "coq_makefile" "-f" "_CoqProject" "-o" "Makefile")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(setenv "COQLIB" (string-append (assoc-ref outputs "out") "/lib/coq/"))
(invoke "make"
(string-append "COQLIB=" (assoc-ref outputs "out")
"/lib/coq/")
"install"))))))
(home-page "https://mattam82.github.io/Coq-Equations/")
(synopsis "Function definition plugin for Coq")
(description "Equations provides a notation for writing programs
by dependent pattern-matching and (well-founded) recursion in Coq. It
compiles everything down to eliminators for inductive types, equality
and accessibility, providing a definitional extension to the Coq
kernel.")
(license license:lgpl2.1)))

150
gnu/packages/cran.scm
View file

@ -13,6 +13,7 @@
;;; Copyright © 2018 Laura Lazzati <laura.lazzati.15@gmail.com>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Brett Gilio <brettg@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -2251,14 +2252,14 @@ (define-public r-squarem
(define-public r-lava
(package
(name "r-lava")
(version "1.6.4")
(version "1.6.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "lava" version))
(sha256
(base32
"0627cjlg55kzbzcy82w6wykmw2i57qhgfcabn2zy3ydfdswyxij1"))))
"13rlqdg42ylnz4hc932bl50xismrcr4d9ykcd9zs19cw5mckjx0f"))))
(build-system r-build-system)
(propagated-inputs
`(("r-numderiv" ,r-numderiv)
@ -6589,19 +6590,19 @@ (define-public r-mosaicdata
(define-public r-raster
(package
(name "r-raster")
(version "2.8-4")
(version "2.8-19")
(source
(origin
(method url-fetch)
(uri (cran-uri "raster" version))
(sha256
(base32
"14pcfznxm5kdwd908axkr9v1l0hzxlrwd8kwrz0liqnfh9cx5rsa"))))
"1lmhf7p7is8ai7lv7zsj2rdzf83j7ccl4x7a9vwxxa824zy4bkf4"))))
(build-system r-build-system)
(propagated-inputs
`(("r-rcpp" ,r-rcpp)
("r-sp" ,r-sp)))
(home-page "http://www.rspatial.org/")
(home-page "https://www.rspatial.org/")
(synopsis "Geographic data analysis and modeling")
(description
"The package implements basic and high-level functions for reading,
@ -10511,3 +10512,142 @@ (define-public r-mcmc
Metropolis (function @code{morph.metrop}), which achieves geometric ergodicity
by change of variable.")
(license license:expat)))
(define-public r-listenv
(package
(name "r-listenv")
(version "0.7.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "listenv" version))
(sha256
(base32
"0ma5jsri2zqkrlsm9nqpikl7imbwfy1glsmk13mblw0q245h49k1"))))
(build-system r-build-system)
(native-inputs
`(("r-r-rsp" ,r-r-rsp))) ; vignette builder
(home-page "https://github.com/HenrikBengtsson/listenv")
(synopsis "Environments behaving (almost) as lists")
(description
"This package implements list environments. List environments are
environments that have list-like properties. For instance, the elements of a
list environment are ordered and can be accessed and iterated over using index
subsetting.")
(license license:lgpl2.1+)))
(define-public r-globals
(package
(name "r-globals")
(version "0.12.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "globals" version))
(sha256
(base32
"0szyv1ayyk31bh3xqlkj43020w44xq6s4rw2bxwizyjssxm3b1br"))))
(build-system r-build-system)
(propagated-inputs
`(("r-codetools" ,r-codetools)))
(home-page "https://github.com/HenrikBengtsson/globals")
(synopsis "Identify global objects in R expressions")
(description
"This package provides tools to identify global (\"unknown\" or \"free\")
objects in R expressions by code inspection using various strategies, e.g.
conservative or liberal. The objective of this package is to make it as
simple as possible to identify global objects for the purpose of exporting
them in distributed compute environments.")
(license license:lgpl2.1+)))
(define-public r-future
(package
(name "r-future")
(version "1.11.1.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "future" version))
(sha256
(base32
"1s4lyqg4mm1drzc6czaalmhmxfjgp4nznb14ql5xzny9rprgz43i"))))
(build-system r-build-system)
(propagated-inputs
`(("r-digest" ,r-digest)
("r-globals" ,r-globals)
("r-listenv" ,r-listenv)))
(native-inputs
`(("r-r-rsp" ,r-r-rsp))) ; vignette builder
(home-page "https://github.com/HenrikBengtsson/future")
(synopsis "Unified parallel and distributed processing in R")
(description
"The purpose of this package is to provide a lightweight and unified
Future API for sequential and parallel processing of R expression via futures.
This package implements sequential, multicore, multisession, and cluster
futures. With these, R expressions can be evaluated on the local machine, in
parallel a set of local machines, or distributed on a mix of local and remote
machines. Extensions to this package implement additional backends for
processing futures via compute cluster schedulers etc. Because of its unified
API, there is no need to modify any code in order to switch from sequential on
the local machine to, say, distributed processing on a remote compute cluster.")
(license license:lgpl2.1+)))
(define-public r-future-apply
(package
(name "r-future-apply")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "future.apply" version))
(sha256
(base32
"0b6v9rxvnnz13sydbgkapw71hx98fwdczjchgqnspjmq2340kdc0"))))
(properties `((upstream-name . "future.apply")))
(build-system r-build-system)
(propagated-inputs
`(("r-future" ,r-future)
("r-globals" ,r-globals)))
(native-inputs
`(("r-r-rsp" ,r-r-rsp))) ; vignette builder
(home-page "https://github.com/HenrikBengtsson/future.apply")
(synopsis "Apply function to elements in parallel using futures")
(description
"This package provides implementations of @code{apply()},
@code{eapply()}, @code{lapply()}, @code{Map()}, @code{mapply()},
@code{replicate()}, @code{sapply()}, @code{tapply()}, and @code{vapply()} that
can be resolved using any future-supported backend, e.g. parallel on the local
machine or distributed on a compute cluster.")
(license license:gpl2+)))
(define-public r-rsvd
(package
(name "r-rsvd")
(version "1.0.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "rsvd" version))
(sha256
(base32
"0vjhrvnkl9rmvl8sv2kac5sd10z3fgxymb676ynxzc2pmhydy3an"))))
(build-system r-build-system)
(propagated-inputs
`(("r-matrix" ,r-matrix)))
(home-page "https://github.com/erichson/rSVD")
(synopsis "Randomized singular value decomposition")
(description
"Low-rank matrix decompositions are fundamental tools and widely used for
data analysis, dimension reduction, and data compression. Classically, highly
accurate deterministic matrix algorithms are used for this task. However, the
emergence of large-scale data has severely challenged our computational
ability to analyze big data. The concept of randomness has been demonstrated
as an effective strategy to quickly produce approximate answers to familiar
problems such as the @dfn{singular value decomposition} (SVD). This package
provides several randomized matrix algorithms such as the randomized singular
value decomposition (@code{rsvd}), randomized principal component
analysis (@code{rpca}), randomized robust principal component
analysis (@code{rrpca}), randomized interpolative decomposition (@code{rid}),
and the randomized CUR decomposition (@code{rcur}). In addition several plot
functions are provided.")
(license license:gpl3+)))

6
gnu/packages/crypto.scm
View file

@ -228,7 +228,7 @@ (define-public encfs
(define-public keyutils
(package
(name "keyutils")
(version "1.5.11")
(version "1.6")
(source
(origin
(method url-fetch)
@ -237,7 +237,7 @@ (define-public keyutils
version ".tar.bz2"))
(sha256
(base32
"1ddig6j5xjyk6g9l2wlqc7k1cgvryxdqbsv3c9rk1p3f42448n0i"))
"05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk"))
(modules '((guix build utils)))
;; Create relative symbolic links instead of absolute ones to /lib/*.
(snippet '(begin
@ -751,7 +751,7 @@ (define-public botan
(replace 'check
(lambda _ (invoke "./botan-test"))))))
(native-inputs
`(("python" ,python-minimal-wrapper)
`(("python" ,python-wrapper)
("python-docutils" ,python-docutils)))
(inputs
`(("sqlite" ,sqlite)

52
gnu/packages/cups.scm
View file

@ -38,6 +38,7 @@ (define-module (gnu packages cups)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
@ -45,6 +46,7 @@ (define-module (gnu packages cups)
#:use-module (gnu packages scanner)
#:use-module (gnu packages tls)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
@ -380,6 +382,32 @@ (define-public cups
("cups-filters" ,cups-filters)
("zlib" ,zlib)))))
(define-public cups-pk-helper
(package
(name "cups-pk-helper")
(version "0.2.6")
(source (origin
(method url-fetch)
(uri (string-append "https://freedesktop.org/software/"
name "/releases/" name "-" version ".tar.xz"))
(sha256
(base32
"0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)
("glib" ,glib)
("polkit" ,polkit)
("cups" ,cups)))
(home-page "https://www.freedesktop.org/wiki/Software/cups-pk-helper/")
(synopsis "PolicyKit helper to configure CUPS with fine-grained privileges")
(description
"This package provides the org.opensuse.CupsPkHelper.Mechanism DBus
system service which uses @file{cups-pk-helper-mechanism}. This package
should only be used as part of the Guix cups-pk-helper service.")
(license license:gpl2+)))
(define-public hplip
(package
(name "hplip")
@ -681,3 +709,27 @@ (define-public escpr
language.")
(home-page "http://download.ebz.epson.net/dsc/search/01/search")
(license license:gpl2+)))
(define-public python-pycups
(package
(name "python-pycups")
(version "1.9.74")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pycups" version ".tar.bz2"))
(sha256
(base32
"1ffp7sswhdsfpy88zg0cc8kl04wygkjs01rlm9f0spbwk8jhy2c6"))))
(build-system python-build-system)
(arguments
'(;; Tests require CUPS to be running
#:tests? #f))
(inputs
`(("cups" ,cups)))
(home-page "https://github.com/zdohnal/pycups")
(synopsis "Python bindings for libcups")
(description
"This package provides Python bindings for libcups, wrapping the CUPS
API.")
(license license:gpl2+)))

10
gnu/packages/curl.scm
View file

@ -8,6 +8,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -188,15 +189,14 @@ (define-public kurly
(define-public guile-curl
(package
(name "guile-curl")
(version "0.5")
(version "0.6")
(source (origin
(method url-fetch)
(uri (string-append
"http://www.lonelycactus.com/tarball/guile-curl-"
version ".tar.gz"))
(uri (string-append "http://www.lonelycactus.com/tarball/"
"guile_curl-" version ".tar.gz"))
(sha256
(base32
"1846rxgc0ylh8768lr79irc7nwjichzb7qb7lzs2k42m0i53sc46"))))
"1pxdhnk288ky6gkpad8i60m0p6404rdvls43lr1b5d3csrklyc70"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list (string-append

37
gnu/packages/databases.scm
View file

@ -23,7 +23,7 @@
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
@ -277,15 +277,14 @@ (define-public leveldb
(define-public memcached
(package
(name "memcached")
(version "1.5.10")
(version "1.5.12")
(source
(origin
(method url-fetch)
(uri (string-append
"https://memcached.org/files/memcached-" version ".tar.gz"))
(sha256
(base32
"0jqw3z0408yx0lzc6ykn4d29n02dk31kqnmq9b3ldmcnpl6hck29"))))
(base32 "0aav15f0lh8k4i62aza2bdv4s8vv65j38pz2zc4v45snd3arfby0"))))
(build-system gnu-build-system)
(inputs
`(("libevent" ,libevent)
@ -335,7 +334,7 @@ (define-public mongodb
(native-inputs
`(("valgrind" ,valgrind)
("perl" ,perl)
("python" ,python2-minimal)
("python" ,python-2)
("python2-pymongo" ,python2-pymongo)
("python2-pyyaml" ,python2-pyyaml)
("tzdata" ,tzdata)))
@ -687,18 +686,18 @@ (define-public mariadb
(define-public postgresql
(package
(name "postgresql")
(version "10.6")
(version "10.7")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"))
"1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz"))
(patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--with-uuid=e2fs")
`(#:configure-flags '("--with-uuid=e2fs" "--with-openssl")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-/bin/sh
@ -717,6 +716,7 @@ (define-public postgresql
(inputs
`(("readline" ,readline)
("libuuid" ,util-linux)
("openssl" ,openssl)
("zlib" ,zlib)))
(home-page "https://www.postgresql.org/")
(synopsis "Powerful object-relational database system")
@ -733,26 +733,25 @@ (define-public postgresql-9.6
(package
(inherit postgresql)
(name "postgresql")
(version "9.6.11")
(version "9.6.12")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q"))))))
"114xay230xia2fagisxahs5fc2mza8hmmkr6ibd7nxllp938931f"))))))
(define-public python-pymysql
(package
(name "python-pymysql")
(version "0.9.2")
(version "0.9.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "PyMySQL" version))
(sha256
(base32
"0gvi63f1zq1bbd30x28kqyx351hal1yc323ckp0mihainb5n1iwy"))))
(base32 "1ry8lxgdc1p3k7gbw20r405jqi5lvhi5wk83kxdbiv8xv3f5kh6q"))))
(build-system python-build-system)
(native-inputs
`(("python-unittest2" ,python-unittest2)))
@ -1069,7 +1068,7 @@ (define-public tdb
(define-public perl-dbi
(package
(name "perl-dbi")
(version "1.641")
(version "1.642")
(source (origin
(method url-fetch)
(uri (string-append
@ -1077,7 +1076,7 @@ (define-public perl-dbi
version ".tar.gz"))
(sha256
(base32
"1hf2x29bnqf2x1v4bdhji802z7n2mbg7h1amv8gdkqyhrlrfa2am"))))
"0pbzqazrx7pnw4nbyaf27in4b6yddkirbd2ws7mnqa2n7812a81z"))))
(build-system perl-build-system)
(synopsis "Database independent interface for Perl")
(description "This package provides an database interface for Perl.")
@ -1490,14 +1489,14 @@ (define-public redis
(define-public kyotocabinet
(package
(name "kyotocabinet")
(version "1.2.76")
(version "1.2.77")
(source (origin
(method url-fetch)
(uri (string-append "http://fallabs.com/kyotocabinet/pkg/"
name "-" version ".tar.gz"))
(sha256
(base32
"0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1"))))
"1rlx4307adbzd842b4npq6cwlw8h010ingxaz3qz1ijc70lr72an"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -1637,7 +1636,7 @@ (define-public guile-wiredtiger
(define-public perl-db-file
(package
(name "perl-db-file")
(version "1.842")
(version "1.843")
(source
(origin
(method url-fetch)
@ -1647,7 +1646,7 @@ (define-public perl-db-file
".tar.gz"))
(sha256
(base32
"0w2d99vs9qarng2f9fpg3gchfdzy6an13507jhclcl8wv183h5hg"))))
"0sildz1i3fmh949w1scpjsyjx0cbmfw0yna3y70mc6vbwp8y696y"))))
(build-system perl-build-system)
(inputs `(("bdb" ,bdb)))
(native-inputs `(("perl-test-pod" ,perl-test-pod)))

36
gnu/packages/debug.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -30,11 +31,13 @@ (define-module (gnu packages debug)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages flex)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang)
#:use-module (gnu packages code)
#:use-module (gnu packages llvm)
#:use-module (gnu packages perl)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages readline)
#:use-module (gnu packages virtualization)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1))
@ -336,3 +339,36 @@ (define-public zzuf
intercepting file operations and changing random bits in the program's
input. Zzuf's behaviour is deterministic, making it easy to reproduce bugs.")
(license (non-copyleft "http://www.wtfpl.net/txt/copying/"))))
(define-public scanmem
(package
(name "scanmem")
(version "0.17")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/scanmem/scanmem")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9"))))
(build-system gnu-build-system)
(native-inputs
`(("libtool" ,libtool)
("intltool" ,intltool)
("automake" ,automake)
("autoconf" ,autoconf)))
(inputs
`(("readline" ,readline)))
(home-page "https://github.com/scanmem/scanmem")
(synopsis "Memory scanner")
(description "Scanmem is a debugging utility designed to isolate the
address of an arbitrary variable in an executing process. Scanmem simply
needs to be told the pid of the process and the value of the variable at
several different times. After several scans of the process, scanmem isolates
the position of the variable and allows you to modify its value.")
;; The library is covered by LGPLv3 or later; the application is covered
;; by GPLv3 or later.
(license (list lgpl3+ gpl3+))))

2
gnu/packages/dictionaries.scm
View file

@ -372,7 +372,7 @@ (define-public apertium
("flex" ,flex)
("pkg-config" ,pkg-config)
;; python is only required for running the test suite
("python-minimal" ,python-minimal)))
("python" ,python)))
(arguments
`(#:phases
(modify-phases %standard-phases

32
gnu/packages/disk.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
@ -37,6 +37,7 @@ (define-module (gnu packages disk)
#:use-module (gnu packages c)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
@ -340,14 +341,14 @@ (define-public idle3-tools
(define-public gparted
(package
(name "gparted")
(version "0.32.0")
(version "0.33.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gparted/gparted/gparted-"
version "/gparted-" version ".tar.gz"))
(sha256
(base32 "1fjp4c8jc0kjbbih1x1vs9v40d9lncma642kflnmy0bixxnvh7df"))))
(base32 "1ml1ky3s75lbxr91p608q3prsdh9x899mw7nbgk252pqhg4vh8sh"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; tests require a network connection
@ -478,16 +479,16 @@ (define-public python2-parted
(define-public duperemove
(package
(name "duperemove")
(version "0.11")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/markfasheh/duperemove/archive/v"
version ".tar.gz"))
(sha256
(base32
"0rjmmh42yqw9a5j6sp31cqwxk3s97dsi4xz0wpxpllj7bsp3aiw5"))
(file-name (string-append name "-" version ".tar.gz"))))
(version "0.11.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/markfasheh/duperemove.git")
(commit (string-append "v" version))))
(sha256
(base32 "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -609,7 +610,7 @@ (define-public volume-key
(define-public ndctl
(package
(name "ndctl")
(version "63")
(version "64.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -618,7 +619,7 @@ (define-public ndctl
(file-name (git-file-name name version))
(sha256
(base32
"060nsza8xic769bxj3pvl70a9885bwrc0myw16l095i3z6w7yzwq"))))
"1la82fqbdwjkw6il498nkdfgqc4aszv481xf2p9p07jfvankx24v"))))
(build-system gnu-build-system)
(native-inputs
`(("asciidoc" ,asciidoc)
@ -635,6 +636,7 @@ (define-public ndctl
(inputs
`(("eudev" ,eudev)
("json-c" ,json-c)
("keyutils" ,keyutils)
("kmod" ,kmod)
("util-linux" ,util-linux)))
(arguments

4
gnu/packages/dlang.scm
View file

@ -249,8 +249,8 @@ (define-public ldc
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
(invoke "make" "test" "-j" (number->string (parallel-job-count))))))))
(native-inputs
`(("llvm" ,llvm)
("clang" ,clang)
`(("llvm" ,llvm-6)
("clang" ,clang-6)
("ldc" ,ldc-bootstrap)
("python-lit" ,python-lit)
("python-wrapper" ,python-wrapper)

28
gnu/packages/dns.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
@ -294,15 +294,14 @@ (define-public libasr
(define-public nsd
(package
(name "nsd")
(version "4.1.25")
(version "4.1.26")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
version ".tar.gz"))
(sha256
(base32
"0zyzjd3wmq258jiry62ci1z23qfd0rc5ggnpmybc60xvpddgynwg"))))
(base32 "1x0mvj4872dzj1rr9adnchdm4dhn41xmc459p5j4s0r13m1l32lz"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -365,15 +364,14 @@ (define-public nsd
(define-public unbound
(package
(name "unbound")
(version "1.8.1")
(version "1.9.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.unbound.net/downloads/unbound-"
version ".tar.gz"))
(sha256
(base32
"0p9w6spar5dfi7fplxjcq4394wldabaws0ns30cqq6sxqfwv6qn3"))))
(base32 "05xrb8havr2vgjsdy7n85kgnvk1mg7qwhjp4a8n6pg4jhd5zjnj1"))))
(build-system gnu-build-system)
(outputs '("out" "python"))
(native-inputs
@ -388,7 +386,7 @@ (define-public unbound
("openssl" ,openssl)))
(arguments
`(#:configure-flags
(list "--disable-static" ;save space and non-determinism in libunbound.a
(list "--disable-static" ; save space and non-determinism in libunbound.a
(string-append
"--with-ssl=" (assoc-ref %build-inputs "openssl"))
(string-append
@ -524,16 +522,16 @@ (define-public unbound
(define-public yadifa
(package
(name "yadifa")
(version "2.3.8")
(version "2.3.9")
(source
(let ((build "7713"))
(let ((build "8497"))
(origin
(method url-fetch)
(uri
(string-append "http://cdn.yadifa.eu/sites/default/files/releases/"
name "-" version "-" build ".tar.gz"))
"yadifa-" version "-" build ".tar.gz"))
(sha256
(base32 "15xhzg4crjcxascwpz6y8qpqcgypzv2p9bspdskp4nx1x1y4316c")))))
(base32 "0xvyr91sfgzkpw6g3h893ldbwnki3w2472n56rr18w67qghs1sa5")))))
(build-system gnu-build-system)
(native-inputs
`(("which" ,which)))
@ -571,14 +569,14 @@ (define-public yadifa
(define-public knot
(package
(name "knot")
(version "2.7.3")
(version "2.7.6")
(source (origin
(method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-dns/"
name "-" version ".tar.xz"))
"knot-" version ".tar.xz"))
(sha256
(base32
"1pwjcv7hzhqawisibybma160k77a6f1v94xw6ay9c7j49vrw05w7"))
"18lpyq3vgr2ainmfiy14x7hcf1zxza66bhkpr54jaz2gy1viijx1"))
(modules '((guix build utils)))
(snippet
'(begin

13
gnu/packages/docker.scm
View file

@ -43,7 +43,7 @@ (define-module (gnu packages docker)
#:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization))
(define %docker-version "18.09.0")
(define %docker-version "18.09.2")
(define-public python-docker-py
(package
@ -162,7 +162,7 @@ (define-public python-docker-pycreds
(define-public containerd
(package
(name "containerd")
(version "1.2.2")
(version "1.2.4")
(source
(origin
(method git-fetch)
@ -171,8 +171,7 @@ (define-public containerd
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya"))))
(base32 "1rw7f0y3iv0mapxid1rgpns80dcy8nhgmxmw27x8qzrzic5viivy"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/containerd/containerd"
@ -241,7 +240,7 @@ (define-public docker
(file-name (git-file-name name version))
(sha256
(base32
"1liqbx58grqih6m8hz9y20y5waflv19pv15l3wl64skap2bsn21c"))
"1zfpk2n8j6gnwbrxrh6d6pj24y60dhbanpf55shrm2yxz54ka36c"))
(patches
(search-patches "docker-engine-test-noinstall.patch"
"docker-fix-tests.patch"))))
@ -337,6 +336,7 @@ (define-public docker
(substitute-LookPath "blkid" "util-linux" "/sbin/blkid")
(substitute-LookPath "unpigz" "pigz" "/bin/unpigz")
(substitute-LookPath "iptables" "iptables" "/sbin/iptables")
(substitute-LookPath "iptables-legacy" "iptables" "/sbin/iptables")
(substitute-LookPath "ip" "iproute2" "/sbin/ip")
(substitute-Command "modprobe" "kmod" "/bin/modprobe")
(substitute-Command "pvcreate" "lvm2" "/sbin/pvcreate")
@ -396,6 +396,7 @@ (define-public docker
;; Timeouts after 5 min.
(delete-file "plugin/manager_linux_test.go")
;; Operation not permitted.
(delete-file "daemon/graphdriver/btrfs/btrfs_test.go")
(delete-file "daemon/graphdriver/overlay/overlay_test.go")
(delete-file "daemon/graphdriver/overlay2/overlay_test.go")
#t))
@ -483,7 +484,7 @@ (define-public docker-cli
(file-name (git-file-name name version))
(sha256
(base32
"1ivisys20kphvbqlazc3bsg7pk0ykj9gjx5d4yg439x4n13jxwvb"))))
"0jzcqh1kqbfyj6ax7z67gihaqgjiz6ddz6rq6k458l68v7zn77r8"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/docker/cli"

13
gnu/packages/documentation.scm
View file

@ -123,14 +123,18 @@ (define-public asciidoc
(define-public doxygen
(package
(name "doxygen")
(version "1.8.14")
(version "1.8.15")
(home-page "http://www.doxygen.nl/")
(source (origin
(method url-fetch)
(uri (string-append "http://ftp.stack.nl/pub/users/dimitri/"
name "-" version ".src.tar.gz"))
(uri (list (string-append home-page "files/doxygen-"
version ".src.tar.gz")
(string-append "mirror://sourceforge/doxygen/rel-"
version "/doxygen-" version
".src.tar.gz")))
(sha256
(base32
"0kcxymbam9jwiyjwyvwdjj0h74lbb6c467szsipzbxjyfl17wxfi"))
"0p94b4yb6bk2dxzs5kyl82xxgq2qakgbx5yy3ssbbadncb20x75x"))
(patches (search-patches "doxygen-test.patch"))))
(build-system cmake-build-system)
(native-inputs
@ -150,7 +154,6 @@ (define-public doxygen
(string-append
(assoc-ref inputs "bash") "/bin/sh")))
#t)))))
(home-page "http://www.stack.nl/~dimitri/doxygen/")
(synopsis "Generate documentation from annotated sources")
(description "Doxygen is the de facto standard tool for generating
documentation from annotated C++ sources, but it also supports other popular

10
gnu/packages/efi.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -29,7 +30,8 @@ (define-module (gnu packages efi)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils))
#:use-module (guix utils)
#:use-module (ice-9 match))
(define-public gnu-efi
(package
@ -195,6 +197,12 @@ (define-public efilinux
(arguments
`(#:make-flags
(list "CC=gcc"
,@(match (%current-system)
("aarch64-linux"
'("ARCH=aarch64"))
("armhf-linux"
'("ARCH=arm"))
(_ '()))
(string-append "INCDIR=" (assoc-ref %build-inputs "gnu-efi")
"/include")
(string-append "LIBDIR=" (assoc-ref %build-inputs "gnu-efi")

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

@ -41,6 +41,7 @@
;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com>
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018, 2019 Brett Gilio <brettg@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -5052,7 +5053,7 @@ (define-public emacs-helm-make
(define-public emacs-cider
(package
(name "emacs-cider")
(version "0.18.0")
(version "0.20.0")
(source
(origin
(method git-fetch)
@ -5062,7 +5063,7 @@ (define-public emacs-cider
(file-name (git-file-name name version))
(sha256
(base32
"1m9kc88vga3q5d731qnpngnsa0n57pf21k3hll20rw8rggrx4vdn"))))
"0lfhzg9c931jbx27hpshk3l76gwbp6ggf668sqa77xrvymwdlsnw"))))
(build-system emacs-build-system)
(arguments
'(#:exclude ; Don't exclude 'cider-test.el'.
@ -5207,8 +5208,8 @@ (define-public emacs-evil
(license license:gpl3+)))
(define-public emacs-evil-collection
(let ((commit "0cfdf4ecf0420aac2a9dd29ff7b54067c3433d71")
(revision "6"))
(let ((commit "e7b57aae0131634d0da5e599717a86c4b3ca6092")
(revision "7"))
(package
(name "emacs-evil-collection")
(version (git-version "0.0.1" revision commit))
@ -5220,7 +5221,7 @@ (define-public emacs-evil-collection
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"1igsvgxvij918myc397cjhfybmm11znc7961vnbcd5xlviq2p01y"))))
"1g7bxvgnsikpxxdimy0lymn3xz53fari048l827sjyw5kxi59d20"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-evil" ,emacs-evil)))
@ -6547,14 +6548,14 @@ (define-public emacs-org2web
(define-public emacs-xelb
(package
(name "emacs-xelb")
(version "0.16")
(version "0.17")
(source (origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/xelb-"
version ".tar"))
(sha256
(base32
"03wsr1jr7f7zfd80h864rd4makwh4widdnj1kjv2xyjwdgap9rl8"))))
"0k98580vq253fjdgklgqlwl450saninfw39fbq8lv3xsnp3dcgml"))))
(build-system emacs-build-system)
;; The following functions and variables needed by emacs-xelb are
;; not included in emacs-minimal:
@ -6586,7 +6587,7 @@ (define-public emacs-xelb
(define-public emacs-exwm
(package
(name "emacs-exwm")
(version "0.21")
(version "0.22")
(synopsis "Emacs X window manager")
(source (origin
(method url-fetch)
@ -6594,7 +6595,7 @@ (define-public emacs-exwm
version ".tar"))
(sha256
(base32
"07ng1pgsnc3isfsyzh2gfc7391p9il8lb5xqf1z6yqn20w7k6xzj"))))
"0lppm8ng37i5s4x7xdrxhjbdcnpl6pyvn4g7w52zbckjsn8qnqh0"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-xelb" ,emacs-xelb)))
@ -8918,7 +8919,7 @@ (define-public emacs-parsebib
(define-public emacs-biblio
(package
(name "emacs-biblio")
(version "0.1")
(version "0.2")
(source
(origin
(method url-fetch)
@ -8927,7 +8928,7 @@ (define-public emacs-biblio
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"109fvivsb4r0rbqljngqrmxqvbnbkqlivczx6brrvlr7ci625lhf"))))
"0vwrljmab8m1z83048gxx5mryml9f5pb3h0jpwkvqcl0ra152lzx"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-seq" ,emacs-seq)
@ -9205,8 +9206,8 @@ (define-public emacs-md4rd
(license license:gpl3+))))
(define-public emacs-pulseaudio-control
(let ((commit "1da372ec79f5d2fb901d1f9f0679fee8848fd011")
(revision "2"))
(let ((commit "7e1a87068379075a5e9ce36c64c686c03d20d379")
(revision "3"))
(package
(name "emacs-pulseaudio-control")
(version (git-version "0.0.1" revision commit))
@ -9219,7 +9220,7 @@ (define-public emacs-pulseaudio-control
(file-name (git-file-name name version))
(sha256
(base32
"02xrsms2pjqdk6327midi61i5vg2h9cq5jwaxv43ldm68wl7hi6k"))))
"0wcaqyh15x56255rrj350089z15pnwixa2vf0ly6dv0hjmzmh3mr"))))
(build-system emacs-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@ -9625,6 +9626,32 @@ (define-public emacs-lacarte
(description "Execute menu items as commands, with completion.")
(license license:gpl3)))
(define-public emacs-isearch-prop
(let ((commit "5e9dc44cf582d998aaa73ccd4d07cbda01248156")
(revision "1"))
(package
(name "emacs-isearch-prop")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacsmirror/isearch-prop.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1xawppy705ybsgx566zvj8zk2aajq0sqvhvfs7nijqq32lx0a2zl"))))
(build-system emacs-build-system)
(home-page "https://www.emacswiki.org/emacs/isearch-prop.el")
(synopsis "Extensions to @code{isearch.el}")
(description "The Emacs library @code{isearch-prop.el} lets you search within
contexts. You can limit incremental search to a set of zones of
buffer text, search contexts that in effect constitute a multi-region.
These zones can be defined in various ways, including some ways
provided specially by this library.")
(license license:gpl3+))))
(define-public emacs-company-lua
(let ((commit "0be8122f3adf57ad27953bf4b03545d6298d3da4"))
(package
@ -10645,27 +10672,26 @@ (define-public emacs-parinfer-mode
(license license:gpl3+)))
(define-public emacs-helm-eww
(let ((commit "9d36acc433bcf689598b1b4d7d47c9aeb84d6b44"))
(package
(name "emacs-helm-eww")
(version (git-version "0.1" "3" commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacs-helm/helm-eww.git")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"06gnf84gx6qbhcw1h5jhjnvcdxkdpv0npm53x3pgqybbll5rn5dy"))))
(propagated-inputs
`(("emacs-helm" ,emacs-helm)))
(build-system emacs-build-system)
(home-page "https://github.com/emacs-helm/helm-eww/")
(synopsis "Helm interface to EWW")
(description "This package provides a Helm interface for EWW buffers,
(package
(name "emacs-helm-eww")
(version "1.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacs-helm/helm-eww.git")
(commit version)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"0dvlp7y6kqc4azg5b7jx5lz2rwd0ia7y0y3hcj9y23zd88r73lg7"))))
(propagated-inputs
`(("emacs-helm" ,emacs-helm)))
(build-system emacs-build-system)
(home-page "https://github.com/emacs-helm/helm-eww/")
(synopsis "Helm interface to EWW")
(description "This package provides a Helm interface for EWW buffers,
bookmarks and history.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public emacs-stumpwm-mode
(let ((commit "8fbe071d2c6c040794060a354eb377218dc10b35")
@ -12457,26 +12483,25 @@ (define-public emacs-slime-repl-ansi-color
(license license:gpl2+))))
(define-public emacs-helm-slime
(let ((commit "9980925f3e5f6ac5a30369d2a544e82006a79c76"))
(package
(name "emacs-helm-slime")
(version (git-version "0.0.0" "1" commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacs-helm/helm-slime")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0xa07gpfkzwn522x9573mq5mfxvbawdgd0m93gqj6w5a14wk8zzh"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-helm" ,emacs-helm)
("emacs-slime" ,emacs-slime)))
(home-page "https://github.com/emacs-helm/helm-slime")
(synopsis "Helm for SLIME, the Superior Lisp Interaction Mode for Emacs")
(description "Helm-SLIME defines a few new commands:
(package
(name "emacs-helm-slime")
(version "0.2.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacs-helm/helm-slime")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0vn93vv2wclnwq6f480z14jn9wfp0ylhp5dd48ycc9jicfsnxqfj"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-helm" ,emacs-helm)
("emacs-slime" ,emacs-slime)))
(home-page "https://github.com/emacs-helm/helm-slime")
(synopsis "Helm for SLIME, the Superior Lisp Interaction Mode for Emacs")
(description "Helm-SLIME defines a few new commands:
@itemize
@item helm-slime-complete: Select a symbol from the SLIME completion systems.
@ -12484,7 +12509,7 @@ (define-public emacs-helm-slime
@item: helm-slime-apropos: Yet another slime-apropos with Helm.
@item helm-slime-repl-history: Select an input from the SLIME REPL history and insert it.
@end itemize\n")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public emacs-gtk-look
(package
@ -13110,3 +13135,51 @@ (define-public emacs-redshank
dialects, too. Redshank's code transformations aim to be expression-based (as
opposed to character-based).")
(license license:gpl1+))))
(define-public emacs-disk-usage
(package
(name "emacs-disk-usage")
(version "1.1.0")
(home-page "https://gitlab.com/ambrevar/emacs-disk-usage.git")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1c9jmjn8vf0v4776v79pc5w0labfs4v9aysbv2w9423rg4mangbg"))))
(build-system emacs-build-system)
(synopsis "Sort and browse disk usage listings with Emacs")
(description "Disk Usage is a file system analyzer: it offers a tabulated
view of file listings sorted by size. Directory sizes are computed
recursively. The results are cached for speed.")
(license license:gpl3+)))
(define-public emacs-orgit
(let ((commit "ddb830c38cb71e5cf86db7fa62d6ee88ab3962d5"))
(package
(name "emacs-orgit")
(version (git-version "1.5.1" "1" commit))
(home-page "https://github.com/magit/orgit")
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0fy4n71yskfkjl6w9mzrw3pfd5lp8f48g2c9bxiwg7mwzsmsb9nb"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
("emacs-magit" ,emacs-magit)))
(synopsis "Support for Org links to Magit buffers")
(description "This package defines several Org link types, which can be
used to link to certain Magit buffers. Use the command
@command{org-store-link} while such a buffer is current to store a link.
Later you can insert it into an Org buffer using the command
@code{org-insert-link}.")
(license license:gpl3+))))

9
gnu/packages/engineering.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@ -606,17 +606,18 @@ (define-public fritzing
(define-public gerbv
(package
(name "gerbv")
(version "2.6.2")
(version "2.7.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gerbv/gerbv/gerbv-"
version "/gerbv-" version ".tar.gz"))
(sha256
(base32
"1cw8k6ni0q8kswad03kha86fk7n06vq8p0wzsfhcnalsdshrn17i"))))
"1d2k43k7i4yvbpi4sw1263a8d0q98z2n7aqhmpinpkih8a681vn5"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
("pkg-config" ,pkg-config)))
(inputs
`(("cairo" ,cairo)
("gtk" ,gtk+-2)

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

@ -109,7 +109,7 @@ (define-public httpfs2
(define-public disorderfs
(package
(name "disorderfs")
(version "0.5.5")
(version "0.5.6")
(source
(origin
(method git-fetch)
@ -119,7 +119,7 @@ (define-public disorderfs
(file-name (git-file-name name version))
(sha256
(base32
"18c32qcdzbxrzg7srnqnw1ls9yqqxyk9b996yxr6w2znw6x6n8v4"))))
"1zn2ydap8k9fwjl3ivgrg6l32s5p4ik6ca6j1idp7c77znlv6cpp"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))

168
gnu/packages/finance.scm
View file

@ -45,6 +45,7 @@ (define-module (gnu packages finance)
#:use-module (gnu packages dns)
#:use-module (gnu packages emacs)
#:use-module (gnu packages dbm)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages groff)
#:use-module (gnu packages libedit)
@ -138,7 +139,7 @@ (define-public bitcoin-core
(define-public ledger
(package
(name "ledger")
(version "3.1.1")
(version "3.1.2")
(source
(origin
(method git-fetch)
@ -147,39 +148,17 @@ (define-public ledger
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1j4p7djkmdmd858hylrsc3inamh9z0vkfl98s9wiqfmrzw51pmxp"))
(patches (search-patches "ledger-revert-boost-python-fix.patch"
"ledger-fix-uninitialized.patch"))))
(base32 "0hwnipj2m9p95hhyv6kyq54m27g14r58gnsy2my883kxhpcyb2vc"))
(patches (search-patches "ledger-fix-uninitialized.patch"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((guix build cmake-build-system)
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils)
(guix build emacs-utils))
#:imported-modules (,@%cmake-build-system-modules
(guix build emacs-utils))
#:configure-flags
`(#:configure-flags
`("-DBUILD_DOCS:BOOL=ON"
"-DBUILD_WEB_DOCS:BOOL=ON"
"-DBUILD_EMACSLISP:BOOL=ON"
"-DUSE_PYTHON:BOOL=ON"
"-DCMAKE_INSTALL_LIBDIR:PATH=lib"
,(string-append "-DUTFCPP_INCLUDE_DIR:PATH="
(assoc-ref %build-inputs "utfcpp")
"/include"))
;; Skip failing test BaselineTest_cmd-org during the check phase.
;; This is a known upstream issue. See
;; https://github.com/ledger/ledger/issues/550
#:make-flags (list "ARGS=-E BaselineTest_cmd-org")
"-DCMAKE_INSTALL_LIBDIR:PATH=lib")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'boost-compat
(lambda _
(substitute* "src/utils.h"
;; This library moved in Boost 1.66. Remove for Ledger
;; versions > 3.1.1.
(("boost/uuid/sha1.hpp") "boost/uuid/detail/sha1.hpp"))
#t))
(add-before 'configure 'install-examples
(lambda* (#:key outputs #:allow-other-keys)
(let ((examples (string-append (assoc-ref outputs "out")
@ -195,18 +174,11 @@ (define-public ledger
(setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo"))
#t))
(replace 'check (assoc-ref gnu:%standard-phases 'check))
(add-after 'install 'relocate-elisp
(lambda* (#:key outputs #:allow-other-keys)
(let* ((site-dir (string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp"))
(guix-dir (string-append site-dir "/guix.d"))
(orig-dir (string-append site-dir "/ledger-mode"))
(dest-dir (string-append guix-dir "/ledger-mode")))
(mkdir-p guix-dir)
(rename-file orig-dir dest-dir)
(emacs-generate-autoloads ,name dest-dir)))))))
;; Skip failing test BaselineTest_cmd-org.
;; This is a known upstream issue. See
;; https://github.com/ledger/ledger/issues/550
(setenv "ARGS" "-E BaselineTest_cmd-org")
#t)))))
(inputs
`(("boost" ,boost)
("gmp" ,gmp)
@ -216,8 +188,7 @@ (define-public ledger
("tzdata" ,tzdata)
("utfcpp" ,utfcpp)))
(native-inputs
`(("emacs" ,emacs-minimal)
("groff" ,groff)
`(("groff" ,groff)
("texinfo" ,texinfo)))
(home-page "https://ledger-cli.org/")
(synopsis "Command-line double-entry accounting program")
@ -243,8 +214,74 @@ (define-public ledger
license:asl2.0 ; src/strptime.cc
(license:non-copyleft
"file://src/wcwidth.cc"
"See src/wcwidth.cc in the distribution.")
license:gpl2+)))) ; lisp/*
"See src/wcwidth.cc in the distribution.")))))
(define-public emacs-ledger-mode
;; There have been no new releases since 2016.
(let ((commit "253a20dc62e137ed0ed8e1dd8614ecba116610ea")
(revision "1"))
(package
(name "emacs-ledger-mode")
(version (git-version "3.1.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ledger/ledger-mode.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "06wrgkqpgvk17vibrk2qikdlqn8y63jg86marp1wgmram92mb3jk"))))
(build-system cmake-build-system)
(arguments
`(#:modules ((guix build cmake-build-system)
(guix build utils)
(guix build emacs-utils))
#:imported-modules (,@%cmake-build-system-modules
(guix build emacs-utils))
#:tests? #f ; there are none
#:phases
(modify-phases %standard-phases
(add-after 'build 'build-doc
(lambda* (#:key outputs #:allow-other-keys)
(let ((target (string-append (assoc-ref outputs "out")
"/share/info")))
(mkdir-p target)
(invoke "makeinfo" "-o" target
"../source/doc/ledger-mode.texi"))
#t))
(add-after 'install 'relocate-elisp
(lambda* (#:key outputs #:allow-other-keys)
(let* ((site-dir (string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp"))
(guix-dir (string-append site-dir "/guix.d"))
(orig-dir (string-append site-dir "/ledger-mode"))
(dest-dir (string-append guix-dir "/ledger-mode")))
(mkdir-p guix-dir)
(rename-file orig-dir dest-dir)
(emacs-generate-autoloads ,name dest-dir)
#t))))))
(native-inputs
`(("emacs-minimal" ,emacs-minimal)
("texinfo" ,texinfo)))
(home-page "https://ledger-cli.org/")
(synopsis "Command-line double-entry accounting program")
(description
"Ledger is a powerful, double-entry accounting system that is
accessed from the UNIX command-line. This may put off some users, since
there is no flashy UI, but for those who want unparalleled reporting
access to their data there are few alternatives.
Ledger uses text files for input. It reads the files and generates
reports; there is no other database or stored state. To use Ledger,
you create a file of your account names and transactions, run from the
command line with some options to specify input and requested reports, and
get output. The output is generally plain text, though you could generate
a graph or html instead. Ledger is simple in concept, surprisingly rich
in ability, and easy to use.
This package provides the Emacs mode.")
(license license:gpl2+))))
(define-public geierlein
(package
@ -591,7 +628,7 @@ (define-public monero-core
(define-public python-trezor-agent
(package
(name "python-trezor-agent")
(version "0.9.4")
(version "0.13.0")
(source
(origin
(method git-fetch)
@ -600,11 +637,18 @@ (define-public python-trezor-agent
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "15aaqk79d9y9nbsfznf2iscz12z5ispcj8kr8v5bc0sqqj2brs12"))))
(base32 "0i4igkxi8fwdlbhg6nx27lhnc9v9nmrw4j5fvpnc202n6yjlc7x7"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-requires-backports-shutil-which
;; Remove requires on backport of shutil_which, as python 3.4+ has
;; a built-in implementation supported in python-trezor-agent.
(lambda _
(substitute* "setup.py"
(("'backports.shutil_which>=3.5.1',") ""))
#t))
(delete 'check)
(add-after 'install 'check
(lambda* (#:key outputs inputs #:allow-other-keys)
@ -612,15 +656,22 @@ (define-public python-trezor-agent
(add-installed-pythonpath inputs outputs)
(invoke "py.test"))))))
(propagated-inputs
`(("python-ecdsa" ,python-ecdsa)
`(("python-configargparse" ,python-configargparse)
("python-daemon" ,python-daemon)
("python-docutils" ,python-docutils)
("python-ecdsa" ,python-ecdsa)
("python-ed25519" ,python-ed25519)
("python-mnemonic" ,python-mnemonic)
("python-pymsgbox" ,python-pymsgbox)
("python-semver" ,python-semver)
("python-unidecode" ,python-unidecode)))
("python-unidecode" ,python-unidecode)
("python-wheel" ,python-wheel)))
(native-inputs
`(("python-mock" ,python-mock)
`(("gnupg" ,gnupg)
("python-mock" ,python-mock)
("python-pytest" ,python-pytest)))
(home-page "https://github.com/romanz/trezor-agent")
(synopsis "TREZOR SSH and GPG host support")
(synopsis "Use hardware wallets as SSH and GPG agent")
(description
"@code{libagent} is a library that allows using TREZOR, Keepkey and
Ledger Nano as a hardware SSH/GPG agent.")
@ -789,19 +840,32 @@ (define-public ledger-agent
(define-public trezor-agent
(package
(name "trezor-agent")
(version "0.9.0")
(version "0.10.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "trezor_agent" version))
(sha256
(base32
"1i5cdamlf3c0ym600pjklij74p8ifj9cv7xrpnrfl1b8nkadswbz"))))
"144657c7bn0a667dq5fv5r6j7iilxf3h9agj29v1m2qpq40g0az8"))))
(arguments
;; Tests fail with "AttributeError: module 'attr' has no attribute 's'".
`(#:phases
(modify-phases %standard-phases
(add-after 'wrap 'fixup-agent-py
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
;; overwrite the wrapper with the real thing.
(install-file "./trezor_agent.py"
(string-append out "/bin"))
#t))))))
(build-system python-build-system)
(inputs
`(("python-trezor" ,python-trezor)
("python-trezor-agent" ,python-trezor-agent)))
(home-page "http://github.com/romanz/trezor-agent")
(native-inputs
`(("python-hidapi" ,python-hidapi)))
(home-page "https://github.com/romanz/trezor-agent")
(synopsis "Using Trezor as hardware SSH/GPG agent")
(description "This package allows using Trezor as a hardware SSH/GPG
agent.")

20
gnu/packages/flashing-tools.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -341,16 +341,16 @@ (define-public heimdall
(define-public ifdtool
(package
(name "ifdtool")
(version "4.7")
(version "4.9")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://review.coreboot.org/p/coreboot")
(url "https://github.com/coreboot/coreboot.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0nw555i0fm5kljha9h47bk70ykbwv8ddfk6qhz6kfqb79vzhy4h2"))))
"0jidj29jh6p65d17k304wlzhxvp4p3c2namgcdwg2sxq8jfr0zlm"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
@ -359,12 +359,12 @@ (define-public ifdtool
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _
(chdir "util/ifdtool")
#t))
(delete 'configure)
(delete 'check))))
(add-after 'unpack 'chdir
(lambda _
(chdir "util/ifdtool")
#t))
(delete 'configure)) ; no configure script
#:tests? #f)) ; no test suite
(home-page "https://github.com/corna/me_cleaner/")
(synopsis "Intel Firmware Descriptor dumper")
(description "This package provides @command{ifdtool}, a program to

51
gnu/packages/fonts.scm
View file

@ -23,6 +23,7 @@
;;; Copyright © 2017 Mohammed Sadiq <sadiq@sadiqpk.org>
;;; Copyright © 2018 Charlie Ritter <chewzerita@posteo.net>
;;; Copyright © 2018 Gabriel Hondet <gabrielhondet@gmail.com>
;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
;;;
;;; This file is part of GNU Guix.
;;;
@ -857,6 +858,56 @@ (define-public font-adobe-source-code-pro
designed to work well in user interface environments.")
(license license:silofl1.1)))
(define-public font-adobe-source-sans-pro
(package
(name "font-adobe-source-sans-pro")
(version "2.040R-ro-1.090R-it")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/adobe-fonts/source-sans-pro/archive/"
(regexp-substitute/global
;; The upstream tag uses "/" between the roman and italic
;; versions, so substitute our "-" separator here.
#f "R-ro-" version 'pre "R-ro/" 'post) ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1wpbhd2idps53ph8rg1mhr3vz4lsgbpjprcq10nliwcxdz9d8lv0"))))
(build-system font-build-system)
(home-page "https://github.com/adobe-fonts/source-sans-pro")
(synopsis
"Sans serif font family for user interface environments")
(description
"Source Sans Pro is a set of OpenType fonts that have been designed to
work well in user interface (UI) environments.")
(license license:silofl1.1)))
(define-public font-adobe-source-serif-pro
(package
(name "font-adobe-source-serif-pro")
(version "2.007R-ro-1.007R-it")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/adobe-fonts/source-serif-pro/archive/"
(regexp-substitute/global
;; The upstream tag uses "/" between the roman and italic
;; versions, so substitute our "-" separator here.
#f "R-ro-" version 'pre "R-ro/" 'post) ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1sws9k26ldqk375qsigk1zv8cq1xlvadjwvv3dqrcc3qzm1c7hwc"))))
(build-system font-build-system)
(home-page "https://github.com/adobe-fonts/source-serif-pro")
(synopsis
"Serif typeface to complement Source Sans Pro for setting text")
(description
"Source Serif Pro is a set of OpenType fonts to complement the Source
Sans Pro family.")
(license license:silofl1.1)))
(define-public font-fira-mono
(package
(name "font-fira-mono")

8
gnu/packages/ftp.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
;;;
;;; This file is part of GNU Guix.
@ -175,7 +175,7 @@ (define-public libfilezilla
(origin
(method url-fetch)
(uri (string-append "https://download.filezilla-project.org/"
name "/" name "-" version ".tar.bz2"))
"libfilezilla/libfilezilla-" version ".tar.bz2"))
(sha256
(base32
"17zlhw5b1a7jzh50cbpy2is3sps5lnzch5yf9qm7mwrviw9c8j10"))))
@ -209,14 +209,14 @@ (define-public libfilezilla
(define-public filezilla
(package
(name "filezilla")
(version "3.39.0")
(version "3.40.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.filezilla-project.org/client/"
"FileZilla_" version "_src.tar.bz2"))
(sha256
(base32 "0ks42q6mi3qx85zpa98izkyficv2bdh3jnvmy97xjnjyfy9mwlgv"))))
(base32 "11b0410fcwrahq5dd7ph10bc09m62sxra4bjp0kj5gph822s0v63"))))
(build-system gnu-build-system)
(arguments
;; Don't let filezilla phone home to check for updates.

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

@ -8,7 +8,7 @@
;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Julian Graham <joolean@gmail.com>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
@ -431,7 +431,7 @@ (define-public python2-xsge
(define-public tiled
(package
(name "tiled")
(version "1.2.1")
(version "1.2.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -440,7 +440,7 @@ (define-public tiled
(file-name (git-file-name name version))
(sha256
(base32
"1dl06k2p0r7l20ghxcq5sn7j0jl2l8q4m27vmfs2qfgvldjll2h3"))))
"0ay4x1b6h5xfax1cqry2fklcmqi6a16klgmci4gkhga7as66lnnn"))))
(build-system gnu-build-system)
(inputs
`(("qtbase" ,qtbase)
@ -641,17 +641,15 @@ (define-public love
(define-public allegro-4
(package
(name "allegro")
(version "4.4.2")
(version "4.4.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/liballeg/allegro5/"
"releases/download/" version "/allegro-"
version ".tar.gz"))
(patches (search-patches
"allegro4-mesa-18.2.5-and-later.patch"))
(sha256
(base32
"1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"))))
"1d5ws3ihvpa6f4qc6a6drq31pajw6bblxifr4kcxzqj9br1nw28y"))))
(build-system cmake-build-system)
(arguments
'(#:phases

74
gnu/packages/games.scm
View file

@ -24,7 +24,7 @@
;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info>
;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 nee <nee-git@hidamari.blue>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
@ -656,7 +656,7 @@ (define-public knights
(define-public gnubg
(package
(name "gnubg")
(version "1.06.001")
(version "1.06.002")
(source
(origin
(method url-fetch)
@ -664,7 +664,7 @@ (define-public gnubg
version "-sources." "tar.gz"))
(sha256
(base32
"0snz3j1bvr25ji7lg82bl2gm2s2x9lrpc7viw0hclgz0ql74cw7b"))))
"11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf"))))
(build-system gnu-build-system)
(inputs `(("glib" ,glib)
("readline" ,readline)
@ -2143,22 +2143,22 @@ (define-public wesnoth-server
(define-public gamine
(package
(name "gamine")
(version "1.5")
(version "1.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gamine-game/"
"gamine-" version ".tar.gz"))
(sha256
(base32
"08wnk7w84c2413hwny89j2cn89cvfdf67bfc6wl0bf475if0mf4h"))))
"1sc6f4445ciigd6yw0ri92746k4hk6ps0bvj9fm1gbp3c3fslk5n"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)))
(inputs
`(("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base) ;playbin plugin
("gst-plugins-good" ,gst-plugins-good) ;for wav playback
("gst-plugins-base" ,gst-plugins-base) ; playbin plugin
("gst-plugins-good" ,gst-plugins-good) ; for wav playback
("gtk+" ,gtk+)))
(arguments
`(#:tests? #f
@ -2413,7 +2413,7 @@ (define openttd-opensfx
(build-system gnu-build-system)
(native-inputs
`(("catcodec" ,catcodec)
("python" ,python2-minimal)))
("python" ,python-2)))
(arguments
`(#:make-flags
(list (string-append "INSTALL_DIR=" %output
@ -2450,7 +2450,7 @@ (define openttd-openmsx
"0nskq97a6fsv1v6d62zf3yb8whzhqnlh3lap3va3nzvj7csjgf7c"))))
(build-system gnu-build-system)
(native-inputs
`(("python" ,python2-minimal)))
`(("python" ,python-2)))
(arguments
`(#:make-flags
(list (string-append "INSTALL_DIR=" %output
@ -2838,7 +2838,9 @@ (define-public red-eclipse
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0"))))
"1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0"))
(patches
(search-patches "red-eclipse-remove-gamma-name-hack.patch"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
@ -3421,22 +3423,23 @@ (define-public supertux
(define-public tintin++
(package
(name "tintin++")
(version "2.01.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/tintin"
"/TinTin++ Source Code/" version
"/tintin" "-" version ".tar.gz"))
(sha256
(base32
"0pnnbcm96xbj69358568rpvp164rjmcvhnnzs7nvj062pi2hqcxx"))))
(version "2.01.7")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/tintin/TinTin++ Source Code/"
(version-major+minor version)
"/tintin-" version ".tar.gz"))
(sha256
(base32
"033n84pyxml3n3gd4dq0497n9w331bnrr1gppwipz9ashmq8jz7v"))))
(inputs
`(("gnutls" ,gnutls)
("pcre" ,pcre)
("readline" ,readline)
("zlib" ,zlib)))
(arguments
'(#:tests? #f ; no test suite
'(#:tests? #f ; no test suite
#:phases
(modify-phases %standard-phases
;; The source is in tt/src.
@ -4104,9 +4107,8 @@ (define-public kiki
(define-public teeworlds
(package
(name "teeworlds")
(version "0.7.0")
(version "0.7.2")
(source (origin
;; do not use auto-generated tarballs
(method git-fetch)
(uri (git-reference
(url "https://github.com/teeworlds/teeworlds.git")
@ -4114,7 +4116,7 @@ (define-public teeworlds
(file-name (git-file-name name version))
(sha256
(base32
"0jigg2yikihbivzs7hpljr0mghx1l9v4f1cdr8fbmqv2wb51ah8q"))
"15l988qcsqgb6rjais0qd5sd2rjanm2708jmzvkariqzz0d6pb93"))
(modules '((guix build utils)
(ice-9 ftw)
(ice-9 regex)
@ -4131,7 +4133,7 @@ (define-public teeworlds
(search-patches "teeworlds-use-latest-wavpack.patch"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests included
`(#:tests? #f ; no tests included
#:modules ((guix build gnu-build-system)
(guix build utils)
(srfi srfi-26))
@ -4293,17 +4295,17 @@ (define-public enigma
(define-public chroma
(package
(name "chroma")
(version "1.15")
(version "1.16")
(source (origin
(method url-fetch)
(uri (string-append "http://level7.org.uk/chroma/download/chroma-"
version ".tar.bz2"))
(sha256
(base32
"0nzm3j5wjazr1d6pkydqlc48sjf72hggq0hmx8mhq03114mmiir5"))))
"1gfaw1kf7cxf5ibr61n6dxjihi49gmysn4cvawx1pqvy52ljpk0p"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f)) ; no tests included
`(#:tests? #f)) ; no tests included
(inputs
`(("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf)))
("freetype" ,freetype)
@ -4948,16 +4950,16 @@ (define-public vkquake
(package
(inherit quakespasm)
(name "vkquake")
(version "1.00.0")
(version "1.01.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/Novum/vkQuake/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/Novum/vkQuake.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0bviv18jvp41jvrabgl7l5kq4n1p6p3rywij481yswawdw6l5idh"))))
(base32 "1iwin8j5kbyrknbkhjgpy8nmm7pxqzr0daa9gn7p38qhg2mh0a39"))))
(arguments
`(#:make-flags
(let ((vulkanlib (string-append (assoc-ref %build-inputs
@ -5376,7 +5378,7 @@ (define-public gzdoom
(define-public fortune-mod
(package
(name "fortune-mod")
(version "2.6.1")
(version "2.6.2")
(source
(origin
(method git-fetch)
@ -5386,7 +5388,7 @@ (define-public fortune-mod
(file-name (git-file-name name version))
(sha256
(base32
"17183z8ls6hrngh8a3374csagqa2acs8jl21dqm7gwj4lk0ghkba"))))
"11xff87s8ifw2dqs90n0rjq0psv4i7ykybygmibsqjj7id3xxw4c"))))
(build-system cmake-build-system)
(arguments
`(#:test-target "check"

11
gnu/packages/gd.scm
View file

@ -39,6 +39,7 @@ (define-module (gnu packages gd)
(define-public gd
(package
(name "gd")
(replacement gd/fixed)
;; Note: With libgd.org now pointing to github.com, genuine old
;; tarballs are no longer available. Notably, versions 2.0.x are
;; missing.
@ -94,6 +95,16 @@ (define-public gd
"See COPYING file in the distribution."))
(properties '((cpe-name . "libgd")))))
(define-public gd/fixed
(hidden-package
(package
(inherit gd)
(source (origin
(inherit (package-source gd))
(patches (append (origin-patches (package-source gd))
(search-patches "gd-CVE-2019-6977.patch"
"gd-CVE-2019-6978.patch"))))))))
(define-public perl-gd
(package
(name "perl-gd")

194
gnu/packages/genimage.scm Normal file
View file

@ -0,0 +1,194 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
;;;
;;; 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 genimage)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
#:use-module (guix build utils)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bootloaders)
#:use-module (gnu packages cdrom)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpio)
#:use-module (gnu packages disk)
#:use-module (gnu packages linux)
#:use-module (gnu packages mtools)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages virtualization)
#:use-module (gnu packages wm))
(define-public genimage
(package
(name "genimage")
(version "10")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pengutronix/genimage.git")
(commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"0had00p2why2l1fl14mq7nbhmmfbd3na4qnnpg36akdy05g67jbn"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'guixify
(lambda* (#:key inputs #:allow-other-keys)
;; Note to maintainers: Check ".def =" lines in source.
(substitute* "config.c"
(("\\.def = \"cpio\"")
(string-append ".def = \""
(assoc-ref inputs "cpio")
"/bin/cpio\""))
(("\\.def = \"dd\"")
(string-append ".def = \""
(assoc-ref inputs "coreutils")
"/bin/dd\""))
(("\\.def = \"debugfs\"")
(string-append ".def = \""
(assoc-ref inputs "e2fsprogs")
"/sbin/debugfs\""))
(("\\.def = \"e2fsck\"")
(string-append ".def = \""
(assoc-ref inputs "e2fsprogs")
"/sbin/e2fsck\""))
(("\\.def = \"genext2fs\"")
(string-append ".def = \""
(assoc-ref inputs "genext2fs")
"/bin/genext2fs\""))
(("\\.def = \"genisoimage\"")
(string-append ".def = \""
(assoc-ref inputs "cdrkit-libre")
"/bin/genisoimage\""))
(("\\.def = \"mcopy\"")
(string-append ".def = \""
(assoc-ref inputs "mtools")
"/bin/mcopy\""))
(("\\.def = \"mmd\"")
(string-append ".def = \""
(assoc-ref inputs "mtools")
"/bin/mmd\""))
;;; Note: mkcramfs is obsolete.
(("\\.def = \"mkdosfs\"")
(string-append ".def = \""
(assoc-ref inputs "dosfstools")
"/sbin/mkfs.fat\""))
(("\\.def = \"mke2fs\"")
(string-append ".def = \""
(assoc-ref inputs "e2fsprogs")
"/sbin/mke2fs\""))
(("\\.def = \"mkfs\\.jffs2\"")
(string-append ".def = \""
(assoc-ref inputs "mtd-utils")
"/sbin/mkfs.jffs2\""))
(("\\.def = \"mkfs\\.ubifs\"")
(string-append ".def = \""
(assoc-ref inputs "mtd-utils")
"/sbin/mkfs.ubifs\""))
(("\\.def = \"mksquashfs\"")
(string-append ".def = \""
(assoc-ref inputs "squashfs-tools")
"/bin/mksquashfs\""))
(("\\.def = \"qemu-img\"")
(string-append ".def = \""
(assoc-ref inputs "qemu")
"/bin/qemu-img\""))
(("\\.def = \"tar\"")
(string-append ".def = \""
(assoc-ref inputs "tar")
"/bin/tar\""))
(("\\.def = \"tune2fs\"")
(string-append ".def = \""
(assoc-ref inputs "e2fsprogs")
"/sbin/tune2fs\""))
(("\\.def = \"ubinize\"")
(string-append ".def = \""
(assoc-ref inputs "mtd-utils")
"/sbin/ubinize\""))
(("\\.def = \"mkimage\"")
(string-append ".def = \""
(assoc-ref inputs "u-boot-tools")
"/bin/mkimage\"")))
(substitute* "test/basic-images.test"
;; Work around bug in sharness.sh.
(("mkdosfs")
"mkfs.fat")
;; Work around bug in sharness.sh.
(("dd,mkfs\\.fat,mcopy")
"dd,mkfs_fat,mcopy")
;; Should be in the next upstream release.
(("qemu_img") "qemu-img"))
(substitute* "util.c"
(("\"/bin/sh\"")
(string-append "\"" (assoc-ref inputs "bash") "/bin/sh\"")))
;; We don't have /etc/passwd so uid 0 is not known as "root".
;; Thus patch it out.
(substitute* '("test/ext2test.dump"
"test/ext3test.dump"
"test/ext4test.dump"
"test/mke2fs.dump")
(("root") "unknown"))
#t))
(add-before 'check 'setenv-check
(lambda _
;; Our container doesn't provide access to /etc/mtab
(setenv "EXT2FS_NO_MTAB_OK" "1")
;; Make test reproducible
(setenv "GENIMAGE_MKFJFFS2" "mkfs.jffs2 -U")
(setenv "GENIMAGE_MKE2FS" "mke2fs -E no_copy_xattrs")
#t))
(replace 'check
(lambda _
(invoke "make" "TEST_LOG_COMPILER=" "check"))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
;;; Note: cramfs is obsolete.
("dtc" ,dtc) ; for the tests
("fdisk" ,fdisk) ; for the tests
("pkg-config" ,pkg-config)
("util-linux" ,util-linux))) ; for the tests
(inputs
`(("bash" ,bash)
("cdrkit-libre" ,cdrkit-libre)
("cpio" ,cpio)
;; Note: invoked by final executable.
("coreutils" ,coreutils) ; chmod, dd
("dosfstools" ,dosfstools)
("e2fsprogs" ,e2fsprogs)
("genext2fs" ,genext2fs)
("libconfuse" ,libconfuse)
("mtd-utils" ,mtd-utils)
("mtools" ,mtools)
("qemu" ,qemu-minimal)
("squashfs-tools" ,squashfs-tools)
("tar" ,tar)
("u-boot-tools" ,u-boot-tools)))
(synopsis "Create Flash images according to specification")
(description "@command{genimage} creates Flash images according to a
specification file.")
(home-page "https://github.com/pengutronix/genimage")
(license license:gpl2)))

27
gnu/packages/geo.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017, 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
@ -32,6 +32,7 @@ (define-module (gnu packages geo)
#:use-module (guix build-system scons)
#:use-module (guix build-system r)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
@ -743,25 +744,25 @@ (define-public imposm3
(define-public protozero
(package
(name "protozero")
(version "1.6.3")
(version "1.6.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/mapbox/protozero/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1xaj4phz1r7xn0vgdfvfkz8b0bizgb6mavjky1zqcvdmbwgwgly5"))))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mapbox/protozero.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "10ldzni46cplmkgx1f73yn95qcb71xh9nxpcfdmi107y3kvicv3c"))))
(build-system cmake-build-system)
(home-page "https://github.com/mapbox/protozero")
(synopsis "Minimalistic protocol buffer decoder and encoder in C++")
(description "Protozero is a minimalistic protocol buffer decored and
(description "Protozero is a minimalistic protocol buffer decoder and
encoder in C++. The developer using protozero has to manually translate the
@file{.proto} description into code.")
(license (list
license:asl2.0; for folly
license:bsd-2))))
license:asl2.0 ; for folly
license:bsd-2))))
(define-public libosmium
(package

16
gnu/packages/gimp.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
;;;
@ -49,7 +49,7 @@ (define-module (gnu packages gimp)
(define-public babl
(package
(name "babl")
(version "0.1.56")
(version "0.1.62")
(source (origin
(method url-fetch)
(uri (list (string-append "https://download.gimp.org/pub/babl/"
@ -63,7 +63,7 @@ (define-public babl
"/babl-" version ".tar.bz2")))
(sha256
(base32
"0a2dvihah1j7qi5dp1qzzlwklcqnndmxsm7lc7i78g7c2yknrlla"))))
"047msfzj8v4sfl61a2xhd69r9rh2pjq4lzpk3j10ijyv9qbry9yw"))))
(build-system gnu-build-system)
(home-page "http://gegl.org/babl/")
(synopsis "Image pixel format conversion library")
@ -80,15 +80,15 @@ (define-public babl
(define-public gegl
(package
(name "gegl")
(version "0.4.8")
(version "0.4.12")
(source (origin
(method url-fetch)
(uri (list (string-append "https://download.gimp.org/pub/gegl/"
(string-take version 3)
"/" name "-" version ".tar.bz2")))
"/gegl-" version ".tar.bz2")))
(sha256
(base32
"0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i"))))
"0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("LDFLAGS=-lm")))
@ -118,7 +118,7 @@ (define-public gegl
(define-public gimp
(package
(name "gimp")
(version "2.10.6")
(version "2.10.8")
(source (origin
(method url-fetch)
(uri (string-append "https://download.gimp.org/pub/gimp/v"
@ -126,7 +126,7 @@ (define-public gimp
"/gimp-" version ".tar.bz2"))
(sha256
(base32
"07qh2ljbza2mph1gh8sicn27qihhj8hx3ivvry2874cfh8ghgj2f"))))
"16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 9 MiB of gtk-doc HTML

6
gnu/packages/gl.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
@ -221,7 +221,7 @@ (define libva-without-mesa
(define-public mesa
(package
(name "mesa")
(version "18.3.1")
(version "18.3.4")
(source
(origin
(method url-fetch)
@ -233,7 +233,7 @@ (define-public mesa
version "/mesa-" version ".tar.xz")))
(sha256
(base32
"0qyw9dj2p9n91qzc4ylck2an7ibssjvzi2bjcpv2ajk851yq47sv"))
"01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j"))
(patches
(search-patches "mesa-skip-disk-cache-test.patch"))))
(build-system gnu-build-system)

334
gnu/packages/gnome.scm
View file

@ -21,7 +21,7 @@
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017, 2018 nee <nee-git@hidamari.blue>
@ -32,7 +32,8 @@
;;; Copyright © 2018 Jovany Leandro G.C <bit4bit@riseup.net>
;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2018 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2018, 2019 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -127,6 +128,7 @@ (define-module (gnu packages gnome)
#:use-module (gnu packages rdesktop)
#:use-module (gnu packages readline)
#:use-module (gnu packages ruby)
#:use-module (gnu packages rust)
#:use-module (gnu packages samba)
#:use-module (gnu packages scanner)
#:use-module (gnu packages selinux)
@ -277,7 +279,7 @@ (define-public deja-dup
`(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gobject-introspection" ,gobject-introspection)
("duplicity" ,duplicity)
("python" ,python2-minimal)
("python" ,python-2)
("python-pygobject" ,python2-pygobject)
("gtk+" ,gtk+)
("libnotify" ,libnotify)
@ -975,6 +977,88 @@ (define-public shared-mime-info
database is translated at Transifex.")
(license license:gpl2+)))
(define-public system-config-printer
(package
(name "system-config-printer")
(version "1.5.11")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/zdohnal/system-config-printer/releases/"
"download/" version
"/system-config-printer-" version ".tar.xz"))
(sha256
(base32
"1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:imported-modules ((guix build python-build-system)
,@%glib-or-gtk-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-Makefile.am
(lambda _
;; The Makefile generates some scripts, so set a valid shebang
(substitute* "Makefile.am"
(("/bin/bash") (which "bash")))
(delete-file "configure")
#t))
(add-after 'unpack 'patch-docbook-xml
(lambda* (#:key inputs #:allow-other-keys)
;; Modify the man XML otherwise xmlto tries to access the network
(substitute* "man/system-config-printer.xml"
(("http://www.oasis-open.org/docbook/xml/4.1.2/")
(string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/")))
#t))
(add-after 'install 'wrap-for-python
(@@ (guix build python-build-system) wrap))
(add-after 'install 'wrap
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
(for-each
(lambda (program)
(wrap-program program
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
(map (lambda (name)
(string-append out "/bin/" name))
'("system-config-printer"
"system-config-printer-applet"
"install-printerdriver"
"scp-dbus-service"))))
#t)))))
(inputs
`(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gobject-introspection" ,gobject-introspection)
("python" ,python)
("cups" ,cups)
("python-dbus" ,python-dbus)
("python-pygobject" ,python-pygobject)
("python-pycups" ,python-pycups)
("python-requests" ,python-requests)
("python-pycairo" ,python-pycairo)
("libnotify" ,libnotify)
("packagekit" ,packagekit)))
(native-inputs
`(("pkg-config" ,pkg-config)
("desktop-file-utils" ,desktop-file-utils)
("glib" ,glib)
("autoconf" ,autoconf)
("automake" ,automake)
("intltool" ,intltool)
("xmlto" ,xmlto)
("docbook-xml" ,docbook-xml-4.1.2)
("docbook-xsl" ,docbook-xsl)
("libxml2" ,libxml2)))
(home-page "https://github.com/zdohnal/system-config-printer")
(synopsis "CUPS administration tool")
(description
"system-config-printer is a CUPS administration tool. It's written in
Python using GTK+, and uses the @acronym{IPP, Internet Printing Protocol} when
configuring CUPS.")
(license license:gpl2+)))
(define-public hicolor-icon-theme
(package
(name "hicolor-icon-theme")
@ -1218,7 +1302,7 @@ (define-public libgsf
(define-public librsvg
(package
(name "librsvg")
(version "2.40.20")
(version "2.44.12")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -1226,11 +1310,22 @@ (define-public librsvg
name "-" version ".tar.xz"))
(sha256
(base32
"0ay9himvw1l1swcf3h1312d2iqzfl65kpbfgiyfykgvq7cydvx6g"))))
"1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6"))))
(build-system gnu-build-system)
(arguments
`(#:phases
`(#:make-flags '("CC=gcc")
#:phases
(modify-phases %standard-phases
;; Don't patch anything in vendor/ to avoid having to recompute
;; checksums for the bundled Cargo "crates". TODO: Unbundle those.
(delete 'patch-source-shebangs)
(delete 'patch-generated-file-shebangs)
(delete 'patch-usr-bin-file)
(add-before 'configure 'patch-all-the-things
(lambda _
(for-each patch-shebang '("tap-driver.sh" "tap-test"))
(patch-/usr/bin/file "configure")
#t))
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "gdk-pixbuf-loader/Makefile.in"
@ -1244,22 +1339,32 @@ (define-public librsvg
(("gdk_pixbuf_cache_file = .*$")
"gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n"))
#t))
(add-after 'unpack 'remove-failing-tests
(add-before 'check 'remove-failing-tests
(lambda _
(with-directory-excursion "tests/fixtures/reftests"
(for-each delete-file
'(;; This test fails on i686:
'(;; The images produced by these tests differ slightly
;; from their reference counterparts due to differences
;; in the build environment (missing fonts, etc). See
;; <tests/README.md> for details.
;; These fail on x86_64.
"svg1.1/coords-viewattr-02-b.svg"
"svg1.1/filters-composite-04-f.svg"
"svg1.1/filters-image-01-b.svg"
"svg1.1/filters-conv-02-f.svg"
"svg1.1/filters-conv-04-f.svg"
;; This test fails on i686:
"svg1.1/masking-path-04-b.svg"
"svg1.1/masking-path-04-b-ref.png"
;; This test fails on armhf:
"svg1.1/masking-mask-01-b.svg"
"svg1.1/masking-mask-01-b-ref.png"
;; This test fails on aarch64:
"bugs/777834-empty-text-children.svg"
"bugs/777834-empty-text-children-ref.png")))
"bugs/777834-empty-text-children.svg")))
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
;; This is the minimum supported Rust version in Librsvg 2.44.
("rust" ,rust-1.27)
("cargo" ,rust-1.27 "cargo")
("glib" ,glib "bin") ; glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
(inputs
@ -4572,6 +4677,14 @@ (define-public gnome-session
(out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/gnome-session")
`("PATH" ":" prefix (,(string-append glib "/bin"))))
#t)))
(add-after 'install 'add-absolute-paths-to-desktop-files
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")))
(substitute* (map (lambda (x)
(string-append out "/share/xsessions/" x))
'("gnome.desktop" "gnome-xorg.desktop"))
(("gnome-session") (string-append out "/bin/gnome-session")))
#t))))
#:configure-flags
@ -5317,10 +5430,6 @@ (define-public gdm
;; service for TTY 1 before starting GDM).
"--with-initial-vt=7"
;; By default, GDM expects distributions to install a custom Xsession
;; script. It provides a generic one if --enable-gdm-xsession is set.
"--enable-gdm-xsession"
;; Use '/etc/environment' for locale settings instead of the
;; systemd-specific '/etc/locale.conf'.
"--with-lang-file=/etc/environment"
@ -5338,7 +5447,7 @@ (define-public gdm
(modify-phases %standard-phases
(add-before
'configure 'pre-configure
(lambda _
(lambda* (#:key inputs #:allow-other-keys)
;; We don't have <systemd/sd-daemon.h>.
(substitute* '("common/gdm-log.c"
"daemon/gdm-server.c"
@ -5367,44 +5476,64 @@ (define-public gdm
"\"/run/current-system/profile/share/wayland")
(("DATADIR \"/gnome")
"\"/run/current-system/profile/share/gnome"))
(substitute* '("daemon/gdm-session.c")
(("set_up_session_environment \\(self\\);")
(string-append
"set_up_session_environment (self);\n"
;; Propagate GDM_X_SERVER environment variable (which is set
;; by the GDM service, as it's a function of what X modules
;; the user decides to have available) down to worker
;; processes.
"gdm_session_set_environment_variable (self, \"GDM_X_SERVER\",\n"
" g_getenv (\"GDM_X_SERVER\"));\n"
;; FIXME: Really glib should be declaring XDG_CONFIG_DIRS as a
;; variable, but it doesn't do that right now. Anyway
;; /run/current-system/profile/share/gnome-session/sessions/gnome.desktop
;; requires that a number of .desktop files be present, and
;; these special .desktop files are in $XDG_CONFIG_DIRS (which
;; defaults to /etc/xdg if it's not set). Here we need to
;; provide a value such that the GNOME session's requirements
;; are met (provided GNOME is installed of course).
"gdm_session_set_environment_variable (self, \"XDG_CONFIG_DIRS\",\n"
" \"/run/current-system/profile/etc/xdg\");\n"
;; The session bus (which GDM will initialize from the this
;; session environment) needs to know where to find the system
;; service files.
"gdm_session_set_environment_variable (self, \"XDG_DATA_DIRS\",\n"
" \"/run/current-system/profile/share\");\n"
)))
(let ((propagate '("GDM_CUSTOM_CONF"
"GDM_DBUS_DAEMON"
"GDM_X_SERVER"
"GDM_X_SESSION"
;; XXX: Remove this once GNOME Shell is
;; a dependency of GDM.
"XDG_DATA_DIRS")))
(substitute* "daemon/gdm-session.c"
(("set_up_session_environment \\(self\\);")
(apply string-append
"set_up_session_environment (self);\n"
(map (lambda (name)
(string-append
"gdm_session_set_environment_variable "
"(self, \"" name "\","
"g_getenv (\"" name "\"));\n"))
propagate)))))
;; Look for custom GDM conf in /run/current-system.
(substitute* '("common/gdm-settings-desktop-backend.c")
(("GDM_CUSTOM_CONF")
"\"/run/current-system/etc/gdm/custom.conf\""))
(string-append "(g_getenv(\"GDM_CUSTOM_CONF\") != NULL"
" ? g_getenv(\"GDM_CUSTOM_CONF\")"
" : GDM_CUSTOM_CONF)")))
;; Use service-supplied path to X.
(substitute* '("daemon/gdm-server.c")
(("\\(X_SERVER X_SERVER_ARG_FORMAT")
"(\"%s\" X_SERVER_ARG_FORMAT, g_getenv (\"GDM_X_SERVER\")"))
(substitute* '("daemon/gdm-x-session.c")
(("\"dbus-daemon\"")
"g_getenv (\"GDM_DBUS_DAEMON\")")
(("X_SERVER")
"g_getenv (\"GDM_X_SERVER\")"))
#t)))))
"g_getenv (\"GDM_X_SERVER\")")
(("GDMCONFDIR \"/Xsession\"")
"g_getenv (\"GDM_X_SESSION\")"))
;; Use an absolute path for GNOME Session.
(substitute* "daemon/gdm-launch-environment.c"
(("\"gnome-session\"")
(string-append "\"" (assoc-ref inputs "gnome-session")
"/bin/gnome-session\"")))
#t))
;; GDM needs GNOME Session to run these applications. We link
;; their autostart files in `share/gdm/greeter/autostart'
;; because GDM explicitly tells GNOME Session to look there.
;;
;; XXX: GNOME Shell should be linked here too, but currently
;; GNOME Shell depends on GDM.
(add-after 'install 'link-autostart-files
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(autostart (string-append out "/share/gdm/"
"greeter/autostart"))
(settings (assoc-ref inputs "gnome-settings-daemon")))
(mkdir-p autostart)
(with-directory-excursion autostart
(for-each (lambda (desktop)
(symlink desktop (basename desktop)))
(find-files (string-append settings "/etc/xdg"))))
#t))))))
(native-inputs
`(("dconf" ,dconf)
("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
@ -5417,6 +5546,8 @@ (define-public gdm
`(("accountsservice" ,accountsservice)
("check" ,check) ; for testing
("elogind" ,elogind)
("gnome-session" ,gnome-session)
("gnome-settings-daemon" ,gnome-settings-daemon)
("gtk+" ,gtk+)
("iso-codes" ,iso-codes)
("libcanberra" ,libcanberra)
@ -6065,6 +6196,7 @@ (define-public gnome
("pinentry-gnome3" ,pinentry-gnome3)
("pulseaudio" ,pulseaudio)
("shared-mime-info" ,shared-mime-info)
("system-config-printer" ,system-config-printer)
("totem" ,totem)
("xdg-user-dirs" ,xdg-user-dirs)
("yelp" ,yelp)
@ -7259,7 +7391,7 @@ (define-public sound-juicer
(define-public soundconverter
(package
(name "soundconverter")
(version "3.0.0")
(version "3.0.1")
(source
(origin
(method url-fetch)
@ -7268,8 +7400,7 @@ (define-public soundconverter
"soundconverter-" version ".tar.xz"))
(sha256
(base32
"1wrxf5py54xplrf97qp24pzbis0cvax5c6k0c7vr3z3ry8r7gd7c"))
(base32 "1d6x1yf8psqbd9zbybxivfqg55khcnngp2mn92l161dfdk9512c5"))
(patches
(search-patches
"soundconverter-remove-gconf-dependency.patch"))))
@ -7286,12 +7417,6 @@ (define-public soundconverter
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-POTFILES.in
(lambda _
(substitute* "po/POTFILES.in"
;; This file doesn't exist, so without removing it, the 'check
;; phase fails for the po directory
(("soundconverter/gconfstore\\.py") ""))))
(add-after 'install 'wrap-soundconverter-for-python
(assoc-ref python:%standard-phases 'wrap))
(add-after 'install 'wrap-soundconverter
@ -7322,52 +7447,49 @@ (define-public soundconverter
(license license:gpl3)))
(define-public workrave
(let ((commit "v1_10_21"))
(package
(name "workrave")
(version (string-map (match-lambda
(#\_ #\.)
(chr chr))
(string-drop commit 1)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rcaelers/workrave.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia"))))
(build-system glib-or-gtk-build-system)
(propagated-inputs `(("glib" ,glib)
("gtk+" ,gtk+)
("gdk-pixbuf" ,gdk-pixbuf)
("gtkmm" ,gtkmm)
("glibmm" ,glibmm)
("libx11" ,libx11)
("libxtst" ,libxtst)
("dconf" ,dconf)
("libice" ,libice)))
(inputs `(("libsm" ,libsm)
("python-cheetah" ,python2-cheetah)))
(native-inputs `(("glib" ,glib "bin")
("pkg-config" ,pkg-config)
("gettext" ,gnu-gettext)
("autoconf" ,autoconf)
("autoconf-archive" , autoconf-archive)
("automake" ,automake)
("libtool" ,libtool)
("intltool" ,intltool)
("libxscrnsaver" ,libxscrnsaver)
("gobject-introspection" ,gobject-introspection)
("python2" ,python-2)))
(synopsis "Tool to help prevent repetitive strain injury (RSI)")
(description
"Workrave is a program that assists in the recovery and prevention of
(package
(name "workrave")
(version "1.10.21")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rcaelers/workrave.git")
(commit (string-map (match-lambda (#\_ #\.) (chr chr)) version))))
(file-name (git-file-name name version))
(sha256
(base32
"150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia"))))
(build-system glib-or-gtk-build-system)
(propagated-inputs `(("glib" ,glib)
("gtk+" ,gtk+)
("gdk-pixbuf" ,gdk-pixbuf)
("gtkmm" ,gtkmm)
("glibmm" ,glibmm)
("libx11" ,libx11)
("libxtst" ,libxtst)
("dconf" ,dconf)
("libice" ,libice)))
(inputs `(("libsm" ,libsm)
("python-cheetah" ,python2-cheetah)))
(native-inputs `(("glib" ,glib "bin")
("pkg-config" ,pkg-config)
("gettext" ,gnu-gettext)
("autoconf" ,autoconf)
("autoconf-archive" , autoconf-archive)
("automake" ,automake)
("libtool" ,libtool)
("intltool" ,intltool)
("libxscrnsaver" ,libxscrnsaver)
("gobject-introspection" ,gobject-introspection)
("python2" ,python-2)))
(synopsis "Tool to help prevent repetitive strain injury (RSI)")
(description
"Workrave is a program that assists in the recovery and prevention of
repetitive strain injury (@dfn{RSI}). The program frequently alerts you to take
micro-pauses and rest breaks, and restricts you to your daily limit.")
(home-page "http://www.workrave.org")
(license license:gpl3+))))
(home-page "http://www.workrave.org")
(license license:gpl3+)))
(define-public ghex
(package
@ -7375,9 +7497,9 @@ (define-public ghex
(version "3.18.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(uri (string-append "mirror://gnome/sources/ghex/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
"ghex-" version ".tar.xz"))
(sha256
(base32
"1lq8920ad2chi9ibmyq0x9hg9yk63b0kdbzid03w42cwdzw50x66"))))
@ -7388,7 +7510,7 @@ (define-public ghex
("which" ,which)
("intltool" ,intltool)
("yelp-tools" ,yelp-tools)
("desktop-file-utils" ,desktop-file-utils))) ;for 'desktop-file-validate'
("desktop-file-utils" ,desktop-file-utils))) ; for 'desktop-file-validate'
(inputs
`(("atk" ,atk)
("gtk" ,gtk+)))
@ -7404,9 +7526,9 @@ (define-public libdazzle
(version "3.28.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(uri (string-append "mirror://gnome/sources/libdazzle/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
"libdazzle-" version ".tar.xz"))
(sha256
(base32
"08qdwv2flywnh6kibkyv0pnm67pk8xlmjh4yqx6hf13hyhkxkqgg"))))
@ -7427,9 +7549,9 @@ (define-public libdazzle
(setenv "DISPLAY" ":1")
#t)))))
(native-inputs
`(("glib" ,glib "bin") ; glib-compile-resources
`(("glib" ,glib "bin") ; glib-compile-resources
("pkg-config" ,pkg-config)
;; For tests
;; For tests.
("xorg-server" ,xorg-server)))
(inputs
`(("glib" ,glib)

19
gnu/packages/gnupg.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;;
@ -137,7 +137,7 @@ (define-public libgcrypt
(define-public libassuan
(package
(name "libassuan")
(version "2.5.2")
(version "2.5.3")
(source
(origin
(method url-fetch)
@ -145,7 +145,7 @@ (define-public libassuan
version ".tar.bz2"))
(sha256
(base32
"1rw8nw6fx6ppxga6m4cqcp898lnlzf7vn3s5c2lzfxg3fzr1nswq"))))
"00p7cpvzf0q3qwcgg51r9d0vbab4qga2xi8wpk2fgd36710b1g4i"))))
(build-system gnu-build-system)
(propagated-inputs
`(("libgpg-error" ,libgpg-error)
@ -223,14 +223,14 @@ (define-public npth
(define-public gnupg
(package
(name "gnupg")
(version "2.2.12")
(version "2.2.13")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2"))
(sha256
(base32
"1jw282iy27j1qygym52aa44zxy7ly4bdadhd628hwr4q9j5hy0yv"))))
"1n0igfn9nwdajzkcgdx7apwm9m5rpw0fg6vwskmf1rpranlqgivn"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -627,7 +627,7 @@ (define-public perl-gnupg-interface
(define-public pius
(package
(name "pius")
(version "2.2.6")
(version "2.2.7")
(source (origin
(method url-fetch)
(uri (string-append
@ -635,15 +635,14 @@ (define-public pius
version "/pius-" version ".tar.bz2"))
(sha256
(base32
"1893hzpx3zv724drqv48csrn0cm98xw4ymb1zmhs2jvjj1778zfj"))
(patches (search-patches "pius.patch"))))
"1nsl7czicv95j0gfz4s82ys3g3h2mwr6cq3ilid8bpz3iy7z4ipy"))))
(build-system python-build-system)
(inputs `(("perl" ,perl) ;for 'pius-party-worksheet'
(inputs `(("perl" ,perl) ; for 'pius-party-worksheet'
("gpg" ,gnupg)
("python-six" ,python2-six)))
(arguments
`(#:tests? #f
#:python ,python-2 ;uses the Python 2 'print' syntax
#:python ,python-2 ; uses the Python 2 'print' syntax
#:phases
(modify-phases %standard-phases
(add-before

4
gnu/packages/gnuzilla.scm
View file

@ -576,7 +576,7 @@ (define* (computed-origin-method gexp-promise hash-algo hash
#:system system
#:guile-for-build guile)))
(define %icecat-version "60.5.0-guix1")
(define %icecat-version "60.5.1-guix1")
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -598,7 +598,7 @@ (define icecat-source
"firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256
(base32
"09a0kk250r03984n1hdwr2rg1vmhi2jkyzzgbbvkf9h9hzp6j7qs"))))
"1xbi1gvrrvqby04vx6klxff7h5r87dqgi1fx6i4mbg3ll59gy09z"))))
(upstream-icecat-base-version "60.3.0") ; maybe older than base-version
(upstream-icecat-gnu-version "1")

29
gnu/packages/gtk.scm
View file

@ -15,7 +15,7 @@
;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@ -1591,18 +1591,21 @@ (define-public gtkspell3
(define-public clipit
(package
(name "clipit")
(version "1.4.2")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/downloads/ClipIt/clipit-"
version ".tar.gz"))
(sha256
(base32
"0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"))))
(version "1.4.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/CristianHenzel/ClipIt.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "05xi29v2y0rvb33fmvrz7r9j4l858qj7ngwd7dp4pzpkkaybjln0"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
`(("autoconf" ,autoconf)
("automake" ,automake)
("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
`(("gtk+" ,gtk+-2)))
@ -1677,7 +1680,7 @@ (define-public spread-sheet-widget
(define-public yad
(package
(name "yad")
(version "0.40.3")
(version "0.41.0")
(source
(origin
(method git-fetch)
@ -1686,7 +1689,7 @@ (define-public yad
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1vpgbjbkkbk5plicyklzpf65j1vlig4n4bi3qpvrz5bb09ic5alw"))))
(base32 "1hkxiich898sbacpg3jflf6i8l4hkfnc0zh10rr376v0mnzbn6jn"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags

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

@ -1251,54 +1251,69 @@ (define-public guile-config
(define-public guile-hall
(package
(name "guile-hall")
(version "0.1.1")
(version "0.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/a-sassmannshausen/guile-hall")
(commit "7d1094a12fe917209ce5b76c681cc8c862d4c65b")))
(file-name "guile-hall-0.1.1-checkout")
(sha256
(base32
"03kb09cjca98hlbx9mj12mqinzsnnvp6ci6i975n88pjhaxigyp1"))))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (base32
"1bkbqgj24xh5b65sw2m98iggpi67b72szx1dsiq3cpzlcxplmgaz"))))
(build-system gnu-build-system)
(arguments
`(#:modules
((ice-9 match)
(ice-9 ftw)
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-after 'install 'hall-wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/"))
(site (string-append out "/share/guile/site"))
(config (assoc-ref inputs "guile-config")))
(match (scandir site)
(("." ".." version)
(let ((modules (string-append site "/" version))
(compiled-modules (string-append
out "/lib/guile/" version
"/site-ccache")))
(wrap-program (string-append bin "hall")
`("GUILE_LOAD_PATH" ":" prefix
(,modules
,(string-append config
"/share/guile/site/"
version)))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,compiled-modules
,(string-append config "/lib/guile/"
version
"/site-ccache"))))
#t)))))))))
`(#:modules
((ice-9 match)
(ice-9 ftw)
,@%gnu-build-system-modules)
#:phases
(modify-phases
%standard-phases
(add-after 'install 'hall-wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((compiled-dir
(lambda (out version)
(string-append
out "/lib/guile/" version "/site-ccache")))
(uncompiled-dir
(lambda (out version)
(string-append
out "/share/guile/site"
(if (string-null? version) "" "/") version)))
(dep-path
(lambda (env modules path)
(list env ":" 'prefix
(cons modules
(map (lambda (input)
(string-append
(assoc-ref inputs input)
path))
,''("guile-config"))))))
(out (assoc-ref outputs "out"))
(bin (string-append out "/bin/"))
(site (uncompiled-dir out "")))
(match (scandir site)
(("." ".." version)
(for-each
(lambda (file)
(wrap-program
(string-append bin file)
(dep-path
"GUILE_LOAD_PATH"
(uncompiled-dir out version)
(uncompiled-dir "" version))
(dep-path
"GUILE_LOAD_COMPILED_PATH"
(compiled-dir out version)
(compiled-dir "" version))))
,''("hall"))
#t))))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(inputs `(("guile" ,guile-2.2)))
(propagated-inputs
`(("guile-config" ,guile-config)))
@ -1963,8 +1978,8 @@ (define-public mcron2
(deprecated-package "mcron2" mcron))
(define-public guile-picture-language
(let ((commit "1531116036d1b5e0d2482ff2c8d77ad21f1d2bef")
(revision "1"))
(let ((commit "1ea8b78a8bceb4f7e5eaeb3e76987072267f99bb")
(revision "2"))
(package
(name "guile-picture-language")
(version (git-version "0" revision commit))
@ -1975,7 +1990,7 @@ (define-public guile-picture-language
(commit commit)))
(sha256
(base32
"04salmqf5x84vb3qkkxx47b64jyl290zsf3ik81l9hg6fwvvlmq3"))))
"1rvq6q2zq21x7dx0qq1hn568wglsl4bkd8gacbarcx1fs0rrxcqw"))))
(build-system guile-build-system)
(inputs
`(("guile" ,guile-2.2)))

12
gnu/packages/hardware.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -38,14 +38,14 @@ (define-module (gnu packages hardware)
(define-public ddcutil
(package
(name "ddcutil")
(version "0.9.2")
(version "0.9.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.ddcutil.com/tarballs/"
name "-" version ".tar.gz"))
"ddcutil-" version ".tar.gz"))
(sha256
(base32 "0nhi261vf2n3jpi0a0n6659911kxi3lj7a4h7cmv0ip6sbb8rk88"))))
(base32 "1jqfip43sx3dnx86znmpy8dj4ikkfpgf8npgq66s7hqwwa99i7zc"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -238,7 +238,7 @@ (define-public msr-tools
(define-public wavemon
(package
(name "wavemon")
(version "0.8.2")
(version "0.9.0")
(source
(origin
(method git-fetch)
@ -247,7 +247,7 @@ (define-public wavemon
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0rqpp7rhl9rlwnihsapaiy62v33h45fm3d0ia2nhdjw7fwkwcqvs"))))
(base32 "07cid0h3mcyr74nnrzzf8k5n1p9a4y3wij43jbiaqmkpxilcc1i6"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags

145
gnu/packages/ibus.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
;;; Copyright © 2018, 2019 Meiyo Peng <meiyo@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -298,7 +298,7 @@ (define-public ibus-anthy
(define-public librime
(package
(name "librime")
(version "1.3.2")
(version "1.4.0")
(source
(origin
(method git-fetch)
@ -308,7 +308,7 @@ (define-public librime
(file-name (git-file-name name version))
(sha256
(base32
"06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r"))
"1zkx1wfbd94v55gfycyd2b94jxclfyk2zl7yw35pyjx63qdlb6sd"))
(modules '((guix build utils)))
(snippet
'(begin
@ -349,16 +349,16 @@ (define-public librime
(define-public rime-data
(package
(name "rime-data")
(version "0.38.20181029")
(version "0.38.20190131")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/plum.git")
(commit "fb4f829da2007f2dbb37d60a79bc67c25ea16568")))
(commit "8b48688cd4610d0c9223eb68831a31b6134e4cc8")))
(file-name "plum-checkout")
(sha256
(base32 "1m1wiv9j5bay4saga58c7dj4h8gqivsbyp16y245ifvxvp9czj67"))))
(base32 "0fv3hv4av9y7afxijh1n8idnyf82v9rxxi2ypmxd7lkj4naa22qh"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
@ -380,7 +380,8 @@ (define-public rime-data
(let* ((dest-dir "package/rime"))
(mkdir-p dest-dir)
(for-each (lambda (pkg)
(symlink (assoc-ref inputs pkg)
(symlink (assoc-ref inputs
(string-append "rime-" pkg))
(string-append dest-dir "/" pkg)))
'("array"
"bopomofo"
@ -406,216 +407,216 @@ (define-public rime-data
#t))
(delete 'configure))))
(native-inputs
`(("array"
`(("rime-array"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-array.git")
(commit "906e923902147584b0b0247028a782abbfbfd8a0")))
(commit "93cc99238f120606a076220ec4ddcad164f6396a")))
(file-name "rime-array-checkout")
(sha256
(base32
"1alk6ghn4ji4kvp7lfm57bwm2gjh99i79r0w9naz6wkdim8idvb1"))))
("bopomofo"
"06yxrv3x702751jvx46rfw3ix34jk7jh183rz6bllznzi7lxz7sz"))))
("rime-bopomofo"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-bopomofo.git")
(commit "8dc44ca1b6ef4e45b452e070b9da737f5da165e3")))
(commit "ed25098386f5efd3d70b08650f0d1b70c41c11a3")))
(file-name "rime-bopomofo-checkout")
(sha256
(base32
"16k6wfhcrw3a77rmbrp21ca0gmsmb3f68s193c1cfwr8i68k46nf"))))
("cangjie"
"1ip1pbfb1hadf2mcymr5939iagf25ywfl67d9198jahzyr6rdyvc"))))
("rime-cangjie"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-cangjie.git")
(commit "ab085e90856b3399b374dc3c8b4cb40d11f307a8")))
(commit "5fd8ce6f64039e505ca02655a621f2e830b97c19")))
(file-name "rime-cangjie-checkout")
(sha256
(base32
"11fgj0rbv9nyzfijwm2l8pm8fznhif4h27ndrrcaaylkp7p5zsx2"))))
("combo-pinyin"
"1gf6r0q593ixar6v0jyvs56cik2gjp7pf9v799rfd2yydyia3bfg"))))
("rime-combo-pinyin"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-combo-pinyin.git")
(commit "f1bae63f20504f2b8113c5cbdf2700e858aa91eb")))
(commit "9bd952b964e9744e5d18e9e31625b50f3585a2cb")))
(file-name "rime-combo-pinyin-checkout")
(sha256
(base32
"1l1079akwm1hw4kkn0q6x9fpylnl2ka6z2fn7lmdpfpsr0xgn0n7"))))
("double-pinyin"
"0crafjs39x4j221gb34mxxh3cdpxfhhx3nfw6b6bgkzlrp35a02b"))))
("rime-double-pinyin"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-double-pinyin.git")
(commit "2101a5cd40e511ec38835769aa66d2dddf059c2e")))
(commit "69bf85d4dfe8bac139c36abbd68d530b8b6622ea")))
(file-name "rime-double-pinyin-checkout")
(sha256
(base32
"19hh2qm0njbfk2js678hfm2hw9b796s43vs11yy3m1v9m0gk2vi7"))))
("emoji"
"093wif5avvvw45fqbwj5wkbxrychy4pagl4mwsmbrayc8jkp69ak"))))
("rime-emoji"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-emoji.git")
(commit "6e6611b315f03ee4c33f958f9dbe960b13a0ed19")))
(commit "c8d67f9b50bf89a10c57da646d2e6db8799aef38")))
(file-name "rime-emoji-checkout")
(sha256
(base32
"1brfs3214w36j3345di9ygp468hbvbqdqpkjxxs1dbp437rayhyy"))))
("essay"
"0ngcm088iyyp3llxvv0m80i7n5928d6cgh256ikhn3ixallxxdxv"))))
("rime-essay"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-essay.git")
(commit "5e5c7a0ef41c9b030abdad81a9df07b56b1661e9")))
(commit "71d0b1f3d4f3bfe61ae07581edf07579740c4421")))
(file-name "rime-essay-checkout")
(sha256
(base32
"0ana9is0zhh79m4gjshvmaxbrg3jiqysydx5bpm151i7i6vw5y1i"))))
("ipa"
"1iwz104k7zfk7lpa257kvpqdr6jhbg3p76n3644ywiz4l7kc678i"))))
("rime-ipa"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-ipa.git")
(commit "02a9e2c181921a2e95e1a81f88188c41132755c3")))
(commit "e420c7bfb07153a2d2484eb2bdccdd719811abbb")))
(file-name "rime-ipa-checkout")
(sha256
(base32
"1szrxgvqlgmxapj2aflw2cvbv0p6pl0sw0gyxa13dvdhhf7s9rvr"))))
("jyutping"
"1wfv7lb4y61b3qic5mhw92rn46cckldd9wrkcq03mg5512mbw63z"))))
("rime-jyutping"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-jyutping.git")
(commit "1402ec3d6cc0973f952fe3f9ef531294e4ffe9e0")))
(commit "04891a298319888e8c6b1a20e0fa81cfaea01264")))
(file-name "rime-jyutping-checkout")
(sha256
(base32
"17g03dy4gw6vyc9da1wjn3iy9hx64dfnwiwsfc7bkzan22x2m4dv"))))
("luna-pinyin"
"0wsj965khglz36cnvfm4fkv386xvxhmsxgcw88p5qi0b3wlbzzx6"))))
("rime-luna-pinyin"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-luna-pinyin.git")
(commit "3b05132576f5c347ff8a70857d2dae080936ac3b")))
(commit "c9c405566177cb3898bdb82d7f4157587f2d9c01")))
(file-name "rime-luna-pinyin-checkout")
(sha256
(base32
"0kgnpxjn10dm2d9718r12rdjlwqd2s2h84jvkhxhh5v0dkv1anl2"))))
("middle-chinese"
"0i7f2675lvj9pzwlm8550ifnr3xqi77xlyyvml1wpxpkfqhjr475"))))
("rime-middle-chinese"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-middle-chinese.git")
(commit "9ba8d70330654b9a730f882d35cfad7dbeddfd75")))
(commit "ed6d44f8d0bedf6e0c1c3183a270f8f01a211a40")))
(file-name "rime-middle-chinese-checkout")
(sha256
(base32
"0hwg5zby5kphh0bcfay8mfxwr5bwqhamiw3cmmmf7kp9fbns5s23"))))
("pinyin-simp"
"09mql88lsrxa99pyllby5z22kaiwwa037ha8gwaxjnnlsjgvz7zx"))))
("rime-pinyin-simp"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-pinyin-simp.git")
(commit "74357ffd62c05fb60edf6eab5b86bc8c8c1907d0")))
(commit "bb5a6dfa871669d2f451b477bfff6d131df6f6c6")))
(file-name "rime-pinyin-simp-checkout")
(sha256
(base32
"1paw3c7pv5bl54abnp9pidfxrkchdacyxy5m9zb311p5sgm7fhxh"))))
("prelude"
"0ss82042k833w5q72h72ghcfchkx00nx6l4z4fb861s2rxr0bkjd"))))
("rime-prelude"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-prelude.git")
(commit "33040568c3ddb2ee6340c9b669494317db21b77c")))
(commit "8a52b4f86a59f3eb602f9a4cf6a680a67c15df8c")))
(file-name "rime-prelude-checkout")
(sha256
(base32
"1gwcasyyg6f0ib6s4qsrrjcqr1lcs7j3xqxl65rznsw44nhnbwwq"))))
("quick"
"039fr3996vfxzn2milaq1f5fw08f6zgjsxsql6cfhsc5b55fidm7"))))
("rime-quick"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-quick.git")
(commit "910a97d403ad8e72f322488da146da79c19d623f")))
(commit "3fe5911ba608cb2df1b6301b76ad1573bd482a76")))
(file-name "rime-quick-checkout")
(sha256
(base32
"0yrq3gbfmm29xlr52rmxc41mqfrb0295q7sdhbc3ax71677mpr0y"))))
("scj"
"08bh87ym5qvw55lyw20l3m7jd4c2z5rvil8h5q8790r7z6j6ijy9"))))
("rime-scj"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-scj.git")
(commit "e0eae889f4376d2a434ac3b38523e0da7400db68")))
(commit "cab5a0858765eff0553dd685a2d61d5536e9149c")))
(file-name "rime-scj-checkout")
(sha256
(base32
"1whnv9zs349kvy0zi7dnmpqwil8i6gqwrzvhy3qdrjzy58y6gwxn"))))
("soutzoe"
"0ard2bjp4896a8dimmcwyjwgmp9kl4rz92yc92jnd3y4rgwl6fvk"))))
("rime-soutzoe"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-soutzoe.git")
(commit "e47841a8ad6341731c41cdb814b7a25c837603c4")))
(commit "beeaeca72d8e17dfd1e9af58680439e9012987dc")))
(file-name "rime-soutzoe-checkout")
(sha256
(base32
"1rgpmkxa72jy6gyy44fn8azpk3amk9s9lrdf7za03nv95d0fvm0p"))))
("stenotype"
"0jyqx0q9s0qxn168l5n8zav8jcl2g5ppr7pa8jm1vwrllf20slcc"))))
("rime-stenotype"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-stenotype.git")
(commit "d4ff379314fd95283853d1734854979cf3cbd287")))
(commit "1d472097c32d943d1096644f4c31f28799a17bd8")))
(file-name "rime-stenotype-checkout")
(sha256
(base32
"1kckpi4l4884hvydr3d6vid3v7rsc1app29kmk7v8jf8vn16afhl"))))
("stroke"
"1dy9qlbyhnshq2k1vcvkqn2624r96iaixhyrx1z7v0vz84fjf6y4"))))
("rime-stroke"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-stroke.git")
(commit "cfd29c675c46cf70b7a7f0a3836a913059316a0a")))
(commit "f802735392b378fb2a56a9b7b53b8ec96a30ccaf")))
(file-name "rime-stroke-checkout")
(sha256
(base32
"135is9c1p4lm98fd9l1gxyflkm69cv5an129ka7sk614bq84m08d"))))
("terra-pinyin"
"1wlrsskxhldh8369n771gk7sxflzdx0c9qhq1mqm5hhkwc5ig1j0"))))
("rime-terra-pinyin"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-terra-pinyin.git")
(commit "15b5c73a796571cd6f9ef6c89f96656cb9df86f9")))
(commit "b9e0edd3182e74b26b03a278c038e669ca538a35")))
(file-name "rime-terra-pinyin-checkout")
(sha256
(base32
"1xsd84h1zw417h5hr4dbgyk5009zi7q2p9774w3ccr5sxgc3i3cm"))))
("wubi"
"1vzrv2k178bii4ld9rvpdi8zmcwybd8bks0qzjx2v4kbjgwj28zk"))))
("rime-wubi"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-wubi.git")
(commit "d44403728a0b1cd8b47cb1f81b83f58e5f790b74")))
(commit "dd052ee158a38cb791755318b1aef9b4a3ed0316")))
(file-name "rime-wubi-checkout")
(sha256
(base32
"0ld31bdn94lncxd1ka44w4sbl03skh08mc927dhdmwq5bpvrgn36"))))
("wugniu"
"00xzv3sbwqh2jz4i7s315h7rw17qa2dgj7kflyy3blxk0s2cqiqa"))))
("rime-wugniu"
,(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rime/rime-wugniu.git")
(commit "65bcc354ada3839591d7546a64c71dbdd0592b02")))
(commit "abd1ee98efbf170258fcf43875c21a4259e00b61")))
(file-name "rime-wugniu-checkout")
(sha256
(base32
"0g31awp40s778sp5c290x40s8np86n8aw011s17sslxrqhhb0bkx"))))))
"0qn54d3cclny106ixdw08r5n6wn52ffs1hgrma3k0j4pv0kr9nlq"))))))
(home-page "https://rime.im/")
(synopsis "Schema data of Rime Input Method Engine")
(description "@dfn{rime-data} provides the schema data of Rime Input
@ -625,7 +626,7 @@ (define-public rime-data
(define-public ibus-rime
(package
(name "ibus-rime")
(version "1.3.0")
(version "1.4.0")
(source
(origin
(method git-fetch)
@ -634,7 +635,7 @@ (define-public ibus-rime
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1nqi7ymv34a9kx24say3xj98lkrs9nkpv1n2ijb91wdz3cr012ly"))))
(base32 "12y6jdz1amhgrnqa7zjim63dfsz6zyxyahbirfan37wmcfp6gp1d"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests

8
gnu/packages/image-processing.scm
View file

@ -457,19 +457,19 @@ (define-public vips
(define-public nip2
(package
(name "nip2")
(version "8.7.0")
(version "8.7.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/libvips/nip2/releases/download/v"
version "/nip2-" version ".tar.gz" ))
(sha256
(base32 "08dxfds4n1vxdilxcw01741a2r6fxyhawi656b7f0hy6znnkbsbc"))))
(base32 "0l7n427njif53npqn02gfjjly8y3khbrkzqxp10j5vp9h97psgiw"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
;; test_conv.ws keep failing so disabling for now
;; test_conv.ws keep failing so disabling for now.
(add-after 'unpack 'disable-test-conv
(lambda _
(delete-file "test/workspaces/test_conv.ws")
@ -484,7 +484,7 @@ (define-public nip2
("gtk+-2" ,gtk+-2)
("libxml2" ,libxml2)
("libexif" ,libexif)
("libjpeg" ,libjpeg) ;required by vips.pc
("libjpeg" ,libjpeg) ; required by vips.pc
("librsvg" ,librsvg)
("fftw" ,fftw)
("libgsf" ,libgsf)

6
gnu/packages/image-viewers.scm
View file

@ -7,7 +7,7 @@
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 nee <nee-git@hidamari.blue>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
@ -62,7 +62,7 @@ (define-module (gnu packages image-viewers)
(define-public feh
(package
(name "feh")
(version "3.1.1")
(version "3.1.3")
(home-page "https://feh.finalrewind.org/")
(source (origin
(method url-fetch)
@ -70,7 +70,7 @@ (define-public feh
name "-" version ".tar.bz2"))
(sha256
(base32
"1sy8z6rv5sy1bhk3846hgfdy96wdi874yr2fnxfprks46qp29l31"))))
"1vsnxf4as3vyzjfhd8frzb1a8i7wnq7ck5ljx7qxqrnfqvxl1s4z"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases (delete 'configure))

42
gnu/packages/image.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2014, 2017 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
@ -321,7 +321,7 @@ (define-public libjpeg
(version "9c")
(source (origin
(method url-fetch)
(uri (string-append "http://www.ijg.org/files/jpegsrc.v"
(uri (string-append "https://www.ijg.org/files/jpegsrc.v"
version ".tar.gz"))
(sha256 (base32
"08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5"))))
@ -342,14 +342,14 @@ (define-public libjpeg
@item wrjpgcom
@end enumerate")
(license license:ijg)
(home-page "http://www.ijg.org/")))
(home-page "https://www.ijg.org/")))
(define-public libjpeg-8
(package (inherit libjpeg)
(version "8d")
(source (origin
(method url-fetch)
(uri (string-append "http://www.ijg.org/files/jpegsrc.v"
(uri (string-append "https://www.ijg.org/files/jpegsrc.v"
version ".tar.gz"))
(sha256 (base32
"1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"))))))
@ -1299,10 +1299,11 @@ (define-public libjpeg-turbo
(package
(name "libjpeg-turbo")
(version "2.0.1")
(replacement libjpeg-turbo-2.0.2)
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/" name "/" version "/"
name "-" version ".tar.gz"))
(uri (string-append "mirror://sourceforge/libjpeg-turbo/"
version "/libjpeg-turbo-" version ".tar.gz"))
(sha256
(base32
"1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75"))))
@ -1328,6 +1329,18 @@ (define-public libjpeg-turbo
license:ijg ;the libjpeg library and associated tools
license:zlib)))) ;the libjpeg-turbo SIMD extensions
(define-public libjpeg-turbo-2.0.2
(package
(inherit libjpeg-turbo)
(version "2.0.2")
(source (origin
(inherit (package-source libjpeg-turbo))
(uri (string-append "mirror://sourceforge/libjpeg-turbo/"
version "/libjpeg-turbo-" version ".tar.gz"))
(sha256
(base32
"1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c"))))))
(define-public niftilib
(package
(name "niftilib")
@ -1575,15 +1588,16 @@ (define-public jp2a
(define-public grim
(package
(name "grim")
(version "1.0")
(version "1.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/emersion/grim/archive/v" version
".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/emersion/grim.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0xkk5nqyp1px0sxz4asmchznc0q39wdx1b67ql741k8aj815km0f"))))
(base32 "1bcvkggqszcwy6hg8g4mch3yr25ic0baafbd90af5s5mrhrjxxxz"))))
(build-system meson-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("cairo" ,cairo)
@ -1600,7 +1614,7 @@ (define-public grim
(define-public slurp
(package
(name "slurp")
(version "1.0")
(version "1.0.1")
(source
(origin
(method git-fetch)
@ -1609,7 +1623,7 @@ (define-public slurp
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "03igv8r8n772xb0y7whhs1pa298l3d94jbnknaxpwp2n4fi04syb"))))
(base32 "072lkwhpvr753wfqzmd994bnhbrgfavxcgqcyml7abab28sdhs1y"))))
(build-system meson-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("cairo" ,cairo)

8
gnu/packages/irc.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -67,15 +67,15 @@ (define-module (gnu packages irc)
(define-public quassel
(package
(name "quassel")
(version "0.13.0")
(version "0.13.1")
(source
(origin
(method url-fetch)
(uri (string-append "http://quassel-irc.org/pub/quassel-"
(uri (string-append "https://quassel-irc.org/pub/quassel-"
version ".tar.bz2"))
(sha256
(base32
"0xp9mppxl63qzgsdyprmblvfrj0bb9z57kfc088gvcavvq1210nr"))
"0mg8jydc70vlylppzich26q4s40kr78r3ysfyjwisfvlg2byxvs8"))
(modules '((guix build utils)))
;; We don't want to install the bundled scripts.
(snippet

39
gnu/packages/java.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2017, 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
@ -2267,22 +2267,23 @@ (define-public javacc-4
(define-public javacc
(package
(inherit javacc-4)
(version "7.0.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/javacc/javacc/"
"archive/" version ".tar.gz"))
(file-name (string-append "javacc-" version ".tar.gz"))
(sha256
(base32
"111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf"))
(modules '((guix build utils)))
;; delete bundled jars
(snippet '(begin (for-each delete-file-recursively
'("bootstrap" "lib"))
#t))))
(version "7.0.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/javacc/javacc.git")
(commit version)))
(file-name (git-file-name "javacc" version))
(sha256
(base32 "18kkak3gda93gr25jrgy6q00g0jr8i24ri2wk4kybz1v234fxx9i"))
(modules '((guix build utils)))
;; Delete bundled jars.
(snippet '(begin (for-each delete-file-recursively
'("bootstrap" "lib"))
#t))))
(arguments
`(#:make-flags ; bootstrap from javacc-4
`(#:make-flags ; bootstrap from javacc-4
(list (string-append "-Dbootstrap-jar="
(assoc-ref %build-inputs "javacc")
"/share/java/javacc.jar"))
@ -5236,18 +5237,18 @@ (define-public java-commons-net
(define-public java-jsch
(package
(name "java-jsch")
(version "0.1.54")
(version "0.1.55")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/jsch/jsch/"
version "/jsch-" version ".zip"))
(sha256
(base32
"029rdddyq1mh3ghryh3ki99kba1xkf1d1swjv2vi6lk6zzjy2wdb"))))
"1lxyjwvmwa723wcf3bqn816hkvc03vz4xhbsi7bvfhrz2rpgcfq6"))))
(build-system ant-build-system)
(arguments
`(#:build-target "dist"
#:tests? #f ; no tests included
#:tests? #f ; no tests included
#:phases
(modify-phases %standard-phases
(replace 'install (install-jars "dist")))))

337
gnu/packages/kde-frameworks.scm
View file

File diff suppressed because it is too large Load diff

228
gnu/packages/kde-plasma.scm Normal file
View file

@ -0,0 +1,228 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages kde-plasma)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages qt)
#:use-module (gnu packages xorg))
(define-public kdecoration
(package
(name "kdecoration")
(version "5.15.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/kdecoration-" version ".tar.xz"))
(sha256
(base32
"1pcyw6rrz0q7i2jnfvmjz2pixiw2aay19q3pxa1g3qvqydh3id5q"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)))
(inputs
`(("ki18n" ,ki18n)
("qtbase" ,qtbase)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'check-setup
(lambda _ (setenv "QT_QPA_PLATFORM" "offscreen") #t)))))
(home-page "https://cgit.kde.org/kdecoration.git")
(synopsis "Plugin based library to create window decorations")
(description "KDecoration is a library to create window decorations.
These window decorations can be used by for example an X11 based window
manager which re-parents a Client window to a window decoration frame.")
(license license:lgpl3+)))
(define-public kscreenlocker
(package
(name "kscreenlocker")
(version "5.15.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/kscreenlocker-" version ".tar.xz"))
(sha256
(base32
"1hgj2mzbbiqn52j3px2mzz6xzzpzr78q3bcai8ddc4gcl1xgs6yi"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'check-setup
(lambda* (#:key inputs outputs #:allow-other-keys)
(system (string-append (assoc-ref inputs "xorg-server")
"/bin/Xvfb :1 -screen 0 640x480x24 &"))
(setenv "DISPLAY" ":1")
#t))
(delete 'check)
;; Tests use the installed library and require a DBus session.
(add-after 'install 'check
(lambda _
(setenv "CTEST_OUTPUT_ON_FAILURE" "1")
(invoke "dbus-launch" "ctest" "."))))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)
;; For tests.
("dbus" ,dbus)
("xorg-server" ,xorg-server)))
(inputs
`(("kcmutils" ,kcmutils)
("kcrash" ,kcrash)
("kdeclarative" ,kdeclarative)
("kglobalaccel" ,kglobalaccel)
("ki18n" ,ki18n)
("kidletime" ,kidletime)
("knotifications" ,knotifications)
("ktextwidgets" ,ktextwidgets)
("kwayland" ,kwayland)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
("libseccomp" ,libseccomp) ;for sandboxing the look'n'feel package
("libxcursor" ,libxcursor) ;missing in CMakeList.txt
("libxi" ,libxi) ;XInput, required for grabbing XInput2 devices
("linux-pam" ,linux-pam)
("logind" ,elogind) ;optional loginctl support
("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
("qtx11extras" ,qtx11extras)
("solid" ,solid)
("wayland" ,wayland)
("xcb-util-keysyms" ,xcb-util-keysyms)))
(home-page "https://cgit.kde.org/kscreenlocker.git")
(synopsis "Screen locking library")
(description
"@code{kscreenlocker} is a library for creating secure lock screens.")
(license license:gpl2+)))
(define-public libkscreen
(package
(name "libkscreen")
(version "5.15.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version "/"
name "-" version ".tar.xz"))
(sha256
(base32 "1clw8966fmwih1fsjasvpgvfq7w728hlabl3i0zjz53r87hdw3mb"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
;; For testing.
("dbus" ,dbus)))
(inputs
`(("kwayland" ,kwayland)
("libxrandr" ,libxrandr)
("qtbase" ,qtbase)
("qtx11extras" ,qtx11extras)))
(arguments
'(#:tests? #f ; FIXME: 55% tests passed, 5 tests failed out of 11
#:phases
(modify-phases %standard-phases
(add-before 'check 'pre-check
(lambda _
;; For the missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0")
;; Run the tests offscreen.
(setenv "QT_QPA_PLATFORM" "offscreen")
#t)))))
(home-page "https://community.kde.org/Solid/Projects/ScreenManagement")
(synopsis "KDE's screen management software")
(description "KScreen is the new screen management software for KDE Plasma
Workspaces which tries to be as magic and automatic as possible for users with
basic needs and easy to configure for those who want special setups.")
(license license:gpl2+)))
(define-public libksysguard
(package
(name "libksysguard")
(version "5.15.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde//stable/plasma/" version
"/libksysguard-" version ".tar.xz"))
(sha256
(base32
"1aqkzbng2qq09rpb21r6drnn866b9y8yba3klhvhi0q5vg3p605d"))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(inputs
`(("kconfigwidgets" ,kconfigwidgets)
("kiconthemes" ,kiconthemes)
("kwindowsystem" ,kwindowsystem)
("ki18n" ,ki18n)
("kauth" ,kauth)
("kcompletion" ,kcompletion)
("kconfig" ,kconfig)
("kcoreaddons" ,kcoreaddons)
("kglobalaccel" ,kglobalaccel)
("kio" ,kio)
("kwidgetsaddons" ,kwidgetsaddons)
("kservice" ,kservice)
("qtbase" ,qtbase)
("qtscript" ,qtscript)
("qtwebkit" ,qtwebkit)
("qtx11extras" ,qtx11extras)
("plasma" ,plasma-framework)
("zlib" ,zlib)))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
`(,(string-append "-DKDE_INSTALL_DATADIR="
(assoc-ref %outputs "out") "/share"))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-cmakelists
(lambda _
;; TODO: Verify: This should no longer be necessary, since
;; KF5AuthConfig.cmake.in contains this already.
(substitute* "processcore/CMakeLists.txt"
(("KAUTH_HELPER_INSTALL_DIR") "KDE_INSTALL_LIBEXECDIR"))))
(add-before 'check 'check-setup
(lambda _
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")))
(replace 'check
(lambda _
;; TODO: Fix this failing test-case
(invoke "ctest" "-E" "processtest"))))))
(home-page "https://userbase.kde.org/KSysGuard")
(synopsis "Network enabled task and system monitoring")
(description "KSysGuard can obtain information on system load and
manage running processes. It obtains this information by interacting
with a ksysguardd daemon, which may also run on a remote system.")
(license license:gpl3+)))

101
gnu/packages/kde.scm
View file

@ -36,11 +36,11 @@ (define-module (gnu packages kde)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages graphics)
#:use-module (gnu packages image)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages kde-plasma)
#:use-module (gnu packages llvm)
#:use-module (gnu packages maths)
#:use-module (gnu packages pdf)
@ -480,105 +480,6 @@ (define-public libkomparediff2
;; source archive
(license (list license:gpl2+ license:lgpl2.0+ license:bsd-3))))
(define-public libkscreen
(package
(name "libkscreen")
(version "5.13.5")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version "/"
name "-" version ".tar.xz"))
(sha256
(base32 "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
;; For testing.
("dbus" ,dbus)))
(inputs
`(("kwayland" ,kwayland)
("libxrandr" ,libxrandr)
("qtbase" ,qtbase)
("qtx11extras" ,qtx11extras)))
(arguments
'(#:tests? #f ; FIXME: 55% tests passed, 5 tests failed out of 11
#:phases
(modify-phases %standard-phases
(add-before 'check 'pre-check
(lambda _
;; For the missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0")
;; Run the tests offscreen.
(setenv "QT_QPA_PLATFORM" "offscreen")
#t)))))
(home-page "https://community.kde.org/Solid/Projects/ScreenManagement")
(synopsis "KDE's screen management software")
(description "KScreen is the new screen management software for KDE Plasma
Workspaces which tries to be as magic and automatic as possible for users with
basic needs and easy to configure for those who want special setups.")
(license license:gpl2+)))
(define-public libksysguard
(package
(name "libksysguard")
(version "5.13.4")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde//stable/plasma/" version
"/libksysguard-" version ".tar.xz"))
(sha256
(base32
"0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh"))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
(inputs
`(("kconfigwidgets" ,kconfigwidgets)
("kiconthemes" ,kiconthemes)
("kwindowsystem" ,kwindowsystem)
("ki18n" ,ki18n)
("kauth" ,kauth)
("kcompletion" ,kcompletion)
("kconfig" ,kconfig)
("kcoreaddons" ,kcoreaddons)
("kwidgetsaddons" ,kwidgetsaddons)
("kservice" ,kservice)
("qtbase" ,qtbase)
("qtscript" ,qtscript)
("qtwebkit" ,qtwebkit)
("qtx11extras" ,qtx11extras)
("plasma" ,plasma-framework)
("zlib" ,zlib)))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
`(,(string-append "-DKDE_INSTALL_DATADIR="
(assoc-ref %outputs "out") "/share"))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-cmakelists
(lambda _
;; TODO: Verify: This should no longer be necessary, since
;; KF5AuthConfig.cmake.in contains this already.
(substitute* "processcore/CMakeLists.txt"
(("KAUTH_HELPER_INSTALL_DIR") "KDE_INSTALL_LIBEXECDIR"))))
(add-before 'check 'check-setup
(lambda _
;; make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen")))
(replace 'check
(lambda _
;; TODO: Fix this failing test-case
(invoke "ctest" "-E" "processtest"))))))
(home-page "https://www.kde.org/info/plasma-5.13.4.php")
(synopsis "Network enabled task and system monitoring")
(description "KSysGuard can obtain information on system load and
manage running processes. It obtains this information by interacting
with a ksysguardd daemon, which may also run on a remote system.")
(license license:gpl3+)))
(define-public qca
(package
(name "qca")

6
gnu/packages/kodi.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
@ -270,7 +270,7 @@ (define-public fstrcmp
(define-public kodi
(package
(name "kodi")
(version "18.0rc3")
(version "18.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -279,7 +279,7 @@ (define-public kodi
(file-name (git-file-name name version))
(sha256
(base32
"0bwi4gwmwppjw6bf0zihyg42zwnd0imq0aw4xxsgnacqakhxzii0"))
"1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc"))
(patches (search-patches "kodi-skip-test-449.patch"))
(snippet
'(begin

6
gnu/packages/libffi.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015 Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
;;; Copyright © 2015, 2019 Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
@ -157,13 +157,13 @@ (define-public python2-cffi
(define-public ruby-ffi
(package
(name "ruby-ffi")
(version "1.9.23")
(version "1.10.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "ffi" version))
(sha256
(base32
"0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"))))
"0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"))))
(build-system ruby-build-system)
;; FIXME: Before running tests the build system attempts to build libffi
;; from sources.

36
gnu/packages/libreoffice.scm
View file

@ -936,7 +936,7 @@ (define-public libqxp
(define-public libreoffice
(package
(name "libreoffice")
(version "6.1.3.2")
(version "6.1.5.2")
(source
(origin
(method url-fetch)
@ -946,7 +946,7 @@ (define-public libreoffice
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256
(base32
"0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl"))
"1wh8qhqkmb89nmfcb0w6iwpdzxwqr7c5kzxgpk4gy60xin6gwjgb"))
(patches
(append (list (origin
;; Support newer versions of Orcus and MDDS. These patches
@ -972,37 +972,7 @@ (define-public libreoffice
(file-name "libreoffice-mdds.patch")
(sha256
(base32
"0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f")))
;; The Poppler API changed rapidly in the versions leading 0.72.
;; Thus, we need several patches from upstream, each adapting to
;; different Poppler changes since version 0.68.
(origin
(method url-fetch)
(uri (string-append "https://github.com/LibreOffice/core/commit/"
"1688a395d05125b83eac6cd5c43f0e3f2f66c491"
".patch"))
(file-name "libreoffice-poppler-compat.patch")
(sha256
(base32
"0ia5avmj772mrgs6m4qqf01hs8hzpy3nafidj7w7gqx2zz2s5ih9")))
(origin
(method url-fetch)
(uri (string-append "https://github.com/LibreOffice/core/commit/"
"5e8bdd9203dd642111c62a6668ee665a20d4ba19"
".patch"))
(file-name "libreoffice-poppler-gbool.patch")
(sha256
(base32
"19kc74h5vnk48l2vny8zmm2lkxpwc7g8n9d3wwpg99748dvbmikd")))
(origin
(method url-fetch)
(uri (string-append "https://github.com/LibreOffice/core/commit/"
"8ff41a26caf51544699863c89598d37d93dc1b21"
".patch"))
(file-name "libreoffice-poppler-0.71.patch")
(sha256
(base32
"1dsd0gynjf7d6412dd2sx70xa2s8kld7ibyjdkwg5w9hhi2zxw2f"))))
"0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f"))))
(search-patches "libreoffice-boost.patch"
"libreoffice-icu.patch"
"libreoffice-glm.patch")))

42
gnu/packages/linux.scm
View file

@ -7,7 +7,7 @@
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
@ -404,8 +404,8 @@ (define* (make-linux-libre version hash supported-systems
It has been modified to remove all non-free binary blobs.")
(license license:gpl2)))
(define %linux-libre-version "4.20.7")
(define %linux-libre-hash "05jbpg4ivcbr8xi5ki03f4n57hnhc52nfjk1ik8czag7f4ph9v0b")
(define %linux-libre-version "4.20.10")
(define %linux-libre-hash "0d386gb1s9ag80iqzms9gdsfzirq7nlkpkkx2d6ky01rv0g4vgqn")
(define %linux-libre-4.20-patches
(list %boot-logo-patch
@ -418,8 +418,8 @@ (define-public linux-libre
#:patches %linux-libre-4.20-patches
#:configuration-file kernel-config))
(define %linux-libre-4.19-version "4.19.20")
(define %linux-libre-4.19-hash "1rs4jvp88n23n9a6f037sn498fzl1fn96zsjjmjngb8nmjr1y9vp")
(define %linux-libre-4.19-version "4.19.23")
(define %linux-libre-4.19-hash "0s207vqq2vcrgydjjwb5n2j7di0rjahnrbn3xv4xxlp5scjp59xq")
(define %linux-libre-4.19-patches
(list %boot-logo-patch
@ -432,8 +432,8 @@ (define-public linux-libre-4.19
#:patches %linux-libre-4.19-patches
#:configuration-file kernel-config))
(define %linux-libre-4.14-version "4.14.98")
(define %linux-libre-4.14-hash "165wlqqpb16zhrwihsb75y153xyz8q5dbi14xim7jsnvwlbh5i79")
(define %linux-libre-4.14-version "4.14.101")
(define %linux-libre-4.14-hash "02j240x30zkhpazdimlfi0xq6zjdw6fidgdfrdnvfryvhf6j097j")
(define-public linux-libre-4.14
(make-linux-libre %linux-libre-4.14-version
@ -442,8 +442,8 @@ (define-public linux-libre-4.14
#:configuration-file kernel-config))
(define-public linux-libre-4.9
(make-linux-libre "4.9.155"
"0fyj8dqhpqi3jh6i58avyvmg4mp9bplnpiffpp3fdka4v85lx152"
(make-linux-libre "4.9.158"
"11v56dzp87wyxrymf2s1cmk7jr440z11m3yan73rnnnqlfq460ig"
'("x86_64-linux" "i686-linux")
#:configuration-file kernel-config))
@ -1830,20 +1830,19 @@ (define-public sshfs-fuse
(define-public archivemount
(package
(name "archivemount")
(version "0.8.9")
(version "0.8.12")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.cybernoia.de/software/archivemount/"
(uri (string-append "https://www.cybernoia.de/software/archivemount/"
"archivemount-" version ".tar.gz"))
(sha256
(base32
"0v4si1ri6lhnq9q87gkx7fsh6lv6xz4bynknwndqncpvfp5cy1jg"))))
(base32 "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4"))))
(build-system gnu-build-system)
(inputs `(("fuse" ,fuse)
("libarchive" ,libarchive)))
(native-inputs `(("pkg-config" ,pkg-config)))
(home-page "http://www.cybernoia.de/software/archivemount")
(home-page "https://www.cybernoia.de/software/archivemount.html")
(synopsis "Tool for mounting archive files with FUSE")
(description "archivemount is a FUSE-based file system for Unix variants,
including Linux. Its purpose is to mount archives (i.e. tar, tar.gz, etc.) to a
@ -3022,7 +3021,7 @@ (define-public mdadm-static
(define-public multipath-tools
(package
(name "multipath-tools")
(version "0.7.7")
(version "0.7.9")
(source (origin
(method url-fetch)
(uri (string-append "https://git.opensvc.com/?p=multipath-tools/"
@ -3030,7 +3029,7 @@ (define-public multipath-tools
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1lirhjjv37jnf42r1ylrhi8kbzx9j9xnyfzvxpp6bzcp0fawigig"))
"1jhi6bhl4ih75rfmyyjxd35ghgch5ls1gw40cjxwy9d6bd41z6q1"))
(modules '((guix build utils)))
(snippet
'(begin
@ -3068,7 +3067,7 @@ (define-public multipath-tools
(("/usr/include/libudev.h")
(string-append udev "/include/libudev.h")))
#t)))
(delete 'configure))))
(delete 'configure)))) ; no configure script
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
@ -3093,7 +3092,7 @@ (define-public multipath-tools
@code{dm} multipath devices.
@item @command{kpartx} - Create device maps from partition tables.
@end enumerate")
(license (list license:gpl2+ ; Main distribution.
(license (list license:gpl2+ ; main distribution
license:lgpl2.0+)))) ; libmpathcmd/mpath_cmd.h
(define-public libaio
@ -3690,7 +3689,7 @@ (define-public rng-tools
(package
(name "rng-tools")
(home-page "https://github.com/nhorman/rng-tools")
(version "6.6")
(version "6.7")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page)
@ -3698,11 +3697,12 @@ (define-public rng-tools
(file-name (git-file-name name version))
(sha256
(base32
"0c32sxfvngdjzfmxn5ngc5yxwi8ij3yl216nhzyz9r31qi3m14v7"))))
"19f75m6mzg8h7b4snzg7d6ypvkz6nq32lrpi9ja95gqz4wsd18a5"))))
(build-system gnu-build-system)
(arguments
`(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB.
#:configure-flags '("--without-nistbeacon")))
#:configure-flags '("--without-nistbeacon"
"--without-pkcs11")))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)

15
gnu/packages/lisp.scm
View file

@ -7,7 +7,7 @@
;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
@ -984,7 +984,8 @@ (define-public stumpwm
;; and can be removed when we move to the next release.
(search-patches "stumpwm-fix-broken-read-one-line.patch"))))
(build-system asdf-build-system/sbcl)
(native-inputs `(("fiasco" ,sbcl-fiasco)))
(native-inputs `(("fiasco" ,sbcl-fiasco)
("texinfo" ,texinfo)))
(inputs `(("cl-ppcre" ,sbcl-cl-ppcre)
("clx" ,sbcl-clx)
("alexandria" ,sbcl-alexandria)))
@ -1016,6 +1017,16 @@ (define-public stumpwm
Icon=~@
Type=Application~%"
out)))
#t)))
(add-after 'install 'install-manual
(lambda* (#:key outputs #:allow-other-keys)
;; The proper way to the manual is bootstrapping a full autotools
;; build system and running ‘./configure && make stumpwm.info’ to
;; do some macro substitution. We can get away with much less.
(let* ((out (assoc-ref outputs "out"))
(info (string-append out "/share/info")))
(invoke "makeinfo" "stumpwm.texi.in")
(install-file "stumpwm.info" info)
#t))))))
(synopsis "Window manager written in Common Lisp")
(description "Stumpwm is a window manager written entirely in Common Lisp.

88
gnu/packages/llvm.scm
View file

@ -3,9 +3,9 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
@ -47,15 +47,15 @@ (define-module (gnu packages llvm)
(define-public llvm
(package
(name "llvm")
(version "6.0.1")
(version "7.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "http://llvm.org/releases/"
(uri (string-append "https://llvm.org/releases/"
version "/llvm-" version ".src.tar.xz"))
(sha256
(base32
"1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"))))
"16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3"))))
(build-system cmake-build-system)
(native-inputs
`(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs python-2
@ -95,21 +95,6 @@ (define-public llvm
of programming tools as well as libraries with equivalent functionality.")
(license license:ncsa)))
;; TODO: Build Mesa with LLVM 7 in the next staging cycle.
;; TODO: Make LLVM 7 the default LLVM once Clang is also upgraded.
(define-public llvm-7.0.1
(package (inherit llvm)
(name "llvm")
(version "7.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "http://llvm.org/releases/"
version "/llvm-" version ".src.tar.xz"))
(sha256
(base32
"16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3"))))))
(define* (clang-runtime-from-llvm llvm hash
#:optional (patches '()))
(package
@ -118,7 +103,7 @@ (define* (clang-runtime-from-llvm llvm hash
(source
(origin
(method url-fetch)
(uri (string-append "http://llvm.org/releases/"
(uri (string-append "https://llvm.org/releases/"
version "/compiler-rt-" version ".src.tar.xz"))
(sha256 (base32 hash))
(patches (map search-patch patches))))
@ -150,7 +135,7 @@ (define* (clang-from-llvm llvm clang-runtime hash
(source
(origin
(method url-fetch)
(uri (string-append "http://llvm.org/releases/"
(uri (string-append "https://llvm.org/releases/"
version "/cfe-" version ".src.tar.xz"))
(sha256 (base32 hash))
(patches (map search-patch patches))))
@ -190,7 +175,7 @@ (define* (clang-from-llvm llvm clang-runtime hash
(compiler-rt (assoc-ref inputs "clang-runtime")))
(case (string->number ,(version-major
(package-version clang-runtime)))
((6)
((or 6 7)
;; Link to libclang_rt files from clang-runtime.
(substitute* "lib/Driver/ToolChain.cpp"
(("getDriver\\(\\)\\.ResourceDir")
@ -274,13 +259,58 @@ (define* (clang-from-llvm llvm clang-runtime hash
code analysis tools.")
(license license:ncsa)))
(define-public libcxx
(package
(name "libcxx")
(version (package-version llvm))
(source
(origin
(method url-fetch)
(uri (string-append "http://llvm.org/releases/"
version "/libcxx-" version ".src.tar.xz"))
(sha256
(base32
"0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"))))
(build-system cmake-build-system)
(native-inputs
`(("clang" ,clang)
("llvm" ,llvm)))
(home-page "https://libcxx.llvm.org")
(synopsis "C++ standard library")
(description
"This package provides an implementation of the C++ standard library for
use with Clang, targeting C++11, C++14 and above.")
(license license:expat)))
(define-public clang-runtime
(clang-runtime-from-llvm
llvm
"1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"))
"065ybd8fsc4h2hikbdyricj6pyv4r7r7kpcikhb2y5zf370xybkq"))
(define-public clang
(clang-from-llvm llvm clang-runtime
"067lwggnbg0w1dfrps790r5l6k8n5zwhlsw7zb6zvmfpwpfn4nx4"
#:patches '("clang-7.0-libc-search-path.patch")))
(define-public llvm-6
(package
(inherit llvm)
(version "6.0.1")
(source (origin
(method url-fetch)
(uri (string-append "https://llvm.org/releases/"
version "/llvm-" version ".src.tar.xz"))
(sha256
(base32
"1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"))))))
(define-public clang-runtime-6
(clang-runtime-from-llvm
llvm-6
"1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"))
(define-public clang-6
(clang-from-llvm llvm-6 clang-runtime
"0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w"
#:patches '("clang-6.0-libc-search-path.patch")))
@ -291,7 +321,7 @@ (define-public llvm-3.9.1
(source
(origin
(method url-fetch)
(uri (string-append "http://llvm.org/releases/"
(uri (string-append "https://llvm.org/releases/"
version "/llvm-" version ".src.tar.xz"))
(sha256
(base32
@ -341,7 +371,7 @@ (define-public llvm-3.7
(source
(origin
(method url-fetch)
(uri (string-append "http://llvm.org/releases/"
(uri (string-append "https://llvm.org/releases/"
version "/llvm-" version ".src.tar.xz"))
(sha256
(base32
@ -365,7 +395,7 @@ (define-public llvm-3.6
(source
(origin
(method url-fetch)
(uri (string-append "http://llvm.org/releases/"
(uri (string-append "https://llvm.org/releases/"
version "/llvm-" version ".src.tar.xz"))
(sha256
(base32
@ -388,7 +418,7 @@ (define-public llvm-3.5
(source
(origin
(method url-fetch)
(uri (string-append "http://llvm.org/releases/"
(uri (string-append "https://llvm.org/releases/"
version "/llvm-" version ".src.tar.xz"))
(patches
(search-patches "llvm-3.5-fix-clang-build-with-gcc5.patch"))
@ -511,7 +541,7 @@ (define-public emacs-clang-format
(description "This package allows to filter code through @code{clang-format}
to fix its formatting. @code{clang-format} is a tool that formats
C/C++/Obj-C code according to a set of style options, see
@url{http://clang.llvm.org/docs/ClangFormatStyleOptions.html}.")))
@url{https://clang.llvm.org/docs/ClangFormatStyleOptions.html}.")))
(define-public emacs-clang-rename
(package

2
gnu/packages/lxqt.scm
View file

@ -43,8 +43,8 @@ (define-module (gnu packages lxqt)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages kde-plasma)
#:use-module (gnu packages linux)
#:use-module (gnu packages perl)
#:use-module (gnu packages lxde)

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

@ -322,9 +322,6 @@ (define-public ocaml-mcl
algorithm.")
(license license:gpl3)))
(define-public ocaml4.01-mcl
(package-with-ocaml4.01 ocaml-mcl))
(define-public randomjungle
(package
(name "randomjungle")

160
gnu/packages/magic-wormhole.scm Normal file
View file

@ -0,0 +1,160 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;;
;;; 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 magic-wormhole)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix licenses)
#:use-module (guix build-system python)
#:use-module (gnu packages check)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz))
(define-public magic-wormhole-mailbox-server
(package
(name "magic-wormhole-mailbox-server")
(version "0.3.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "magic-wormhole-mailbox-server" version))
(sha256
(base32
"1q6zhbx8fcpk7rchclm7yqcxdsc1x97hki2ji61sa544r5xvxv55"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-tests
(lambda _
;; This test requires network access.
(substitute* "src/wormhole_mailbox_server/test/test_web.py"
(("test_log_http") "disabled_test_log_http"))
#t)))))
(native-inputs
`(("python-mock" ,python-mock)))
(propagated-inputs
`(("python-attrs" ,python-attrs)
("python-autobahn" ,python-autobahn)
("python-idna" ,python-idna)
("python-service-identity" ,python-service-identity)
("python-six" ,python-six)
("python-treq" ,python-treq)
("python-twisted" ,python-twisted)))
(home-page "https://github.com/warner/magic-wormhole-mailbox-server")
(synopsis "Magic-Wormhole central mailbox server")
(description "This package provides the main server that Magic-Wormhole
clients connect to. The server performs store-and-forward delivery for small
key-exchange and control messages. Bulk data is sent over a direct TCP
connection, or through a transit-relay.")
(license expat)))
(define-public magic-wormhole-transit-relay
(package
(name "magic-wormhole-transit-relay")
(version "0.1.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "magic-wormhole-transit-relay" version))
(sha256
(base32
"11w5gdc6am2ph5rns60x0694sx4zrlzxj540jljhn5cmnbx1ngxi"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-docs
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(docs (string-append out "/share/doc/magic-wormhole-transit-relay")))
(for-each (lambda (file)
(install-file file docs))
(find-files "docs/"))
#t))))))
(native-inputs
`(("python-mock" ,python-mock)
("python-pyflakes" ,python-pyflakes)
("python-tox" ,python-tox)))
(propagated-inputs
`(("python-twisted" ,python-twisted)))
(home-page
"https://github.com/warner/magic-wormhole-transit-relay")
(synopsis "Magic-Wormhole relay server")
(description "This package provides the Magic-Wormhole Transit Relay
server, which helps clients establish bulk-data transit connections even when
both are behind NAT boxes. Each side makes a TCP connection to this server and
presents a handshake. Two connections with identical handshakes are glued
together, allowing them to pretend they have a direct connection.")
(license expat)))
(define-public magic-wormhole
(package
(name "magic-wormhole")
(version "0.11.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "magic-wormhole" version))
(sha256
(base32
"01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
;; XXX I can't figure out how to build the docs properly.
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34515#101
(add-after 'install 'install-docs
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man/man1")))
(install-file "docs/wormhole.1" man))
#t)))))
(native-inputs
`(("python-mock" ,python-mock)
;; XXX These are required for the test suite but end up being referenced
;; by the built package.
;; https://bugs.gnu.org/25235
("magic-wormhole-mailbox-server" ,magic-wormhole-mailbox-server)
("magic-wormhole-transit-relay" ,magic-wormhole-transit-relay)))
(propagated-inputs
`(("python-autobahn" ,python-autobahn)
("python-click" ,python-click)
("python-hkdf" ,python-hkdf)
("python-humanize" ,python-humanize)
("python-pynacl" ,python-pynacl)
("python-spake2" ,python-spake2)
("python-tqdm" ,python-tqdm)
("python-twisted" ,python-twisted)
("python-txtorcon" ,python-txtorcon)))
(home-page "https://github.com/warner/magic-wormhole")
(synopsis "Securely transfer data between computers")
(description "Magic-Wormhole is a library and a command-line tool named
wormhole, which makes it possible to securely transfer arbitrary-sized files and
directories (or short pieces of text) from one computer to another. The two
endpoints are identified by using identical \"wormhole codes\": in general, the
sending machine generates and displays the code, which must then be typed into
the receiving machine.
The codes are short and human-pronounceable, using a phonetically-distinct
wordlist. The receiving side offers tab-completion on the codewords, so usually
only a few characters must be typed. Wormhole codes are single-use and do not
need to be memorized.")
(license expat)))

42
gnu/packages/mail.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
@ -491,7 +491,7 @@ (define-public bogofilter
(define-public offlineimap
(package
(name "offlineimap")
(version "7.2.2")
(version "7.2.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -500,7 +500,7 @@ (define-public offlineimap
(file-name (git-file-name name version))
(sha256
(base32
"11nj7y9fa7v6vcxk3wr8smfgm3mxxnmq3l8q69rrjxlfzcv7dl8m"))))
"18sdnhjldn8zs03bgqy1qa3ikmlfvyxcvwp3nbnv1a74biccqbpa"))))
(build-system python-build-system)
(native-inputs
`(("asciidoc" ,asciidoc)))
@ -757,14 +757,14 @@ (define-public notifymuch
(define-public notmuch
(package
(name "notmuch")
(version "0.28.1")
(version "0.28.2")
(source (origin
(method url-fetch)
(uri (string-append "https://notmuchmail.org/releases/notmuch-"
version ".tar.gz"))
(sha256
(base32
"0mcsfkrp6mpy374m5rwwgm9md8qzvwa3s4rbzid4cnkx2cwfj4fi"))))
"0cg9ff7h7mklgbqqknxigxxx1j3p3s2a9cxvrs5ih7j56f04k9l5"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
@ -1066,7 +1066,7 @@ (define-public claws-mail
(define-public msmtp
(package
(name "msmtp")
(version "1.8.2")
(version "1.8.3")
(source
(origin
(method url-fetch)
@ -1074,7 +1074,7 @@ (define-public msmtp
"/msmtp-" version ".tar.xz"))
(sha256
(base32
"14w7lmw1jxlganfk089b0ib23y5917mxbg3xqpid007dd4cmq66i"))))
"1d4jdgrx4czp66nnwdsy938lzr4llhwyy0715pwg0j6h6gyyxciw"))))
(build-system gnu-build-system)
(inputs
`(("libsecret" ,libsecret)
@ -1730,27 +1730,23 @@ (define-public procmail
(define-public khard
(package
(name "khard")
(version "0.12.2")
(version "0.13.0")
(source (origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
"01y52qmab4cw9wmx87aahnxbyaxrxw8j2wx06mpcqsfvgk8d54wi"))))
"1lyjiskc6ckjjylzr04dnm66p3cnn7vlysw9c27qls3y3ywx14zw"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/khard")))
(copy-recursively "misc/khard" doc)
#t))))
;; Tests are currently only runnable without preexisting data on
;; the development branch:
;; https://github.com/scheibler/khard/issues/176
#:tests? #f))
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/khard")))
(copy-recursively "misc/khard" doc)
#t))))))
(propagated-inputs
`(("python-atomicwrites" ,python-atomicwrites)
("python-configobj" ,python-configobj)
@ -2597,14 +2593,14 @@ (define-public imapfilter
(define-public urlscan
(package
(name "urlscan")
(version "0.9.1")
(version "0.9.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "urlscan" version))
(sha256
(base32
"0vpdyrx51sg9a8kswa7ibbcgcpvc7r03aq8x4n4c7v2xg0v3c7wb"))))
"1zldck7vnp7z04aacbx3cprf5kzha4gfhjmss4iv2lh5nccxjfzx"))))
(build-system python-build-system)
(propagated-inputs
`(("python-urwid" ,python-urwid)))

110
gnu/packages/maths.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2016, 2017 John Darrington <jmd@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2014 Mathieu Lirzin <mathieu.lirzin@openmailbox.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
@ -584,7 +584,8 @@ (define-public scalapack
version ".tgz"))
(sha256
(base32
"0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c"))))
"0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c"))
(patches (search-patches "scalapack-blacs-mpi-deprecations.patch"))))
(build-system cmake-build-system)
(inputs
`(("mpi" ,openmpi)
@ -1635,7 +1636,7 @@ (define-public maxflow
(define-public petsc
(package
(name "petsc")
(version "3.10.2")
(version "3.10.3")
(source
(origin
(method url-fetch)
@ -1643,7 +1644,7 @@ (define-public petsc
(uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/"
"petsc-lite-" version ".tar.gz"))
(sha256
(base32 "0bl64pydak3rblnjffi482r8bin4xim9sb37ksl2jkcxf0i0irsi"))))
(base32 "10p9ap1rp6k8k2g8zdc505kdlsc3976fjymyp393sccjapm50dph"))))
(outputs '("out" ;libraries and headers
"examples")) ;~30MiB of examples
(build-system gnu-build-system)
@ -3446,7 +3447,7 @@ (define-public lpsolve
(define-public dealii
(package
(name "dealii")
(version "8.5.1")
(version "9.0.1")
(source
(origin
(method url-fetch)
@ -3454,7 +3455,8 @@ (define-public dealii
"download/v" version "/dealii-" version ".tar.gz"))
(sha256
(base32
"1bh9rsmkrg0zi70n27b11djmac9lximghsiy7mg7w7x544n82gnk"))
"0r7f8rhl3xr94imd372plizdcbqk0a70w73lwc3vw912dxk0sbyz"))
(patches (search-patches "dealii-mpi-deprecations.patch"))
(modules '((guix build utils)))
(snippet
;; Remove bundled sources: UMFPACK, TBB, muParser, and boost
@ -3507,10 +3509,8 @@ (define-public dealii-openmpi
(arguments
(substitute-keyword-arguments (package-arguments dealii)
((#:configure-flags cf)
``("-DMPI_C_COMPILER=mpicc"
"-DMPI_CXX_COMPILER=mpicxx"
"-DMPI_Fortran_COMPILER=mpifort"
,@,cf))
`(cons "-DDEAL_II_WITH_MPI:BOOL=ON"
,cf))
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-before 'check 'mpi-setup
@ -3973,6 +3973,96 @@ (define-public z3
theories} (SMT) solver. It provides a C/C++ API, as well as Python bindings.")
(license license:expat)))
(define-public elpa
(package
(name "elpa")
(version "2018.11.001")
(source (origin
(method url-fetch)
(uri (string-append "http://elpa.mpcdf.mpg.de/html/Releases/"
version "/elpa-" version ".tar.gz"))
(sha256
(base32
"05hv3v5i6xmziaizw350ff72y1c3k662r85fm3xfdrkclj5zw9yc"))))
(build-system gnu-build-system)
(native-inputs
`(("fortran" ,gfortran)
("perl" ,perl))) ;for configure and deps
(inputs
`(("blas" ,openblas)))
(arguments
`(#:configure-flags
`("--enable-openmp"
"--with-mpi=no"
;; ELPA unfortunately does not support runtime dispatch, so we can
;; only enable the "generic" kernels. See the "Cross compilation"
;; section of INSTALL.md.
"--enable-generic"
"--disable-sse" "--disable-sse-assembly" ;Require SSE3
"--disable-avx" "--disable-avx2" "--disable-avx512"
,(string-append "CFLAGS=-O3 "
"-funsafe-loop-optimizations -funsafe-math-optimizations "
"-ftree-vect-loop-version -ftree-vectorize "
,(let ((system (or (%current-target-system)
(%current-system))))
(cond
((or (string-prefix? "x86_64" system)
(string-prefix? "i686" system))
"-msse2")
(else "")))))
#:parallel-tests? #f ;tests are multi-threaded, via BLAS
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-header-generation
(lambda _
(substitute* "configure"
(("^ *make.*top_srcdir=\"\\$srcdir\"" &)
(string-append & " CPP=\"$CPP\"")))
#t))
(add-before 'check 'setup-tests
(lambda _
;; Decrease test time and RAM use by computing fewer eigenvalues.
;; The flags are (MATRIX-SIZE, EIGENVALUES, BLOCK-SIZE), where
;; the default is (500, 250, 16) for C tests and (5000, 150, 16)
;; for Fortran. This also causes several tests to pass that
;; otherwise would otherwise fail with matrix size 5000; possibly
;; due to floating point tolerances that are too tight.
(setenv "TEST_FLAGS" "1500 50 16") ;from elpa.spec
(setenv "OMP_NUM_THREADS" (number->string (parallel-job-count)))
(substitute* "Makefile"
;; Test scripts are generated, patch the shebang
(("#!/bin/bash") (string-append "#!" (which "sh"))))
#t)))))
(home-page "http://elpa.mpcdf.mpg.de")
(synopsis "Eigenvalue solvers for symmetric matrices")
(description
"The ELPA library provides efficient and scalable direct eigensolvers for
symmetric matrices.")
(license license:lgpl3)))
(define-public elpa-openmpi
(package (inherit elpa)
(name "elpa-openmpi")
(inputs
`(("mpi" ,openmpi)
("scalapack" ,scalapack)
,@(package-inputs elpa)))
(arguments
(substitute-keyword-arguments (package-arguments elpa)
((#:configure-flags cf '())
`(cons "--with-mpi=yes" (delete "--with-mpi=no" ,cf)))
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-before 'check 'mpi-setup
(lambda _
;; Tests use 2 mpi tasks by default, use our remaining build
;; cores as OpenMP threads.
(setenv "OMP_NUM_THREADS" (number->string
(max (quotient (parallel-job-count) 2)
1)))
(,%openmpi-setup)))))))
(synopsis "Eigenvalue solvers for symmetric matrices (with MPI support)")))
(define-public elemental
(package
(name "elemental")

12
gnu/packages/maven.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019 Tobias Geerinckx-Rite <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -20,6 +21,7 @@ (define-module (gnu packages maven)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system ant)
#:use-module (gnu packages)
@ -79,12 +81,14 @@ (define-public maven-resolver-api
(name "maven-resolver-api")
(version "1.3.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/apache/maven-resolver/"
"archive/maven-resolver-" version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/apache/maven-resolver.git")
(commit (string-append "maven-resolver-" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0gfkf8g5zbjh6ciq3dnby9m5irhrbyc7d2jzic9l8xx6hl61q6mm"))))
"1x1gll8nkfl6zgnab78fxxvvhg42b2grxgdh1wp2h4qxsjkxg93d"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "maven-resolver-api.jar"

27
gnu/packages/mpi.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -32,6 +33,7 @@ (define-module (gnu packages mpi)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages fabric-management)
#:use-module (gnu packages gcc)
#:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
@ -174,6 +176,7 @@ (define-public openmpi
("gfortran" ,gfortran)
("libfabric" ,libfabric)
("libevent" ,libevent)
("opensm" ,opensm)
,@(if (and (not (%current-target-system))
(member (%current-system) (package-supported-systems psm)))
`(("psm" ,psm))
@ -198,11 +201,31 @@ (define-public openmpi
"--with-valgrind"
"--with-hwloc=external"
"--with-libevent"
;; InfiniBand support
"--enable-openib-control-hdr-padding"
"--enable-openib-dynamic-sl"
"--enable-openib-udcm"
"--enable-openib-rdmacm"
"--enable-openib-rdmacm-ibaddr"
;; Enable support for SLURM's Process Manager
;; Interface (PMI).
,(string-append "--with-pmi="
(assoc-ref %build-inputs "slurm")))
#:phases (modify-phases %standard-phases
;; opensm is needed for InfiniBand support.
(add-after 'unpack 'find-opensm-headers
(lambda* (#:key inputs #:allow-other-keys)
(setenv "C_INCLUDE_PATH"
(string-append (assoc-ref inputs "opensm")
"/include/infiniband/:"
(getenv "C_INCLUDE_PATH")))
(setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "opensm")
"/include/infiniband/:"
(getenv "CPLUS_INCLUDE_PATH")))
#t))
(add-before 'build 'remove-absolute
(lambda _
;; Remove compiler absolute file names (OPAL_FC_ABSOLUTE
@ -273,14 +296,14 @@ (define-public %openmpi-setup
(define-public python-mpi4py
(package
(name "python-mpi4py")
(version "3.0.0")
(version "3.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "mpi4py" version))
(sha256
(base32
"1mzgd26dfv4vwbci8gq77ss9f0x26i9aqzq9b9vs9ndxhlnv0mxl"))))
"0ld8rjmsjr0dklvj2g1gr3ax32sdq0xjxyh0cspknc1i36waajb5"))))
(build-system python-build-system)
(arguments
`(#:phases

15
gnu/packages/multiprecision.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2015, 2018 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;;
@ -230,17 +230,16 @@ (define-public qd
(define-public tomsfastmath
(package
(name "tomsfastmath")
(version "0.13.0")
(version "0.13.1")
(synopsis "Large integer arithmetic library")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/libtom/tomsfastmath/"
"releases/download/v" version "/"
"tfm-" (version-major+minor version) ".tar.bz2"))
"tfm-" version ".tar.xz"))
(sha256
(base32
"01rlsvp6lskk2a0gfdi24ak5h8vdwi6kqbvbwjnmb92r0zrfdvwd"))
(patches (search-patches "tomsfastmath-constness.patch"))))
"0f0pmiaskh89sp0q933pafxb914shpaj5ad8sb5rzk1wv8d7mja7"))))
(build-system gnu-build-system)
(native-inputs
`(("libtool" ,libtool)))
@ -252,7 +251,7 @@ (define-public tomsfastmath
"CC=gcc")
#:phases
(modify-phases %standard-phases
(delete 'configure) ;no configuration
(delete 'configure) ; no configuration
(replace 'check
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make"
@ -262,7 +261,7 @@ (define-public tomsfastmath
(invoke "./test")))
(add-before 'install 'install-nogroup
(lambda _
;; Let permissions inherit from the current process
;; Let permissions inherit from the current process.
(substitute* "makefile.shared"
(("-g \\$\\(GROUP\\) -o \\$\\(USER\\)") ""))
#t))
@ -286,7 +285,7 @@ (define-public tomsfastmath
,synopsis ,version out)))
(install-file "tomsfastmath.pc" pc-dir)
#t))))))
(home-page "http://www.libtom.org/TomsFastMath/")
(home-page "https://www.libtom.net/TomsFastMath/")
(description "TomsFastMath is a large integer library written in portable
ISO C. It is a port of LibTomMath with optional support for inline assembler
multiplies.")

18
gnu/packages/music.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017, 2018 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018 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 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
@ -2249,14 +2249,14 @@ (define-public aj-snapshot
(define-public qtractor
(package
(name "qtractor")
(version "0.9.3")
(version "0.9.5")
(source (origin
(method url-fetch)
(uri (string-append "http://downloads.sourceforge.net/qtractor/"
"qtractor-" version ".tar.gz"))
(sha256
(base32
"1010gvkzdzdk39g1g6wx2j19ls0kdl6l9q51xzk2qik7h2fwxl71"))))
"1zsikhqj5xzhw2x3b6pqlmcwz3hxx07lbbif8v3m3j41snzjic22"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f)) ; no "check" target
@ -4227,7 +4227,7 @@ (define-public perl-webservice-musicbrainz
(define-public clyrics
(package
(name "clyrics")
(version "0.10")
(version "0.11")
(source
(origin
(method git-fetch)
@ -4237,10 +4237,10 @@ (define-public clyrics
(file-name (git-file-name name version))
(sha256
(base32
"1qvj4dyipkkdccx5hci4z0q23i54ldk6hh7x5m35a7f70rrj6fbk"))))
"0vfjy555achgi5zwa34x4q7r692nc6bq4jx518a5w4m7k5fvm71j"))))
(build-system trivial-build-system)
(inputs
`(("bash" ,bash) ;for the wrapped program
`(("bash" ,bash) ; for the wrapped program
("perl" ,perl)
("perl-www-mechanize" ,perl-www-mechanize)
("perl-lwp-protocol-https" ,perl-lwp-protocol-https)
@ -4270,9 +4270,9 @@ (define-public clyrics
,(delete
""
(map (match-lambda
(((? (cut string-prefix? "perl-" <>) name) . dir)
(string-append dir "/lib/perl5/site_perl"))
(_ ""))
(((? (cut string-prefix? "perl-" <>) name) . dir)
(string-append dir "/lib/perl5/site_perl"))
(_ ""))
%build-inputs))))
(copy-recursively "plugins" (string-append output "/clyrics"))
#t))))

12
gnu/packages/musl.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -28,17 +28,17 @@ (define-module (gnu packages musl)
(define-public musl
(package
(name "musl")
(version "1.1.20")
(version "1.1.21")
(source (origin
(method url-fetch)
(uri (string-append "http://www.musl-libc.org/releases/"
name "-" version ".tar.gz"))
(uri (string-append "https://www.musl-libc.org/releases/"
"musl-" version ".tar.gz"))
(sha256
(base32
"0q8dsjxl41dccscv9a0r78bs7jap57mn4mni5pwbbip6s1qqggj4"))))
"0i2z52zgc86af1n1gjiz43hgd85mxjgvgn345zsybja9dxpvchn7"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; Musl has no tests
`(#:tests? #f ; musl has no tests
#:configure-flags
(list "--disable-gcc-wrapper")))
(synopsis "Small C standard library")

6
gnu/packages/ncdu.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -28,14 +28,14 @@ (define-module (gnu packages ncdu)
(define-public ncdu
(package
(name "ncdu")
(version "1.13")
(version "1.14")
(source (origin
(method url-fetch)
(uri (string-append "https://dev.yorhel.nl/download/ncdu-"
version ".tar.gz"))
(sha256
(base32
"0ni56ymlii577src4dzfbrq1mznbf6i0nka4bvh2sb1971f2ingl"))))
"0i4cap2z3037xx2rdzhrlazl2igk3xy4ncddp9j7xqi1mcx7i566"))))
(build-system gnu-build-system)
(inputs `(("ncurses" ,ncurses)))
(synopsis "Ncurses based disk usage analyzer")

8
gnu/packages/ncurses.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -229,15 +229,15 @@ (define-public ncurses/gpm
(define-public dialog
(package
(name "dialog")
(version "1.3-20180621")
(version "1.3-20190211")
(source (origin
(method url-fetch)
(uri (string-append
"http://invisible-mirror.net/archives/dialog/dialog-"
"https://invisible-mirror.net/archives/dialog/dialog-"
version ".tgz"))
(sha256
(base32
"0yjqczlf64yppgvk4i6s0jm06mdr0mb5m6sj39nf891dnbi5jj2a"))))
"1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f)) ; no test suite

4
gnu/packages/netpbm.scm
View file

@ -135,7 +135,9 @@ (define-syntax drop
;; 'gsc', so look for that instead.
(substitute* "converter/other/pstopnm.c"
(("\"%s/gs\"")
"\"%s/gsc\"")))
"\"%s/gsc\"")
(("/usr/bin/gs")
(string-append (assoc-ref inputs "ghostscript") "/bin/gsc"))))
#t))
(add-before 'check 'setup-check
(lambda _

46
gnu/packages/networking.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2016 Raimon Grau <raimonster@gmail.com>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
@ -16,7 +16,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2017, 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018 Adam Van Ymeren <adam@vany.ca>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
@ -98,6 +98,7 @@ (define-module (gnu packages networking)
#:use-module (gnu packages textutils)
#:use-module (gnu packages tls)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages web)
#:use-module (gnu packages wm)
#:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xml)
@ -1203,19 +1204,18 @@ (define-public proxychains-ng
(define-public enet
(package
(name "enet")
(version "1.3.13")
(version "1.3.14")
(source (origin
(method url-fetch)
(uri (string-append "http://enet.bespin.org/download/"
name "-" version ".tar.gz"))
"enet-" version ".tar.gz"))
(sha256
(base32
"0p53mnmjbm56wizwraznynx13fcibcxiqny110dp6a5a3w174q73"))))
"0w780zc6cy8yq4cskpphx0f91lzh51vh9lwyc5ll8hhamdxgbxlq"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(synopsis
"Network communication layer on top of UDP")
(synopsis "Network communication layer on top of UDP")
(description
"ENet's purpose is to provide a relatively thin, simple and robust network
communication layer on top of UDP. The primary feature it provides is optional
@ -1401,7 +1401,7 @@ (define-public nzbget
(define-public openvswitch
(package
(name "openvswitch")
(version "2.8.1")
(version "2.10.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -1409,7 +1409,7 @@ (define-public openvswitch
version ".tar.gz"))
(sha256
(base32
"14rqqhfyv49irz8ag0qbv9jn8z0bn3qzxir3r074y16p4sg4674d"))))
"103wi6k8xal0z1pyy680gms56skagh6jawa2ja588ljr55jcg4sg"))))
(build-system gnu-build-system)
(arguments
'(;; FIXME: many tests fail with:
@ -2367,3 +2367,31 @@ (define-public opendht
be used to manage peer-to-peer network connections as needed for real time
communication.")
(license license:gpl3+)))
(define-public frrouting
(package
(name "frrouting")
(version "6.0.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/FRRouting/frr/releases/"
"download/frr-" version "/frr-" version
".tar.xz"))
(sha256
(base32
"0xfrvi62w8qlh46f504ka0skb7pm0g0p8vmdng4w90gsbirlzpdd"))))
(build-system gnu-build-system)
(inputs
`(("c-ares" ,c-ares)
("json-c" ,json-c)
("readline" ,readline)))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
("python-pytest" ,python-pytest)))
(home-page "https://frrouting.org/")
(synopsis "IP routing protocol suite")
(description "FRRouting (FRR) is an IP routing protocol suite which includes
protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ")
(license license:gpl2+)))

228
gnu/packages/ocaml.scm
View file

@ -234,45 +234,6 @@ (define-public ocaml-4.02
;; distributed under lgpl2.0.
(license (list license:qpl license:lgpl2.0))))
(define-public ocaml-4.01
(package
(inherit ocaml-4.02)
(version "4.01.0")
(source (origin
(method url-fetch)
(uri (string-append
"http://caml.inria.fr/pub/distrib/ocaml-"
(version-major+minor version)
"/ocaml-" version ".tar.xz"))
(sha256
(base32
"03d7ida94s1gpr3gadf4jyhmh5rrszd5s4m4z59daaib25rvfyv7"))))
(arguments
(substitute-keyword-arguments (package-arguments ocaml-4.02)
((#:phases phases)
`(modify-phases ,phases
(replace 'build
(lambda _
;; Specifying '-j' at all causes the build to fail.
(invoke "make" "world.opt")))
,@(if (string=? "aarch64-linux" (%current-system))
;; Custom configure script doesn't recongnize aarch64.
'((replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(mandir (string-append out "/share/man")))
(invoke "./configure"
"--prefix" out
"--mandir" mandir
"-host" "armv8l-unknown-linux-gnu")))))
'())
(replace 'check
(lambda _
(with-directory-excursion "testsuite"
(invoke "make" "all"
(string-append
"TOPDIR=" (getcwd) "/..")))))))))))
(define-public ocaml-4.07
(package
(inherit ocaml-4.02)
@ -957,14 +918,6 @@ (define-public ocaml4.02-findlib
("m4" ,m4)
("ocaml" ,ocaml-4.02)))))
(define-public ocaml4.01-findlib
(package
(inherit ocaml-findlib)
(name "ocaml4.01-findlib")
(native-inputs
`(("m4" ,m4)
("ocaml" ,ocaml-4.01)))))
;; note that some tests may hang for no obvious reason.
(define-public ocaml-ounit
(package
@ -990,9 +943,6 @@ (define-public ocaml-ounit
other XUnit testing frameworks.")
(license license:expat)))
(define-public ocaml4.01-ounit
(package-with-ocaml4.01 ocaml-ounit))
(define-public ocaml4.02-ounit
(package-with-ocaml4.02 ocaml-ounit))
@ -1038,24 +988,6 @@ (define-public camlzip
files in these formats.")
(license license:lgpl2.1+)))
(define-public ocaml4.01-camlzip
(let ((base (package-with-ocaml4.01 camlzip)))
(package
(inherit base)
(name "ocaml4.01-camlzip")
;; Version 1.05 is the last version to support OCaml 4.01.0.
(version "1.05")
(source
(origin
(method url-fetch)
(uri
(string-append
"http://forge.ocamlcore.org/frs/download.php/1037/camlzip-"
version ".tar.gz"))
(sha256
(base32
"0syh72jk9s0qwjmmfrkqchaj98m020ii082jn38pwnmb6v3p02wk")))))))
(define-public ocaml4.02-camlzip
(package-with-ocaml4.02 camlzip))
@ -1222,9 +1154,6 @@ (define-public ocaml-qtest
to use -- to sophisticated random generation of test cases.")
(license license:lgpl3+)))
(define-public ocaml4.01-qtest
(package-with-ocaml4.01 ocaml-qtest))
(define-public ocaml4.02-qtest
(package-with-ocaml4.02 ocaml-qtest))
@ -1301,39 +1230,9 @@ (define-public ocaml-bisect
format that is the replica of the application source code annotated with code
coverage information.")
(properties
`((ocaml4.01-variant . ,(delay ocaml4.01-bisect))
(ocaml4.02-variant . ,(delay ocaml4.02-bisect))))
`((ocaml4.02-variant . ,(delay ocaml4.02-bisect))))
(license license:gpl3+)))
(define-public ocaml4.01-bisect
(let ((base (package-with-ocaml4.01 (strip-ocaml4.01-variant ocaml-bisect))))
(package
(inherit base)
(version "1.3")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/gasche/bisect/archive/"
version ".tar.gz"))
(file-name (string-append "ocaml-bisect-" version ".tar.gz"))
(sha256
(base32
"1ip49jqf0kkbrqf8qspmfjbg9ap9fhvjkg718myzix88dg5rv8d4"))))
(arguments
`(#:ocaml ,ocaml-4.01
,@(substitute-keyword-arguments (package-arguments ocaml-bisect)
((#:make-flags flags)
`(list "all"))
((#:phases phases)
`(modify-phases ,phases
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(invoke "./configure"
"-ocaml-prefix" (assoc-ref inputs "ocaml"))
#t)))))))
(native-inputs `(,@(alist-delete "camlp4" (package-native-inputs base))))
(propagated-inputs
`(,@(alist-delete "camlp4" (package-propagated-inputs base)))))))
(define-public ocaml4.02-bisect
(let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-bisect))))
(package
@ -1648,9 +1547,6 @@ (define-public ocaml-sqlite3
@code{ocaml-sqlite}.")
(license license:expat)))
(define-public ocaml4.01-sqlite3
(package-with-ocaml4.01 ocaml-sqlite3))
(define-public ocaml4.02-sqlite3
(package-with-ocaml4.02 ocaml-sqlite3))
@ -1680,9 +1576,6 @@ (define-public ocaml-csv
manipulate such data.")
(license (package-license camlp4))))
(define-public ocaml4.01-csv
(package-with-ocaml4.01 ocaml-csv))
(define-public ocaml4.02-csv
(package-with-ocaml4.02 ocaml-csv))
@ -2191,9 +2084,6 @@ (define-public ocaml-xmlm
representation of the data.")
(license license:isc)))
(define-public ocaml4.01-xmlm
(package-with-ocaml4.01 ocaml-xmlm))
(define-public ocaml4.02-xmlm
(package-with-ocaml4.02 ocaml-xmlm))
@ -2530,8 +2420,7 @@ (define-public ocaml-batteries
(invoke "make" "all")
#t)))))
(properties
`((ocaml4.01-variant . ,(delay ocaml4.01-batteries))
(ocaml4.02-variant . ,(delay ocaml4.02-batteries))))
`((ocaml4.02-variant . ,(delay ocaml4.02-batteries))))
(home-page "http://batteries.forge.ocamlcore.org/")
(synopsis "Development platform for the OCaml programming language")
(description "Define a standard set of libraries which may be expected on
@ -2552,12 +2441,6 @@ (define-public ocaml4.02-batteries
"1a97w3x2l1jr5x9kj5gqm1x6b0q9fjqdcsvls7arnl3bvzgsia0n"))))
(propagated-inputs '()))))
(define-public ocaml4.01-batteries
(let ((base (package-with-ocaml4.01 (strip-ocaml4.01-variant ocaml4.02-batteries))))
(package
(inherit base)
(name "ocaml4.01-batteries"))))
(define-public ocaml-pcre
(package
(name "ocaml-pcre")
@ -4683,6 +4566,110 @@ (define-public ocaml-ppx-inline-test
collection.")
(license license:expat)))
(define-public ocaml-bindlib
(package
(name "ocaml-bindlib")
(version "5.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rlepigre/ocaml-bindlib.git")
(commit (string-append "ocaml-bindlib_" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1f8kr81w8vsi4gv61xn1qbc6zrzkjp8l9ix0942vjh4gjxc74v75"))))
(build-system ocaml-build-system)
(arguments
`(#:tests? #f ;no tests
#:use-make? #t
#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda _
(invoke "make")))
(replace 'install
(lambda _
(invoke "make" "install"))))))
(native-inputs
`(("ocamlbuild" ,ocamlbuild)
("ocaml-findlib" ,ocaml-findlib)))
(home-page "https://rlepigre.github.io/ocaml-bindlib/")
(synopsis "OCaml Bindlib library for bound variables")
(description "Bindlib is a library allowing the manipulation of data
structures with bound variables. It is particularly useful when writing ASTs
for programming languages, but also for manipulating terms of the λ-calculus
or quantified formulas.")
(license license:gpl3+)))
(define-public ocaml-earley
(package
(name "ocaml-earley")
(version "2.0.0")
(home-page "https://github.com/rlepigre/ocaml-earley")
(source
(origin
(method git-fetch)
(uri (git-reference
(url (string-append home-page ".git"))
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"18k7bi7krc4bvqnhijz1q0pfr0nfahghfjifci8rh1q4i5zd0xz5"))))
(build-system dune-build-system)
(arguments
`(#:test-target "."))
(synopsis "Parsing library based on Earley Algorithm")
(description "Earley is a parser combinator library base on Earley's
algorithm. It is intended to be used in conjunction with an OCaml syntax
extension which allows the definition of parsers inside the language. There
is also support for writing OCaml syntax extensions in a camlp4 style.")
(license license:cecill-b)))
(define-public ocaml-timed
(package
(name "ocaml-timed")
(version "1.0")
(home-page "https://github.com/rlepigre/ocaml-timed")
(source (origin
(method git-fetch)
(uri (git-reference
(url (string-append home-page ".git"))
(commit (string-append name "_" version))))
(sha256
(base32
"0hfxz710faxy5yk97bkfnw87r732jcxxhmjppwrbfdb6pd0wks96"))
(file-name (git-file-name name version))))
(build-system ocaml-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'build
(lambda _
(invoke "make")))
(replace 'install
(lambda _
(invoke "make" "install")))
(replace 'check
(lambda _
(invoke "make" "tests"))))))
(synopsis "Timed references for imperative state")
(description "Timed references for imperative state. This module provides
an alternative type for references (or mutable cells) supporting undo/redo
operations. In particular, an abstract notion of time is used to capture the
state of the references at any given point, so that it can be restored. Note
that usual reference operations only have a constant time / memory overhead
(compared to those of the standard library).
Moreover, we provide an alternative implementation based on the references
of the standard library (Pervasives module). However, it is less efficient
than the first one.")
(license license:expat)))
(define-public ocaml-biniou
(package
(name "ocaml-biniou")
@ -4828,9 +4815,6 @@ (define-public ocaml-gsl
the OCaml language.")
(license license:gpl3+)))
(define-public ocaml4.01-gsl
(package-with-ocaml4.01 ocaml-gsl))
(define-public cubicle
(package
(name "cubicle")

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

@ -10,6 +10,7 @@
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@reproducible-builds.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -33,6 +34,7 @@ (define-module (gnu packages package-management)
#:use-module (gnu packages avahi)
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages bison)
#:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin'
@ -107,8 +109,8 @@ (define-public guix
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "0.16.0")
(commit "4bddd12ad540d45a33a5f9f129b896843dca603f")
(revision 9))
(commit "2637cfd7a4894ef2a2a7da3bb46d8815c43d7e75")
(revision 10))
(package
(name "guix")
@ -124,7 +126,7 @@ (define-public guix
(commit commit)))
(sha256
(base32
"1abn4ghb25kn0cmr9dbb3q3fxdcc0g2fnnmbrykxv111s6ahdmlw"))
"1m734gm45x9czqspsagdfxfgw5wiiinyq1s6zc9gfv7d3b2w472k"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@ -227,6 +229,7 @@ (define (intern tarball)
"guile-bytestructures"))
(ssh (assoc-ref inputs "guile-ssh"))
(gnutls (assoc-ref inputs "gnutls"))
(locales (assoc-ref inputs "glibc-utf8-locales"))
(deps (list gcrypt json sqlite gnutls
git bs ssh))
(effective
@ -245,11 +248,13 @@ (define (intern tarball)
"/lib/guile/" effective
"/site-ccache")
(delete #f deps))
":")))
":"))
(locpath (string-append locales "/lib/locale")))
(wrap-program (string-append out "/bin/guix")
`("GUILE_LOAD_PATH" ":" prefix (,path))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath)))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath))
`("GUIX_LOCPATH" ":" suffix (,locpath)))
#t))))))
(native-inputs `(("pkg-config" ,pkg-config)
@ -282,7 +287,9 @@ (define (intern tarball)
,@(if (and (not (%current-target-system))
(string=? (%current-system) "x86_64-linux"))
`(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux")))
'())))
'())
("glibc-utf8-locales" ,glibc-utf8-locales)))
(propagated-inputs
`(("gnutls" ,gnutls)
("guile-gcrypt" ,guile-gcrypt)
@ -541,13 +548,13 @@ (define-public rpm
(define-public diffoscope
(package
(name "diffoscope")
(version "106")
(version "111")
(source (origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
"0qrfp7nha2n2s9h5ibcf7rqji1amh4cqbcf80m6anim6p3ik26da"))))
"0sgqx3n0ny75bvcw10pfx61z67mdk5hx3mblw4gqnn2h9vc74qz1"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -606,6 +613,55 @@ (define-public diffoscope
compare two tarballs, ISO images, or PDFs just as easily.")
(license license:gpl3+)))
(define-public trydiffoscope
(package
(name "trydiffoscope")
(version "67.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://salsa.debian.org/reproducible-builds/trydiffoscope.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"03b66cjii7l2yiwffj6ym6mycd5drx7prfp4j2550281pias6mjh"))))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((share (string-append (assoc-ref outputs "out") "/share/")))
(mkdir-p (string-append share "/man/man1/" ))
(invoke "rst2man.py"
"trydiffoscope.1.rst"
(string-append share "/man/man1/trydiffoscope.1"))
(mkdir-p (string-append share "/doc/" ,name "-" ,version))
(install-file "./README.rst"
(string-append share "/doc/" ,name "-" ,version)))
#t)))))
(propagated-inputs
`(("python-requests" ,python-requests)))
(native-inputs
`(("gzip" ,gzip)
("python-docutils" ,python-docutils)))
(build-system python-build-system)
(home-page "https://try.diffoscope.org")
(synopsis "Client for remote diffoscope service")
(description "This is a client for the @url{https://try.diffoscope.org,
remote diffoscope service}.
Diffoscope tries to get to the bottom of what makes files or directories
different. It recursively unpacks archives of many kinds and transforms
various binary formats into more human readable forms to compare them. It can
compare two tarballs, ISO images, or PDFs just as easily.
Results are displayed by default, stored as local text or html files, or made
available via a URL on @url{https://try.diffoscope.org}. Results stored on the
server are purged after 30 days.")
(license license:gpl3+)))
(define-public python-anaconda-client
(package
(name "python-anaconda-client")
@ -870,17 +926,18 @@ (define-public gcab
(define-public msitools
(package
(name "msitools")
(version "0.98")
(version "0.99")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
version "/" name "-" version ".tar.xz"))
(uri (string-append "mirror://gnome/sources/msitools/"
version "/msitools-" version ".tar.xz"))
(sha256
(base32
"19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac"))))
"0d9nidn5zc81bc30w119933rn2g87mrsqyqkndg20srkbsd96xfl"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
`(("bison" ,bison)
("pkg-config" ,pkg-config)))
(inputs
`(("gcab" ,gcab)
("glib" ,glib)
@ -952,7 +1009,7 @@ (define-public libostree
(define-public flatpak
(package
(name "flatpak")
(version "1.2.0")
(version "1.2.3")
(source
(origin
(method url-fetch)
@ -960,7 +1017,7 @@ (define-public flatpak
version "/flatpak-" version ".tar.xz"))
(sha256
(base32
"1bdk6qmsvy4d80245x1si9qvrga2f2yalj9qfmf1lqj5ljxxxifv"))))
"0i0dn3w3545lvmjlzqj3j70lk8yrq64r9frp1rk6a161gwq20ixv"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ;; Tests fail due to trying to create files where it can't.

6
gnu/packages/parallel.scm
View file

@ -7,7 +7,7 @@
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;;
;;; This file is part of GNU Guix.
@ -48,7 +48,7 @@ (define-module (gnu packages parallel)
(define-public parallel
(package
(name "parallel")
(version "20181222")
(version "20190122")
(source
(origin
(method url-fetch)
@ -56,7 +56,7 @@ (define-public parallel
version ".tar.bz2"))
(sha256
(base32
"0sd39nzgff3rpyzfwkffb5yxbdm5r6amrkslbgpjlrcrymy9z305"))))
"030rjhis8s47gkm05k4vc9p886cxvadpgzs8rqmgzvlc38h5ywxf"))))
(build-system gnu-build-system)
(arguments
`(#:phases

41
gnu/packages/patches/allegro4-mesa-18.2.5-and-later.patch
View file

@ -1,41 +0,0 @@
Fixes compilation with Mesa >= 18.2.5.
Modified from upstream to work on allegro4:
https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47
diff --git a/addons/allegrogl/include/alleggl.h b/addons/allegrogl/include/alleggl.h
index 0f86a6768..652dd024e 100644
--- a/addons/allegrogl/include/alleggl.h
+++ b/addons/allegrogl/include/alleggl.h
@@ -103,10 +103,14 @@
/* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
#define __glext_h_
+#define __gl_glext_h_
#define __glxext_h_
+#define __glx_glxext_h_
#include <GL/gl.h>
#undef __glext_h_
+#undef __gl_glext_h_
#undef __glxext_h_
+#undef __glx_glxext_h_
#endif /* ALLEGRO_MACOSX */
diff --git a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
index 49c502091..fba8aea5d 100644
--- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
+++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h
@@ -1,7 +1,9 @@
/* HACK: Prevent both Mesa and SGI's broken headers from screwing us */
#define __glxext_h_
+#define __glx_glxext_h_
#include <GL/glx.h>
#undef __glxext_h_
+#undef __glx_glxext_h_
#ifndef GLX_VERSION_1_3
#define _ALLEGRO_GLX_VERSION_1_3
--
2.20.0

82
gnu/packages/patches/clang-7.0-libc-search-path.patch Normal file
View file

@ -0,0 +1,82 @@
Clang attempts to guess file names based on the OS and distro (yes!),
but unfortunately, that doesn't work for us.
This patch makes it easy to insert libc's $libdir so that Clang passes the
correct absolute file name of crt1.o etc. to 'ld'. It also disables all
the distro-specific stuff and removes the hard-coded FHS directory names
to make sure Clang also works on non-GuixSD systems.
--- a/lib/Driver/ToolChains/Linux.cpp
+++ b/lib/Driver/ToolChains/Linux.cpp
@@ -225,7 +225,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
GCCInstallation.getTriple().str() + "/bin")
.str());
-
+ // Comment out the distro-specific tweaks so that they don't bite when
+ // using Guix on a foreign distro.
+#if 0
Distro Distro(D.getVFS());
if (Distro.IsAlpineLinux()) {
@@ -284,6 +286,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
if (IsAndroid || Distro.IsOpenSUSE())
ExtraOpts.push_back("--enable-new-dtags");
+#endif
// The selection of paths to try here is designed to match the patterns which
// the GCC driver itself uses, as this is part of the GCC-compatible driver.
@@ -342,7 +345,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
// the cross. Note that GCC does include some of these directories in some
// configurations but this seems somewhere between questionable and simply
// a bug.
- if (StringRef(LibPath).startswith(SysRoot)) {
+ if (0) {
addPathIfExists(D, LibPath + "/" + MultiarchTriple, Paths);
addPathIfExists(D, LibPath + "/../" + OSLibDir, Paths);
}
@@ -361,6 +364,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
addPathIfExists(D, SysRoot + "/lib/" + MultiarchTriple, Paths);
addPathIfExists(D, SysRoot + "/lib/../" + OSLibDir, Paths);
+ // This requires the commented distro tweaks above.
+#if 0
if (IsAndroid) {
// Android sysroots contain a library directory for each supported OS
// version as well as some unversioned libraries in the usual multiarch
@@ -389,10 +394,14 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
addPathIfExists(D, SysRoot + "/" + OSLibDir + "/" + ABIName, Paths);
addPathIfExists(D, SysRoot + "/usr/" + OSLibDir + "/" + ABIName, Paths);
}
+#endif
// Try walking via the GCC triple path in case of biarch or multiarch GCC
// installations with strange symlinks.
if (GCCInstallation.isValid()) {
+ // The following code would end up adding things like
+ // "/usr/lib/x86_64-unknown-linux-gnu/../../lib64" to the search path.
+#if 0
addPathIfExists(D,
SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
"/../../" + OSLibDir,
@@ -405,6 +414,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
BiarchSibling.gccSuffix(),
Paths);
}
+#endif
// See comments above on the multilib variant for details of why this is
// included even from outside the sysroot.
@@ -429,8 +439,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
if (StringRef(D.Dir).startswith(SysRoot))
addPathIfExists(D, D.Dir + "/../lib", Paths);
- addPathIfExists(D, SysRoot + "/lib", Paths);
- addPathIfExists(D, SysRoot + "/usr/lib", Paths);
+ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o,
+ // and friends can be found.
+ addPathIfExists(D, "@GLIBC_LIBDIR@", Paths);
}
bool Linux::HasNativeLLVMSupport() const { return true; }

28
gnu/packages/patches/dealii-mpi-deprecations.patch Normal file
View file

@ -0,0 +1,28 @@
From 40538ad31a71495649d174b0f7be5f7135d0a905 Mon Sep 17 00:00:00 2001
From: David Wells <drwells@email.unc.edu>
Date: Sat, 2 Feb 2019 10:00:38 -0500
Subject: [PATCH] Avoid calling a deprecated MPI function.
This was deprecated a long time ago (1996) and is not present in the
latest version of openMPI (4.0): see
https://www.open-mpi.org/faq/?category=mpi-removed
Credit goes to Pratik Nayak for finding this issue.
---
source/base/mpi.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/base/mpi.cc b/source/base/mpi.cc
index bd1f7f9846a..b8cd45e7c26 100644
--- a/source/base/mpi.cc
+++ b/source/base/mpi.cc
@@ -448,7 +448,7 @@ namespace Utilities
MPI_Aint displacements[] = {0, offsetof(MinMaxAvg, min_index)};
MPI_Datatype types[] = {MPI_DOUBLE, MPI_INT};
- ierr = MPI_Type_struct(2, lengths, displacements, types, &type);
+ ierr = MPI_Type_create_struct(2, lengths, displacements, types, &type);
AssertThrowMPI(ierr);
ierr = MPI_Type_commit(&type);

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