me
/
guix
Archived
1
0
Fork 0

Merge branch 'master' into staging

master
Marius Bakke 2019-12-18 23:07:40 +01:00
commit 7ba6d70e45
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
57 changed files with 6019 additions and 1086 deletions

View File

@ -46,7 +46,7 @@ Copyright @copyright{} 2017, 2018 Carlo Zancanaro@*
Copyright @copyright{} 2017 Thomas Danckaert@*
Copyright @copyright{} 2017 humanitiesNerd@*
Copyright @copyright{} 2017 Christopher Allan Webber@*
Copyright @copyright{} 2017, 2018 Marius Bakke@*
Copyright @copyright{} 2017, 2018, 2019 Marius Bakke@*
Copyright @copyright{} 2017, 2019 Hartmut Goebel@*
Copyright @copyright{} 2017, 2019 Maxim Cournoyer@*
Copyright @copyright{} 2017, 2018, 2019 Tobias Geerinckx-Rice@*
@ -2472,7 +2472,7 @@ Boot the USB installation image in an VM:
@example
qemu-system-x86_64 -m 1024 -smp 1 -enable-kvm \
-net user -net nic,model=virtio -boot menu=on,order=d \
-nic user,model=virtio-net-pci -boot menu=on,order=d \
-drive file=guix-system.img \
-drive media=cdrom,file=guix-system-install-@value{VERSION}.@var{system}.iso
@end example
@ -26156,7 +26156,7 @@ below, which enables networking and requests 1@tie{}GiB of RAM for the
emulated machine:
@example
$ /gnu/store/@dots{}-run-vm.sh -m 1024 -net user
$ /gnu/store/@dots{}-run-vm.sh -m 1024 -smp 2 -net user,model=virtio-net-pci
@end example
The VM shares its store with the host system.
@ -26642,7 +26642,7 @@ vm-image} on x86_64 hardware:
@example
$ qemu-system-x86_64 \
-net user -net nic,model=virtio \
-nic user,model=virtio-net-pci \
-enable-kvm -m 1024 \
-device virtio-blk,drive=myhd \
-drive if=none,file=/tmp/qemu-image,id=myhd
@ -26655,16 +26655,14 @@ Here is what each of these options means:
This specifies the hardware platform to emulate. This should match the
host.
@item -net user
@item -nic user,model=virtio-net-pci
Enable the unprivileged user-mode network stack. The guest OS can
access the host but not vice versa. This is the simplest way to get the
guest OS online.
@item -net nic,model=virtio
You must create a network interface of a given model. If you do not
create a NIC, the boot will fail. Assuming your hardware platform is
guest OS online. @code{model} specifies which network device to emulate:
@code{virtio-net-pci} is a special device made for virtualized operating
systems and recommended for most uses. Assuming your hardware platform is
x86_64, you can get a list of available NIC models by running
@command{qemu-system-x86_64 -net nic,model=help}.
@command{qemu-system-x86_64 -nic model=help}.
@item -enable-kvm
If your system has hardware virtualization extensions, enabling the
@ -26688,11 +26686,11 @@ the ``myhd'' drive.
@end table
The default @command{run-vm.sh} script that is returned by an invocation of
@command{guix system vm} does not add a @command{-net user} flag by default.
@command{guix system vm} does not add a @command{-nic user} flag by default.
To get network access from within the vm add the @code{(dhcp-client-service)}
to your system definition and start the VM using
@command{`guix system vm config.scm` -net user}. An important caveat of using
@command{-net user} for networking is that @command{ping} will not work, because
@command{`guix system vm config.scm` -nic user}. An important caveat of using
@command{-nic user} for networking is that @command{ping} will not work, because
it uses the ICMP protocol. You'll have to use a different command to check for
network connectivity, for example @command{guix download}.
@ -26706,7 +26704,7 @@ To enable SSH inside a VM you need to add an SSH server like
22 by default, to the host. You can do this with
@example
`guix system vm config.scm` -net user,hostfwd=tcp::10022-:22
`guix system vm config.scm` -nic user,model=virtio-net-pci,hostfwd=tcp::10022-:22
@end example
To connect to the VM you can run

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 David Craven <david@craven.ch>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -33,6 +33,7 @@
u-boot-nintendo-nes-classic-edition-bootloader
u-boot-novena-bootloader
u-boot-pine64-plus-bootloader
u-boot-pine64-lts-bootloader
u-boot-pinebook-bootloader
u-boot-puma-rk3399-bootloader
u-boot-rock64-rk3328-bootloader
@ -206,6 +207,11 @@
(inherit u-boot-allwinner64-bootloader)
(package u-boot-pine64-plus)))
(define u-boot-pine64-lts-bootloader
(bootloader
(inherit u-boot-allwinner-bootloader)
(package u-boot-pine64-lts)))
(define u-boot-pinebook-bootloader
(bootloader
(inherit u-boot-allwinner64-bootloader)

View File

@ -131,14 +131,7 @@ the #:references-graphs parameter of 'derivation'."
;; The serial port name differs between emulated
;; architectures/machines.
" console="
(if target-arm? "ttyAMA0" "ttyS0"))
;; NIC is not supported on ARM "virt" machine, so use a user mode
;; network stack instead.
,@(if target-arm?
'("-device" "virtio-net-pci,netdev=mynet"
"-netdev" "user,id=mynet")
'("-net" "nic,model=virtio"))))
(if target-arm? "ttyAMA0" "ttyS0"))))
(when make-disk-image?
(format #t "creating ~a image of ~,2f MiB...~%"
@ -163,6 +156,7 @@ the #:references-graphs parameter of 'derivation'."
;; CPU with the maximum possible feature set otherwise.
"-cpu" "max"
"-m" (number->string memory-size)
"-nic" "user,model=virtio-net-pci"
"-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng"
"-device" "virtio-rng-pci,rng=guixsd-vm-rng"
"-virtfs"

View File

@ -969,7 +969,6 @@ dist_patch_DATA = \
%D%/packages/patches/hdf4-shared-fortran.patch \
%D%/packages/patches/hdf4-tirpc.patch \
%D%/packages/patches/hdf5-config-date.patch \
%D%/packages/patches/hdf5-mpi-deprecations.patch \
%D%/packages/patches/hdf5-1.8-mpi-deprecations.patch \
%D%/packages/patches/hdf-eos2-build-shared.patch \
%D%/packages/patches/hdf-eos2-remove-gctp.patch \

View File

@ -3331,7 +3331,7 @@ mixers.")
(define-public bluez-alsa
(package
(name "bluez-alsa")
(version "1.2.0")
(version "2.0.0")
(source (origin
;; The tarballs are mere snapshots and don't contain a
;; bootstrapped build system.
@ -3339,11 +3339,19 @@ mixers.")
(uri (git-reference
(url "https://github.com/Arkq/bluez-alsa.git")
(commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout"))
(file-name (git-file-name name version))
(sha256
(base32
"1qinf41wl2ihx54zmmhanycihwjkn7dn1cicq6pp4rqbiv79b95x"))))
"08mppgnjf1j2733bk9yf0cny6rfxxwiys0s62lz2zd2lpdl6d9lz"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list (string-append "--with-alsaplugindir="
(assoc-ref %outputs "out")
"/lib/alsa-lib")
(string-append "--with-dbusconfdir="
(assoc-ref %outputs "out")
"/etc/dbus-1"))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
@ -3352,6 +3360,7 @@ mixers.")
(inputs
`(("alsa-lib" ,alsa-lib)
("bluez" ,bluez)
("dbus" ,dbus)
("glib" ,glib)
("libbsd" ,libbsd)
("ncurses" ,ncurses)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -9,6 +9,7 @@
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 nee <nee@cock.li>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -28,7 +29,7 @@
(define-module (gnu packages bootloaders)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module ((gnu packages algebra) #:select (bc))
#:use-module (gnu packages algebra)
#:use-module (gnu packages assembly)
#:use-module (gnu packages base)
#:use-module (gnu packages disk)
@ -661,9 +662,11 @@ it fits within common partitioning schemes.")
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'set-environment
(lambda* (#:key inputs #:allow-other-keys)
(let ((bl31 (string-append (assoc-ref inputs "firmware")
"/bl31.bin")))
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((bl31
(string-append
(assoc-ref (or native-inputs inputs) "firmware")
"/bl31.bin")))
(setenv "BL31" bl31)
;; This is necessary when we're using the bundled dtc.
;(setenv "PATH" (string-append (getenv "PATH") ":"
@ -677,6 +680,9 @@ it fits within common partitioning schemes.")
(define-public u-boot-pine64-plus
(make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu"))
(define-public u-boot-pine64-lts
(make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu"))
(define-public u-boot-pinebook
(make-u-boot-sunxi64-package "pinebook" "aarch64-linux-gnu"))

View File

@ -2601,4 +2601,17 @@ an d binaries, plus debugging symbols in the @code{debug} output), and Binutils
(define-public gcc-toolchain-9
(make-gcc-toolchain gcc-9))
;; Provide the Fortran toolchain package only for the version of gfortran that
;; is used by Guix internally to build Fortran libraries, because combining
;; code compiled with different versions can cause problems.
(define-public gfortran-toolchain
(package (inherit (make-gcc-toolchain gfortran))
(synopsis "Complete GCC tool chain for Fortran development")
(description "This package provides a complete GCC tool chain for
Fortran development to be installed in user profiles. This includes
gfortran, as well as libc (headers and binaries, plus debugging symbols
in the @code{debug} output), and binutils.")))
;;; commencement.scm ends here

View File

@ -137,7 +137,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
(define-public cmst
(package
(name "cmst")
(version "2017.09.19")
(version "2019.01.13")
(source
(origin
(method url-fetch)
@ -145,7 +145,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
"https://github.com/andrew-bibb/cmst/releases/download/cmst-"
version "/cmst-" version ".tar.xz"))
(sha256
(base32 "0dh4639n3l8a19svaagib41hdq5q7x70bnc28dmnwy4jflf38yrm"))))
(base32 "1cn6xz2rpkf5kx5d6p2x2lh85zppjacp59l6gj3n6x12p90al1vl"))))
(inputs
`(("qtbase" ,qtbase)))
(native-inputs

File diff suppressed because it is too large Load Diff

View File

@ -884,10 +884,10 @@ trivial to build for local use. Portability is emphasized over performance.")
(license license:unlicense)))
(define-public libsecp256k1
(let ((commit "e34ceb333b1c0e6f4115ecbb80c632ac1042fa49"))
(let ((commit "d644dda5c9dbdecee52d1aa259235510fdc2d4ee"))
(package
(name "libsecp256k1")
(version (git-version "20181126" "1" commit))
(version (git-version "20191213" "1" commit))
(source (origin
(method git-fetch)
(uri (git-reference
@ -895,7 +895,7 @@ trivial to build for local use. Portability is emphasized over performance.")
(commit commit)))
(sha256
(base32
"0as78s179hcr3ysk3fw98k5wzabgnwri7vkkc17wg31lyz6ids6c"))
"0zmx32746khsm2cx0p3pdy3j2vkwmafvf7axiixijhgcg0xjv93i"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs

View File

@ -17,7 +17,7 @@
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
@ -125,6 +125,7 @@
#:use-module (guix build-system ruby)
#:use-module (guix build-system cmake)
#:use-module (guix build-system scons)
#:use-module (guix build-system trivial)
#:use-module ((guix build utils) #:hide (which))
#:use-module (guix utils)
#:use-module (srfi srfi-1)
@ -913,6 +914,33 @@ Language.")
as a drop-in replacement of MySQL.")
(license license:gpl2)))
;; TODO: mysql_install_db is broken in MariaDB. This package is here as
;; a workaround for packages that need it. Merge with 'mariadb' in the next
;; rebuild cycle.
(define-public mariadb/fixed-install-db
(hidden-package
(package/inherit
mariadb
(name "mariadb-fixed")
(native-inputs '())
(inputs
`(("mariadb" ,mariadb)
("mariadb:lib" ,mariadb "lib")))
(outputs '("out"))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules ((guix build utils)))
(let ((out (assoc-ref %outputs "out")))
(copy-recursively (assoc-ref %build-inputs "mariadb") out)
(substitute* (string-append out "/bin/mysql_install_db")
(("\\$basedir/share/mysql")
(string-append (assoc-ref %build-inputs "mariadb:lib")
"/share/mysql")))
#t)))))))
;; Don't forget to update the other postgresql packages when upgrading this one.
(define-public postgresql
(package
@ -3247,25 +3275,29 @@ simultaneous database connections by using this framework.")
"0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"))))
(build-system gnu-build-system)
(native-inputs
`(("inetutils" ,inetutils)
("glibc-locales" ,glibc-locales)))
`(;; For tests.
("inetutils" ,inetutils)
("glibc-locales" ,glibc-locales)
("mariadb" ,mariadb/fixed-install-db)))
(inputs
`(("libdbi" ,libdbi)
("mysql" ,mariadb)
("mariadb:dev" ,mariadb "dev")
("mariadb:lib" ,mariadb "lib")
("postgresql" ,postgresql)
("sqlite" ,sqlite)))
(arguments
`(#:configure-flags
(let ((libdbi (assoc-ref %build-inputs "libdbi"))
(mysql (assoc-ref %build-inputs "mysql"))
(mysql:inc (assoc-ref %build-inputs "mariadb:dev"))
(mysql:lib (assoc-ref %build-inputs "mariadb:lib"))
(postgresql (assoc-ref %build-inputs "postgresql"))
(sqlite (assoc-ref %build-inputs "sqlite")))
(list "--disable-docs"
(string-append "--with-dbi-incdir=" libdbi "/include")
(string-append "--with-dbi-libdir=" libdbi "/lib")
"--with-mysql"
(string-append "--with-mysql-incdir=" mysql "/include/mysql")
(string-append "--with-mysql-libdir=" mysql "/lib")
(string-append "--with-mysql-incdir=" mysql:inc "/include/mysql")
(string-append "--with-mysql-libdir=" mysql:lib "/lib")
"--with-pgsql"
(string-append "--with-pgsql-incdir=" postgresql "/include")
(string-append "--with-pgsql-libdir=" postgresql "/lib")
@ -3279,7 +3311,7 @@ simultaneous database connections by using this framework.")
(substitute* "tests/test_mysql.sh"
(("^MYMYSQLD=.*")
(string-append "MYMYSQLD="
(assoc-ref inputs "mysql")
(assoc-ref inputs "mariadb")
"/bin/mysqld")))
#t))
(add-after 'install 'remove-empty-directories

View File

@ -67,7 +67,7 @@
#:use-module (ice-9 match))
(define-public diffoscope
(let ((version "131"))
(let ((version "133"))
(package
(name "diffoscope")
(version version)
@ -79,7 +79,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"0jai3kycjlrc64f4vg8yklri6ds1451qy6r6sw2646bhjr0gs233"))))
"0mvg5iyd3zjxsm66vax3qb89214j3wxcklvbhfrr8jlbzaw9pznh"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@ -90,6 +90,12 @@
(lambda _
(substitute* "setup.py"
(("'python-magic',") ""))))
;; Patch in support for known tools
(add-after 'unpack 'add-known-tools
(lambda _
(substitute* "diffoscope/external_tools.py"
(("'debian': 'zstd'")
"'debian': 'zstd', 'guix': 'zstd'"))))
;; This test is broken because our `file` package has a
;; bug in berkeley-db file type detection.
(add-after 'unpack 'remove-berkeley-test
@ -209,7 +215,8 @@
("wabt" ,wabt)
("xxd" ,xxd)
("xz" ,xz)
("zip" ,zip)))
("zip" ,zip)
("zstd" ,zstd)))
(home-page "https://diffoscope.org/")
(synopsis "Compare files, archives, and directories in depth")
(description

View File

@ -1241,6 +1241,30 @@ or unexpected behavior inside an elisp configuration file (typically
"Emacs-wget is an emacs interface for the wget file downloader.")
(license license:gpl2+)))
(define-public emacs-eww-lnum
(package
(name "emacs-eww-lnum")
(version "1.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/m00natic/eww-lnum.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0gs6bi3s2sszc6v2b26929azmn5513kvyin99n4d0ark1jdbjmv2"))))
(build-system emacs-build-system)
(home-page "https://github.com/m00natic/eww-lnum")
(synopsis "Conkeror-like functionality for Eww")
(description "This is extension to the Emacs browser Eww that adds
Conkeror-like functionality. In short, currently visible links, forms,
buttons are temporarily assigned numbers with which the former can be
immediately activated. Also filtering can be applied so selection can be
incrementally confined in Isearch manner.")
(license license:gpl3+)))
;;;
;;; Multimedia.
@ -1586,7 +1610,7 @@ rather than the contents of files.")
(package
(name "emacs-async")
(home-page "https://github.com/jwiegley/emacs-async")
(version "1.9.3")
(version "1.9.4")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1595,7 +1619,7 @@ rather than the contents of files.")
(file-name (git-file-name name version))
(sha256
(base32
"1zsnb6dy8p6y68xgidv3dfxaga4biramfw8fq7wac0sc50vc98vq"))))
"0hhpyxb3d531jb2f3wvzx25183f0anm8nxv6mh0p825q2gkm6ly7"))))
(build-system emacs-build-system)
(synopsis "Asynchronous processing in Emacs")
(description
@ -1720,7 +1744,7 @@ Emacs buffer.")
(define-public emacs-direnv
(package
(name "emacs-direnv")
(version "1.5.0")
(version "2.0.0")
(source
(origin
(method git-fetch)
@ -1730,7 +1754,7 @@ Emacs buffer.")
(file-name (git-file-name name version))
(sha256
(base32
"02blhinkkfh3iai6j1k5swplf5mkwijy3p7wy38rnd1gnyj2z4la"))))
"005ibyzsx1fdyrl5iyhqpb1bg83mphzahq7zvw58x00syyqi2z49"))))
(build-system emacs-build-system)
(propagated-inputs
`(("dash" ,emacs-dash)
@ -2682,16 +2706,16 @@ keep pressing the key until it selects what you want. There's also
(define-public emacs-fill-column-indicator
(package
(name "emacs-fill-column-indicator")
(version "1.89")
(version "1.90")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alpaker/Fill-Column-Indicator.git")
(commit (string-append "v" version))))
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y"))))
(base32 "0snjznxdwwfdgccdcvrnk467416r244r2r5qcm2sga8l0ha9gw9z"))))
(build-system emacs-build-system)
(home-page "https://www.emacswiki.org/emacs/FillColumnIndicator")
(synopsis "Graphically indicate the fill column")
@ -2786,16 +2810,16 @@ Emacs shell script.")
(define-public emacs-undercover
(package
(name "emacs-undercover")
(version "0.6.0")
(version "0.6.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/sviridov/undercover.el.git")
(commit (string-append "v" version))))
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "06qcvbp5rd0kh3ibrxj5p6r578lwsrgd7yj5c6slwmkdmna2fj33"))))
(base32 "080bmfwyfi8663y8x594770hqz7mff7zvj2v03qdfwbhdr9w9y29"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
@ -2810,7 +2834,7 @@ Lisp.")
(define-public emacs-paren-face
(package
(name "emacs-paren-face")
(version "1.0.0")
(version "1.0.4")
(source
(origin
(method git-fetch)
@ -2819,7 +2843,8 @@ Lisp.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0f128gqn170s6hl62n44i9asais75ns1mpvb4l8vzy1sc0v16c0k"))))
(base32
"1cr0vnm57lxs48z17ddcv7qlfvks7wdsp01zsw0c7i3h5ajl8myp"))))
(build-system emacs-build-system)
(home-page "https://github.com/tarsius/paren-face")
(synopsis "Face for parentheses in lisp modes")
@ -3053,7 +3078,7 @@ their original location with another.")
(define-public emacs-rich-minority
(package
(name "emacs-rich-minority")
(version "1.0.1")
(version "1.0.3")
(source
(origin
(method git-fetch)
@ -3062,7 +3087,8 @@ their original location with another.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3"))))
(base32
"1kn7c9qr9ykj68iqffzzmjsr6aazwac8cxb7j960sjb282rq0yyj"))))
(build-system emacs-build-system)
(home-page "https://github.com/Malabarba/rich-minority")
(synopsis "Clean-up and beautify the list of minor modes")
@ -3468,16 +3494,16 @@ minibuffer to enable editing the minibuffer input in another buffer with
(define-public emacs-ob-ipython
(package
(name "emacs-ob-ipython")
(version "20150704.8807064693")
(version "20180224")
(source (origin
(method git-fetch)
(uri (git-reference
(commit "880706469338ab59b5bb7dbe8460016f89755364")
(commit "7147455230841744fb5b95dcbe03320313a77124")
(url "https://github.com/gregsexton/ob-ipython.git")))
(file-name (git-file-name name version))
(sha256
(base32
"1scf25snbds9ymagpny30ijbsg479r3nm0ih01dy4m9d0g7qryb7"))))
"1a10fc2jk37ni5sjjvf87s5nyaz2a6h2mlj5dxh4dhv5sd3bb85p"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-f" ,emacs-f)))
@ -4363,7 +4389,7 @@ and popup menus.")
(define-public emacs-jedi
(package
(name "emacs-jedi")
(version "0.2.7")
(version "0.2.8")
(source (origin
(method git-fetch)
(uri (git-reference
@ -4372,7 +4398,7 @@ and popup menus.")
(file-name (git-file-name name version))
(sha256
(base32
"0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7"))))
"1bckxppfzd5gwn0aw4h86igb7igal9axqncq7j8zmflg7zppncf1"))))
(build-system emacs-build-system)
(native-inputs
`(("emacs-mocker" ,emacs-mocker)))
@ -4669,7 +4695,7 @@ overview of tasks in a subtree.")
(define-public emacs-org-trello
(package
(name "emacs-org-trello")
(version "0.8.0")
(version "0.8.1")
(source
(origin
(method git-fetch)
@ -4678,7 +4704,8 @@ overview of tasks in a subtree.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0m5hyhb6211hdmyp1bq6f3fklfgw3957knd96bfdafj727vdnlzm"))))
(base32
"02gx3kv4mkij69ln8x8wf9n28x17pbb4kv85v78d3lxph7ykqimc"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
@ -6352,7 +6379,7 @@ and tooling.")
(define-public emacs-elfeed
(package
(name "emacs-elfeed")
(version "3.2.0")
(version "3.3.0")
(source
(origin
(method git-fetch)
@ -6361,7 +6388,7 @@ and tooling.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2"))))
(base32 "0j8a94val4ml7g1vcjgzk1w89h55sxfdrwnncmz6qbh1y2xsz8c5"))))
(build-system emacs-build-system)
(arguments
`(#:tests? #t
@ -6479,7 +6506,7 @@ maximizes flexibility (at the expense of conciseness).")
(define-public emacs-find-file-in-project
(package
(name "emacs-find-file-in-project")
(version "5.4.7")
(version "5.7.7")
(source (origin
(method git-fetch)
(uri (git-reference
@ -6488,19 +6515,13 @@ maximizes flexibility (at the expense of conciseness).")
(file-name (git-file-name name version))
(sha256
(base32
"1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr"))))
"1skjbh7m0cck2rwmgzrrds51gipqf1jqghyfx15drc1n6kwivx3h"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'check 'set-shell
;; Otherwise Emacs shell-file-name is set to "/bin/sh", which doesn't
;; work.
(lambda _
(setenv "SHELL" (which "sh"))
#t)))
#:tests? #t
#:test-command '("./tests/test.sh")))
`(#:tests? #t
#:test-command '("ert-runner" "tests")))
(native-inputs
`(("ert-runner" ,emacs-ert-runner)))
(home-page "https://github.com/technomancy/find-file-in-project")
(synopsis "File/directory finder for Emacs")
(description "@code{find-file-in-project} allows to find files or
@ -6646,7 +6667,7 @@ completion, interactive development and more.")
(define-public emacs-rainbow-delimiters
(package
(name "emacs-rainbow-delimiters")
(version "2.1.3")
(version "2.1.4")
(source (origin
(method git-fetch)
(uri (git-reference
@ -6655,7 +6676,7 @@ completion, interactive development and more.")
(file-name (git-file-name name version))
(sha256
(base32
"0vs9pf8lqq5p5qz1770pxgw47ym4xj8axxmwamn66br59mykdhv0"))))
"1zr2669savnmkc68hiqsq9wccm6bs1j6jbmlac1xqh6nq7xgq36g"))))
(build-system emacs-build-system)
(home-page "https://github.com/Fanael/rainbow-delimiters")
(arguments
@ -6740,7 +6761,7 @@ window edge.")
(define-public emacs-writeroom
(package
(name "emacs-writeroom")
(version "3.7")
(version "3.9")
(source
(origin
(method git-fetch)
@ -6749,7 +6770,8 @@ window edge.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z"))))
(base32
"1nrppnfqsaki6myp58w8jhmzb94rzskh5n98glcn4ghr8sqnafi8"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-visual-fill-column" ,emacs-visual-fill-column)))
@ -6909,7 +6931,7 @@ ack, ag, helm and pt.")
(define-public emacs-helm
(package
(name "emacs-helm")
(version "3.5.0")
(version "3.6.0")
(source
(origin
(method git-fetch)
@ -6918,7 +6940,7 @@ ack, ag, helm and pt.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "07bijcnfkv60l3swasxv53x32l6glds05mxnbb3xbnmkgm1pm9if"))))
(base32 "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-async" ,emacs-async)
@ -6936,8 +6958,8 @@ not tied in the trap of backward compatibility.")
(license license:gpl3+)))
(define-public emacs-helm-org
(let ((commit "542dda7bc9a3b9dfb439e4f8a1e5f60cfb6cc256")
(revision "1"))
(let ((commit "b9a1167b0716a22a69670f4c35e0ac59d2e0b220")
(revision "2"))
(package
(name "emacs-helm-org")
(version (git-version "1.0" revision commit))
@ -6949,7 +6971,7 @@ not tied in the trap of backward compatibility.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1xa32w80icrykpyfb89fhb0s4l7ysi0sc7f7lfwqz5najwbgqipl"))))
(base32 "1gc27i4azqpgijva1f4ckfdp4s52mc9pnfcmzhkwhknr6pd6jlcr"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-helm" ,emacs-helm)))
@ -7146,7 +7168,7 @@ target will call @code{compile} on it.")
(define-public emacs-cider
(package
(name "emacs-cider")
(version "0.21.0")
(version "0.23.0")
(source
(origin
(method git-fetch)
@ -7156,7 +7178,7 @@ target will call @code{compile} on it.")
(file-name (git-file-name name version))
(sha256
(base32
"0lbrwj67fnvynkdkzvnzp3p8vqlz0ldrcs317vg60bqfhx7hvqkj"))))
"05yjkqc6d4grq9z5pxmv3anqh4zlhfg4v46jlccp6ynh030g7axs"))))
(build-system emacs-build-system)
(arguments
'(#:exclude ; Don't exclude 'cider-test.el'.
@ -7164,10 +7186,12 @@ target will call @code{compile} on it.")
(propagated-inputs
`(("emacs-clojure-mode" ,emacs-clojure-mode)
("emacs-sesman" ,emacs-sesman)
("emacs-seq" ,emacs-seq)
("emacs-spinner" ,emacs-spinner)
("emacs-parseedn" ,emacs-parseedn)
("emacs-pkg-info" ,emacs-pkg-info)
("emacs-queue" ,emacs-queue)))
(home-page "https://cider.readthedocs.io/")
(home-page "https://cider.mx/")
(synopsis "Clojure development environment for Emacs")
(description
"CIDER (Clojure Interactive Development Environment that Rocks) aims to
@ -9134,7 +9158,7 @@ to the home page or read the comments in the source file,
(define-public emacs-htmlize
(package
(name "emacs-htmlize")
(version "1.53")
(version "1.55")
(source
(origin
(method git-fetch)
@ -9143,7 +9167,7 @@ to the home page or read the comments in the source file,
(commit (string-append "release/" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0dr235c0z8is3pi5xdgqyqljg6px0b2aya6qb79zkyi477bmz4ip"))))
(base32 "0gi3xshscpa53qrj8yplfsqahcilc2ybcc2p7gnh5nbnf2n1n97x"))))
(build-system emacs-build-system)
(home-page "https://github.com/hniksic/emacs-htmlize")
(synopsis "Convert buffer text and decorations to HTML")
@ -19783,38 +19807,47 @@ contrast and few colors.")
(license license:gpl3+))))
(define-public emacs-doom-themes
(package
(name "emacs-doom-themes")
(version "2.1.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hlissner/emacs-doom-themes.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "042pzcdhxi2z07jcscgjbaki9nrrm0cbgbbrnymd1r4q8ckkn8l9"))))
(build-system emacs-build-system)
(native-inputs
`(("emacs-ert-runner" ,emacs-ert-runner)))
(arguments
`(#:tests? #t
#:test-command '("ert-runner")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'move-themes
(lambda _
;; Move the source files to the top level, which is in the
;; EMACSLOADPATH.
(for-each (lambda (f)
(rename-file f (basename f)))
(find-files "./themes" ".*\\.el$"))
#t)))))
(synopsis "Wide collection of color themes for Emacs")
(description "Emacs-doom-themes contains numerous popular color themes for
(let ((commit "088bfad9a6983c42016da33cd11b9ee855451dcb")
(revision "2")
(version "2.1.6"))
(package
(name "emacs-doom-themes")
(version (git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hlissner/emacs-doom-themes.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1dmq0vja1k907id56y4012cm3f49vf106v3gglk9sf4kbi9cash2"))))
(build-system emacs-build-system)
(native-inputs
`(("emacs-ert-runner" ,emacs-ert-runner)))
(arguments
`(#:tests? #t
#:test-command '("ert-runner")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'move-themes
(lambda _
;; Move the source files to the top level, which is in the
;; EMACSLOADPATH.
(for-each (lambda (f)
(rename-file f (basename f)))
(find-files "./themes" ".*\\.el$"))
#t))
;; XXX: There is a byte-code overflow issue in the latest
;; checkout which affects byte-compilation for several theme
;; files. The easiest way to work around this is to disable
;; byte-compilation until the issue is resolved.
;; <https://github.com/hlissner/emacs-doom-themes/issues/314>
(delete 'build))))
(synopsis "Wide collection of color themes for Emacs")
(description "Emacs-doom-themes contains numerous popular color themes for
Emacs that integrate with major modes like Org-mode.")
(home-page "https://github.com/hlissner/emacs-doom-themes")
(license license:expat)))
(home-page "https://github.com/hlissner/emacs-doom-themes")
(license license:expat))))
(define-public emacs-modus-themes
(package
@ -20048,34 +20081,35 @@ Google guidelines.")
(license license:gpl3+))))
(define-public emacs-helm-fish-completion
(let ((commit "ef764dd123040fe67ef8b62a1c13842e940b0963")
(revision "1"))
(package
(name "emacs-helm-fish-completion")
(version (git-version "0.1" revision commit))
(home-page "https://github.com/emacs-helm/helm-fish-completion")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0k80kpapwfq2rv1lb0r994d0w6czl92xrmnkmrg0a05f4b3q0lb4"))))
(build-system emacs-build-system)
(propagated-inputs
`(("helm" ,emacs-helm)
("fish-completion" ,emacs-fish-completion)))
(synopsis "Helm interface for Emacs fish-completion")
(description "Helm Fish Completion is a Helm interface for Emacs
(package
(name "emacs-helm-fish-completion")
(version "0.2")
(home-page "https://github.com/emacs-helm/helm-fish-completion")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "089gp2k22xwn33z8brpyb7r18vpyralq2cwxj1xsc8b2sj9s4896"))))
(build-system emacs-build-system)
(propagated-inputs
`(("helm" ,emacs-helm)
("fish-completion" ,emacs-fish-completion)))
(synopsis "Helm interface for Emacs fish-completion")
(description "Helm Fish Completion is a Helm interface for Emacs
fish-completion. It can be used in both Eshell and M-x shell.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public emacs-telega
;; This package has versions newer than indicated on MELPA.
;; Get the current version from `telega-version` in telega.el.
;; or by running M-x telega-version.
(let ((commit "6184e76990db395bea02f7b5d3169e746111e1ad")
(revision "2")
(version "0.5.2"))
(revision "1")
(version "0.5.3"))
(package
(name "emacs-telega")
(version (git-version version revision commit))
@ -20113,10 +20147,24 @@ fish-completion. It can be used in both Eshell and M-x shell.")
(("python3 run_tests.py")
""))
#t))
;; Modify telega-util to reflect unique dir name in
;; `telega-install-data' phase.
(add-after 'unpack 'telega-data-patch
(lambda _
(add-after 'unpack 'telega-paths-patch
(lambda* (#:key inputs #:allow-other-keys)
;; Hard-code paths to `ffplay` and `ffmpeg`.
(let ((ffplay-bin (string-append (assoc-ref inputs "ffmpeg")
"/bin/ffplay"))
(ffmpeg-bin (string-append (assoc-ref inputs "ffmpeg")
"/bin/ffmpeg")))
(substitute* "telega-ffplay.el"
(("\\(executable-find \"ffplay\"\\)")
(string-append
"(and (file-executable-p \"" ffplay-bin "\")"
"\"" ffplay-bin "\")"))
(("\\(executable-find \"ffmpeg\"\\)")
(string-append
"(and (file-executable-p \"" ffmpeg-bin "\")"
"\"" ffmpeg-bin "\")"))))
;; Modify telega-util to reflect unique dir name in
;; `telega-install-data' phase.
(substitute* "telega-util.el"
(("\\(concat \"etc/\" filename\\) telega--lib-directory")
"(concat \"telega-data/\" filename)
@ -20149,7 +20197,6 @@ fish-completion. It can be used in both Eshell and M-x shell.")
(invoke "python3" "server/run_tests.py")
#t))
(delete 'configure)
;; Build emacs-side using `emacs-build-system'
(add-after 'compress-documentation 'emacs-add-source-to-load-path
(assoc-ref emacs:%standard-phases 'add-source-to-load-path))
@ -20168,9 +20215,10 @@ fish-completion. It can be used in both Eshell and M-x shell.")
(assoc-ref emacs:%standard-phases 'build))
(add-after 'emacs-build 'emacs-make-autoloads
(assoc-ref emacs:%standard-phases 'make-autoloads)))))
(inputs
`(("ffmpeg" ,ffmpeg))) ; mp4/gif support.
(propagated-inputs
`(("emacs-visual-fill-column" ,emacs-visual-fill-column)
("ffmpeg" ,ffmpeg) ; mp4/gif support.
("libwebp" ,libwebp))) ; sticker support.
(native-inputs
`(("tdlib" ,tdlib)
@ -20186,7 +20234,7 @@ Telegram messaging platform.")
(define-public emacs-doom-modeline
(package
(name "emacs-doom-modeline")
(version "2.8.0")
(version "2.8.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -20194,7 +20242,7 @@ Telegram messaging platform.")
(commit (string-append "v" version))))
(sha256
(base32
"12zksk0rwpgpdc00km3z0hmc8wm1j1r8lbwn4kivniw56mgy0n22"))
"11srz1mr821axggs2jcmdhihxx09a2dniqv3n039wbdfaimfaidz"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(arguments
@ -20499,3 +20547,73 @@ on removable volumes in Linux.")
data, including buffers, window configuration, variables, and more.")
(home-page "https://github.com/thierryvolpiatto/psession")
(license license:gpl3+))))
(define-public emacs-parseedn
(package
(name "emacs-parseedn")
(version "0.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/clojure-emacs/parseedn.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"11wi3hwcgmy54p6ivpijqm7v0hj6j75a19qk5z779bqfrp79b4pc"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-a" ,emacs-a)
("emacs-parseclj" ,emacs-parseclj)))
(home-page "https://cider.mx")
(synopsis "EDN parser for Emacs Lisp")
(description
"An Emacs Lisp library for parsing EDN (Clojure) data.
It uses parseclj's shift-reduce parser internally.")
(license license:gpl3+)))
(define-public emacs-parseclj
(package
(name "emacs-parseclj")
(version "0.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/clojure-emacs/parseclj.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"03bm5dm4hmkqimv4wqxjjh5814pxysmm7z54bv2rf7zwv1x7dggr"))))
(build-system emacs-build-system)
(propagated-inputs `(("emacs-a" ,emacs-a)))
(home-page "https://cider.mx")
(synopsis "Clojure parser for Emacs Lisp")
(description
"An Emacs Lisp library for parsing Clojure code and EDN data.
It supports several input and output formats, all powered by the
same shift-reduce parser function.")
(license license:gpl3+)))
(define-public emacs-hide-mode-line
(package
(name "emacs-hide-mode-line")
(version "1.0.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hlissner/emacs-hide-mode-line.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0dfzjgxfkcw4wisbyldsm1km18pfp9j8xgadn6qnsz11l55bpgyp"))))
(build-system emacs-build-system)
(synopsis "Emacs plugin that hides the mode-line")
(description "A minor mode that hides the mode-line in your current
buffer. It can be used to toggle an alternative mode-line, toggle its visibility,
or simply disable the mode-line in buffers where it is not very useful.")
(home-page "https://github.com/hlissner/emacs-hide-mode-line")
(license license:expat)))

View File

@ -445,28 +445,31 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
(package
(inherit electrum)
(name "electron-cash")
(version "4.0.10")
(version "4.0.12")
(source
(origin
(method url-fetch)
(uri (string-append "https://electroncash.org/downloads/"
version
"/win-linux/Electron-Cash-"
version
".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/Electron-Cash/Electron-Cash.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1rcywlma6hk52ymisx536jvkdwa73rhn1jxhsbs4wbvajl90w9s8"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete the bundled dependencies.
(delete-file-recursively "packages")
#t))))
"0gidrx8499v7rig7ljhd70wssshs1qm0gp1553g70i323hcbf62x"))))
(inputs
`(,@(package-inputs electrum)
("libsecp256k1", libsecp256k1)
("python-dateutil", python-dateutil)
("python-dnspython", python-dnspython)))
(arguments
(substitute-keyword-arguments (package-arguments electrum)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'use-libsecp256k1-input
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "lib/secp256k1.py"
(("library_paths = .* 'libsecp256k1.so.0'.")
(string-append "library_paths = ('" (assoc-ref inputs "libsecp256k1") "/lib/libsecp256k1.so.0'")))))))))
(home-page "https://electroncash.org/")
(synopsis "Bitcoin Cash wallet")
(description

View File

@ -16,6 +16,7 @@
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Leo Prikler <leo.prikler@student.tugraz.at>
;;; Copyright © 2019 Jethro Cao <jethrocao@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -653,6 +654,37 @@ programming language.")
(home-page "https://love2d.org/")
(license license:zlib)))
(define-public love-nuklear
(let ((version "v2.6")
(commit "fef4e00a602efb16c57ae962850b6e7a01f7a29a"))
(package
(name "love-nuklear")
(version (git-version version "1" commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/keharriso/love-nuklear/")
(commit commit)
(recursive? #t)))
;; NOTE: the HEAD of the Nuklear git-submodule is at commit
;; "adc52d710fe3c87194b99f540c53e82eb75c2521" of Oct 1 2019
(file-name (git-file-name name version))
(sha256
(base32
"15qmy8mfwkxy2x9rmxs6f9cyvjvwwj6yf78bs863xmc56dmjzzbn"))))
(build-system cmake-build-system)
(arguments
`(#:build-type "Release"
#:tests? #f))
(inputs
`(("luajit" ,luajit)))
(synopsis "Lightweight immediate mode GUI for LÖVE games")
(description "LÖVE is a Lua framework for making 2D games. Nuklear
is a minimal state immediate mode graphical user interface toolkit. This
package is the Nuklear bindings for LÖVE created by Kevin Harrison.")
(home-page "https://github.com/keharriso/love-nuklear/")
(license license:expat))))
(define-public allegro-4
(package
(name "allegro")

View File

@ -502,6 +502,45 @@ cows can think too: all you have to do is run @command{cowthink}. If you're
tired of cows, a variety of other ASCII-art messengers are available.")
(license license:gpl3+)))
(define-public lolcat
(let ((commit "35dca3d0a381496d7195cd78f5b24aa7b62f2154")
(revision "0"))
(package
(name "lolcat")
(version (git-version "1.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jaseg/lolcat.git")
(commit commit)))
(sha256
(base32
"0jjbkqcc2ikjxd1xgdyv4rb0vsw218181h89f2ywg29ffs3ypd8g"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;; no check target
#:make-flags (list "CC=gcc")
#:phases
(modify-phases %standard-phases
(delete 'bootstrap)
(delete 'configure)
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(dest (string-append out "/bin")))
(mkdir-p dest)
(install-file "lolcat" dest)
(install-file "censor" dest)
#t))))))
(home-page "https://github.com/jaseg/lolcat")
(synopsis "Rainbow coloring effect for text console display")
(description "@command{lolcat} concatenates files and streams like
regular @command{cat}, but it also adds terminal escape codes between
characters and lines resulting in a rainbow effect.")
(license license:wtfpl2))))
(define-public freedoom
(package
(name "freedoom")

View File

@ -649,32 +649,39 @@ as the 'native-search-paths' field."
(files '("lib" "lib64")))))
(define-public gfortran-4.8
(custom-gcc gcc-4.8 "gfortran" '("fortran")
%generic-search-paths))
(hidden-package
(custom-gcc gcc-4.8 "gfortran" '("fortran")
%generic-search-paths)))
(define-public gfortran-4.9
(custom-gcc gcc-4.9 "gfortran" '("fortran")
%generic-search-paths))
(hidden-package
(custom-gcc gcc-4.9 "gfortran" '("fortran")
%generic-search-paths)))
(define-public gfortran-5
(custom-gcc gcc-5 "gfortran" '("fortran")
%generic-search-paths))
(hidden-package
(custom-gcc gcc-5 "gfortran" '("fortran")
%generic-search-paths)))
(define-public gfortran-6
(custom-gcc gcc-6 "gfortran" '("fortran")
%generic-search-paths))
(hidden-package
(custom-gcc gcc-6 "gfortran" '("fortran")
%generic-search-paths)))
(define-public gfortran-7
(custom-gcc gcc-7 "gfortran" '("fortran")
%generic-search-paths))
(hidden-package
(custom-gcc gcc-7 "gfortran" '("fortran")
%generic-search-paths)))
(define-public gfortran-8
(custom-gcc gcc-8 "gfortran" '("fortran")
%generic-search-paths))
(hidden-package
(custom-gcc gcc-8 "gfortran" '("fortran")
%generic-search-paths)))
(define-public gfortran-9
(custom-gcc gcc-9 "gfortran" '("fortran")
%generic-search-paths))
(hidden-package
(custom-gcc gcc-9 "gfortran" '("fortran")
%generic-search-paths)))
(define-public gfortran
;; Note: Update this when GCC changes! We cannot use

View File

@ -1081,7 +1081,7 @@ an independent project by the JOSM team.")
(define-public josm
(package
(name "josm")
(version "15492")
(version "15553")
(source (origin
(method svn-fetch)
(uri (svn-reference
@ -1090,7 +1090,7 @@ an independent project by the JOSM team.")
(recursive? #f)))
(sha256
(base32
"12xkwcv77as30a61w1c8a0i2b0kiiks71d487gbdfv7azlj4vqia"))
"091pbcn4fnmk42fmxplhis3nw5dbljf6ws8acyhx5dflyn49xzmx"))
(file-name (string-append name "-" version "-checkout"))
(modules '((guix build utils)))
(snippet

View File

@ -213,3 +213,37 @@ It uses ES6 syntax and claims to be more actively maintained than others.")
dark elements. It supports GNOME, Unity, Xfce, and Openbox.")
(home-page "https://numixproject.github.io")
(license license:gpl3+)))
(define-public papirus-icon-theme
(let ((version "0.0.0") ;; The package does not use semver
(revision "0")
(tag "20191201"))
(package
(name "papirus-icon-theme")
(version (git-version version revision tag))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme.git")
(commit tag)))
(sha256
(base32
"0lnz1kmz28xh1f4slbsx7ycji5hgszyiyprbf5w5fbjhvi5gzw1h"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'bootstrap)
(delete 'configure)
(delete 'build))))
(native-inputs
`(("gtk+:bin" ,gtk+ "bin")))
(home-page "https://git.io/papirus-icon-theme")
(synopsis "Fork of Paper icon theme with a lot of new icons and a few extras")
(description "Papirus is a fork of the icon theme Paper with a lot of new icons
and a few extra features.")
(license license:gpl3))))

View File

@ -193,9 +193,9 @@
(version "3.12.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(uri (string-append "mirror://gnome/sources/brasero/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
"brasero-" version ".tar.xz"))
(sha256
(base32
"0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8"))))
@ -219,6 +219,7 @@
`(("hicolor-icon-theme" ,hicolor-icon-theme)))
(native-inputs
`(("intltool" ,intltool)
("itstool" ,itstool)
("glib" ,glib "bin") ; glib-compile-schemas, etc.
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)))
@ -229,14 +230,13 @@
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gtk+" ,gtk+)
("itstool" ,itstool)
("libcanberra" ,libcanberra)
("libice" ,libice)
("libnotify" ,libnotify)
("libsm" ,libsm)
("libxml2" ,libxml2)
("totem-pl-parser" ,totem-pl-parser)))
(home-page "https://projects.gnome.org/brasero/")
(home-page "https://wiki.gnome.org/Apps/Brasero")
(synopsis "CD/DVD burning tool for Gnome")
(description "Brasero is an application to burn CD/DVD for the Gnome
Desktop. It is designed to be as simple as possible and has some unique
@ -328,39 +328,40 @@ either on a local, or remote machine via a number of methods.")
(let ((commit "fbc306168edab63db80b904956117cbbdc514ee4"))
(package
(name "dia")
(version (string-append "0.97.2-" (string-take commit 7)))
(version (git-version "0.97.3" "1" commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.gnome.org/browse/dia")
(url "https://gitlab.gnome.org/GNOME/dia.git/")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(file-name (git-file-name name version))
(sha256
(base32
"1b4bba0k8ph4cwgw8xjglss0p6n111bpd5app67lrq79mp0ad06l"))))
(build-system gnu-build-system)
(inputs
`(("glib" ,glib "bin")
("pango" ,pango)
`(("freetype" ,freetype)
("gdk-pixbuf" ,gdk-pixbuf)
("gtk+" ,gtk+-2)
("libart-lgpl" ,libart-lgpl)
("libxml2" ,libxml2)
("freetype" ,freetype)
("libart-lgpl" ,libart-lgpl)))
("pango" ,pango)))
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)
`(("autoconf" ,autoconf)
("automake" ,automake)
("autoconf" ,autoconf)
("intltool" ,intltool)
("glib" ,glib "bin")
("libtool" ,libtool)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'run-autogen
(add-before 'bootstrap 'dont-configure-during-bootstrap
(lambda _
(system* "sh" "autogen.sh"))))))
(setenv "NOCONFIGURE" "true")
#t)))))
(home-page "https://wiki.gnome.org/Apps/Dia")
(synopsis "Diagram creation for GNOME")
(description "Dia can be used to draw different types of diagrams, and
@ -1779,10 +1780,9 @@ library.")
(version "0.8.14")
(source (origin
(method url-fetch)
(uri (let ((upstream-name "libIDL"))
(string-append "mirror://gnome/sources/" upstream-name "/"
(version-major+minor version) "/"
upstream-name "-" version ".tar.bz2")))
(uri (string-append "mirror://gnome/sources/libIDL/"
(version-major+minor version) "/"
"libIDL-" version ".tar.bz2"))
(sha256
(base32
"08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5"))))
@ -1799,6 +1799,7 @@ Definition Language (idl) files, which is a specification for defining
portable interfaces. libidl was initially written for orbit (the orb from the
GNOME project, and the primary means of libidl distribution). However, the
functionality was designed to be as reusable and portable as possible.")
(properties `((upstream-name . "libIDL")))
(license license:lgpl2.0+)))
@ -5092,32 +5093,38 @@ metadata in photo and video files of various formats.")
"1m9i8r4gyd2hzlxjjwfyck4kz7gdg2vz2k6l6d0ga9hdfq2l4p9l"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t))
'(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
(lambda _
(substitute* "build-aux/meson/postinstall.py"
(("gtk-update-icon-cache") (which "true"))
(("update-desktop-database") (which "true")))
#t)))))
(propagated-inputs
`(("dconf" ,dconf)))
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
("gettext" ,gettext-minimal)
("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("itstool" ,itstool)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(inputs
`(("glib:bin" ,glib "bin")
("gstreamer" ,gstreamer)
`(("gcr" ,gcr)
("gexiv2" ,gexiv2)
("gst-plugins-base" ,gst-plugins-base)
("gstreamer" ,gstreamer)
("json-glib" ,json-glib)
("libgdata" ,libgdata)
("libgee" ,libgee)
("gexiv2" ,gexiv2)
("libgphoto2" ,libgphoto2)
("libgudev" ,libgudev)
("libraw" ,libraw)
("json-glib" ,json-glib)
("webkitgtk" ,webkitgtk)
("sqlite" ,sqlite)
("libsoup" ,libsoup)
("libxml2" ,libxml2)
("libgudev" ,libgudev)
("libgphoto2" ,libgphoto2)
("gcr" ,gcr)))
("sqlite" ,sqlite)
("webkitgtk" ,webkitgtk)))
(home-page "https://wiki.gnome.org/Apps/Shotwell")
(synopsis "Photo manager for GNOME 3")
(description

View File

@ -149,14 +149,14 @@ tool to extract metadata from a file and print the results.")
(define-public libmicrohttpd
(package
(name "libmicrohttpd")
(version "0.9.68")
(version "0.9.69")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
version ".tar.gz"))
(sha256
(base32
"0q8bc4hrxn6llml7w2vam6n833x8injs39wgdkhwkawr50m6wwf5"))))
"0zp34zgcahym5kp2r83gfb5wnr8yf643a26k6zk96x3qica6p6zv"))))
(build-system gnu-build-system)
(inputs
`(("curl" ,curl)

View File

@ -456,7 +456,7 @@ gpgpme starting with version 1.7.")
(define-public guile-gcrypt
(package
(name "guile-gcrypt")
(version "0.2.0")
(version "0.2.1")
(home-page "https://notabug.org/cwebber/guile-gcrypt")
(source (origin
(method git-fetch)
@ -465,7 +465,7 @@ gpgpme starting with version 1.7.")
(commit (string-append "v" version))))
(sha256
(base32
"1mhc5m4xygkfj7x18f8apiqpfdn9mrql0am5sk13cf5xn8x1r63z"))
"0n232iyayc46f7hywmjw0jr7pbmmz5h4b04jskhkzz9gxz0ci99c"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(native-inputs

View File

@ -165,14 +165,14 @@ model.")
(define-public r-rgraphviz
(package
(name "r-rgraphviz")
(version "2.28.0")
(version "2.30.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "Rgraphviz" version))
(sha256
(base32
"0nivz8fshaqig6ynjqbya2gmxsy4hm7jnd8fhb853z5g0ydp7g0c"))))
"00lrkbgbb4payybckcmazsv8skysgdlglyqbl7yjb37vv3gnfc6c"))))
(properties `((upstream-name . "Rgraphviz")))
(build-system r-build-system)
;; FIXME: Rgraphviz bundles the sources of an older variant of

View File

@ -2002,59 +2002,67 @@ The picture values can directly be displayed in Geiser.")
(license license:lgpl3+))))
(define-public guile-studio
(let ((commit "98fbbbd08de396cd8a0e45f2a4badf1c733a5772")
(revision "3"))
(package
(name "guile-studio")
(version (git-version "0.0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.elephly.net/software/guile-studio.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0rxl5gv2mavycwkl33lcwyb3z71j2f4zyzk60k7vl3hzszpr08iq"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; there are none
#:make-flags
(list (string-append "ICONS_DIR="
(assoc-ref %build-inputs "adwaita-icon-theme")
"/share/icons/Adwaita/")
(string-append "PICT_DIR="
(assoc-ref %build-inputs "guile-picture-language"))
(string-append "EMACS_DIR="
(assoc-ref %build-inputs "emacs"))
(string-append "GUILE_DIR="
(assoc-ref %build-inputs "guile"))
(string-join (cons "INPUTS=" (map cdr %build-inputs)))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'install))))
(inputs
`(("guile" ,guile-2.2)
("guile-picture-language" ,guile-picture-language)
("emacs" ,emacs)
("emacs-geiser" ,emacs-geiser)
("emacs-company" ,emacs-company)
("emacs-flycheck" ,emacs-flycheck)
("emacs-smart-mode-line" ,emacs-smart-mode-line)
("emacs-paren-face" ,emacs-paren-face)
("adwaita-icon-theme" ,adwaita-icon-theme)))
(native-inputs
`(("texinfo" ,texinfo)))
(home-page "https://gnu.org/software/guile")
(synopsis "IDE for Guile")
(description
"This is Emacs with a few settings that make working with Guile easier
(package
(name "guile-studio")
(version "0.0.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.elephly.net/software/guile-studio.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"10ls4ra148hd9ra7sin4kh9vv0am5pwk48p7dsjhrlg2l1hsh4hi"))))
(build-system gnu-build-system)
(arguments
`(#:modules
((ice-9 match)
(srfi srfi-1)
,@%gnu-build-system-modules)
#:tests? #f ; there are none
#:make-flags
(list (string-append "ICONS_DIR="
(assoc-ref %build-inputs "adwaita-icon-theme")
"/share/icons/Adwaita/")
(string-append "PICT_DIR="
(assoc-ref %build-inputs "guile-picture-language"))
(string-append "EMACS_DIR="
(assoc-ref %build-inputs "emacs"))
(string-append "GUILE_DIR="
(assoc-ref %build-inputs "guile"))
(string-join (cons "INPUTS="
(filter-map
(lambda (input)
(match input
((label . pkg)
(and (string-prefix? "emacs" label) pkg))))
%build-inputs)))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'install))))
(inputs
`(("guile" ,guile-2.2)
("guile-picture-language" ,guile-picture-language)
("emacs" ,emacs)
("emacs-geiser" ,emacs-geiser)
("emacs-company" ,emacs-company)
("emacs-flycheck" ,emacs-flycheck)
("emacs-smart-mode-line" ,emacs-smart-mode-line)
("emacs-paren-face" ,emacs-paren-face)
("adwaita-icon-theme" ,adwaita-icon-theme)))
(native-inputs
`(("texinfo" ,texinfo)))
(home-page "https://gnu.org/software/guile")
(synopsis "IDE for Guile")
(description
"This is Emacs with a few settings that make working with Guile easier
for people new to Emacs. Features include: CUA mode, Geiser, tool bar icons
to evaluate Guile buffers, support for Guile's very own picture language, code
completion, a simple mode line, etc.")
(license license:gpl3+))))
(license license:gpl3+)))
(define-public guile-stis-parser
(let ((commit "6e85d37ffc333b722f4413a6c648263701eb75bd")

View File

@ -288,14 +288,14 @@ without requiring the source code to be rewritten.")
(package
(inherit guile-2.2)
(name "guile-next")
(version "2.9.6")
(version "2.9.7")
(source (origin
(inherit (package-source guile-2.2))
(uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-"
version ".tar.xz"))
(sha256
(base32
"09rihg5bhzhdk6hfkpav6ajny69dflabgvnm8r7lran723gy5vbf"))))
"1dskpj8a2gl3h8si4virq8z4y06v9ywyadfa92gn2fiip2qmkw0d"))))
(native-search-paths
(list (search-path-specification
(variable "GUILE_LOAD_PATH")

View File

@ -852,7 +852,7 @@ compose, and analyze GIF images.")
(define-public imlib2
(package
(name "imlib2")
(version "1.6.0")
(version "1.6.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -860,7 +860,7 @@ compose, and analyze GIF images.")
"/imlib2-" version ".tar.bz2"))
(sha256
(base32
"07b9v3ycwhici35fnczvpyjpgkc7gbcdhajpl9dwhpzdzbfl1i6g"))))
"0v8n3dswx7rxqfd0q03xwc7j2w1mv8lv18rdxv487a1xw5vklfad"))))
(build-system gnu-build-system)
(native-inputs
`(("pkgconfig" ,pkg-config)))

View File

@ -1,3 +1,4 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
@ -11478,7 +11479,7 @@ network protocols, and core version control algorithms.")
(define-public abcl
(package
(name "abcl")
(version "1.5.0")
(version "1.6.0")
(source
(origin
(method url-fetch)
@ -11486,7 +11487,7 @@ network protocols, and core version control algorithms.")
version "/abcl-src-" version ".tar.gz"))
(sha256
(base32
"1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj"))
"0hvbcsffr8n2xwdixc8wyw1bfl9fxn2gyy0c4nma7j9zbn0wwgw9"))
(patches
(search-patches
"abcl-fix-build-xml.patch"))))
@ -11680,7 +11681,9 @@ IPTC, XMP, ICC and more formats.")
"1zv3kjdkf6iqf02x6ln76254y634j2ji448y706a65lsbfjmmicf"))
(modules '((guix build utils)))
(snippet
`(for-each delete-file (find-files "." ".*.jar")))
'(begin
(for-each delete-file (find-files "." ".*.jar"))
#t))
(patches
(search-patches "java-svg-salamander-Fix-non-det.patch"))))
(build-system ant-build-system)

View File

@ -929,7 +929,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(define-public libreoffice
(package
(name "libreoffice")
(version "6.3.3.2")
(version "6.3.4.2")
(source
(origin
(method url-fetch)
@ -939,7 +939,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256
(base32
"1kz5950vhjc33rx7pyl5sw9lxxm90hxrj7v8y86jy34skjrfa3nl"))
"1774vmf3lr5x24ikpn1z5vqcdwrhiwfkjy7sx09jqkvpm6d5awnb"))
(patches (search-patches "libreoffice-icu.patch"
"libreoffice-glm.patch"))
(modules '((guix build utils)))

View File

@ -188,31 +188,31 @@ defconfig. Return the appropriate make target if applicable, otherwise return
(define deblob-scripts-5.3
(linux-libre-deblob-scripts
"5.3.11"
"5.3.17"
(base32 "15n09zq38d69y1wl28s3nasf3377qp2yil5b887zpqrm00dif7i4")
(base32 "1xk3gzgnl9m29avka32zkggl36sdxyvps40hr12hjy42l1ysfshm")))
(define deblob-scripts-4.19
(linux-libre-deblob-scripts
"4.19.84"
"4.19.90"
(base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy")
(base32 "1s89hmy4ihd65by2p1xxkxj476f6c9s5g9r9yvqncb50xlhilk50")))
(base32 "0xpcl6pd1280gm81bivz45dfhy6v16j0hghxhjynmcbasgnx8vpd")))
(define deblob-scripts-4.14
(linux-libre-deblob-scripts
"4.14.154"
"4.14.159"
(base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6")
(base32 "1pcsfzpcv3bs30iyhwpk1x64r0gyv7wi22spnq6avzj1ayva10kw")))
(base32 "0yd0c3qxk5rm686j4kd5v4zppjj3k9ivqnv46z4p3xh1gqmhv7cz")))
(define deblob-scripts-4.9
(linux-libre-deblob-scripts
"4.9.201"
"4.9.206"
(base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg")
(base32 "0is8gn4qdd7h5l6lacvhqdch26lmrbgxfm8ab7fx8n85ha7y358w")))
(define deblob-scripts-4.4
(linux-libre-deblob-scripts
"4.4.201"
"4.4.206"
(base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw")
(base32 "12ac4g3ky8yma8sylmxvvysqvd4hnaqjiwmxrxb6wlxggfd7zkbx")))
@ -356,26 +356,26 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
"linux-" version ".tar.xz"))
(sha256 hash)))
(define-public linux-libre-5.3-version "5.3.15")
(define-public linux-libre-5.3-version "5.3.18")
(define-public linux-libre-5.3-pristine-source
(let ((version linux-libre-5.3-version)
(hash (base32 "15qidl06lyfylx1b43b4wz2zfkr4000bkr7ialslmb7yi7mamj6f")))
(hash (base32 "133342nv9ddjad2rizmcbilg9rhg339sfqr9l77j4cgkqhblkw90")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.3)))
(define-public linux-libre-4.19-version "4.19.88")
(define-public linux-libre-4.19-version "4.19.90")
(define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version)
(hash (base32 "1gizkdmq46ykw7ya3hibd6lalww2kvsia346pq3xvrk6s5mkp4n1")))
(hash (base32 "1zgpbim9019aymvgh0fr5g2r9j2xspw14amlnk09w5mgdl56rn19")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.158")
(define-public linux-libre-4.14-version "4.14.159")
(define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version)
(hash (base32 "1cqvr8pgqx005a9qyphqykakzwc54adq8mmdc9sgrxkkw9rfqj8d")))
(hash (base32 "1wi6m3w40z0v9krb12g9q09s9y471r51rhcv3qa81lc53cx2vm78")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-4.14)))
@ -1078,6 +1078,13 @@ at login. Local and dynamic reconfiguration are its key features.")
(sha256
(base32 "16i7qzjmm6g0lzha8yzpfrlcxnvkgh95hkq9gdjd4zmzb8d0wxa1"))))
(build-system gnu-build-system)
(arguments
`(,@(if (%current-target-system)
'(#:configure-flags
(list
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes"))
'())))
(inputs `(("ncurses" ,ncurses)))
(home-page "https://gitlab.com/psmisc/psmisc")
(synopsis "Small utilities that use the proc file system")
@ -2075,8 +2082,18 @@ configuration and monitoring interfaces.")
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("libnl" ,libnl)))
(arguments
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc")
`(#:make-flags
(let* ((target ,(%current-target-system))
(gcc (if target (string-append target "-gcc") "gcc"))
(pkg-config (if target
(string-append target "-pkg-config")
"pkg-config")))
(list
(string-append "CC=" gcc)
(string-append "PKG_CONFIG="
(assoc-ref %build-inputs "pkg-config")
"/bin/" pkg-config)
(string-append "PREFIX=" (assoc-ref %outputs "out"))))
#:phases (modify-phases %standard-phases (delete 'configure))))
(home-page "https://wireless.wiki.kernel.org/")
(synopsis "Tool for configuring wireless devices")

View File

@ -741,7 +741,7 @@ enough to play the original mainframe Zork all the way through.")
(define-public txr
(package
(name "txr")
(version "224")
(version "229")
(source
(origin
(method git-fetch)
@ -752,7 +752,7 @@ enough to play the original mainframe Zork all the way through.")
(patches (search-patches "txr-shell.patch"))
(sha256
(base32
"1036k71f6mffy9rjwzmhr5nnp1n0wzb0rqvilpzvb8jc5yxv0810"))))
"070lqckhbcq3wn5ajyaa41hh0gypaa48wnxkk6mc5mxvmv76ml46"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("cc=gcc")

View File

@ -925,7 +925,7 @@ extremely large and complex data collections.")
(define-public hdf5-1.10
(package (inherit hdf5)
(version "1.10.4")
(version "1.10.5")
(source
(origin
(method url-fetch)
@ -939,9 +939,8 @@ extremely large and complex data collections.")
(take (string-split version #\.) 2))
"/src/hdf5-" version ".tar.bz2")))
(sha256
(base32 "1pr85fa1sh2ky6ai2hs3f21lp252grl2cq3wbyi4rh7dm83gyrqj"))
(patches (search-patches "hdf5-config-date.patch"
"hdf5-mpi-deprecations.patch"))))))
(base32 "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8"))
(patches (search-patches "hdf5-config-date.patch"))))))
(define-public hdf-java
(package

View File

@ -2185,7 +2185,7 @@ capabilities, custom envelopes, effects, etc.")
(define-public yoshimi
(package
(name "yoshimi")
(version "1.6.0.3")
(version "1.6.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/yoshimi/"
@ -2193,7 +2193,7 @@ capabilities, custom envelopes, effects, etc.")
"/yoshimi-" version ".tar.bz2"))
(sha256
(base32
"1z2mnmm299ng6jcwa61dzr1ilwa5fjgsggxl2wa5smji6b4npmx7"))))
"1shnz429zgl0b4y5bpb61frk1747jwqfahq4hx44c972580zghzh"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are no tests

View File

@ -1,61 +0,0 @@
--- a/src/H5.c
+++ b/src/H5.c
@@ -138,7 +138,7 @@
if (mpi_initialized && !mpi_finalized) {
int key_val;
- if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_NULL_COPY_FN,
+ if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN,
(MPI_Comm_delete_attr_function *)H5_mpi_delete_cb,
&key_val, NULL)))
HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code)
--- hdf5-1.10.4/testpar/t_cache.c
+++ hdf5-1.10.4/testpar/t_cache.c
@@ -1217,20 +1217,20 @@
struct mssg_t sample; /* used to compute displacements */
/* setup the displacements array */
- if ( ( MPI_SUCCESS != MPI_Address(&sample.req, &displs[0]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.src, &displs[1]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.dest, &displs[2]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.mssg_num, &displs[3]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.base_addr, &displs[4]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.len, &displs[5]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.ver, &displs[6]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.count, &displs[7]) ) ||
- ( MPI_SUCCESS != MPI_Address(&sample.magic, &displs[8]) ) ) {
+ if ( ( MPI_SUCCESS != MPI_Get_address(&sample.req, &displs[0]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.src, &displs[1]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.dest, &displs[2]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.mssg_num, &displs[3]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.base_addr, &displs[4]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.len, &displs[5]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.ver, &displs[6]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.count, &displs[7]) ) ||
+ ( MPI_SUCCESS != MPI_Get_address(&sample.magic, &displs[8]) ) ) {
nerrors++;
success = FALSE;
if ( verbose ) {
- HDfprintf(stdout, "%d:%s: MPI_Address() call failed.\n",
+ HDfprintf(stdout, "%d:%s: MPI_Get_address() call failed.\n",
world_mpi_rank, FUNC);
}
@@ -1245,14 +1245,14 @@
if ( success ) {
- result = MPI_Type_struct(9, block_len, displs, mpi_types, &mpi_mssg_t);
+ result = MPI_Type_create_struct(9, block_len, displs, mpi_types, &mpi_mssg_t);
if ( result != MPI_SUCCESS ) {
nerrors++;
success = FALSE;
if ( verbose ) {
- HDfprintf(stdout, "%d:%s: MPI_Type_struct() call failed.\n",
+ HDfprintf(stdout, "%d:%s: MPI_Type_create_struct() call failed.\n",
world_mpi_rank, FUNC);
}
}

View File

@ -361,7 +361,7 @@ photographic equipment.")
(define-public darktable
(package
(name "darktable")
(version "2.6.2")
(version "2.6.3")
(source
(origin
(method url-fetch)
@ -369,27 +369,25 @@ photographic equipment.")
"https://github.com/darktable-org/darktable/releases/"
"download/release-" version "/darktable-" version ".tar.xz"))
(sha256
(base32 "0igvgyd042j7hm4y8fcm6dc1qqjs4d1r7y6f0pzpa0x416xyzfcw"))))
(base32 "1w3q3dhcxa0bs590zbsj61ap8z84wmn04xs5q3gjwisqhjf9j655"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are no tests
#:configure-flags '("-DBINARY_PACKAGE_BUILD=On")
#:make-flags
(list
(string-append "CPATH=" (assoc-ref %build-inputs "ilmbase")
"/include/OpenEXR:" (or (getenv "CPATH") "")))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'set-ldflags
(lambda* (#:key outputs #:allow-other-keys)
(add-before 'configure 'set-LDFLAGS-and-CPATH
(lambda* (#:key inputs outputs #:allow-other-keys)
(setenv "LDFLAGS"
(string-append
"-Wl,-rpath="
(assoc-ref outputs "out") "/lib/darktable"))
;; Ensure the OpenEXR headers are found.
(setenv "CPATH"
(string-append (assoc-ref inputs "ilmbase")
"/include/OpenEXR:" (or (getenv "CPATH") "")))
#t)))))
(native-inputs
`(("llvm" ,llvm-3.9.1)
("clang" ,clang-3.9.1)))
(inputs
`(("libxslt" ,libxslt)
("libxml2" ,libxml2)

View File

@ -232,16 +232,24 @@ Python interface around SSH networking concepts.")
(define-public python-ecdsa
(package
(name "python-ecdsa")
(version "0.13.3")
(version "0.14.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ecdsa" version))
(sha256
(base32 "0k9xxklf865g6x43gkfarwb25ffrkmpvkzkh71rylqx7cjq80g0n"))))
(base32 "13nx5cbfxc0gnax5zwdmp9xc40qd1llk62mv85jyrvqkbw017ik4"))))
(build-system python-build-system)
(inputs
`(("openssl" ,openssl)))
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _ (invoke "pytest"))))))
(propagated-inputs
`(("python-six" ,python-six)))
(native-inputs
`(("openssl" ,openssl)
("python-pytest" ,python-pytest)))
(home-page "https://github.com/warner/python-ecdsa")
(synopsis "ECDSA cryptographic signature library (pure python)")
(description

View File

@ -2532,14 +2532,14 @@ CSS tidy. Also supports URL rewriting in CSS files.")
(define-public python-elasticsearch
(package
(name "python-elasticsearch")
(version "6.1.1")
(version "7.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "elasticsearch" version))
(sha256
(base32
"1kjxl45yvvgfb5fmamx0kfsfg9pzphiqrwbkns3s28r1w7ya74cd"))))
"0rnjvlhw4v3vg14l519qliy1s1zpmx3827q0xfviwvk42rr7hh01"))))
(build-system python-build-system)
(native-inputs
`(("python-mock" ,python-mock)

View File

@ -67,6 +67,7 @@
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2019 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -15889,41 +15890,63 @@ append on old values. Partd excels at shuffling operations.")
(define-public python2-partd
(package-with-python2 python-partd))
(define-public python-fsspec
(package
(name "python-fsspec")
(version "0.6.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "fsspec" version))
(sha256
(base32
"1g9ba8v04s1nrh7pvzfm2md7ivl2mrz3hcq3y9d1a44gd62h17zj"))))
(build-system python-build-system)
(arguments '(#:tests? #f)) ; there are none
(home-page "https://github.com/intake/filesystem_spec")
(synopsis "File-system specification")
(description "The purpose of this package is to produce a template or
specification for a file-system interface, that specific implementations
should follow, so that applications making use of them can rely on a common
behavior and not have to worry about the specific internal implementation
decisions with any given backend.")
(license license:bsd-3)))
(define-public python-dask
(package
(name "python-dask")
(version "1.2.2")
(version "2.9.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "dask" version))
(sha256
(base32 "0b29gvf96gmp20wicly3v3mhyc93zbm3mdv935fka6x0wax7cy2y"))))
(base32 "1w1hqr8vyx6ygwflj2737dcy0mmgvrc0s602gnny8pzlcbs9m76b"))))
(build-system python-build-system)
;; A single test out of 5000+ fails. This test is marked as xfail when
;; pytest-xdist is used.
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-broken-test
(add-after 'unpack 'disable-broken-tests
(lambda _
;; This test is marked as xfail when pytest-xdist is used.
(substitute* "dask/tests/test_threaded.py"
(("def test_interrupt\\(\\)" m)
(string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n"
m)))
(when (which "python2")
;; This test fails with recent Pandas:
;; <https://github.com/dask/dask/issues/3794>.
(substitute* "dask/dataframe/tests/test_dataframe.py"
(("def test_info\\(\\)" m)
(string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n"
m))))
;; This one fails with a type error:
;; TypeError: Already tz-aware, use tz_convert to convert.
(substitute* "dask/dataframe/tests/test_shuffle.py"
(("def test_set_index_timestamp\\(\\)" m)
(string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n"
m)))
#t))
(replace 'check
(lambda _ (invoke "pytest" "-vv"))))))
(propagated-inputs
`(("python-cloudpickle" ,python-cloudpickle)
("python-fsspec" ,python-fsspec)
("python-numpy" ,python-numpy)
("python-packaging" ,python-packaging)
("python-pandas" ,python-pandas)
("python-partd" ,python-partd)
("python-toolz" ,python-toolz)
@ -15942,9 +15965,6 @@ larger-than-memory or distributed environments. These parallel collections
run on top of the dynamic task schedulers. ")
(license license:bsd-3)))
(define-public python2-dask
(package-with-python2 python-dask))
(define-public python-ilinkedlist
(package
(name "python-ilinkedlist")
@ -16786,3 +16806,78 @@ services to what you expect in your tests.")
(define-public python2-ujson
(package-with-python2 python-ujson))
(define-public python-iocapture
;; The latest release is more than a year older than this commit.
(let ((commit "fdc021c431d0840303908dfc3ca8769db383595c")
(revision "1"))
(package
(name "python-iocapture")
(version "0.1.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/oinume/iocapture.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1mkbhqibxvgwg0p7slr8dfraa3g2s6bsayladhax2jccwj4kcndz"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'check)
(add-after 'install 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
(invoke "py.test" "-v" "tests")
#t)))))
(propagated-inputs
`(("python-flexmock" ,python-flexmock)
("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov)
("python-six" ,python-six)))
(home-page "https://github.com/oinume/iocapture")
(synopsis "Python capturing tool for stdout and stderr")
(description
"This package helps you to capture the standard out (stdout) and the
standard error channel (stderr) in your program.")
(license license:expat))))
(define-public python-argh
;; There are 21 commits since the latest release containing important
;; improvements.
(let ((commit "dcd3253f2994400a6a58a700c118c53765bc50a4")
(revision "1"))
(package
(name "python-argh")
(version (git-version "0.26.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/neithere/argh.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1p5h3dnpbsjmqrvil96s71asc6i3gpinmbrabqmwnrsxprz7r3ns"))))
(build-system python-build-system)
(propagated-inputs
`(("python-iocapture" ,python-iocapture)
("python-mock" ,python-mock)
("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov)
("python-pytest-xdist" ,python-pytest-xdist)
("python-tox" ,python-tox)))
(home-page "https://github.com/neithere/argh/")
(synopsis "Argparse wrapper with natural syntax")
(description
"python-argh is a small library that provides several layers of
abstraction on top of @code{python-argparse}. The layers can be mixed. It is
always possible to declare a command with the highest possible (and least
flexible) layer and then tune the behaviour with any of the lower layers
including the native API of @code{python-argparse}.")
(license license:lgpl3+))))

View File

@ -11,6 +11,7 @@
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2019 Meiyo Peng <meiyo.peng@gmail.com>
;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -794,30 +795,22 @@ is commonly written.")
(define-public gash
(package
(name "gash")
(version "0.1")
(version "0.2.0")
(source
(origin (method url-fetch)
(uri (string-append "mirror://savannah/gash/gash-"
version ".tar.gz"))
(sha256
(base32
"00m3lif64zyxd41cnk208kc81nl6qz659676qgiaqgwrw0brzrid"))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "Makefile.in"
(("^moddir = (.*)/guile/(.*)" _ before after)
(string-append "moddir = " before "/guile/site/"
after))
(("^ccachedir = (.*)/ccache/(.*)" _ before after)
(string-append "ccachedir = " before
"/site-ccache/" after)))
#t))))
"13m0yz5h9nj3x40mr6wr5xcpq1lscndfwcicw3skrz801025hhgf"))
(modules '((guix build utils)))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("guile" ,guile-2.2)))
(arguments
'(#:make-flags '("XFAIL_TESTS=tests/redirects.org")))
(home-page "https://savannah.nongnu.org/projects/gash/")
(synopsis "POSIX-compatible shell written in Guile Scheme")
(description "Gash is a POSIX-compatible shell written in Guile

View File

@ -11,6 +11,7 @@
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Alexandros Theodotou <alex@zrythm.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -565,3 +566,26 @@ and several other projects.")
(description "This package is an extension to reStructuredText and Sphinx
to be able to read and render the Doxygen xml output.")
(license license:bsd-3)))
(define-public python-sphinx-intl
(package
(name "python-sphinx-intl")
(version "2.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "sphinx-intl" version))
(sha256
(base32
"0zbf1bh23b3kza8bnjykmv2k21xmmr4gamhi3lnicnr6ypnrphr5"))))
(build-system python-build-system)
(propagated-inputs
`(("python-sphinx" ,python-sphinx)
("python-click" ,python-click)))
(home-page "https://github.com/sphinx-doc/sphinx-intl")
(synopsis
"Sphinx utility that makes it easy to translate and to apply translation")
(description
"A utility tool that provides several features that make it easy to
translate and to apply translation to Sphinx generated document.")
(license license:bsd-2)))

View File

@ -590,13 +590,13 @@ and operations on them using LAPACK and SuiteSparse.")
(define-public r-nlme
(package
(name "r-nlme")
(version "3.1-142")
(version "3.1-143")
(source
(origin
(method url-fetch)
(uri (cran-uri "nlme" version))
(sha256
(base32 "0figfb1i22hfkkhzpprmpp723s01r43x725a1ab0pc9gsxqg90nx"))))
(base32 "13iixbs2ibldc75rl7rav5n5kx33zwm33xnfw1yvlkpcqf38bd22"))))
(build-system r-build-system)
(propagated-inputs
`(("r-lattice" ,r-lattice)))
@ -933,15 +933,15 @@ in which the whole-plots or split-plots or both can be freely exchangeable.")
(define-public r-plyr
(package
(name "r-plyr")
(version "1.8.4")
(version "1.8.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "plyr" version))
(sha256
(base32 "1igar5pcjqh0jyxv0z3jah8rz617vfa86vw0r5c7c031b7bj5db0"))))
(base32 "0x4mbb3rgv1ayxqidw0p9i10khbg51fz5r62vw4il8d7licqq07a"))))
(build-system r-build-system)
(native-inputs `(("r-rcpp" ,r-rcpp)))
(propagated-inputs `(("r-rcpp" ,r-rcpp)))
(home-page "http://had.co.nz/plyr")
(synopsis "Tools for Splitting, Applying and Combining Data")
(description
@ -1240,13 +1240,13 @@ evaluation (NSE) in R.")
(define-public r-dbi
(package
(name "r-dbi")
(version "1.0.0")
(version "1.1.0")
(source (origin
(method url-fetch)
(uri (cran-uri "DBI" version))
(sha256
(base32
"1x8wy2vg2gcgd9bww04qmf0dsn3kp0rfjd8q8j1r2x9zxccg25pz"))))
"1r03j9rdcxb9bhxk40dkmy10ikz4yzsxhy3f9k9ix3x577xbfvd9"))))
(build-system r-build-system)
(home-page "https://github.com/rstats-db/DBI")
(synopsis "R database interface")
@ -1260,13 +1260,13 @@ R/DBMS implementations.")
(define-public r-bh
(package
(name "r-bh")
(version "1.69.0-1")
(version "1.72.0-1")
(source (origin
(method url-fetch)
(uri (cran-uri "BH" version))
(sha256
(base32
"18mckfwxxv8m8rzaz03mg2h6vhaj7y131h6yasfg0s73nxj47zd0"))))
"1cm3gawky0dlfj8awv356j3f5pfv732rz10wlfnix2s2xf5cdz4a"))))
(build-system r-build-system)
(home-page "https://github.com/eddelbuettel/bh")
(synopsis "R package providing subset of Boost headers")
@ -2662,13 +2662,13 @@ certain criterion, e.g., it contains a certain regular file.")
(define-public r-rmarkdown
(package
(name "r-rmarkdown")
(version "1.18")
(version "2.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "rmarkdown" version))
(sha256
(base32 "0fykzbb5kjsqc8v6gjcdma7rmq0gailp30qij6plgna4d8nhjw3w"))))
(base32 "1bm3n17wa0pf1cq7qmwhbnn02x2pld7zzmmzjcvwy6apanch9fl7"))))
(properties `((upstream-name . "rmarkdown")))
(build-system r-build-system)
(propagated-inputs
@ -2972,14 +2972,14 @@ statements.")
(define-public r-segmented
(package
(name "r-segmented")
(version "1.0-0")
(version "1.1-0")
(source
(origin
(method url-fetch)
(uri (cran-uri "segmented" version))
(sha256
(base32
"1igsfkffpa60zn6j45lhw1zgr5pz6rjknv2f3sylnx5l9fdwibgf"))))
"06cxdrqgnpk5fvbam5i7qa4n71wry0yvlj0jpwbxf267mvpx10fh"))))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/segmented")
(synopsis "Regression models with breakpoints estimation")
@ -3013,16 +3013,16 @@ worker processes and collect and return the results on the master.")
(define-public r-sparsem
(package
(name "r-sparsem")
(version "1.77")
(version "1.78")
(source (origin
(method url-fetch)
(uri (cran-uri "SparseM" version))
(sha256
(base32
"0p6ljma2h12cq1xmy0cxb48ih8dhxxbnwkqzvx3cckxf2kprycm9"))))
"0cmlm0lps3daalvp5jzjnjfys388hgkyc8yw0g5r2351h749xdyn"))))
(properties
`((upstream-name . "SparseM")))
(inputs
(native-inputs
`(("gfortran" ,gfortran)))
(build-system r-build-system)
(home-page "http://www.econ.uiuc.edu/~roger/research/sparse/sparse.html")
@ -3207,13 +3207,13 @@ analysis of large sparse or dense matrices.")
(define-public r-glmnet
(package
(name "r-glmnet")
(version "3.0-1")
(version "3.0-2")
(source
(origin
(method url-fetch)
(uri (cran-uri "glmnet" version))
(sha256
(base32 "04wa926mnss53p1fhx0mjgxnmwmmqls12sc0sy7w09kbmyqa3fq7"))))
(base32 "0b3nnfzp8dxcdkvxr0yvy6d58yk3xg4kz1wqa42bxqppbakmd2gl"))))
(build-system r-build-system)
(native-inputs
`(("gfortran" ,gfortran)))
@ -4080,14 +4080,14 @@ hierarchical clustering dendrograms.")
(define-public r-preprocesscore
(package
(name "r-preprocesscore")
(version "1.46.0")
(version "1.48.0")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "preprocessCore" version))
(sha256
(base32
"0iiyn42hlvmc5vabg5x15mls11124i23sh4qijwk0narh438cqm0"))))
"0zrb9hx60vppkg0priczdb301nhq5f0dj8lkc8rcc4xrqqr915qm"))))
(properties
`((upstream-name . "preprocessCore")))
(build-system r-build-system)
@ -5107,13 +5107,13 @@ using modular prediction and response module classes.")
(define-public r-quantreg
(package
(name "r-quantreg")
(version "5.52")
(version "5.54")
(source
(origin
(method url-fetch)
(uri (cran-uri "quantreg" version))
(sha256
(base32 "0rq9as31wiz41lmi9hmdq3gknpcbpwqzfcn065ysjdxzjdb57dcy"))))
(base32 "19nh79qrkb75q348nk148l8wqjwnq5jgq29wpzqym5cfv1kjqfvh"))))
(build-system r-build-system)
(native-inputs
`(("gfortran" ,gfortran)))

