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

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2020-03-11 22:58:11 +01:00
parent 4510aeb91c 58363ee500
commit 41c6e4f2b4
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
49 changed files with 676 additions and 415 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -71,6 +71,7 @@
/etc/guix-daemon.service
/etc/guix-publish.conf
/etc/guix-publish.service
/etc/init.d/guix-daemon
/guix-daemon
/guix/config.scm
/libformat.a

6
configure.ac
View file

@ -96,7 +96,11 @@ dnl 'GUILE_EFFECTIVE_VERSION'.
GUILE_PKG([3.0 2.2])
GUILE_PROGS
if test "x$GUILD" = "x"; then
AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.])
AC_MSG_ERROR(['guild' binary not found; please check your Guile installation.])
fi
if test "x$GUILE_EFFECTIVE_VERSION" = "x2.2"; then
PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.3])
fi
dnl Installation directories for .scm and .go files.

11
etc/guix-install.sh
View file

@ -361,6 +361,17 @@ sys_enable_guix_daemon()
systemctl enable guix-daemon; } &&
_msg "${PAS}enabled Guix daemon via systemd"
;;
sysv-init)
{ mkdir -p /etc/init.d;
cp "${ROOT_HOME}/.config/guix/current/etc/init.d/guix-daemon" \
/etc/init.d/guix-daemon;
chmod 775 /etc/init.d/guix-daemon;
update-rc.d guix-daemon defaults &&
update-rc.d guix-daemon enable &&
service guix-daemon start; } &&
_msg "${PAS}enabled Guix daemon via sysv"
;;
NA|*)
_msg "${ERR}unsupported init system; run the daemon manually:"
echo " ${ROOT_HOME}/.config/guix/current/bin/guix-daemon --build-users-group=guixbuild"

78
etc/init.d/guix-daemon.in Normal file
View file

@ -0,0 +1,78 @@
#!/bin/bash
### BEGIN INIT INFO
# Provides: guix-daemon
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Guix build daemon
# Description: Provides a daemon that does builds for Guix
### END INIT INFO
set -e
mkdir -p "/var/run"
if [ ! -f "@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon" ]
then
exit 5
fi
case "$1" in
start)
if [ -f "/var/run/guix-daemon.pid" ]
then
if pgrep -F "/var/run/guix-daemon.pid" guix-daemon
then
exit 0
else
echo "guix-daemon has a stale pid file" >&2
exit 1
fi
else
daemonize \
-a \
-e "/var/log/guix-daemon-stderr.log" \
-o "/var/log/guix-daemon-stdout.log" \
-E GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale \
-E LC_ALL=en_US.utf8 \
-p "/var/run/guix-daemon.pid" \
@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \
--build-users-group=guixbuild
fi
;;
stop)
if [ -f "/var/run/guix-daemon.pid" ]
then
pkill -F "/var/run/guix-daemon.pid" guix-daemon || {
exit 1
}
rm -f "/var/run/guix-daemon.pid"
exit 0
else
exit 0
fi
;;
status)
if [ -f "/var/run/guix-daemon.pid" ]
then
if pgrep -F "/var/run/guix-daemon.pid" guix-daemon
then
echo "guix-daemon is running"
exit 0
else
echo "guix-daemon has a stale pid file"
exit 1
fi
else
echo "guix-daemon is not running"
exit 3
fi
;;
restart|force-reload)
"$0" stop
"$0" start
;;
*)
echo "Usage: $0 (start|stop|status|restart|force-reload)"
exit 3
;;
esac

19
gnu/packages/admin.scm
View file

