[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
02/03: Merge branch 'master' into core-updates |
|
Date: |
Wed, 8 Apr 2020 07:14:17 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 27783023993f9272ce422868d14529159c4a5218
Merge: be1e842 ba6f2bd
Author: Marius Bakke <address@hidden>
AuthorDate: Wed Apr 8 13:00:50 2020 +0200
Merge branch 'master' into core-updates
Conflicts:
etc/news.scm
gnu/local.mk
gnu/packages/check.scm
gnu/packages/cross-base.scm
gnu/packages/gimp.scm
gnu/packages/java.scm
gnu/packages/mail.scm
gnu/packages/sdl.scm
gnu/packages/texinfo.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
.gitignore | 1 +
build-aux/build-self.scm | 6 +-
doc/guix-cookbook.texi | 54 +-
doc/guix.texi | 121 +-
etc/news.scm | 8 +
etc/release-manifest.scm | 25 +-
gnu/bootloader/grub.scm | 6 +-
gnu/ci.scm | 1 -
gnu/installer.scm | 30 +-
gnu/installer/newt.scm | 21 +-
gnu/installer/newt/keymap.scm | 33 +-
gnu/installer/newt/page.scm | 4 +-
gnu/installer/newt/parameters.scm | 57 +
gnu/installer/newt/user.scm | 4 +-
gnu/installer/proxy.scm | 45 +
gnu/installer/record.scm | 14 +-
gnu/local.mk | 23 +-
gnu/packages/admin.scm | 7 +-
gnu/packages/algebra.scm | 8 +-
gnu/packages/assembly.scm | 4 +-
gnu/packages/astronomy.scm | 120 +-
gnu/packages/audio.scm | 67 +-
gnu/packages/bioconductor.scm | 30 +-
gnu/packages/bioinformatics.scm | 31 +-
gnu/packages/bittorrent.scm | 9 +-
gnu/packages/cdrom.scm | 2 +-
gnu/packages/cedille.scm | 17 +-
gnu/packages/check.scm | 48 +
gnu/packages/chromium.scm | 4 +-
gnu/packages/coq.scm | 20 +-
gnu/packages/cran.scm | 123 +-
gnu/packages/crates-io.scm | 4 +-
gnu/packages/cross-base.scm | 22 +-
gnu/packages/databases.scm | 80 +
gnu/packages/debug.scm | 3 +-
gnu/packages/dico.scm | 3 +-
gnu/packages/diffoscope.scm | 9 +-
gnu/packages/disk.scm | 5 +-
gnu/packages/docker.scm | 5 +-
gnu/packages/ebook.scm | 1 +
gnu/packages/emacs-xyz.scm | 785 +++-
gnu/packages/emulators.scm | 49 +-
gnu/packages/engineering.scm | 17 +-
gnu/packages/finance.scm | 64 +
gnu/packages/fonts.scm | 66 +-
gnu/packages/games.scm | 169 +-
gnu/packages/genimage.scm | 5 +-
gnu/packages/geo.scm | 16 +
gnu/packages/gimp.scm | 6 +
gnu/packages/gnome.scm | 132 +-
gnu/packages/gnunet.scm | 6 +-
gnu/packages/gnuzilla.scm | 12 +-
gnu/packages/golang.scm | 46 +-
gnu/packages/gps.scm | 10 +-
gnu/packages/graphics.scm | 46 +-
gnu/packages/gtk.scm | 47 +
gnu/packages/guile-xyz.scm | 4 +-
gnu/packages/guile.scm | 80 +-
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/hurd.scm | 25 +-
gnu/packages/image-processing.scm | 3 +-
gnu/packages/image-viewers.scm | 58 +
gnu/packages/image.scm | 61 +-
gnu/packages/java.scm | 42 +-
gnu/packages/julia.scm | 549 ++-
gnu/packages/kde-frameworks.scm | 21 +-
gnu/packages/kde-internet.scm | 1 +
gnu/packages/linphone.scm | 594 +++
gnu/packages/linux.scm | 144 +-
gnu/packages/lisp-xyz.scm | 50 +-
gnu/packages/lisp.scm | 55 +-
gnu/packages/lxde.scm | 2 +-
gnu/packages/mail.scm | 57 +-
gnu/packages/man.scm | 9 +-
gnu/packages/mastodon.scm | 9 +-
gnu/packages/mate.scm | 168 +-
gnu/packages/maths.scm | 196 +-
gnu/packages/matrix.scm | 121 +
gnu/packages/messaging.scm | 5 +-
gnu/packages/mingw.scm | 5 +-
gnu/packages/mpi.scm | 12 +-
gnu/packages/music.scm | 247 +-
gnu/packages/netpbm.scm | 33 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/nfs.scm | 4 +-
gnu/packages/ntp.scm | 10 +-
gnu/packages/ocaml.scm | 5 +-
gnu/packages/package-management.scm | 2 +-
.../beancount-disable-googleapis-fonts.patch | 25 +
...s-mingw-w64-reproducible-import-libraries.patch | 22 +
.../binutils-mingw-w64-specify-timestamp.patch | 137 +
gnu/packages/patches/calibre-msgpack-compat.patch | 18 +
.../patches/higan-remove-march-native-flag.patch | 12 -
gnu/packages/patches/icecat-makeicecat.patch | 4 +-
.../patches/julia-SOURCE_DATE_EPOCH-mtime.patch | 28 +
gnu/packages/patches/mediastreamer2-srtp2.patch | 155 +
.../patches/mingw-w64-dlltool-temp-prefix.patch | 26 +
.../patches/mingw-w64-reproducible-gendef.patch | 23 +
gnu/packages/patches/pam-krb5-CVE-2020-10595.patch | 42 +
.../python-aiohttp-3.6.2-no-warning-fail.patch | 34 +
gnu/packages/patches/reprotest-support-guix.patch | 79 -
gnu/packages/patches/sdl2-mesa-compat.patch | 21 -
gnu/packages/patches/xplanet-1.3.1-cxx11-eof.patch | 154 +
...planet-1.3.1-libdisplay_DisplayOutput.cpp.patch | 16 +
.../patches/xplanet-1.3.1-libimage_gif.c.patch | 54 +
...planet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch | 15 +
gnu/packages/patchutils.scm | 2 +-
gnu/packages/perl.scm | 364 +-
gnu/packages/photo.scm | 10 +-
gnu/packages/pretty-print.scm | 3 +-
gnu/packages/python-check.scm | 30 +-
gnu/packages/python-web.scm | 45 +-
gnu/packages/python-xyz.scm | 732 ++-
gnu/packages/sdl.scm | 16 +-
gnu/packages/security-token.scm | 2 +-
gnu/packages/speech.scm | 22 +-
gnu/packages/sssd.scm | 7 +-
gnu/packages/statistics.scm | 43 +-
gnu/packages/syncthing.scm | 4 +-
gnu/packages/syndication.scm | 41 +-
gnu/packages/telephony.scm | 147 +-
gnu/packages/tex.scm | 5 +-
gnu/packages/texinfo.scm | 15 +-
gnu/packages/time.scm | 30 +
gnu/packages/tls.scm | 21 +-
gnu/packages/tor.scm | 6 +-
gnu/packages/version-control.scm | 59 +-
gnu/packages/video.scm | 38 +-
gnu/packages/vim.scm | 4 +-
gnu/packages/vpn.scm | 61 +-
gnu/packages/vulkan.scm | 2 +-
gnu/packages/web.scm | 52 +-
gnu/packages/wm.scm | 73 +-
gnu/packages/xdisorg.scm | 43 +-
gnu/packages/xfce.scm | 18 +-
gnu/packages/xiph.scm | 5 +-
gnu/services.scm | 9 +-
gnu/services/base.scm | 130 +-
gnu/services/desktop.scm | 16 +-
gnu/services/linux.scm | 57 +-
gnu/services/telephony.scm | 4 +-
gnu/services/web.scm | 75 +-
gnu/system.scm | 8 +-
gnu/system/examples/lightweight-desktop.tmpl | 3 +
gnu/system/keyboard.scm | 7 +-
gnu/system/shadow.scm | 5 +
gnu/tests/base.scm | 23 +
gnu/tests/linux-modules.scm | 45 +-
guix/build/bournish.scm | 24 +-
guix/build/compile.scm | 51 +-
guix/channels.scm | 19 +-
guix/ci.scm | 4 +-
guix/gexp.scm | 2 +-
guix/git.scm | 9 +-
guix/grafts.scm | 60 +-
guix/lint.scm | 1 +
guix/packages.scm | 14 +
guix/profiles.scm | 80 +-
guix/records.scm | 5 +-
guix/scripts/pack.scm | 1 +
guix/scripts/package.scm | 76 +-
guix/scripts/system.scm | 32 +-
guix/scripts/system/reconfigure.scm | 63 +-
guix/store.scm | 27 +-
guix/ui.scm | 2 +-
po/guix/LINGUAS | 1 +
po/guix/POTFILES.in | 2 +
po/guix/ta.po | 4957 ++++++++++++++++++++
tests/guix-build-branch.sh | 4 +-
tests/guix-pack.sh | 12 +-
tests/packages.scm | 59 +
tests/store.scm | 27 +
172 files changed, 12139 insertions(+), 1669 deletions(-)
diff --cc etc/news.scm
index 8c6f5f8,f03db67..ba15f12
--- a/etc/news.scm
+++ b/etc/news.scm
@@@ -10,14 -10,14 +10,22 @@@
(channel-news
(version 0)
+ (entry (commit "0468455e7d279c89ea3ad1b51935efb2b785ec47")
+ (title (en "Rottlog service added to @code{%base-services}"))
+ (body (en "An instance of @code{rottlog-service-type}, the system
+ service responsible for log rotation, has been added to @code{%base-services}.
+ If your operating system configuration for Guix System is explicitly adding
+ @code{rottlog-service-type} to the services, you should now remove it. See
+ the ``Log Rotation'' section of the manual for more information.")))
+
+ (entry (commit "b6bee63bed4f013064c0d902e7c8b83ed7514ade")
+ (title (en "@code{guile} package now refers to version 3.0"))
+ (body (en "The @code{guile} package has been upgraded to version 3.0
+ (instead of 2.2). The @code{guile3.0-} packages have been renamed to their
+original name, and @code{guile2.2-} variants of these packages have been
+defined. Additionally, derivations are now all built with Guile 3.0, and
+system services also run on 3.0.")))
+
(entry (commit "e3e1a7ba08af2d58c47264c543617e499c239444")
(title (en "@command{guix pull} now supports SSH authenticated
repositories")
diff --cc gnu/local.mk
index f5ca0e3,eefcdf5..2197ae5
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -757,10 -765,9 +763,11 @@@ dist_patch_DATA =
%D%/packages/patches/azr3.patch \
%D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \
%D%/packages/patches/bash-completion-directories.patch \
+ %D%/packages/patches/bash-linux-pgrp-pipe.patch \
%D%/packages/patches/bastet-change-source-of-unordered_set.patch \
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
+ %D%/packages/patches/bc-fix-cross-compilation.patch \
+ %D%/packages/patches/beancount-disable-googleapis-fonts.patch \
%D%/packages/patches/beets-werkzeug-compat.patch \
%D%/packages/patches/beignet-correct-file-names.patch \
%D%/packages/patches/benchmark-unbundle-googletest.patch \
@@@ -1035,9 -1032,8 +1045,8 @@@
%D%/packages/patches/hdf-eos5-remove-gctp.patch \
%D%/packages/patches/hdf-eos5-fix-szip.patch \
%D%/packages/patches/hdf-eos5-fortrantests.patch \
- %D%/packages/patches/higan-remove-march-native-flag.patch \
%D%/packages/patches/hubbub-sort-entities.patch \
- %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \
+ %D%/packages/patches/hurd-cross.patch \
%D%/packages/patches/hplip-remove-imageprocessor.patch \
%D%/packages/patches/hydra-disable-darcs-test.patch \
%D%/packages/patches/icecat-makeicecat.patch \
@@@ -1207,10 -1207,10 +1218,12 @@@
%D%/packages/patches/metabat-fix-compilation.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch \
%D%/packages/patches/mingw-w64-6.0.0-gcc.patch \
+ %D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch \
+ %D%/packages/patches/mingw-w64-reproducible-gendef.patch \
%D%/packages/patches/minisat-friend-declaration.patch \
%D%/packages/patches/minisat-install.patch \
+ %D%/packages/patches/mit-krb5-hurd.patch \
+ %D%/packages/patches/mit-krb5-qualify-short-hostnames.patch \
%D%/packages/patches/mpc123-initialize-ao.patch \
%D%/packages/patches/module-init-tools-moduledir.patch \
%D%/packages/patches/monero-use-system-miniupnpc.patch
\
@@@ -1282,9 -1282,8 +1295,10 @@@
%D%/packages/patches/p7zip-CVE-2016-9296.patch \
%D%/packages/patches/p7zip-CVE-2017-17969.patch \
%D%/packages/patches/p7zip-remove-unused-code.patch \
+ %D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
%D%/packages/patches/pam-mount-luks2-support.patch \
+ %D%/packages/patches/pango-skip-libthai-test.patch \
+ %D%/packages/patches/pciutils-hurd-configure.patch \
%D%/packages/patches/sdl-pango-api_additions.patch \
%D%/packages/patches/sdl-pango-blit_overflow.patch \
%D%/packages/patches/sdl-pango-fillrect_crash.patch \
@@@ -1349,8 -1348,10 +1363,9 @@@
%D%/packages/patches/python-3-deterministic-build-info.patch \
%D%/packages/patches/python-3-search-paths.patch \
%D%/packages/patches/python-3-fix-tests.patch \
- %D%/packages/patches/python-3.8-search-paths.patch \
%D%/packages/patches/python-3.8-fix-tests.patch \
%D%/packages/patches/python-CVE-2018-14647.patch \
+ %D%/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch \
%D%/packages/patches/python-alembic-exceptions-cause.patch \
%D%/packages/patches/python-axolotl-AES-fix.patch \
%D%/packages/patches/python-cairocffi-dlopen-path.patch \
@@@ -1427,9 -1426,7 +1441,8 @@@
%D%/packages/patches/scheme48-tests.patch \
%D%/packages/patches/scotch-build-parallelism.patch \
%D%/packages/patches/scotch-integer-declarations.patch \
+ %D%/packages/patches/screen-hurd-path-max.patch \
%D%/packages/patches/sdl-libx11-1.6.patch \
- %D%/packages/patches/sdl2-mesa-compat.patch \
%D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \
%D%/packages/patches/seq24-rename-mutex.patch \
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
diff --cc gnu/packages/admin.scm
index 4e1f9af,e7f63eb..e4f9808
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@@ -29,10 -29,10 +29,11 @@@
;;; Copyright © 2019 Hartmut Goebel <address@hidden>
;;; Copyright © 2019 Alex Griffin <address@hidden>
;;; Copyright © 2019 Guillaume Le Vaillant <address@hidden>
-;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+;;; Copyright © 2019, 2020 Mathieu Othacehe <address@hidden>
;;; Copyright © 2020 Oleg Pykhalov <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
;;; Copyright © 2020 Michael Rohleder <address@hidden>
+ ;;; Copyright © 2020 Vincent Legoll <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/astronomy.scm
index 2ac41e1,2c97635..076a03e
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@@ -289,3 -297,95 +297,95 @@@ Mechanics, Astrometry and Astrodynamic
(license (list license:lgpl2.0+
license:gpl2+)))) ; examples/transforms.c & lntest/*.c
+ (define-public xplanet
+ (package
+ (name "xplanet")
+ (version "1.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append
+ "mirror://sourceforge/xplanet/xplanet/"
+ version "/xplanet-" version ".tar.gz"))
+ (sha256
+ (base32 "1rzc1alph03j67lrr66499zl0wqndiipmj99nqgvh9xzm1qdb023"))
+ (patches
+ (search-patches
+ "xplanet-1.3.1-cxx11-eof.patch"
+ "xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch"
+ "xplanet-1.3.1-libimage_gif.c.patch"
+ "xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("libx11" ,libx11)
+ ("libxscrnsaver" ,libxscrnsaver)
+ ("libice" ,libice)
+ ("freetype" ,freetype)
+ ("pango" ,pango)
+ ("giflib" ,giflib)
- ("libjpeg", libjpeg)
++ ("libjpeg", libjpeg-turbo)
+ ("libpng" ,libpng)
+ ("libtiff" ,libtiff)
+ ("netpbm" ,netpbm)
+ ("zlib" ,zlib)))
+ (arguments
+ `(#:configure-flags
+ (let ((netpbm (assoc-ref %build-inputs "netpbm")))
+ (append (list
+ ;; Give correct path for pnm.h header to configure script
+ (string-append "CPPFLAGS=-I" netpbm "/include/netpbm")
+ ;; no nasa jpl cspice support
+ "--without-cspice" )))))
+ (home-page "http://xplanet.sourceforge.net/";)
+ (synopsis "Planetary body renderer")
+ (description
+ "Xplanet renders an image of a planet into an X window or file.
+ All of the major planets and most satellites can be drawn and different map
+ projections are also supported, including azimuthal, hemisphere, Lambert,
+ Mercator, Mollweide, Peters, polyconic, orthographic and rectangular.")
+ (license license:gpl2+)))
+
+ (define-public gpredict
+ (package
+ (name "gpredict")
+ (version "2.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/csete/gpredict/releases";
+ "/download/v" version
+ "/gpredict-" version ".tar.bz2"))
+ (sha256
+ (base32 "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("intltool" ,intltool)
+ ("gettext" ,gettext-minimal)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("curl" ,curl)
+ ("glib" ,glib)
+ ("goocanvas" ,goocanvas)
+ ("gtk+" ,gtk+)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ ;; Remove reference to non-existent file.
+ (substitute* "po/POTFILES.in"
+ (("src/gtk-sat-tree\\.c")
+ ""))
+ #t)))))
+ (synopsis "Satellite tracking and orbit prediction application")
+ (description
+ "Gpredict is a real-time satellite tracking and orbit prediction
+ application. It can track a large number of satellites and display their
+ position and other data in lists, tables, maps, and polar plots (radar view).
+ Gpredict can also predict the time of future passes for a satellite, and
+ provide you with detailed information about each pass.")
+ (home-page "http://gpredict.oz9aec.net/index.php";)
+ (license license:gpl2+)))
diff --cc gnu/packages/check.scm
index c84a682,2cfaddb..b7267e1
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@@ -2578,15 -2536,24 +2604,37 @@@ system. The code under test requires n
(define-public python2-pyfakefs
(package-with-python2 python-pyfakefs))
+;; This minimal variant is used to avoid a circular dependency between
+;; python2-importlib-metadata, which requires pyfakefs for its tests, and
+;; python2-pytest, which requires python2-importlib-metadata.
+(define-public python2-pyfakefs-bootstrap
+ (hidden-package
+ (package
+ (inherit python2-pyfakefs)
+ (name "python2-pyfakefs-bootstrap")
+ (native-inputs '())
+ (arguments
+ `(#:python ,python-2
+ #:tests? #f)))))
++
+ (define-public python-aiounittest
+ (package
+ (name "python-aiounittest")
+ (version "1.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "aiounittest" version))
+ (sha256
+ (base32
+ "1q4bhmi80smaa1lknvdna0sx3915naczlfna1fp435nf6cjyrjl1"))))
+ (build-system python-build-system)
+ (native-inputs
+ `(("python-coverage" ,python-coverage)
+ ("python-nose" ,python-nose)))
+ (home-page
+ "https://github.com/kwarunek/aiounittest";)
+ (synopsis "Test asyncio code more easily")
+ (description "Aiounittest is a library that helps write tests using
+ asynchronous code in Python (asyncio).")
+ (license license:expat)))
diff --cc gnu/packages/cross-base.scm
index 6c971d0,b0eb7ab..58e3f77
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@@ -74,14 -70,8 +74,8 @@@
`(cons ,(string-append "--target=" target)
,flags))))))
- (define (package-with-patch original patch)
- "Return package ORIGINAL with PATCH applied."
- (package (inherit original)
- (source (origin (inherit (package-source original))
- (patches (list patch))))))
-
-(define (cross-binutils target)
- "Return a cross-Binutils for TARGET."
+(define* (cross-binutils target #:optional (binutils binutils))
+ "Return a cross-Binutils for TARGET using BINUTILS."
(let ((binutils (package (inherit binutils)
(arguments
(substitute-keyword-arguments (package-arguments
diff --cc gnu/packages/games.scm
index 06d1b3c,1efc50e..7b22dfc
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@@ -10291,3 -10355,119 +10336,119 @@@ to conquer opponents by defeating them
capturing their buildings with spies, or offering opponents money for their
kingdom.")
(license license:gpl2+)))
+
+ (define-public neverball
+ ;; Git version is 6-years younger than latest release.
+ (let ((commit "760a25d32a5fb0661b99426d4ddcb9ac9f3d1644")
+ (revision "1"))
+ (package
+ (name "neverball")
+ (version (git-version "1.6.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Neverball/neverball.git";)
+ (commit commit)))
+ (sha256
+ (base32
+ "0bwh67df3lyf33bv710y25l3frjdd34j9b7gsjadwxviz6r1vpj5"))
+ (file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Octocat seems to be non-free. Oddly, Debian doesn't strip it.
+ (delete-file-recursively "data/ball/octocat")
+ #t))))
+ (build-system copy-build-system)
+ (arguments
+ `(#:install-plan
+ '(("neverball" "bin/")
+ ("neverputt" "bin/")
+ ("mapc" "bin/")
+ ("data" "share/games/neverball/")
+ ("locale" "share/")
+ ("dist/" "share/games/neverball" #:include ("neverball_replay.png"
+ "neverlogos.svg"
+ "svg readme.txt"))
+ ("dist/" "share/applications" #:include ("neverball.desktop"
+ "neverputt.desktop"))
+ ("dist/neverball_16.png"
+ "/share/icons/hicolor/16x16/apps/neverball.png")
+ ("dist/neverball_24.png"
+ "/share/icons/hicolor/24x24/apps/neverball.png")
+ ("dist/neverball_32.png"
+ "/share/icons/hicolor/32x32/apps/neverball.png")
+ ("dist/neverball_48.png"
+ "/share/icons/hicolor/48x48/apps/neverball.png")
+ ("dist/neverball_64.png"
+ "/share/icons/hicolor/64x64/apps/neverball.png")
+ ("dist/neverball_128.png"
+ "/share/icons/hicolor/128x128/apps/neverball.png")
+ ("dist/neverball_256.png"
+ "/share/icons/hicolor/256x256/apps/neverball.png")
+ ("dist/neverball_512.png"
+ "/share/icons/hicolor/512x512/apps/neverball.png")
+ ("dist/neverputt_16.png"
+ "/share/icons/hicolor/16x16/apps/neverputt.png")
+ ("dist/neverputt_24.png"
+ "/share/icons/hicolor/24x24/apps/neverputt.png")
+ ("dist/neverputt_32.png"
+ "/share/icons/hicolor/32x32/apps/neverputt.png")
+ ("dist/neverputt_48.png"
+ "/share/icons/hicolor/48x48/apps/neverputt.png")
+ ("dist/neverputt_64.png"
+ "/share/icons/hicolor/64x64/apps/neverputt.png")
+ ("dist/neverputt_128.png"
+ "/share/icons/hicolor/128x128/apps/neverputt.png")
+ ("dist/neverputt_256.png"
+ "/share/icons/hicolor/256x256/apps/neverputt.png")
+ ("dist/neverputt_512.png"
+ "/share/icons/hicolor/512x512/apps/neverputt.png")
+ ("dist/" "share/man/man1" #:include ("mapc.1"))
+ ("dist/" "share/man/man6" #:include ("neverball.6" "neverputt.6"))
+ ("doc/" "share/doc/neverball")
+ ("README.md" "share/doc/neverball/"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'install 'build
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (sdl (assoc-ref inputs "sdl")))
+ (invoke "make" "-j" (number->string (parallel-job-count))
+ "--environment-overrides"
+ "CC=gcc" "BUILD=release"
+ (string-append "DATADIR="
+ out
+ "/share/games/neverball/data")
+ (string-append "LOCALEDIR=" out "/share/locale")
+ (string-append "SDL_CPPFLAGS=-I"
+ sdl
+ "/include/SDL2/")))
+ #t))
+ (add-after 'install 'fix-some-broken-fonts
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/neverball")
+ `("LANG" = ("en_US.utf8")))
+ (wrap-program (string-append out "/bin/neverputt")
+ `("LANG" = ("en_US.utf8"))))
+ #t)))))
+ (native-inputs
+ `(("gettext" ,gettext-minimal))) ;for msgfmt
+ (inputs
- `(("libjpeg" ,libjpeg)
++ `(("libjpeg" ,libjpeg-turbo)
+ ("libpng" ,libpng)
+ ("libvorbis" ,libvorbis)
+ ("physfs" ,physfs)
+ ("sdl" ,(sdl-union (list sdl2 sdl2-ttf)))))
+ (home-page "https://neverball.org/";)
+ (synopsis "3D floor-tilting game")
+ (description
+ "In the grand tradition of Marble Madness and Super Monkey Ball,
+ Neverball has you guide a rolling ball through dangerous territory. Balance
+ on narrow bridges, navigate mazes, ride moving platforms, and dodge pushers
+ and shovers to get to the goal. Race against the clock to collect coins to
+ earn extra balls. Also included is Neverputt, which is a 3D miniature golf
+ game.") ;thanks to Debian for description
+ (license license:gpl2+))))
diff --cc gnu/packages/gimp.scm
index 9995d44,3537fa1..5966906
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@@ -152,10 -151,9 +152,16 @@@ buffers."
(list (string-append "--with-html-dir="
(assoc-ref %outputs "doc")
"/share/gtk-doc/html")
++
+ ;; Prevent the build system from running 'gtk-update-icon-cache'
+ ;; which is not needed during the build because Guix runs it at
+ ;; profile creation time.
+ "ac_cv_path_GTK_UPDATE_ICON_CACHE=true"
++
+ ;; Disable automatic network request on startup to check for
+ ;; version updates.
+ "--disable-check-update"
++
;; ./configure requests not to annoy upstream with packaging
bugs.
"--with-bug-report-url=https://bugs.gnu.org/guix";)
#:phases
diff --cc gnu/packages/guile.scm
index d957b3e,c643f9d..a665c05
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -385,74 -384,59 +385,84 @@@ GNU@tie{}Guile. Use the @code{(ice-9 r
(define package-for-guile-2.0
;; A procedure that rewrites the dependency tree of the given package to use
- ;; GUILE-2.0 instead of GUILE-2.2.
- (package-input-rewriting `((,guile-2.2 . ,guile-2.0))
+ ;; GUILE-2.0 instead of GUILE-3.0.
+ (package-input-rewriting `((,guile-3.0 . ,guile-2.0))
(guile-variant-package-name "guile2.0")))
-(define package-for-guile-3.0
- (package-input-rewriting `((,guile-2.2 . ,guile-next))
- (guile-variant-package-name "guile3.0")))
+(define package-for-guile-2.2
+ (package-input-rewriting `((,guile-3.0 . ,guile-2.2))
+ (guile-variant-package-name "guile2.2")))
+
+(define-syntax define-deprecated-guile3.0-package
+ (lambda (s)
+ "Define a deprecated package alias for \"guile3.0-something\"."
+ (syntax-case s ()
+ ((_ name)
+ (and (identifier? #'name)
+ (string-prefix? "guile3.0-" (symbol->string (syntax->datum
+ #'name))))
+ (let ((->guile (lambda (str)
+ (let ((base (string-drop str
+ (string-length
"guile3.0-"))))
+ (string-append "guile-" base)))))
+ (with-syntax ((package-name (symbol->string (syntax->datum #'name)))
+ (package
+ (datum->syntax
+ #'name
+ (string->symbol
+ (->guile (symbol->string (syntax->datum
#'name)))))))
+ #'(begin
+ (define-deprecated name package
+ (deprecated-package package-name package))
+ (export name))))))))
+
+(define-deprecated-guile3.0-package guile3.0-readline)
(define-public guile-for-guile-emacs
- (package (inherit guile-2.2)
- (name "guile-for-guile-emacs")
- (version "20150510.d8d9a8d")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "git://git.hcoop.net/git/bpt/guile.git")
- (commit "d8d9a8da05ec876acba81a559798eb5eeceb5a17")))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "00sprsshy16y8pxjy126hr2adqcvvzzz96hjyjwgg8swva1qh6b0"))))
- (arguments
- `(;; Tests aren't passing for now.
- ;; Obviously we should re-enable this!
- #:tests? #f
- ,@(package-arguments guile-2.2)))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("libtool" ,libtool)
- ("flex" ,flex)
- ("texinfo" ,texinfo)
- ("gettext" ,gettext-minimal)
- ,@(package-native-inputs guile-2.2)))
- ;; Same as in guile-2.0
- (native-search-paths
- (list (search-path-specification
- (variable "GUILE_LOAD_PATH")
- (files '("share/guile/site/2.0")))
- (search-path-specification
- (variable "GUILE_LOAD_COMPILED_PATH")
- (files '("lib/guile/2.0/site-ccache"
- "share/guile/site/2.0")))))))
+ (let ((commit "15ca78482ac0dd2e3eb36dcb31765d8652d7106d")
+ (revision "1"))
+ (package (inherit guile-2.2)
+ (name "guile-for-guile-emacs")
+ (version (git-version "2.1.2" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "git://git.savannah.gnu.org/guile.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1l7ik4q4zk7vq4m3gnwizc0b64b1mdr31hxqlzxs94xaf2lvi7s2"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments guile-2.2)
+ ((#:phases phases '%standard-phases)
+ `(modify-phases ,phases
+ (replace 'bootstrap
+ (lambda _
+ ;; Disable broken tests.
+ ;; TODO: Fix them!
+ (substitute* "test-suite/tests/gc.test"
+ (("\\(pass-if \"after-gc-hook gets called\"" m)
+ (string-append "#;" m)))
+ (substitute* "test-suite/tests/version.test"
+ (("\\(pass-if \"version reporting works\"" m)
+ (string-append "#;" m)))
+ ;; Warning: Unwind-only `out-of-memory' exception; skipping
pre-unwind handler.
+ ;; FAIL: test-out-of-memory
+ (substitute* "test-suite/standalone/Makefile.am"
+ (("(check_SCRIPTS|TESTS) \\+= test-out-of-memory") ""))
+
+ (patch-shebang "build-aux/git-version-gen")
+ (invoke "sh" "autogen.sh")
+ #t))))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("flex" ,flex)
+ ("texinfo" ,texinfo)
+ ("gettext" ,gettext-minimal)
+ ,@(package-native-inputs guile-2.2))))))
;;;
diff --cc gnu/packages/hurd.scm
index b2a53b5,d483bad..f94d4fa
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@@ -1,9 -1,7 +1,9 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017 Manolis Fragkiskos Ragkousis
<address@hidden>
- ;;; Copyright © 2018 Ludovic Courtès <address@hidden>
+ ;;; Copyright © 2018, 2020 Ludovic Courtès <address@hidden>
;;; Copyright © 2020 Efraim Flashner <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/image-viewers.scm
index 5587bad,e7bfb10..5b03701
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@@ -595,3 -597,60 +596,60 @@@ with tiling window managers. Features
@end itemize\n")
(home-page "https://github.com/eXeC64/imv";)
(license license:expat)))
+
+ (define-public qiv
+ (package
+ (name "qiv")
+ (version "2.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://spiegl.de/qiv/download/qiv-";
+ version ".tgz"))
+ (sha256
+ (base32 "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ;; That is required for testing.
+ ("xorg-server" ,xorg-server-for-tests)))
+ (inputs
+ `(("imlib2" ,imlib2)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+-2)
+ ("lcms" ,lcms)
- ("libjpeg" ,libjpeg)
++ ("libjpeg" ,libjpeg-turbo)
+ ("libtiff" ,libtiff)
+ ("libexif" ,libexif)
+ ("libx11" ,libx11)
+ ("libxext" ,libxext)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (delete 'configure) ; no configure script
+ (add-before 'install 'patch-file-start-xserver
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; patch the file so that qiv runs and exits by itself
+ (substitute* "Makefile"
+ (("./qiv -f ./intro.jpg") "./qiv -f -C -s ./intro.jpg")
+ ;; Fail the build when test fails.
+ (("echo \"-- Test Failed --\"")
+ "(echo \"-- Test Failed --\" ; false)"))
+ ;; There must be a running X server and make install doesn't
start one.
+ ;; Therefore we must do it.
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1")
+ #t)))
+ #:tests? #f ; there is no check target
+ #:make-flags
+ (list
+ (string-append "PREFIX=" (assoc-ref %outputs "out")))))
+ (home-page "http://spiegl.de/qiv/";)
+ (synopsis "Graphical image viewer for X")
+ (description
+ "Quick Image Viewer is a small and fast GDK/Imlib2 image viewer.
+ Features include zoom, maxpect, scale down, fullscreen, slideshow, delete,
+ brightness/contrast/gamma correction, pan with keyboard and mouse, flip,
+ rotate left/right, jump/forward/backward images, filename filter and use it
+ to set X desktop background.")
+ (license license:gpl2)))
diff --cc gnu/packages/image.scm
index 9974208,8d44bae..0ae88ea
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -45,9 -46,9 +46,10 @@@
#:use-module (gnu packages algebra)
#:use-module (gnu packages assembly)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages curl)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
@@@ -2009,3 -1981,56 +2011,56 @@@ AOM, including with alpha."
(home-page "https://github.com/AOMediaCodec/libavif";)
(license (list license:bsd-2 ; libavif itself
license:expat)))) ; cJSON in the test suite
+
+ (define-public mtpaint
+ (let ((commit "03b1b0938067b88d86d9f1b1088730f1934d411e")
+ (revision "1"))
+ (package
+ (name "mtpaint")
+ ;; The author neither releases tarballs nor uses git version tags.
+ ;; Instead, author puts version in git commit title.
+ (version (git-version "3.49.25" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/wjaguar/mtPaint/";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0izm2wvj26566fd8mqvypr7bmv7jnq8qhp4760m7z2wrc4y8pjn1"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("gettext" ,gettext-minimal)
+ ("pkg-config" ,pkg-config)
+ ("which" ,which)))
+ (inputs
+ `(("imlib2" ,imlib2)
+ ("libtiff" ,libtiff)
+ ("libpng" ,libpng)
+ ("libungif", libungif)
- ("libjpeg", libjpeg)
++ ("libjpeg", libjpeg-turbo)
+ ("libwebp" ,libwebp)
+ ("openjpeg" ,openjpeg)
+ ("lcms" ,lcms)
+ ("zlib", zlib)
+ ("glib" ,glib)
+ ;; support for gtk3 is in testing stage
+ ("gtk+" ,gtk+-2)))
+ (arguments
+ `(#:configure-flags
+ (list
+ ;; internationalized version
+ "intl"
+ ;; install man page
+ "man")
+ ;; no check target
+ #:tests? #f))
+ (home-page "http://mtpaint.sourceforge.net/";)
+ (synopsis "Create pixel art and manipulate digital images")
+ (description
+ "Mtpaint is a graphic editing program which uses the GTK+ toolkit.
+ It can create and edit indexed palette or 24bit RGB images, offers basic
+ painting and palette manipulation tools. It also handles JPEG, JPEG2000,
+ GIF, TIFF, WEBP, BMP, PNG, XPM formats.")
+ (license license:gpl3+))))
diff --cc gnu/packages/java.scm
index 1d910e1,4d305aa..c52140b
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@@ -11,7 -11,9 +11,9 @@@
;;; Copyright © 2018 Chris Marusich <address@hidden>
;;; Copyright © 2018, 2019, 2020 Efraim Flashner <address@hidden>
;;; Copyright © 2019, 2020 Björn Höfling <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
+ ;;; Copyright © 2020 Raghav Gururajan <address@hidden>
+ ;;; Copyright © 2020 Maxim Cournoyer <address@hidden>
-
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/mail.scm
index 139f737,a6ed776..2acc6ec
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@@ -218,12 -221,12 +221,12 @@@
#:parallel-tests? #f))
(native-inputs
- `(("perl" ,perl))) ;for 'gylwrap'
- (inputs
- `(("dejagnu" ,dejagnu)
- ("m4" ,m4)
+ `(("perl" ,perl) ;for 'gylwrap'
("texinfo" ,texinfo)
+ ("dejagnu" ,dejagnu)))
+ (inputs
+ `(("m4" ,m4)
- ("guile" ,guile-2.2)
+ ("guile" ,guile-3.0)
("gsasl" ,gsasl)
("gnutls" ,gnutls)
("ncurses" ,ncurses)
diff --cc gnu/packages/nfs.scm
index ecf0921,81eabef..45ed181
--- a/gnu/packages/nfs.scm
+++ b/gnu/packages/nfs.scm
@@@ -113,9 -114,10 +114,10 @@@
("rpcsvc-proto" ,rpcsvc-proto) ;for 'rpcgen'
("sqlite" ,sqlite)
("lvm2" ,lvm2)
- ("util-linux" ,util-linux)
+ ("util-linux" ,util-linux "lib")
("mit-krb5" ,mit-krb5)
- ("libtirpc" ,libtirpc)))
+ ("libtirpc" ,libtirpc)
+ ("python-wrapper" ,python-wrapper))) ;for the Python based tools
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.kernel.org/pub/linux/utils/nfs-utils/";)
diff --cc gnu/packages/sdl.scm
index 608cb40,7b36d55..6f634f7
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@@ -130,7 -129,21 +129,15 @@@ joystick, and graphics hardware."
((#:configure-flags flags)
`(append '("--disable-wayland-shared" "--enable-video-kmsdrm"
"--disable-kmsdrm-shared")
- ,flags))))
+ ,flags))
+ ((#:make-flags flags ''())
+ `(cons*
- ;; Add the Fcitx header files to GCCs "system header" search path
- ;; in order to suppress compiler warnings induced by those:
- ;; .../include/fcitx-utils/utarray.h:178:9: error: ISO C90 forbids
- ;; mixed declarations and code
[-Werror=declaration-after-statement]
- (string-append "C_INCLUDE_PATH="
- (assoc-ref %build-inputs "fcitx") "/include")
+ ;; SDL dlopens libudev, so make sure it is in rpath. This overrides
+ ;; the LDFLAG set in sdl’s configure-flags, which isn’t necessary
+ ;; as sdl2 includes Mesa by default.
+ (string-append "LDFLAGS=-Wl,-rpath,"
+ (assoc-ref %build-inputs "eudev") "/lib")
+ ,flags))))
(inputs
;; SDL2 needs to be built with ibus support otherwise some systems
;; experience a bug where input events are doubled.
diff --cc gnu/packages/telephony.scm
index fd8ec3f,85c2f2a..5e43061
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@@ -916,11 -970,23 +969,11 @@@ This package provides a library common
("libnotify" ,libnotify)
("clutter" ,clutter)
("clutter-gtk" ,clutter-gtk)
- ("gettext" ,gnu-gettext)
("libcanberra" ,libcanberra)
- ("webkitgtk" ,webkitgtk)
- ;; TODO: We must wrap ring-client-gnome to force using the
- ;; `sqlite-with-column-metadata' package instead of `sqlite' or else it
- ;; fails with:
- ;;
- ;;
/gnu/store/...-qtbase-5.11.2/lib/qt5/plugins/sqldrivers/libqsqlite.so:
- ;; undefined symbol: sqlite3_column_table_name16
- ;;
- ;; qtbase is built against sqlite-with-column-metadata but somehow
- ;; jami-client-gnome ends up with both `sqlite' and
- ;; `sqlite-with-column-metadata' as inputs and it seems that
- ;; libqsqlite.so gets confused.
- ("sqlite" ,sqlite-with-column-metadata)))
+ ("webkitgtk" ,webkitgtk)))
(native-inputs
`(("pkg-config" ,pkg-config)
+ ("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("doxygen" ,doxygen)))
(propagated-inputs
diff --cc gnu/packages/texinfo.scm
index acb607a,4042353..7457d99
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@@ -4,8 -4,7 +4,9 @@@
;;; Copyright © 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2017, 2019 Efraim Flashner <address@hidden>
;;; Copyright © 2019 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2019 Pierre-Moana Levesque <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+ ;;; Copyright © 2020 Nicolas Goaziou <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/time.scm
index 41a0802,14f44c8..a059976
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@@ -36,9 -37,9 +37,10 @@@
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
+ #:use-module (gnu packages)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages perl)
diff --cc gnu/packages/tls.scm
index 812057c,e8b3d88..a73b497
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -165,7 -162,8 +165,8 @@@ living in the same process."
(define-public gnutls
(package
(name "gnutls")
+ (replacement gnutls-3.6.13)
- (version "3.6.9")
+ (version "3.6.12")
(source (origin
(method url-fetch)
(uri
@@@ -250,10 -245,23 +251,23 @@@ required structures."
(properties '((ftp-server . "ftp.gnutls.org")
(ftp-directory . "/gcrypt/gnutls")))))
- (define-public gnutls/guile-2.0
- ;; GnuTLS for Guile 2.0.
+ (define gnutls-3.6.13
(package
(inherit gnutls)
- (version "3.6.A")
++ (version "3.6.13")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnupg/gnutls/v"
+ (version-major+minor version)
+ "/gnutls-3.6.13.tar.xz"))
+ (patches (search-patches "gnutls-skip-trust-store-test.patch"))
+ (sha256
+ (base32
+ "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j"))))))
+
+ (define-public gnutls/guile-2.0
+ ;; GnuTLS for Guile 2.0.
+ (package/inherit gnutls
(name "guile2.0-gnutls")
(inputs `(("guile" ,guile-2.0)
,@(alist-delete "guile" (package-inputs gnutls))))))
diff --cc gnu/packages/version-control.scm
index 75de83a,fdbfab2..d2d2b23
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -649,25 -617,11 +637,18 @@@ on @command{git}, and use any regular G
(build-system cmake-build-system)
(outputs '("out" "debug"))
(arguments
- `(#:configure-flags '("-DUSE_NTLMCLIENT=OFF" ;TODO: package this
- "-DREGEX_BACKEND=pcre2"
- "-DUSE_HTTP_PARSER=system")
+ `(#:configure-flags
+ (list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this
+ "-DREGEX_BACKEND=pcre2"
++ "-DUSE_HTTP_PARSER=system"
+ ,@(if (%current-target-system)
+ `((string-append
+ "-DPKG_CONFIG_EXECUTABLE="
+ (assoc-ref %build-inputs "pkg-config")
+ "/bin/" ,(%current-target-system) "-pkg-config"))
+ '()))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-pcre2-reference
- (lambda _
- ;; Use PCRE2 with 8-bit character support, as there is no
"libpcre2.pc".
- ;; See <https://github.com/libgit2/libgit2/issues/5438>.
- (substitute* "src/CMakeLists.txt"
- (("\"libpcre2\"")
- "\"libpcre2-8\""))
- #t))
(add-after 'unpack 'fix-hardcoded-paths
(lambda _
(substitute* "tests/repo/init.c"
@@@ -676,19 -630,12 +657,16 @@@
(("/bin/cp") (which "cp"))
(("/bin/rm") (which "rm")))
#t))
- (add-after 'unpack 'make-git-checkout-writable
- (lambda _
- (for-each make-file-writable (find-files "."))
- #t))
- ;; Run checks more verbosely.
+ ;; Run checks more verbosely, unless we are cross-compiling.
(replace 'check
- (lambda _ (invoke "./libgit2_clar" "-v" "-Q"))))))
+ (lambda* (#:key (tests? #t) #:allow-other-keys)
+ (if tests?
+ (invoke "./libgit2_clar" "-v" "-Q")
+ ;; Tests may be disabled if cross-compiling.
+ (format #t "Test suite not run.~%")))))))
(inputs
- `(("libssh2" ,libssh2)))
+ `(("libssh2" ,libssh2)
+ ("http-parser" ,http-parser)))
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python)))
diff --cc gnu/packages/web.scm
index 2b1585c,5e393db..e6883b7
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -41,8 -39,8 +41,9 @@@
;;; Copyright © 2020 Timotej Lazar <address@hidden>
;;; Copyright © 2020 Alexandros Theodotou <address@hidden>
;;; Copyright © 2020 Pierre Neidhardt <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
;;; Copyright © 2018, 2019, 2020 Björn Höfling <address@hidden>
+ ;;; Copyright © 2020 Paul Garlick <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;