[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into core-updates-fr
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into core-updates-frozen |
|
Date: |
Wed, 3 Nov 2021 08:28:55 -0400 (EDT) |
efraim pushed a commit to branch core-updates-frozen
in repository guix.
commit 075df3d3e2f86ad2548075969b34402a3c40ec42
Merge: aba40a6 b2721c3
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Nov 3 14:25:30 2021 +0200
Merge remote-tracking branch 'origin/master' into core-updates-frozen
gnu/local.mk | 2 -
gnu/packages/admin.scm | 4 +-
gnu/packages/audio.scm | 4 +-
gnu/packages/crates-io.scm | 214 ++++++++++++++---
gnu/packages/diffoscope.scm | 2 +-
gnu/packages/dunst.scm | 8 +-
gnu/packages/emacs-xyz.scm | 253 ++++++++++++---------
gnu/packages/games.scm | 63 ++++-
gnu/packages/gnuzilla.scm | 13 +-
gnu/packages/graphics.scm | 4 +-
gnu/packages/guile-xyz.scm | 10 +
gnu/packages/haskell-check.scm | 12 +-
gnu/packages/haskell-crypto.scm | 24 +-
gnu/packages/haskell-web.scm | 26 +--
gnu/packages/haskell-xyz.scm | 228 ++++++++++---------
gnu/packages/image-processing.scm | 4 +-
gnu/packages/image-viewers.scm | 14 +-
gnu/packages/inkscape.scm | 21 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/java.scm | 8 +-
gnu/packages/lego.scm | 5 +-
gnu/packages/less.scm | 7 +-
gnu/packages/libusb.scm | 6 +-
gnu/packages/linux.scm | 24 +-
gnu/packages/lisp-xyz.scm | 46 ++--
gnu/packages/mail.scm | 37 ++-
gnu/packages/messaging.scm | 26 +--
gnu/packages/moreutils.scm | 10 +-
gnu/packages/music.scm | 4 +-
gnu/packages/networking.scm | 41 ++--
.../patches/emacs-exwm-fix-fullscreen-states.patch | 39 ----
.../inkscape-1.1-fix-build-witch-gcc7.5.patch | 24 --
.../patches/rust-openssl-sys-no-vendor.patch | 2 +
gnu/packages/pdf.scm | 8 +-
gnu/packages/pulseaudio.scm | 16 +-
gnu/packages/purescript.scm | 6 +-
gnu/packages/python-web.scm | 25 +-
gnu/packages/python-xyz.scm | 12 +-
gnu/packages/samba.scm | 7 +-
gnu/packages/shells.scm | 11 +-
gnu/packages/terminals.scm | 4 +-
gnu/packages/video.scm | 66 +++---
gnu/packages/vim.scm | 87 ++++++-
gnu/packages/webkit.scm | 20 +-
gnu/services/configuration.scm | 16 +-
guix/import/stackage.scm | 2 +-
46 files changed, 878 insertions(+), 591 deletions(-)
diff --cc gnu/local.mk
index 3c90bb2,5ae09d7d..69576a6
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1285,9 -1294,9 +1284,8 @@@ dist_patch_DATA =
%D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \
%D%/packages/patches/imagemagick-ReadDCMPixels-fix.patch \
%D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \
- %D%/packages/patches/inetutils-hurd.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/instead-use-games-path.patch \
- %D%/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch \
%D%/packages/patches/intel-xed-fix-nondeterminism.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/iputils-libcap-compat.patch \
diff --cc gnu/packages/games.scm
index 34051b8,a1f6deb..521bfcc
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@@ -8022,6 -8036,66 +8022,65 @@@ ncurses for text display."
(home-page "http://frotz.sourceforge.net";)
(license license:gpl2+)))
+ (define-public naev
+ (package
+ (name "naev")
+ (version "0.8.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/naev/naev";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "02rk2fv2nhx5xsi0cariisamab3dpncwps4q3i3ki0y27xpwxzfx"))))
+ (build-system meson-build-system)
+ (arguments
+ ;; XXX: Do not add debugging symbols, which cause the build to fail.
+ `(#:configure-flags (list "--buildtype=release")
- #:tests? #f ;sole test fails with a missing "/dev/dri" error
- #:meson ,meson-0.55))
++ #:tests? #f)) ;sole test fails with a missing "/dev/dri" error
+ (native-inputs
+ `(("gettext" ,gettext-minimal)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("freetype" ,freetype)
+ ("glpk" ,glpk)
+ ("libpng" ,libpng)
+ ("libvorbis" ,libvorbis)
+ ("libwebp" ,libwebp)
+ ("libxml2" ,libxml2)
+ ("luajit" ,luajit)
+ ("openal" ,openal)
+ ("openblas" ,openblas)
+ ("physfs" ,physfs)
+ ("sdl" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer)))
+ ("suitesparse" ,suitesparse)))
+ (home-page "https://naev.org/";)
+ (synopsis "Game about space exploration, trade and combat")
+ (description
+ "Naev is a 2d action/rpg space game that combines elements from
+ the action, RPG and simulation genres. You pilot a spaceship from
+ a top-down perspective, and are more or less free to do what you want.
+ As the genre name implies, you’re able to trade and engage in combat
+ at will. Beyond that, there’s an ever-growing number of story-line
+ missions, equipment, and ships; even the galaxy itself grows larger
+ with each release. For the literacy-inclined, there are large amounts
+ of lore accompanying everything from planets to equipment.")
+ (license (list license:gpl3
+ license:public-domain
+ license:expat ;edtaa3func.c
+ license:bsd-2 ;distance_field.c
+ license:bsd-3 ;perlin.c
+ ;; Assets.
+ license:silofl1.1
+ license:gpl2+
+ license:cc0
+ license:cc-by3.0
+ license:cc-by-sa3.0
+ license:cc-by4.0
+ license:cc-by-sa4.0))))
+
(define-public frotz-dumb-terminal
(package
(name "frotz-dumb-terminal")
diff --cc gnu/packages/inkscape.scm
index 1fd328e,8747218..ded2b01
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@@ -259,8 -253,7 +253,7 @@@ endif()~%~%
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/inkscape")
- `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))))
- #t)))))
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))))))))
++ `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH"))))))))))
(inputs
`(("aspell" ,aspell)
("autotrace" ,autotrace)
diff --cc gnu/packages/pulseaudio.scm
index 9e6321c,060a061..4639c45
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@@ -296,7 -294,8 +296,8 @@@ sound server."
(build-system glib-or-gtk-build-system)
(inputs
`(("adwaita-icon-theme" ,adwaita-icon-theme) ;hard-coded theme
- ("gtkmm" ,gtkmm)
+ ("gtkmm" ,gtkmm-3)
+ ("json-glib" ,json-glib)
("libcanberra" ,libcanberra)
("pulseaudio" ,pulseaudio)))
(native-inputs
diff --cc gnu/packages/terminals.scm
index eb9a749,8d751f6..971b506
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@@ -746,10 -747,11 +746,10 @@@ eye-candy, customizable, and reasonabl
(file-name (git-file-name name version))
(sha256
(base32
- "0rm7w29wf3gipf69qf7s42qw8857z74gsigrpz9g6vvd1x58f03m"))))
+ "15h01ijx87i60bdgjjap1ymwlxggsxc6iziykh3bahj8432s1836"))))
(build-system meson-build-system)
(arguments
- `(#:meson ,meson-0.55
- ;; Using a "release" build is recommended both for performance, and
+ `(;; Using a "release" build is recommended both for performance, and
;; also to address a GCC 10 issue when doing PGO builds.
#:build-type "release"
;; Enable LTO as recommended by INSTALL.md.