@ -18,7 +18,7 @@
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
@ -809,12 +809,17 @@ (define-public isc-dhcp
(("^RELEASEVER=.*")
(format #f "RELEASEVER=~a\n" ,bind-release-version)))
#t))
(add-before 'configure 'fix-bind-cross-compilation
(lambda _
(substitute* "configure"
(("--host=\\$host")
"--host=$host_alias"))
#t))
,@(if (%current-target-system)
'((add-before 'configure 'fix-bind-cross-compilation
(lambda _
(substitute* "configure"
(("--host=\\$host")
"--host=$host_alias"))
;; BIND needs a native compiler because the DHCP
;; build system uses the built 'gen' executable.
(setenv "BUILD_CC" "gcc")
#t)))
'())
(add-after 'configure 'post-configure
(lambda* (#:key outputs #:allow-other-keys)
;; Point to the right client script, which will be

9
gnu/packages/algebra.scm
View file

@ -8,6 +8,7 @@
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -857,8 +858,8 @@ (define-public java-jlargearrays
(version "1.6")
(source (origin
(method url-fetch)
(uri (string-append "http://search.maven.org/remotecontent?"
"filepath=pl/edu/icm/JLargeArrays/"
(uri (string-append "https://repo1.maven.org/maven2/"
"pl/edu/icm/JLargeArrays/"
version "/JLargeArrays-" version
"-sources.jar"))
(file-name (string-append name "-" version ".jar"))
@ -884,8 +885,8 @@ (define-public java-jtransforms
(version "3.1")
(source (origin
(method url-fetch)
(uri (string-append "http://search.maven.org/remotecontent?"
"filepath=com/github/wendykierp/JTransforms/"
(uri (string-append "https://repo1.maven.org/maven2/"
"com/github/wendykierp/JTransforms/"
version "/JTransforms-" version "-sources.jar"))
(sha256
(base32

29
gnu/packages/assembly.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
;;; Copyright © 2019 Andy Tai <atai@atai.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Christopher Lemmer Webber <cwebber@dustycloud.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -342,3 +343,31 @@ (define-public wla-dx
@item spc700
@end itemize")
(license license:gpl2)))
(define-public xa
(package
(name "xa")
(version "2.3.10")
(source (origin
(method url-fetch)
(uri (string-append "https://www.floodgap.com/retrotech/xa"
"/dists/xa-" version ".tar.gz"))
(sha256
(base32
"0y5sd247g11jfk5msxy91hz2nhpy7smj125dzfyfhjsjnqk5nyw6"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; TODO: custom test harness, not sure how it works
#:phases
(modify-phases %standard-phases
(delete 'configure)) ; no "configure" script
#:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")))))
(native-inputs `(("perl" ,perl)))
(home-page "https://www.floodgap.com/retrotech/xa/")
(synopsis "Two-pass portable cross-assembler")
(description
"xa is a high-speed, two-pass portable cross-assembler.
It understands mnemonics and generates code for NMOS 6502s (such
as 6502A, 6504, 6507, 6510, 7501, 8500, 8501, 8502 ...),
CMOS 6502s (65C02 and Rockwell R65C02) and the 65816.")
(license license:gpl2)))

2
gnu/packages/audio.scm
View file

@ -2112,7 +2112,7 @@ (define-public freealut
`(("openal" ,openal)))
(synopsis "Free implementation of OpenAL's ALUT standard")
(description "freealut is the OpenAL Utility Toolkit.")
(home-page "http://kcat.strangesoft.net/openal.html")
(home-page "https://kcat.strangesoft.net/openal.html")
(license license:lgpl2.0)))
(define-public patchage

2
gnu/packages/bash.scm
View file

@ -341,7 +341,7 @@ (define-public bash-tap
(install-file "bash-tap" bin)
(install-file "bash-tap-bootstrap" bin)
(install-file "bash-tap-mock" bin)))))))
(home-page "http://www.illusori.co.uk/projects/bash-tap/")
(home-page "https://www.illusori.co.uk/projects/bash-tap/")
(synopsis "Bash port of a Test::More/Test::Builder-style TAP-compliant
test library")
(description "Bash TAP is a TAP-compliant Test::More-style testing library

30
gnu/packages/bioinformatics.scm
View file

@ -15,6 +15,7 @@
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -784,13 +785,13 @@ (define-public bioawk
(define-public python-pybedtools
(package
(name "python-pybedtools")
(version "0.8.0")
(version "0.8.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "pybedtools" version))
(sha256
(base32
"1xl454ijvd4dzfvqgfahad49b49j7qy710fq9xh1rvk42z6x5ssf"))))
"14w5i40gi25clrr7h4wa2pcpnyipya8hrqi7nq77553zc5wf0df0"))))
(build-system python-build-system)
(arguments
`(#:modules ((ice-9 ftw)
@ -817,6 +818,10 @@ (define-public python-pybedtools
;; (see: https://github.com/daler/pybedtools/issues/192).
(("def test_getting_example_beds")
"def _do_not_test_getting_example_beds"))
;; This issue still occurs on python2
(substitute* "pybedtools/test/test_issues.py"
(("def test_issue_303")
"def _test_issue_303"))
#t))
;; TODO: Remove phase after it's part of PYTHON-BUILD-SYSTEM.
;; build system.
@ -885,7 +890,12 @@ (define (cythonized? c/c++-file)
(license license:gpl2+)))
(define-public python2-pybedtools
(package-with-python2 python-pybedtools))
(let ((pybedtools (package-with-python2 python-pybedtools)))
(package
(inherit pybedtools)
(native-inputs
`(("python2-pathlib" ,python2-pathlib)
,@(package-native-inputs pybedtools))))))
(define-public python-biom-format
(package
@ -12140,8 +12150,8 @@ (define-public java-forester-1.005
(version "1.005")
(source (origin
(method url-fetch)
(uri (string-append "http://search.maven.org/remotecontent?"
"filepath=org/biojava/thirdparty/forester/"
(uri (string-append "https://repo1.maven.org/maven2/"
"org/biojava/thirdparty/forester/"
version "/forester-" version "-sources.jar"))
(file-name (string-append name "-" version ".jar"))
(sha256
@ -12217,7 +12227,8 @@ (define-public java-forester-1.005
(method url-fetch)
(uri (string-append "https://raw.githubusercontent.com/cmzmasek/forester/"
"29e04321615da6b35c1e15c60e52caf3f21d8e6a/"
"forester/java/classes/resources/synth_look_and_feel_1.xml"))
"forester/java/classes/resources/"
"synth_look_and_feel_1.xml"))
(file-name (string-append name "-synth-look-and-feel-" version ".xml"))
(sha256
(base32
@ -13509,14 +13520,14 @@ (define-public python-pypairix
(define-public python-pyfaidx
(package
(name "python-pyfaidx")
(version "0.5.7")
(version "0.5.8")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyfaidx" version))
(sha256
(base32
"02jvdx3ksy6w5gd29i1d0g0zsabbz7c14qg482ff7pza6sdl0b2i"))))
"038xi3a6zvrxbyyfpp64ka8pcjgsdq4fgw9cl5lpxbvmm1bzzw2q"))))
(build-system python-build-system)
(propagated-inputs
`(("python-six" ,python-six)))
@ -13527,6 +13538,9 @@ (define-public python-pyfaidx
fasta subsequences.")
(license license:bsd-3)))
(define-public python2-pyfaidx
(package-with-python2 python-pyfaidx))
(define-public python-cooler
(package
(name "python-cooler")

35
gnu/packages/cran.scm
View file

@ -10,7 +10,7 @@
;;; Copyright © 2018 Sandeep Subramanian <sandeepsubramanian94@gmail.com>
;;; Copyright © 2018 Charlie Ritter <chewzeirta@posteo.net>
;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;; Copyright © 2018 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;; Copyright © 2018, 2020 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
;;; Copyright © 2018 Laura Lazzati <laura.lazzati.15@gmail.com>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
@ -5843,6 +5843,8 @@ (define-public r-ggsignif
(base32
"17j9hg967k1wp9xw3x84mqss58jkb8pvlrnlchz4i1hklgykxqbg"))))
(build-system r-build-system)
(native-inputs
`(("r-knitr" ,r-knitr)))
(propagated-inputs
`(("r-ggplot2" ,r-ggplot2)))
(home-page "https://github.com/const-ae/ggsignif")
@ -20750,3 +20752,34 @@ (define-public r-ppcor
calculate the higher-order partial and semi-partial correlations but also with
statistics and p-values of the correlation coefficients.")
(license license:gpl2)))
(define-public r-hrbrthemes
(package
(name "r-hrbrthemes")
(version "0.8.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "hrbrthemes" version))
(sha256
(base32 "057h60b5p53dcyjyfwlgjc1ry968s9s64dw78p443w8717zk7zpc"))))
(properties `((upstream-name . "hrbrthemes")))
(build-system r-build-system)
(propagated-inputs
`(("r-extrafont" ,r-extrafont)
("r-gdtools" ,r-gdtools)
("r-ggplot2" ,r-ggplot2)
("r-htmltools" ,r-htmltools)
("r-knitr" ,r-knitr)
("r-magrittr" ,r-magrittr)
("r-rmarkdown" ,r-rmarkdown)
("r-scales" ,r-scales)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://github.com/hrbrmstr/hrbrthemes/")
(synopsis "Additional themes, theme components and utilities for @code{ggplot2}")
(description
"This package provides a compilation of extra @code{ggplot2} themes,
scales and utilities, including a spell check function for plot label fields
and an overall emphasis on typography.")
(license license:expat)))

4
gnu/packages/crypto.scm
View file

@ -133,7 +133,7 @@ (define-public libmd
(define-public signify
(package
(name "signify")
(version "28")
(version "29")
(home-page "https://github.com/aperezdc/signify")
(source (origin
(method url-fetch)
@ -141,7 +141,7 @@ (define-public signify
"/download/v" version "/signify-" version ".tar.xz"))
(sha256
(base32
"05v970glhpaxv0m4cnidfxsdnsjp12nf2crzrdq4ml7g5a3g6hdq"))))
"1bzcax5kb4lr0rmpmrdpq5q0iq6b2dxzpl56li8aanbkck1c7hd9"))))
(build-system gnu-build-system)
;; TODO Build with libwaive (described in README.md), to implement something
;; like OpenBSD's pledge().

4
gnu/packages/cups.scm
View file

@ -420,14 +420,14 @@ (define-public cups-pk-helper
(define-public hplip
(package
(name "hplip")
(version "3.20.2")
(version "3.20.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
"1hkiyj29vzmz14cy68g94i617ymxinzvjvcsfdd78kcbd1s9vi4h"))
"0sh6cg7yjc11x1cm4477iaslj9n8ksghs85hqwgfbk7m5b2pw2a1"))
(modules '((guix build utils)))
(patches (search-patches "hplip-remove-imageprocessor.patch"))
(snippet

2
gnu/packages/databases.scm
View file

@ -1225,7 +1225,7 @@ (define-public rocksdb
("lz4" ,lz4)
("snappy" ,snappy)
("zlib" ,zlib)))
(home-page "http://rocksdb.org/")
(home-page "https://rocksdb.org/")
(synopsis "Persistent key-value store for fast storage")
(description
"RocksDB is a library that forms the core building block for a fast

6
gnu/packages/docker.scm
View file

@ -46,7 +46,7 @@ (define-module (gnu packages docker)
#:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization))
(define %docker-version "19.03.5")
(define %docker-version "19.03.7")
(define-public python-docker-py
(package
@ -315,7 +315,7 @@ (define-public docker
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1dlknwn0fh82nbzdzxdk6pfhqwph9vcw3vs3111wfr19y5hwncq9"))
(base32 "1sik109lxmiwgrsnvfip1nnal1xkh8z1mlvys6aknjyh29ll1iq8"))
(patches
(search-patches "docker-fix-tests.patch"))))
(build-system gnu-build-system)
@ -588,7 +588,7 @@ (define-public docker-cli
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "07ldz46y74b3la4ah65v5bzbfx09yy6kncvxrr0zfx0s1214ar3m"))))
(base32 "164l33npy8acdbbrz8vcyiwx18vi55wwwikkasg0w43b5bdhz8sx"))))
(build-system go-build-system)
(arguments
`(#:import-path "github.com/docker/cli"

2
gnu/packages/emulators.scm
View file

@ -308,7 +308,7 @@ (define-public emulation-station
number of video game console emulators. It features an interface that is
usable with any game controller that has at least 4 buttons, theming support,
and a game metadata scraper.")
(home-page "http://www.emulationstation.org")
(home-page "https://emulationstation.org")
(license license:expat))))
;; Note: higan v107 has been released, but as explained by the dialog that

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

@ -169,7 +169,7 @@ (define-public dfu-programmer
`(("pkg-config" ,pkg-config)))
(inputs
`(("libusb" ,libusb)))
(home-page "http://dfu-programmer.github.io/")
(home-page "https://dfu-programmer.github.io/")
(synopsis "Device firmware update programmer for Atmel chips")
(description
"Dfu-programmer is a multi-platform command-line programmer for

2
gnu/packages/fontutils.scm
View file

@ -383,7 +383,7 @@ (define-public t1lib
metric information. But t1lib is in itself entirely independent of the
X11-system or any other graphical user interface.")
(license license:gpl2)
(home-page "http://www.t1lib.org/")))
(home-page "https://www.t1lib.org/")))
(define-public teckit
(package

9
gnu/packages/freedesktop.scm
View file

@ -1386,14 +1386,15 @@ (define-public fprintd
(define-public desktop-file-utils
(package
(name "desktop-file-utils")
(version "0.23")
(version "0.24")
(source (origin
(method url-fetch)
(uri (string-append "https://www.freedesktop.org/software/" name
"/releases/" name "-" version ".tar.xz"))
(uri (string-append "https://www.freedesktop.org/software/"
"desktop-file-utils/releases/"
"desktop-file-utils-" version ".tar.xz"))
(sha256
(base32
"119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc"))))
"1nc3bwjdrpcrkbdmzvhckq0yngbcxspwj2n1r7jr3gmx1jk5vpm1"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))

12
gnu/packages/games.scm
View file

@ -301,14 +301,14 @@ (define-public alex4
(define-public armagetronad
(package
(name "armagetronad")
(version "0.2.8.3.4")
(version "0.2.8.3.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/armagetronad/stable/"
version "/armagetronad-" version ".src.tar.gz"))
(sha256
(base32
"1pgy0r80z702qdv94aw3ywdn4ynnr4cdi86ml558pljfc5ygasj4"))))
"1z266haq22n5b0733h7qsg1rpzhz8lvm82f7wd06r008iiar7jdl"))))
(build-system gnu-build-system)
(inputs
`(("libxml2" ,libxml2)
@ -1118,7 +1118,7 @@ (define-public ltris
(define-public nethack
(package
(name "nethack")
(version "3.6.5")
(version "3.6.6")
(source
(origin
(method url-fetch)
@ -1126,7 +1126,7 @@ (define-public nethack
(string-append "https://www.nethack.org/download/" version "/nethack-"
(string-join (string-split version #\.) "") "-src.tgz"))
(sha256
(base32 "0xifs8pqfffnmkbpmrcd1xf14yakcj06nl2bbhy4dyacg8myysmv"))))
(base32 "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng"))))
(inputs
`(("ncurses" ,ncurses)
("bison" ,bison)
@ -3486,7 +3486,7 @@ (define-public grue-hunter
("tar" ,tar)
("gzip" ,gzip)
("tarball" ,source)))
(home-page "http://jxself.org/grue-hunter.shtml")
(home-page "https://jxself.org/grue-hunter.shtml")
(synopsis "Text adventure game")
(description
"Grue Hunter is a text adventure game written in Perl. You must make
@ -6094,7 +6094,7 @@ (define-public fortune-mod
("perl-test-runvalgrind" ,perl-test-runvalgrind)
("cmake-rules" ,shlomif-cmake-modules)
("rinutils" ,rinutils)))
(home-page "http://www.shlomifish.org/open-source/projects/fortune-mod/")
(home-page "https://www.shlomifish.org/open-source/projects/fortune-mod/")
(synopsis "The Fortune Cookie program from BSD games")
(description "Fortune is a command-line utility which displays a random
quotation from a collection of quotes.")

2
gnu/packages/gd.scm
View file

@ -83,7 +83,7 @@ (define-public gd
(propagated-inputs
`(("fontconfig" ,fontconfig)
("libjpeg" ,libjpeg)))
(home-page "http://www.libgd.org/")
(home-page "https://www.libgd.org/")
(synopsis "Library for the dynamic creation of images by programmers")
(description
"GD is a library for the dynamic creation of images by programmers. GD

8
gnu/packages/geo.scm
View file

@ -561,6 +561,14 @@ (define-public spatialite-gui
("sqlite" ,sqlite)
("wxwidgets" ,wxwidgets-2)
("zlib" ,zlib)))
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'fix-gui
(lambda _
;; Fix for the GUI not showing up.
(substitute* "Main.cpp"
(("Hide\\(\\);") ""))
#t)))))
(synopsis "Graphical user interface for SpatiaLite")
(description "Spatialite-gui provides a visual interface for viewing and
maintaining a spatialite database. You can easily see the structure of the

8
gnu/packages/gimp.scm
View file

@ -89,7 +89,7 @@ (define-public babl
(define-public gegl
(package
(name "gegl")
(version "0.4.20")
(version "0.4.22")
(source (origin
(method url-fetch)
(uri (list (string-append "https://download.gimp.org/pub/gegl/"
@ -103,7 +103,7 @@ (define-public gegl
"/gegl-" version ".tar.xz")))
(sha256
(base32
"1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93"))))
"0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
@ -134,7 +134,7 @@ (define-public gegl
(define-public gimp
(package
(name "gimp")
(version "2.10.14")
(version "2.10.18")
(source (origin
(method url-fetch)
(uri (string-append "https://download.gimp.org/pub/gimp/v"
@ -142,7 +142,7 @@ (define-public gimp
"/gimp-" version ".tar.bz2"))
(sha256
(base32
"0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz"))))
"05np26g61fyr72s7qjfrcck8v57r0yswq5ihvqyzvgzfx08y3gv5"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 9 MiB of gtk-doc HTML

31
gnu/packages/gnome.scm
View file

@ -246,6 +246,35 @@ (define-public brasero
features to enable users to create their discs easily and quickly.")
(license license:gpl2+)))
(define-public phodav
(package
(name "phodav")
(version "2.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"1hxq8c5qfah3w7mxcyy3yhzdgswplll31a69p5mqdl04bsvw5pbx"))))
(build-system meson-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gtk-doc" ,gtk-doc)
("pkg-config" ,pkg-config)))
(inputs
`(("avahi" ,avahi)
("libgudev" ,libgudev)
("libsoup" ,libsoup)))
(synopsis "WebDav server implementation using libsoup")
(description "PhoDav was initially developed as a file-sharing mechanism for Spice,
but it is generic enough to be reused in other projects,
in particular in the GNOME desktop.")
(home-page "https://wiki.gnome.org/phodav")
(license license:lgpl2.1+)))
(define-public gnome-color-manager
(package
(name "gnome-color-manager")
@ -9254,7 +9283,7 @@ (define-public soundconverter
("python-pygobject" ,python-pygobject)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)))
(home-page "http://soundconverter.org/")
(home-page "https://soundconverter.org/")
(synopsis "Convert between audio formats with a graphical interface")
(description
"SoundConverter supports converting between many audio formats including

10
gnu/packages/gps.scm
View file

@ -178,7 +178,7 @@ (define-public gama
(define-public gpxsee
(package
(name "gpxsee")
(version "7.16")
(version "7.25")
(source (origin
(method git-fetch)
(uri (git-reference
@ -187,7 +187,7 @@ (define-public gpxsee
(file-name (git-file-name name version))
(sha256
(base32
"1mkfhb2c9qafjpva600nyn6yik49l4q1k6id1xvrci37wsn6ijav"))))
"0lml3hz2zxljl9j5wnh7bn9bj8k9v3wf6bk3g77x9nnarsmw0fcx"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@ -208,8 +208,10 @@ (define-public gpxsee
(home-page "https://www.gpxsee.org")
(synopsis "GPS log file viewer and analyzer")
(description
"GPXSee is a Qt-based GPS log file viewer and analyzer that supports
all common GPS log file formats.")
"GPXSee is a Qt-based GPS log file viewer and analyzer that supports all
common GPS log file formats. It can display multiple tracks on various on-
and off-line maps. You can easily add more maps and graph other captured data
such as elevation, speed, heart rate, power, temperature, and gear shifts.")
(license license:gpl3)))
(define-public gpsd

5
gnu/packages/graphviz.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -236,6 +236,9 @@ (define-public python-pygraphviz
structure and layout algorithms.")
(license license:bsd-3)))
(define-public python2-pygraphviz
(package-with-python2 python-pygraphviz))
(define-public gts
(package
(name "gts")

2
gnu/packages/gtk.scm
View file

@ -1732,7 +1732,7 @@ (define-public graphene
("python-2" ,python-2)
("glib" ,glib)
("gobject-introspection" ,gobject-introspection)))
(home-page "http://ebassi.github.io/graphene")
(home-page "https://ebassi.github.io/graphene/")
(synopsis "Thin layer of graphic data types")
(description "This library provides graphic types and their relative API;
it does not deal with windowing system surfaces, drawing, scene graphs, or

4
gnu/packages/installers.scm
View file

@ -34,14 +34,14 @@ (define (make-nsis machine target-arch nsis-target-type)
(xgcc (cross-gcc triplet #:libc xlibc)))
(package
(name (string-append "nsis-" machine))
(version "3.04")
(version "3.05")
(source (origin
(method url-fetch)
(uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-"
version "-src.tar.bz2"))
(sha256
(base32
"1xgllk2mk36ll2509hd31mfq6blgncmdzmwxj3ymrwshdh23d5b0"))
"1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn"))
(patches (search-patches "nsis-env-passthru.patch"))))
(build-system scons-build-system)
(native-inputs `(("xgcc" ,xgcc)

6
gnu/packages/ipfs.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -104,7 +104,7 @@ (define-public go-github-com-ipfs-go-ipfs-api
(define-public gx
(package
(name "gx")
(version "0.14.2")
(version "0.14.3")
(source
(origin
(method git-fetch)
@ -113,7 +113,7 @@ (define-public gx
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "048bx6khzcwxnvz3lf7kgp6fkg8mxqcqchxh0jxm9fg2iwizsi0k"))))
(base32 "1sk20kv3rfsnizgwmcmmr69jb1b2iwzqh9wwwd6wg6x0pnqm8swc"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/whyrusleeping/gx"))

6
gnu/packages/java.scm
View file

@ -10,7 +10,7 @@
;;; Copyright © 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2019, 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -4322,7 +4322,7 @@ (define-public java-asm
(install-jars "dist")))))
(native-inputs
`(("java-junit" ,java-junit)))
(home-page "http://asm.ow2.org/")
(home-page "https://asm.ow2.io/")
(synopsis "Very small and fast Java bytecode manipulation framework")
(description "ASM is an all purpose Java bytecode manipulation and
analysis framework. It can be used to modify existing classes or dynamically
@ -7476,7 +7476,7 @@ (define-public java-osgi-namespace-contract
(version "1.0.0")
(source (origin
(method url-fetch)
(uri (string-append "http://central.maven.org/maven2/org/osgi/"
(uri (string-append "https://repo1.maven.org/maven2/org/osgi/"
"org.osgi.namespace.contract/"
version "/org.osgi.namespace.contract-"
version "-sources.jar"))

2
gnu/packages/linux.scm
View file

@ -5435,7 +5435,7 @@ (define (sbin-directory input-name)
"wireless-tools"))))))
bin-files)
#t))))))
(home-page "http://linrunner.de/en/tlp/tlp.html")
(home-page "https://linrunner.de/en/tlp/tlp.html")
(synopsis "Power management tool for Linux")
(description "TLP is a power management tool for Linux. It comes with
a default configuration already optimized for battery life. Nevertheless,

8
gnu/packages/mpi.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017 Dave Love <fx@gnu.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;;
@ -169,7 +169,7 @@ (define-public hwloc
(define-public openmpi
(package
(name "openmpi")
(version "4.0.2")
(version "4.0.3")
(source
(origin
(method url-fetch)
@ -177,7 +177,7 @@ (define-public openmpi
(version-major+minor version)
"/downloads/openmpi-" version ".tar.bz2"))
(sha256
(base32 "0ms0zvyxyy3pnx9qwib6zaljyp2b3ixny64xvq3czv3jpr8zf2wh"))
(base32 "00zxcw99gr5n693cmcmn4f6a47vx1ywna895p0x7p163v37gw0hl"))
(patches (search-patches "openmpi-mtl-priorities.patch"))))
(build-system gnu-build-system)
(inputs
@ -264,7 +264,7 @@ (define-public openmpi
(let ((out (assoc-ref outputs "out")))
(for-each delete-file (find-files out "config.log"))
#t))))))
(home-page "http://www.open-mpi.org")
(home-page "https://www.open-mpi.org")
(synopsis "MPI-3 implementation")
(description
"The Open MPI Project is an MPI-3 implementation that is developed and

36
gnu/packages/music.scm
View file

@ -4615,42 +4615,6 @@ (define-public demlo
@end itemize\n")
(license license:expat))))
(define-public lpd8editor
(package
(name "lpd8editor")
(version "0.0.13")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/charlesfleche/lpd8editor.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0lsz3v493ilq2zr016m7kvymrplxd0n3pqv1pjglpq1h7sjw9764"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'setenv
(lambda _
(setenv "INSTALL_PREFIX"
(assoc-ref %outputs "out"))))
(delete 'configure) ; no configure script
(add-before 'build 'qmake
(lambda _ (invoke "qmake"))))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("alsa" ,alsa-lib)
("qtbase" ,qtbase)
("qtsvg" ,qtsvg)))
(synopsis "Graphical editor for the Akai LPD8 MIDI controller")
(description "lpd8editor is a graphical patch editor for the Akai LPD8 MIDI
controller.")
(home-page "https://github.com/charlesfleche/lpd8editor")
(license license:expat)))
(define-public fmit
(package
(name "fmit")

4
gnu/packages/networking.scm
View file

@ -2713,14 +2713,14 @@ (define-public iwd
(define-public batctl
(package
(name "batctl")
(version "2019.5")
(version "2020.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.open-mesh.org/batman/releases/batman-adv-"
version "/batctl-" version ".tar.gz"))
(sha256
(base32 "1b9w4636dq8m38nzr8j0v0j3b0vdsw84c58c2isc33h66dx8brgz"))))
(base32 "01414ywhlb2b9ng9d5kd5rr1s7wzvi234j8hj6ra2spn92qykvv0"))))
(inputs
`(("libnl" ,libnl)))
(native-inputs

16
gnu/packages/plotutils.scm
View file

@ -194,14 +194,14 @@ (define-public ploticus
(define-public asymptote
(package
(name "asymptote")
(version "2.62")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/asymptote/"
version "/asymptote-" version ".src.tgz"))
(sha256
(base32
"0510vnlpfyrvshsxr5lh3klwyhmn2cf4ba1ja476mbv5dcqqbc30"))))
(version "2.64")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/asymptote/"
version "/asymptote-" version ".src.tgz"))
(sha256
(base32 "1x4nmzklzd2xfmm03mgnpg0345dwrwr5czk9gkfl5sx7x1cgx4c0"))))
(build-system gnu-build-system)
;; Note: The 'asy' binary retains a reference to docdir for use with its
;; "help" command in interactive mode, so adding a "doc" output is not

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

@ -1834,7 +1834,7 @@ (define-public python-cookies
`(;; test are broken: https://gitlab.com/sashahart/cookies/issues/3
#:tests? #f))
(native-inputs
`(("python-pytest" ,python2-pytest)))
`(("python-pytest" ,python-pytest)))
(synopsis "HTTP cookie parser and renderer")
(description "A RFC 6265-compliant HTTP cookie parser and renderer in
Python.")

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

@ -19,7 +19,7 @@
;;; Copyright © 2015, 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2016, 2018-2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016, 2018, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016 Daniel Pimentel <d4n1@d4n1.org>
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016, 2017 Troy Sankey <sankeytms@gmail.com>
@ -28,7 +28,6 @@
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2017 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
;;; Copyright © 2016, 2017, 2019 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017, 2018, 2020 Julien Lepiller <julien@lepiller.eu>
@ -2398,14 +2397,14 @@ (define-public python-vine
(define-public python-virtualenv
(package
(name "python-virtualenv")
(version "20.0.8")
(version "20.0.10")
(source
(origin
(method url-fetch)
(uri (pypi-uri "virtualenv" version))
(sha256
(base32
"096r7g5cv85vxymg9iqbn5z749613snlvd6p3rf1nxnrd386j0qz"))))
"0y6x41l3ja891993i4adylbbyly0r4m52n2d0a0y9y4h3lzyh4l5"))))
(build-system python-build-system)
(native-inputs
`(("python-mock" ,python-mock)
@ -2426,10 +2425,39 @@ (define-public python-virtualenv
(synopsis "Virtual Python environment builder")
(description
"Virtualenv is a tool to create isolated Python environments.")
(properties `((python2-variant . ,(delay python2-virtualenv))))
(license license:expat)))
(define-public python2-virtualenv
(package-with-python2 python-virtualenv))
(let ((base (package-with-python2 (strip-python2-variant python-virtualenv))))
(package
(inherit base)
(arguments
`(#:python ,python-2
#:phases
(modify-phases %standard-phases
(add-after 'set-paths 'adjust-PYTHONPATH
(lambda* (#:key inputs #:allow-other-keys)
(let* ((python (assoc-ref inputs "python"))
(python-sitedir (string-append python "/lib/python2.7"
"/site-packages")))
;; XXX: 'python2' always comes first on PYTHONPATH
;; and shadows the 'setuptools' input. Move python2
;; last: this should be fixed in python-build-system
;; in a future rebuild cycle.
(setenv "PYTHONPATH"
(string-append (string-join (delete python-sitedir
(string-split
(getenv "PYTHONPATH")
#\:))
":")
":" python-sitedir))
(format #t "environment variable `PYTHONPATH' changed to `~a'~%"
(getenv "PYTHONPATH"))
#t))))))
(propagated-inputs
`(("python-contextlib2" ,python2-contextlib2)
,@(package-propagated-inputs base))))))
(define-public python-markupsafe
(package
@ -4402,18 +4430,37 @@ (define-public python2-pycodestyle
(define-public python-multidict
(package
(name "python-multidict")
(version "4.2.0")
(version "4.7.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "multidict" version))
(sha256
(base32
"1vf5bq8hn5a9rvhr5v4fwbmarfsp35hhr8gs74kqfijy34j2f194"))))
"07ikq2c72kd263hpldw55y0px2l3g34hjk66ml9lryh1jv287qmf"))))
(build-system python-build-system)
(arguments
'(#:modules ((ice-9 ftw)
(srfi srfi-1)
(srfi srfi-26)
(guix build utils)
(guix build python-build-system))
#:phases (modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(if tests?
(begin
(let ((libdir (find (cut string-prefix? "lib." <>)
(scandir "build"))))
(setenv "PYTHONPATH"
(string-append "./build/" libdir ":"
(getenv "PYTHONPATH")))
(invoke "pytest" "-vv")))
(format #t "test suite not run~%"))
#t)))))
(native-inputs
`(("python-pytest" ,python-pytest)
("python-pytest-runner" ,python-pytest-runner)))
("python-pytest-cov" ,python-pytest-cov)))
(home-page "https://github.com/aio-libs/multidict/")
(synopsis "Multidict implementation")
(description "Multidict is dict-like collection of key-value pairs
@ -5493,36 +5540,34 @@ (define-public python-ipykernel
(synopsis "IPython Kernel for Jupyter")
(description
"This package provides the IPython kernel for Jupyter.")
(properties `((python2-variant . ,(delay python2-ipykernel))))
(license license:bsd-3)))
;; Version 5.1.1 and above no longer support Python 2.
;; Version 5.x and above no longer support Python 2.
(define-public python2-ipykernel
(package
(name "python2-ipykernel")
(version "5.1.0")
(version "4.10.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ipykernel" version))
(sha256
(base32 "0br95qhrd5k65g10djngiy27hs0642301hlf2q142i8djabvzh0g"))))
(base32 "1yzmdiy1djsszqp54jzd8ym8h4hpl67zjq83j2kxbkp0rwmlpdzf"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2
#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(setenv "HOME" "/tmp")
(invoke "pytest" "-v")
#t)))))
`(#:python ,python-2))
(propagated-inputs
`(("python2-ipython" ,python2-ipython)
;; imported at runtime during connect
("python2-jupyter-client" ,python2-jupyter-client)))
("python2-jupyter-client" ,python2-jupyter-client)
("python2-tornado" ,python2-tornado)
("python2-traitlets" ,python2-traitlets)))
(native-inputs
`(("python2-pytest" ,python2-pytest)
("python2-nose" ,python2-nose)))
`(("python2-mock" ,python2-mock)
("python2-nose" ,python2-nose)
("python2-pytest" ,python2-pytest)
("python2-pytest-cov" ,python2-pytest-cov)))
(home-page "https://ipython.org")
(synopsis "IPython Kernel for Jupyter")
(description
@ -5576,69 +5621,6 @@ (define-public python-backcall
callback signature using a prototype function.")
(license license:bsd-3)))
;; This is the latest release of the LTS version of ipython with support for
;; Python 2.7 and Python 3.x. Later non-LTS versions starting from 6.0 have
;; dropped support for Python 2.7.
(define-public python2-ipython
(package
(name "python2-ipython")
(version "5.8.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ipython" version ".tar.gz"))
(sha256
(base32 "01l93i4hspf0lvhmycvc8j378bslm9rw30mwfspsl6v1ayc69b2b"))))
(build-system python-build-system)
(propagated-inputs
`(("python2-backports-shutil-get-terminal-size"
,python2-backports-shutil-get-terminal-size)
("python2-pathlib2" ,python2-pathlib2)
("python2-pyzmq" ,python2-pyzmq)
("python2-prompt-toolkit" ,python2-prompt-toolkit-1)
("python2-terminado" ,python2-terminado)
("python2-matplotlib" ,python2-matplotlib)
("python2-numpy" ,python2-numpy)
("python2-numpydoc" ,python2-numpydoc)
("python2-jinja2" ,python2-jinja2)
("python2-mistune" ,python2-mistune)
("python2-pexpect" ,python2-pexpect)
("python2-pickleshare" ,python2-pickleshare)
("python2-simplegeneric" ,python2-simplegeneric)
("python2-jsonschema" ,python2-jsonschema)
("python2-traitlets" ,python2-traitlets)
("python2-nbformat" ,python2-nbformat)
("python2-pygments" ,python2-pygments)))
(inputs
`(("readline" ,readline)
("which" ,which)))
(native-inputs
`(("graphviz" ,graphviz)
("pkg-config" ,pkg-config)
("python2-requests" ,python2-requests) ;; for tests
("python2-testpath" ,python2-testpath)
("python2-mock" ,python2-mock)
("python2-nose" ,python2-nose)))
(arguments
`(#:python ,python-2
#:phases
(modify-phases %standard-phases
(add-before 'check 'delete-broken-tests
(lambda* (#:key inputs #:allow-other-keys)
;; These tests throw errors for unknown reasons.
(delete-file "IPython/core/tests/test_profile.py")
(delete-file "IPython/core/tests/test_interactiveshell.py")
(delete-file "IPython/core/tests/test_magic.py")
#t)))))
(home-page "https://ipython.org")
(synopsis "IPython is a tool for interactive computing in Python")
(description
"IPython provides a rich architecture for interactive computing with:
Powerful interactive shells, a browser-based notebook, support for interactive
data visualization, embeddable interpreters and tools for parallel
computing.")
(license license:bsd-3)))
(define-public python-ipython
(package
(name "python-ipython")
@ -5721,6 +5703,70 @@ (define-public python-ipython
"IPython provides a rich architecture for interactive computing with:
Powerful interactive shells, a browser-based notebook, support for interactive
data visualization, embeddable interpreters and tools for parallel
computing.")
(properties `((python2-variant . ,(delay python2-ipython))))
(license license:bsd-3)))
;; This is the latest release of the LTS version of ipython with support for
;; Python 2.7 and Python 3.x. Later non-LTS versions starting from 6.0 have
;; dropped support for Python 2.7.
(define-public python2-ipython
(package
(name "python2-ipython")
(version "5.8.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ipython" version ".tar.gz"))
(sha256
(base32 "01l93i4hspf0lvhmycvc8j378bslm9rw30mwfspsl6v1ayc69b2b"))))
(build-system python-build-system)
(propagated-inputs
`(("python2-backports-shutil-get-terminal-size"
,python2-backports-shutil-get-terminal-size)
("python2-pathlib2" ,python2-pathlib2)
("python2-pyzmq" ,python2-pyzmq)
("python2-prompt-toolkit" ,python2-prompt-toolkit-1)
("python2-terminado" ,python2-terminado)
("python2-matplotlib" ,python2-matplotlib)
("python2-numpy" ,python2-numpy)
("python2-numpydoc" ,python2-numpydoc)
("python2-jinja2" ,python2-jinja2)
("python2-mistune" ,python2-mistune)
("python2-pexpect" ,python2-pexpect)
("python2-pickleshare" ,python2-pickleshare)
("python2-simplegeneric" ,python2-simplegeneric)
("python2-jsonschema" ,python2-jsonschema)
("python2-traitlets" ,python2-traitlets)
("python2-nbformat" ,python2-nbformat)
("python2-pygments" ,python2-pygments)))
(inputs
`(("readline" ,readline)
("which" ,which)))
(native-inputs
`(("graphviz" ,graphviz)
("pkg-config" ,pkg-config)
("python2-requests" ,python2-requests) ;; for tests
("python2-testpath" ,python2-testpath)
("python2-mock" ,python2-mock)
("python2-nose" ,python2-nose)))
(arguments
`(#:python ,python-2
#:phases
(modify-phases %standard-phases
(add-before 'check 'delete-broken-tests
(lambda* (#:key inputs #:allow-other-keys)
;; These tests throw errors for unknown reasons.
(delete-file "IPython/core/tests/test_profile.py")
(delete-file "IPython/core/tests/test_interactiveshell.py")
(delete-file "IPython/core/tests/test_magic.py")
#t)))))
(home-page "https://ipython.org")
(synopsis "IPython is a tool for interactive computing in Python")
(description
"IPython provides a rich architecture for interactive computing with:
Powerful interactive shells, a browser-based notebook, support for interactive
data visualization, embeddable interpreters and tools for parallel
computing.")
(license license:bsd-3)))
@ -8496,14 +8542,14 @@ (define-public python-argparse-manpage
(define-public python-contextlib2
(package
(name "python-contextlib2")
(version "0.5.5")
(version "0.6.0.post1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "contextlib2" version))
(sha256
(base32
"0j6ad6lwwyc9kv71skj098v5l7x5biyj2hs4lc5x1kcixqcr97sh"))))
"0bhnr2ac7wy5l85ji909gyljyk85n92w8pdvslmrvc8qih4r1x01"))))
(build-system python-build-system)
(home-page "https://contextlib2.readthedocs.org/")
(synopsis "Tools for decorators and context managers")
@ -10717,26 +10763,24 @@ (define-public python2-cleo
(define-public python-tomlkit
(package
(name "python-tomlkit")
(version "0.5.8")
(version "0.5.11")
(source
(origin
(method url-fetch)
(uri (pypi-uri "tomlkit" version))
(sha256
(base32
"0sf2a4q61kf344hjbw8kb6za1hlccl89j9lzqw0l2zpddp0hrh9j"))))
(base32 "1kq1663iqxgwrmb883n55ypi5axnixla2hrby9g2x227asifsi7h"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest" ,python-pytest)))
(home-page
"https://github.com/sdispater/tomlkit")
(synopsis "Style preserving TOML library")
(home-page "https://github.com/sdispater/tomlkit")
(synopsis "Style-preserving TOML library")
(description
"TOML Kit is a 0.5.0-compliant TOML library. It includes a parser that
preserves all comments, indentations, whitespace and internal element ordering,
and makes them accessible and editable via an intuitive API. It can also
create new TOML documents from scratch using the provided helpers. Part of the
implementation as been adapted, improved and fixed from Molten.")
implementation has been adapted, improved, and fixed from Molten.")
(license license:expat)))
(define-public python-shellingham
@ -13428,10 +13472,17 @@ (define-public python-radon
@item Halstead metrics (all of them)
@item the Maintainability Index (a Visual Studio metric)
@end itemize")
(properties `((python2-variant . ,(delay python2-radon))))
(license license:expat)))
(define-public python2-radon
(package-with-python2 python-radon))
(let ((base (package-with-python2 (strip-python2-variant python-radon))))
(package
(inherit base)
(propagated-inputs
`(("python-configparser" ,python2-configparser)
("python-future" ,python2-future)
,@(package-propagated-inputs base))))))
(define-public python-sure
(package

2
gnu/packages/ruby.scm
View file

@ -3335,7 +3335,7 @@ (define-public ruby-minitest-rg
(synopsis "Coloured output for Minitest")
(description
"@code{minitest-rg} changes the colour of the output from Minitest.")
(home-page "http://blowmage.com/minitest-rg")
(home-page "https://blowmage.com/minitest-rg/")
(license license:expat)))
(define-public ruby-minitest-hooks

30
gnu/packages/skarnet.scm
View file

@ -30,14 +30,14 @@ (define-module (gnu packages skarnet)
(define-public skalibs
(package
(name "skalibs")
(version "2.9.1.0")
(version "2.9.2.0")
(source
(origin
(method url-fetch)
(uri (string-append "http://skarnet.org/software/skalibs/skalibs-"
(uri (string-append "https://skarnet.org/software/skalibs/skalibs-"
version ".tar.gz"))
(sha256
(base32 "19c6s3f7vxi96l2yqzjk9x9i4xkfg4fdzxhn1jg6bfb2qjph9cnk"))))
(base32 "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no tests exist
@ -62,14 +62,14 @@ (define-public skalibs
(define-public execline
(package
(name "execline")
(version "2.5.1.0")
(version "2.6.0.0")
(source
(origin
(method url-fetch)
(uri (string-append "http://skarnet.org/software/execline/execline-"
(uri (string-append "https://skarnet.org/software/execline/execline-"
version ".tar.gz"))
(sha256
(base32 "0xr6yb50wm6amj1wc7jmxyv7hvlx2ypbnww1vc288j275625d9xi"))))
(base32 "1m6pvawxqaqjr49456vyjyl8dnqwvr19v77sjj7dnglfijwza5al"))))
(build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs)))
(arguments
@ -108,7 +108,7 @@ (define-public s6
(source
(origin
(method url-fetch)
(uri (string-append "http://skarnet.org/software/s6/s6-"
(uri (string-append "https://skarnet.org/software/s6/s6-"
version ".tar.gz"))
(sha256
(base32 "0mvcjrz8nlj9p2zclmcv22b4y6bqzd2iz38arhgc989vdvrbmkg0"))))
@ -150,14 +150,14 @@ (define-public s6
(define-public s6-dns
(package
(name "s6-dns")
(version "2.3.1.1")
(version "2.3.2.0")
(source
(origin
(method url-fetch)
(uri (string-append "http://skarnet.org/software/s6-dns/s6-dns-"
(uri (string-append "https://skarnet.org/software/s6-dns/s6-dns-"
version ".tar.gz"))
(sha256
(base32 "0clib10dk3r9rcxv1yfr6gdvqqrx0arzivjpmhz9p8xaif53wpj1"))))
(base32 "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7"))))
(build-system gnu-build-system)
(inputs `(("skalibs" ,skalibs)))
(arguments
@ -183,7 +183,7 @@ (define-public s6-networking
(source
(origin
(method url-fetch)
(uri (string-append "http://skarnet.org/software/s6-networking/s6-networking-"
(uri (string-append "https://skarnet.org/software/s6-networking/s6-networking-"
version ".tar.gz"))
(sha256
(base32 "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr"))))
@ -226,7 +226,7 @@ (define-public s6-rc
(source
(origin
(method url-fetch)
(uri (string-append "http://skarnet.org/software/s6-rc/s6-rc-"
(uri (string-append "https://skarnet.org/software/s6-rc/s6-rc-"
version ".tar.gz"))
(sha256
(base32 "18m8jsx3bkj566p6xwwnsvdckk10n8wqnhp0na2k88i295h4rnjp"))))
@ -268,7 +268,7 @@ (define-public s6-portable-utils
(origin
(method url-fetch)
(uri (string-append
"http://skarnet.org/software/s6-portable-utils/s6-portable-utils-"
"https://skarnet.org/software/s6-portable-utils/s6-portable-utils-"
version ".tar.gz"))
(sha256
(base32 "1k3la37q46n93vjwk9wm9ym4w87z6lqzv43f03qd0vqj9k94mpv3"))))
@ -300,7 +300,7 @@ (define-public s6-linux-init
(origin
(method url-fetch)
(uri (string-append
"http://skarnet.org/software/s6-linux-init/s6-linux-init-"
"https://skarnet.org/software/s6-linux-init/s6-linux-init-"
version ".tar.gz"))
(sha256
(base32 "176mgkqxlp6gb6my66dv73xsp7adfxbjp5hjyh35sykqkr4kfyfy"))))
@ -345,7 +345,7 @@ (define-public s6-linux-utils
(origin
(method url-fetch)
(uri (string-append
"http://skarnet.org/software/s6-linux-utils/s6-linux-utils-"
"https://skarnet.org/software/s6-linux-utils/s6-linux-utils-"
version ".tar.gz"))
(sha256
(base32 "0w4jms9qyb5kx9zcyd3gzri60rrii2rbmh08s59ckg4awy27py86"))))

17
gnu/packages/tls.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2016, 2017, 2018 ng0 <ng0@n0.is>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
@ -276,7 +276,14 @@ (define gnutls-3.6.10
"/gnutls-" version ".tar.xz"))
(sha256
(base32
"14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi"))))))
"14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi"))))
(native-inputs
`(,@(package-native-inputs gnutls)
;; Datefudge is used to fuzz time for tests, and its presence
;; enables a test that uses 'setsid' from util-linux.
("datefudge" ,datefudge)
("util-linux" ,util-linux)))))
(define-public guile3.0-gnutls
(package
@ -553,13 +560,13 @@ (define-public python-acme
(package
(name "python-acme")
;; Remember to update the hash of certbot when updating python-acme.
(version "1.2.0")
(version "1.3.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "acme" version))
(sha256
(base32
"1ar6mjax7cyvq3zgh64yrg485l02dy6zqddxjxg99nlvsi0cfc06"))))
"03fjmg0fgfy7xfn3i8rzn9i0i4amajmijkash84qb8mlphgrxpn0"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -610,7 +617,7 @@ (define-public certbot
(uri (pypi-uri "certbot" version))
(sha256
(base32
"0g1p4nkaid6davjm5qz8lsln92dhjhlv3rrg8hcfpr7qhphbmp4m"))))
"1n5i0k6kwmd6wvivshfl3k4djwcpwx390c39xmr2hhrgpk5r285w"))))
(build-system python-build-system)
(arguments
`(,@(substitute-keyword-arguments (package-arguments python-acme)

2
gnu/packages/version-control.scm
View file

@ -1066,7 +1066,7 @@ (define-public git-flow
"gitflow-shFlags")))))
(delete 'configure)
(delete 'build))))
(home-page "http://nvie.com/posts/a-successful-git-branching-model/")
(home-page "https://nvie.com/posts/a-successful-git-branching-model/")
(synopsis "Git extensions for Vincent Driessen's branching model")
(description
"Vincent Driessen's branching model is a git branching and release

4
gnu/packages/video.scm
View file

@ -1687,7 +1687,7 @@ (define-public youtube-dl-gui
(define-public you-get
(package
(name "you-get")
(version "0.4.1403")
(version "0.4.1410")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1696,7 +1696,7 @@ (define-public you-get
(file-name (git-file-name name version))
(sha256
(base32
"04viy19x4g9dngml82nf9j94ys3p47bs62c2q2cn1barkybaa3as"))))
"1v4lfldcijgngg0s4q5w4ixa0k8k75dwmkhf57pgb31bqlrr8h0s"))))
(build-system python-build-system)
(inputs
`(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos

2
gnu/packages/wxwidgets.scm
View file

@ -225,7 +225,7 @@ (define-public python-wxpython
`(("python-numpy" ,python-numpy)
("python-pillow" ,python-pillow)
("python-six" ,python-six)))
(home-page "http://wxPython.org/")
(home-page "https://wxpython.org/")
(synopsis "Cross platform GUI toolkit for Python")
(description "wxPython is a cross-platform GUI toolkit for the Python
programming language. It is implemented as a set of Python extension modules

113
gnu/packages/xdisorg.scm
View file

@ -33,6 +33,7 @@
;;; Copyright © 2020 David Wilson <david@daviwil.com>
;;; Copyright © 2020 Ivan Vilata i Balaguer <ivan@selidor.net>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Damien Cassou <damien@cassou.me>
;;;
;;; This file is part of GNU Guix.
;;;
@ -2117,3 +2118,115 @@ (define-public xsettingsd
not running. With a simple @file{.xsettingsd} configuration file one can avoid
configuring visual settings in different UI toolkits separately.")
(license license:bsd-3)))
(define-public clipnotify
(package
(name "clipnotify")
(version "1.0.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cdown/clipnotify.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1v3ydm5ljy8z1savmdxrjyx7a5bm5013rzw80frp3qbbjaci0wbg"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(delete 'configure)
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(doc (string-append %output "/share/doc/" ,name "-" ,version)))
(install-file "clipnotify" bin)
(install-file "README.md" doc)
#t))))
#:make-flags (list "CC=gcc")
#:tests? #f))
(inputs
`(("libx11" ,libx11)
("libXfixes" ,libxfixes)))
(home-page "https://github.com/cdown/clipnotify")
(synopsis "Notify on new X clipboard events")
(description "@command{clipnotify} is a simple program that, using the
XFIXES extension to X11, waits until a new selection is available and then
exits.
It was primarily designed for clipmenu, to avoid polling for new selections.
@command{clipnotify} doesn't try to print anything about the contents of the
selection, it just exits when it changes. This is intentional -- X11's
selection API is verging on the insane, and there are plenty of others who
have already lost their sanity to bring us xclip/xsel/etc. Use one of those
tools to complement clipnotify.")
(license license:public-domain)))
(define-public clipmenu
(let ((commit "a495bcc7a4ab125182a661c5808364f66938a87c")
(revision "1"))
(package
(name "clipmenu")
(version (string-append "5.6.0-"
revision "." (string-take commit 7)))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/cdown/clipnotify.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"12vvircdhl4psqi51cnfd6bqy85v2vwfcmdq1mimjgng727nwzys"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-hardcoded-paths
(lambda _
(substitute* "clipmenud"
(("has_clipnotify=0")
"has_clipnotify=1")
(("command -v clipnotify >/dev/null 2>&1 && has_clipnotify=1")
"")
(("clipnotify \\|\\| .*")
(string-append (which "clipnotify") "\n"))
(("xsel --logfile")
(string-append (which "xsel") " --logfile")))
(substitute* "clipmenu"
(("xsel --logfile")
(string-append (which "xsel") " --logfile")))
#t))
(delete 'configure)
(delete 'build)
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(doc (string-append %output "/share/doc/"
,name "-" ,version)))
(install-file "clipdel" bin)
(install-file "clipmenu" bin)
(install-file "clipmenud" bin)
(install-file "README.md" doc)
#t))))
#:tests? #f))
(inputs
`(("clipnotify" ,clipnotify)
("xsel" ,xsel)))
(home-page "https://github.com/cdown/clipmenu")
(synopsis "Simple clipboard manager using dmenu or rofi and xsel")
(description "Start @command{clipmenud}, then run @command{clipmenu} to
select something to put on the clipboard.
When @command{clipmenud} detects changes to the clipboard contents, it writes
them out to the cache directory. @command{clipmenu} reads the cache directory
to find all available clips and launches @command{dmenu} (or @command{rofi},
depending on the value of @code{CM_LAUNCHER}) to let the user select a clip.
After selection, the clip is put onto the PRIMARY and CLIPBOARD X selections.")
(license license:public-domain))))

74
gnu/packages/xfce.scm
View file

@ -72,7 +72,7 @@ (define-public gtk-xfce-engine
(version "2.10.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/xfce/"
(uri (string-append "https://archive.xfce.org/src/xfce/"
name "/" (version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
@ -499,7 +499,7 @@ (define-public xfce4-xkb-plugin
(version "0.8.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
name "/" (version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
@ -609,7 +609,7 @@ (define-public xfce4-settings
(version "4.14.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/xfce/"
(uri (string-append "https://archive.xfce.org/src/xfce/"
name "/" (version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
@ -648,7 +648,7 @@ (define-public thunar
(version "1.8.12")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/xfce/"
(uri (string-append "https://archive.xfce.org/src/xfce/"
"thunar/" (version-major+minor version) "/"
"thunar-" version ".tar.bz2"))
(sha256
@ -917,7 +917,7 @@ (define-public ristretto
(version "0.10.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/apps/ristretto/"
(uri (string-append "https://archive.xfce.org/src/apps/ristretto/"
(version-major+minor version) "/"
"ristretto-" version ".tar.bz2"))
(sha256
@ -979,7 +979,7 @@ (define-public orage
(version "4.12.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/apps/"
(uri (string-append "https://archive.xfce.org/src/apps/"
name "/" (version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
@ -1050,7 +1050,7 @@ (define-public xfburn
(version "0.6.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/apps/xfburn/"
(uri (string-append "https://archive.xfce.org/src/apps/xfburn/"
(version-major+minor version) "/"
"xfburn-" version ".tar.bz2"))
(sha256
@ -1086,7 +1086,7 @@ (define-public mousepad
(version "0.4.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/apps/mousepad/"
(uri (string-append "https://archive.xfce.org/src/apps/mousepad/"
(version-major+minor version) "/mousepad-"
version ".tar.bz2"))
(sha256
@ -1128,7 +1128,7 @@ (define-public xfce4-screenshooter
(version "1.9.7")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/apps/"
(uri (string-append "https://archive.xfce.org/src/apps/"
"xfce4-screenshooter/"
(version-major+minor version)
"/xfce4-screenshooter-"
@ -1161,7 +1161,7 @@ (define-public xfce4-screensaver
(version "0.1.8")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/apps/"
(uri (string-append "https://archive.xfce.org/src/apps/"
"xfce4-screensaver/"
(version-major+minor version)
"/xfce4-screensaver-"
@ -1237,7 +1237,7 @@ (define-public xfce4-cpugraph-plugin
(version "1.1.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-cpugraph-plugin/"
(version-major+minor version)
"/xfce4-cpugraph-plugin-" version ".tar.bz2"))
@ -1270,7 +1270,7 @@ (define-public xfce4-eyes-plugin
(version "4.5.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-eyes-plugin/"
(version-major+minor version)
"/xfce4-eyes-plugin-" version ".tar.bz2"))
@ -1297,7 +1297,7 @@ (define-public xfce4-equake-plugin
(version "1.3.8")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-equake-plugin/"
(version-major+minor version)
"/xfce4-equake-plugin-" version ".tar.bz2"))
@ -1326,7 +1326,7 @@ (define-public xfce4-datetime-plugin
(version "0.8.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-datetime-plugin/"
(version-major+minor version)
"/xfce4-datetime-plugin-" version ".tar.bz2"))
@ -1353,7 +1353,7 @@ (define-public xfce4-calculator-plugin
(version "0.7.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-calculator-plugin/"
(version-major+minor version)
"/xfce4-calculator-plugin-" version ".tar.bz2"))
@ -1381,7 +1381,7 @@ (define-public xfce4-cpufreq-plugin
(version "1.2.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-cpufreq-plugin/"
(version-major+minor version)
"/xfce4-cpufreq-plugin-" version ".tar.bz2"))
@ -1408,7 +1408,7 @@ (define-public xfce4-diskperf-plugin
(version "2.6.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-diskperf-plugin/"
(version-major+minor version)
"/xfce4-diskperf-plugin-" version ".tar.bz2"))
@ -1435,7 +1435,7 @@ (define-public xfce4-embed-plugin
(version "1.6.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-embed-plugin/"
(version-major+minor version)
"/xfce4-embed-plugin-" version ".tar.bz2"))
@ -1470,7 +1470,7 @@ (define-public xfce4-fsguard-plugin
(version "1.1.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-fsguard-plugin/"
(version-major+minor version)
"/xfce4-fsguard-plugin-" version ".tar.bz2"))
@ -1500,7 +1500,7 @@ (define-public xfce4-genmon-plugin
(version "4.0.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-genmon-plugin/"
(version-major+minor version)
"/xfce4-genmon-plugin-" version ".tar.bz2"))
@ -1531,7 +1531,7 @@ (define-public xfce4-kbdleds-plugin
(version "0.0.6")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-kbdleds-plugin/"
(version-major+minor version)
"/xfce4-kbdleds-plugin-" version ".tar.bz2"))
@ -1559,7 +1559,7 @@ (define-public xfce4-mailwatch-plugin
(version "1.2.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-mailwatch-plugin/"
(version-major+minor version)
"/xfce4-mailwatch-plugin-" version ".tar.bz2"))
@ -1597,7 +1597,7 @@ (define-public xfce4-mpc-plugin
(version "0.5.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-mpc-plugin/"
(version-major+minor version)
"/xfce4-mpc-plugin-" version ".tar.bz2"))
@ -1640,7 +1640,7 @@ (define-public xfce4-mount-plugin
(version "1.1.3")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-mount-plugin/"
(version-major+minor version)
"/xfce4-mount-plugin-" version ".tar.bz2"))
@ -1669,7 +1669,7 @@ (define-public xfce4-netload-plugin
(version "1.3.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-netload-plugin/"
(version-major+minor version)
"/xfce4-netload-plugin-" version ".tar.bz2"))
@ -1696,7 +1696,7 @@ (define-public xfce4-places-plugin
(version "1.8.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-places-plugin/"
(version-major+minor version)
"/xfce4-places-plugin-" version ".tar.bz2"))
@ -1738,7 +1738,7 @@ (define-public xfce4-smartbookmark-plugin
(version "0.5.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-smartbookmark-plugin/"
(version-major+minor version)
"/xfce4-smartbookmark-plugin-" version ".tar.bz2"))
@ -1763,16 +1763,16 @@ (define-public xfce4-smartbookmark-plugin
(define-public xfce4-statusnotifier-plugin
(package
(name "xfce4-statusnotifier-plugin")
(version "0.2.1")
(version "0.2.2")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-statusnotifier-plugin/"
(version-major+minor version)
"/xfce4-statusnotifier-plugin-" version ".tar.bz2"))
(sha256
(base32
"154b0q9pmlbjh30vvx4c48msdfxp4pq8x4mbn71mk7pibk018hsj"))))
"1yic99jx7013pywpd0k31pxab8s8lv3wcq364iha99qhsm25k42c"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
@ -1798,7 +1798,7 @@ (define-public xfce4-stopwatch-plugin
(version "0.3.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-stopwatch-plugin/"
(version-major+minor version)
"/xfce4-stopwatch-plugin-" version ".tar.bz2"))
@ -1827,7 +1827,7 @@ (define-public xfce4-systemload-plugin
(version "1.2.3")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-systemload-plugin/"
(version-major+minor version)
"/xfce4-systemload-plugin-" version ".tar.bz2"))
@ -1855,7 +1855,7 @@ (define-public xfce4-time-out-plugin
(version "1.1.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-time-out-plugin/"
(version-major+minor version)
"/xfce4-time-out-plugin-" version ".tar.bz2"))
@ -1885,7 +1885,7 @@ (define-public xfce4-timer-plugin
(version "1.7.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-timer-plugin/"
(version-major+minor version)
"/xfce4-timer-plugin-" version ".tar.bz2"))
@ -1913,7 +1913,7 @@ (define-public xfce4-verve-plugin
(version "2.0.0")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-verve-plugin/"
(version-major+minor version)
"/xfce4-verve-plugin-" version ".tar.bz2"))
@ -1947,7 +1947,7 @@ (define-public xfce4-wavelan-plugin
(version "0.6.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-wavelan-plugin/"
(version-major+minor version)
"/xfce4-wavelan-plugin-" version ".tar.bz2"))
@ -1974,7 +1974,7 @@ (define-public xfce4-weather-plugin
(version "0.10.1")
(source (origin
(method url-fetch)
(uri (string-append "http://archive.xfce.org/src/panel-plugins/"
(uri (string-append "https://archive.xfce.org/src/panel-plugins/"
"xfce4-weather-plugin/"
(version-major+minor version)
"/xfce4-weather-plugin-" version ".tar.bz2"))

21
gnu/packages/zile.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -51,7 +52,7 @@ (define-public zile
"0x3byaddms8l3g7igx6njycqsq98wgapysdb5c7lhcnajlkp8y3s"))))
(build-system gnu-build-system)
(arguments
'(#:phases
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-/bin/sh
(lambda* (#:key inputs #:allow-other-keys)
@ -60,7 +61,18 @@ (define-public zile
(substitute* '("lib/spawni.c" "src/funcs.c")
(("/bin/sh")
(string-append bash "/bin/sh")))
#t))))))
#t)))
;; Zile generates its manual pages by calling the built Zile
;; with the --help argument. That does not work when cross-
;; compiling; use the native Zile added below in that case.
,@(if (%current-target-system)
'((add-before 'build 'use-native-zile-for-documentation
(lambda _
(substitute* "build-aux/zile-help2man-wrapper"
(("src/zile")
(which "zile")))
#t)))
'()))))
(inputs
`(("boehm-gc" ,libgc)
("ncurses" ,ncurses)
@ -68,6 +80,11 @@ (define-public zile
(native-inputs
`(("perl" ,perl)
("help2man" ,help2man)
;; When cross-compiling, Zile needs a native version of itself to
;; generate the manual pages (see the related phase above).
,@(if (%current-target-system)
`(("self" ,this-package))
'())
("pkg-config" ,pkg-config)))
(home-page "https://www.gnu.org/software/zile/")
(synopsis "Lightweight Emacs clone")

129
guix/build/download.scm
View file

@ -457,135 +457,6 @@ (define (close-connection port) ;deprecated
'set-port-encoding!
(lambda (p e) #f))
;; XXX: Work around <http://bugs.gnu.org/23421>, fixed in Guile commit
;; 16050431f29d56f80c4a8253506fc851b8441840. Guile's date validation
;; procedure rejects dates in which the hour is not padded with a zero but
;; with whitespace.
(begin
(define-syntax string-match?
(lambda (x)
(syntax-case x ()
((_ str pat) (string? (syntax->datum #'pat))
(let ((p (syntax->datum #'pat)))
#`(let ((s str))
(and
(= (string-length s) #,(string-length p))
#,@(let lp ((i 0) (tests '()))
(if (< i (string-length p))
(let ((c (string-ref p i)))
(lp (1+ i)
(case c
((#\.) ; Whatever.
tests)
((#\d) ; Digit.
(cons #`(char-numeric? (string-ref s #,i))
tests))
((#\a) ; Alphabetic.
(cons #`(char-alphabetic? (string-ref s #,i))
tests))
(else ; Literal.
(cons #`(eqv? (string-ref s #,i) #,c)
tests)))))
tests)))))))))
(define (parse-rfc-822-date str space zone-offset)
(let ((parse-non-negative-integer (@@ (web http) parse-non-negative-integer))
(parse-month (@@ (web http) parse-month))
(bad-header (@@ (web http) bad-header)))
;; We could verify the day of the week but we don't.
(cond ((string-match? (substring str 0 space) "aaa, dd aaa dddd dd:dd:dd")
(let ((date (parse-non-negative-integer str 5 7))
(month (parse-month str 8 11))
(year (parse-non-negative-integer str 12 16))
(hour (parse-non-negative-integer str 17 19))
(minute (parse-non-negative-integer str 20 22))
(second (parse-non-negative-integer str 23 25)))
(make-date 0 second minute hour date month year zone-offset)))
((string-match? (substring str 0 space) "aaa, d aaa dddd dd:dd:dd")
(let ((date (parse-non-negative-integer str 5 6))
(month (parse-month str 7 10))
(year (parse-non-negative-integer str 11 15))
(hour (parse-non-negative-integer str 16 18))
(minute (parse-non-negative-integer str 19 21))
(second (parse-non-negative-integer str 22 24)))
(make-date 0 second minute hour date month year zone-offset)))
;; The next two clauses match dates that have a space instead of
;; a leading zero for hours, like " 8:49:37".
((string-match? (substring str 0 space) "aaa, dd aaa dddd d:dd:dd")
(let ((date (parse-non-negative-integer str 5 7))
(month (parse-month str 8 11))
(year (parse-non-negative-integer str 12 16))
(hour (parse-non-negative-integer str 18 19))
(minute (parse-non-negative-integer str 20 22))
(second (parse-non-negative-integer str 23 25)))
(make-date 0 second minute hour date month year zone-offset)))
((string-match? (substring str 0 space) "aaa, d aaa dddd d:dd:dd")
(let ((date (parse-non-negative-integer str 5 6))
(month (parse-month str 7 10))
(year (parse-non-negative-integer str 11 15))
(hour (parse-non-negative-integer str 17 18))
(minute (parse-non-negative-integer str 19 21))
(second (parse-non-negative-integer str 22 24)))
(make-date 0 second minute hour date month year zone-offset)))
(else
(bad-header 'date str) ; prevent tail call
#f))))
(module-set! (resolve-module '(web http))
'parse-rfc-822-date parse-rfc-822-date))
;; XXX: Work around broken proxy handling on Guile 2.2 <= 2.2.2, fixed in
;; Guile commits 7d0d9e2c25c1e872cfc7d14ab5139915f1813d56 and
;; 6ad28ae3bc6a6d9e95ab7d70510d12c97673a143. See bug report at
;; <https://lists.gnu.org/archive/html/guix-devel/2017-11/msg00070.html>.
(cond-expand
(guile-2.2
(when (<= (string->number (micro-version)) 2)
(let ()
(define put-symbol (@@ (web http) put-symbol))
(define put-non-negative-integer
(@@ (web http) put-non-negative-integer))
(define write-http-version
(@@ (web http) write-http-version))
(define (write-request-line method uri version port)
"Write the first line of an HTTP request to PORT."
(put-symbol port method)
(put-char port #\space)
(when (http-proxy-port? port)
(let ((scheme (uri-scheme uri))
(host (uri-host uri))
(host-port (uri-port uri)))
(when (and scheme host)
(put-symbol port scheme)
(put-string port "://")
(cond
((string-index host #\:) ;<---- The fix is here!
(put-char port #\[) ;<---- And here!
(put-string port host)
(put-char port #\]))
(else
(put-string port host)))
(unless ((@@ (web uri) default-port?) scheme host-port)
(put-char port #\:)
(put-non-negative-integer port host-port)))))
(let ((path (uri-path uri))
(query (uri-query uri)))
(if (string-null? path)
(put-string port "/")
(put-string port path))
(when query
(put-string port "?")
(put-string port query)))
(put-char port #\space)
(write-http-version version port)
(put-string port "\r\n"))
(module-set! (resolve-module '(web http)) 'write-request-line
write-request-line))))
(else #t))
(define (resolve-uri-reference ref base)
"Resolve the URI reference REF, interpreted relative to the BASE URI, into a
target URI, according to the algorithm specified in RFC 3986 section 5.2.2.

25
guix/ui.scm
View file

@ -1218,16 +1218,23 @@ (define (maybe-break chr result)
;;;
(define %text-width
(make-parameter (terminal-columns)))
;; '*line-width*' was introduced in Guile 2.2.7/3.0.1. On older versions of
;; Guile, monkey-patch 'wrap*' below.
(if (defined? '*line-width*)
(let ((parameter (fluid->parameter *line-width*)))
(parameter (terminal-columns))
parameter)
(make-parameter (terminal-columns))))
(set! (@@ (texinfo plain-text) wrap*)
;; XXX: Monkey patch this private procedure to let 'package->recutils'
;; parameterize the fill of description field correctly.
(lambda strings
(let ((indent (fluid-ref (@@ (texinfo plain-text) *indent*))))
(fill-string (string-concatenate strings)
#:line-width (%text-width) #:initial-indent indent
#:subsequent-indent indent))))
(unless (defined? '*line-width*) ;Guile < 2.2.7
(set! (@@ (texinfo plain-text) wrap*)
;; XXX: Monkey patch this private procedure to let 'package->recutils'
;; parameterize the fill of description field correctly.
(lambda strings
(let ((indent (fluid-ref (@@ (texinfo plain-text) *indent*))))
(fill-string (string-concatenate strings)
#:line-width (%text-width) #:initial-indent indent
#:subsequent-indent indent)))))
(define (texi->plain-text str)
"Return a plain-text representation of texinfo fragment STR."

16
nix/local.mk
View file

@ -164,6 +164,16 @@ etc/guix-%.service: etc/guix-%.service.in \
"$<" > "$@.tmp"; \
mv "$@.tmp" "$@"
sysvinitservicedir = $(sysconfdir)/init.d
nodist_sysvinitservice_DATA = etc/init.d/guix-daemon
etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
$(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \
"$<" > "$@.tmp"; \
mv "$@.tmp" "$@"
# The '.conf' jobs for Upstart.
upstartjobdir = $(libdir)/upstart/system
nodist_upstartjob_DATA = etc/guix-daemon.conf etc/guix-publish.conf
@ -177,7 +187,8 @@ etc/guix-%.conf: etc/guix-%.conf.in \
CLEANFILES += \
$(nodist_systemdservice_DATA) \
$(nodist_upstartjob_DATA)
$(nodist_upstartjob_DATA) \
$(nodist_sysvinitservice_DATA)
EXTRA_DIST += \
%D%/AUTHORS \
@ -185,7 +196,8 @@ EXTRA_DIST += \
etc/guix-daemon.service.in \
etc/guix-daemon.conf.in \
etc/guix-publish.service.in \
etc/guix-publish.conf.in
etc/guix-publish.conf.in \
etc/init.d/guix-daemon.in
if CAN_RUN_TESTS