View File

@ -2,7 +2,8 @@
;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -22,12 +23,17 @@
(define-module (gnu packages texinfo)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl))
#:use-module (gnu packages perl)
#:use-module (gnu packages readline))
(define-public texinfo
(package
@ -181,3 +187,52 @@ of the GNU Texinfo implementation) do not intend to make further releases of
Texi2HTML.")
;; Files in /lib under lgpl2.1+ and x11
(license gpl2+)))
(define-public pinfo
(package
(name "pinfo")
(version "0.6.13")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/baszoetekouw/pinfo.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'remove-Werror
(lambda _
(substitute* "configure.ac"
(("-Werror") ""))
#t))
(add-after 'unpack 'embed-reference-to-clear
(lambda* (#:key inputs #:allow-other-keys)
(substitute* '("src/manual.c"
"src/mainfunction.c"
"src/utils.c")
(("\"clear\"")
(string-append "\"" (which "clear") "\"")))
#t)))))
(inputs
`(("ncurses" ,ncurses)
("readline" ,readline)))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gnu-gettext)
("libtool" ,libtool)
("texinfo" ,texinfo)))
(home-page "https://github.com/baszoetekouw/pinfo")
(synopsis "Lynx-style Info file and man page reader")
(description
"Pinfo is an Info file viewer. Pinfo is similar in use to the Lynx web
browser. You just move across info nodes, and select links, follow them, etc.
It supports many colors. Pinfo also supports viewing of manual pages -- they
are colorized like in the midnight commander's viewer, and additionaly they
are hypertextualized.")
(license gpl2+)))

View File

@ -24,7 +24,7 @@
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@ -3677,3 +3677,42 @@ user interface features a builtin video player and is designed with attention
to convenience of translating and batch processing of multiple documents.")
(home-page "https://otsaloma.io/gaupol/")
(license license:gpl3+)))
(define-public theorafile
(let ((commit "404b14d7602b5918d117eaa64e8aa6601ede8593"))
(package
(name "theorafile")
(version (git-version "0.0.0" "1" commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/FNA-XNA/Theorafile.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "128c3pjzqbgrj020glm5jd6ss18vl19471lj615w2brjwb7c1f0z"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("CC=gcc")
#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'check
(lambda _
(setenv "CC" "gcc")
(invoke "make" "test")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(install-file "libtheorafile.so" (string-append out "/lib"))
(install-file "theorafile.h" (string-append out "/include")))
#t)))))
(native-inputs
;; For tests.
`(("sdl2" ,sdl2)))
(home-page "https://github.com/FNA-XNA/Theorafile")
(synopsis "Ogg Theora Video Decoder Library")
(description "Theorafile is a library for quickly and easily decoding Ogg
Theora videos. Theorafile was written to be used for FNA's VideoPlayer.")
(license license:zlib))))

View File

@ -57,6 +57,7 @@
#:use-module (gnu packages golang)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages ncurses)
@ -690,14 +691,14 @@ domains, their live performance and resource utilization statistics.")
(define-public criu
(package
(name "criu")
(version "3.11")
(version "3.13")
(source (origin
(method url-fetch)
(uri (string-append "http://download.openvz.org/criu/criu-"
version ".tar.bz2"))
(sha256
(base32
"03nimyn3wy5mlw30gq7bvlzvvprqjv8f25240yj5arzlld8mhsw8"))))
"1yn9ix9lqvqvjrs3a3g6g1wqfniyf9n7giy0mr3jvijmrcm7y0pa"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@ -705,7 +706,11 @@ domains, their live performance and resource utilization statistics.")
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "LIBDIR=" (assoc-ref %outputs "out")
"/lib"))
"/lib")
(string-append "ASCIIDOC=" (assoc-ref %build-inputs "asciidoc")
"/bin/asciidoc")
(string-append "XMLTO=" (assoc-ref %build-inputs "xmlto")
"/bin/xmlto"))
#:phases
(modify-phases %standard-phases
(replace 'configure
@ -721,21 +726,17 @@ domains, their live performance and resource utilization statistics.")
;; which define some of the same constants.
(assoc-ref inputs "kernel-headers")
"/include"))
;; Prevent xmlto from failing the install phase.
#t))
(add-after 'configure 'fix-documentation
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "Documentation/Makefile"
(("XMLTO.*:=.*")
(string-append "XMLTO:="
(assoc-ref inputs "xmlto")
"/bin/xmlto"
" --skip-validation "
" -x "
(assoc-ref inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl)
"/manpages/docbook.xsl"))
(("\\$\\(XMLTO\\);")
(string-append (assoc-ref inputs "xmlto")
"/bin/xmlto;")))
(("-m custom.xsl")
(string-append
"-m custom.xsl --skip-validation -x "
(assoc-ref inputs "docbook-xsl") "/xml/xsl/"
,(package-name docbook-xsl) "-"
,(package-version docbook-xsl)
"/manpages/docbook.xsl")))
#t))
(add-after 'unpack 'hardcode-variables
(lambda* (#:key inputs #:allow-other-keys)
@ -783,7 +784,8 @@ domains, their live performance and resource utilization statistics.")
("libaio" ,libaio)
("libcap" ,libcap)
("libnet" ,libnet)
("libnl" ,libnl)))
("libnl" ,libnl)
("libbsd" ,libbsd)))
(native-inputs
`(("pkg-config" ,pkg-config)
("perl" ,perl)

View File

@ -4194,8 +4194,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
(package-with-python2 python-feedparser))
(define-public guix-data-service
(let ((commit "156b7eea7e7d538e332d8cfcf482c5ebec0a25c0")
(revision "7"))
(let ((commit "a019a5ed821cf1b7b2c2b0e1bd2dc25a51bbcb84")
(revision "8"))
(package
(name "guix-data-service")
(version (string-append "0.0.1-" revision "." (string-take commit 7)))
@ -4207,7 +4207,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
(file-name (git-file-name name version))
(sha256
(base32
"1cg7jzk7pabfp3mgnkpycasv7fs522xp3nqdvna1y76aif3pd3zh"))))
"1kckfdgh8v9mmxxrsz6n2ibs78jr821qpbqh4mz8fyavm28c7h3f"))))
(build-system gnu-build-system)
(arguments
'(#:modules ((guix build utils)
@ -7011,3 +7011,36 @@ endpoint that will be used to trigger the task. Poussetaches makes HTTP
requests with the registered payload until the right status code is
returned.")
(license license:isc)))
(define-public htmlcxx
(package
(name "htmlcxx")
(version "0.87")
(source
(origin
(method url-fetch)
(uri
(string-append "mirror://sourceforge/htmlcxx/v"
version "/htmlcxx-" version ".tar.gz"))
(sha256
(base32 "1j3mzjlczjrk4ahc43s6kzpvzypzjmqz4sillnca5yadrwwgjf2x"))))
(build-system gnu-build-system)
(home-page "http://htmlcxx.sourceforge.net/")
(synopsis "Simple non-validating CSS1 and HTML parser for C++")
(description "htmlcxx is a simple non-validating CSS1 and HTML parser for
C++. Although there are several other HTML parsers available, htmlcxx has some
characteristics that make it unique:
@itemize
@item STL like navigation of DOM tree, using excelent's tree.hh library from
Kasper Peeters
@item It is possible to reproduce exactly, character by character, the original
document from the parse tree
@item Bundled CSS parser
@item Optional parsing of attributes
@item C++ code that looks like C++ (not so true anymore)
@item Offsets of tags/elements in the original document are stored in the nodes
of the DOM tree
@end itemize")
(license (list license:lgpl2.0
license:gpl2
license:asl2.0))))

View File

@ -927,7 +927,6 @@ with '-virtfs' options for the host file systems listed in SHARED-FS."
'())
"-no-reboot"
"-net nic,model=virtio"
"-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng"
"-device" "virtio-rng-pci,rng=guixsd-vm-rng"
@ -1046,8 +1045,8 @@ FORWARDINGS is a list of host-port/guest-port pairs."
(($ <virtual-machine> os qemu graphic? memory-size disk-image-size
forwardings)
(let ((options
`("-net" ,(string-append
"user,"
`("-nic" ,(string-append
"user,model=virtio-net-pci,"
(port-forwardings->qemu-options forwardings)))))
(system-qemu-image/shared-store-script os
#:qemu qemu

View File

@ -98,7 +98,7 @@
(or (pred x)
(one-of rest ...))))))
(one-of symbol? string? keyword? pair? null? array?
number? boolean?)))
number? boolean? char?)))
(match (primitive-fork)
(0

View File

@ -52,11 +52,10 @@
base64url-alphabet
get-delimited-base64
put-delimited-base64)
#:use-module (rnrs)
#:use-module ((srfi srfi-13)
#:select (string-index
string-prefix? string-suffix?
string-concatenate string-trim-both)))
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-60)
#:use-module (rnrs bytevectors)
#:use-module (rnrs io ports))
(define-syntax define-alias
@ -67,12 +66,19 @@
;; Force the use of Guile's own primitives to avoid the overhead of its 'fx'
;; procedures.
(define-alias fxbit-field bitwise-bit-field)
(define-alias fxbit-field bit-field)
(define-alias fxarithmetic-shift ash)
(define-alias fxarithmetic-shift-left ash)
(define-alias fxand logand)
(define-alias fxior logior)
(define-alias fxxor logxor)
(define-alias fx=? =)
(define-alias fx+ +)
(define-alias mod modulo)
(define-syntax-rule (assert exp)
(unless exp
(throw 'assertion-failure 'exp)))
(define base64-alphabet
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/")

View File

@ -59,7 +59,7 @@ release corresponding to NAME and VERSION."
"/src/contrib/"
name "_" version ".tar.gz")
;; TODO: use %bioconductor-version from (guix import cran)
(string-append "https://bioconductor.org/packages/3.9"
(string-append "https://bioconductor.org/packages/3.10"
type-url-part
"/src/contrib/Archive/"
name "_" version ".tar.gz"))))

View File

@ -1028,7 +1028,7 @@ and in the current monad setting (system type, etc.)"
(or (pred x)
(one-of rest ...))))))
(one-of symbol? string? keyword? pair? null? array?
number? boolean?)))
number? boolean? char?)))
(define* (reference->sexp ref #:optional native?)
(with-monad %store-monad

View File

@ -82,6 +82,7 @@
("LGPL-2.1" 'lgpl2.1)
("LGPL-3" 'lgpl3)
("LGPL (>= 2)" 'lgpl2.0+)
("LGPL (>= 2.1)" 'lgpl2.1+)
("LGPL (>= 3)" 'lgpl3+)
("MIT" 'expat)
("MIT + file LICENSE" 'expat)
@ -132,9 +133,9 @@ package definition."
(define %cran-url "https://cran.r-project.org/web/packages/")
(define %bioconductor-url "https://bioconductor.org/packages/")
;; The latest Bioconductor release is 3.9. Bioconductor packages should be
;; The latest Bioconductor release is 3.10. Bioconductor packages should be
;; updated together.
(define %bioconductor-version "3.9")
(define %bioconductor-version "3.10")
(define* (bioconductor-packages-list-url #:optional type)
(string-append "https://bioconductor.org/packages/"

View File

@ -402,7 +402,7 @@ obtain a node's uniquely identifying \"key\"."
(define* (recursive-import package-name repo
#:key repo->guix-package guix-name
#:allow-other-keys)
"Return a stream of package expressions for PACKAGE-NAME and all its
"Return a list of package expressions for PACKAGE-NAME and all its
dependencies, sorted in topological order. For each package,
call (REPO->GUIX-PACKAGE NAME REPO), which should return a package expression
and a list of dependencies; call (GUIX-NAME NAME) to obtain the Guix package

View File

@ -37,7 +37,7 @@
(or (pred x)
(one-of rest ...))))))
(one-of symbol? string? keyword? pair? null? array?
number? boolean?)))
number? boolean? char?)))
(define (send-repl-response exp output)
"Write the response corresponding to the evaluation of EXP to PORT, an

View File

@ -321,8 +321,9 @@ specified in COMPARISON-REPORT."
(define narinfo1
(if local-hash
(find (lambda (narinfo)
(not (string=? (narinfo-hash narinfo)
local-hash)))
(not (bytevector=? (narinfo-hash->sha256
(narinfo-hash narinfo))
local-hash)))
narinfos)
(first (comparison-report-narinfos comparison-report))))

View File

@ -244,7 +244,7 @@ FALSE-IF-404? is true, return #f upon 404 responses."
docstring
(call (swh-url components ...) json->value)))))
;; <https://archive.softwareheritage.org/api/1/origin/git/url/https://github.com/guix-mirror/guix/>
;; <https://archive.softwareheritage.org/api/1/origin/ttps://github.com/guix-mirror/guix/get>
(define-json-mapping <origin> make-origin origin?
json->origin
(id origin-id)
@ -365,7 +365,7 @@ FALSE-IF-404? is true, return #f upon 404 responses."
(define-query (lookup-origin url)
"Return an origin for URL."
(path "/api/1/origin/git/url" url)
(path "/api/1/origin" url "get")
json->origin)
(define-query (lookup-content hash type)

View File

@ -886,6 +886,12 @@
(run-with-store %store
(lower-gexp #~(foo #$+)))))
(test-equal "lower-gexp, character literal"
'(#\+)
(lowered-gexp-sexp
(run-with-store %store
(lower-gexp #~(#\+)))))
(test-assertm "gexp->derivation #:references-graphs"
(mlet* %store-monad
((one (text-file "one" (random-text)))