guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge remote-tracking branch 'signed/master' into core-updates


From: guix-commits
Subject: 01/01: Merge remote-tracking branch 'signed/master' into core-updates
Date: Mon, 18 Oct 2021 16:25:00 -0400 (EDT)

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

commit e486b2b674badc80627b11077b7df2ac1cab92d8
Merge: 0df1eb0 88badc0
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Mon Oct 18 14:33:09 2021 +0000

    Merge remote-tracking branch 'signed/master' into core-updates

 .gitattributes                                     |     3 +
 .gitignore                                         |     2 +
 Makefile.am                                        |    12 +-
 build-aux/convert-xref.scm                         |    26 +
 doc/contributing.texi                              |     2 +-
 doc/guix.texi                                      |    18 +-
 doc/local.mk                                       |    29 +-
 etc/git/gitconfig                                  |     5 +
 gnu/build/hurd-boot.scm                            |     4 +-
 gnu/home/services/shells.scm                       |    40 +-
 gnu/local.mk                                       |    19 +-
 gnu/packages/acl.scm                               |    20 +-
 gnu/packages/admin.scm                             |     8 +-
 gnu/packages/adns.scm                              |     8 +-
 gnu/packages/astronomy.scm                         |     4 +-
 gnu/packages/audio.scm                             |   112 +
 gnu/packages/backup.scm                            |    12 +-
 gnu/packages/benchmark.scm                         |    13 +-
 gnu/packages/c.scm                                 |   171 +-
 gnu/packages/check.scm                             |    11 +
 gnu/packages/cpp.scm                               |   101 +-
 gnu/packages/crypto.scm                            |    35 +
 gnu/packages/databases.scm                         |     4 +-
 gnu/packages/disk.scm                              |    10 +-
 gnu/packages/elixir.scm                            |    16 +-
 gnu/packages/emacs-xyz.scm                         |   178 +-
 gnu/packages/emulators.scm                         |     4 +-
 gnu/packages/file-systems.scm                      |    10 +-
 gnu/packages/finance.scm                           |    27 +
 gnu/packages/fonts.scm                             |    60 +-
 gnu/packages/fpga.scm                              |     4 +-
 gnu/packages/games.scm                             |    22 +-
 gnu/packages/gnome.scm                             |    30 +-
 gnu/packages/gnuzilla.scm                          |     8 +-
 gnu/packages/golang.scm                            |    25 +-
 gnu/packages/gtk.scm                               |     2 +-
 gnu/packages/guile-xyz.scm                         |    39 -
 gnu/packages/hardware.scm                          |     7 +-
 gnu/packages/haskell-xyz.scm                       |     8 +-
 gnu/packages/linux.scm                             |   192 +-
 gnu/packages/lisp-xyz.scm                          |   189 +-
 gnu/packages/lisp.scm                              |    21 +-
 gnu/packages/mail.scm                              |    19 +-
 gnu/packages/mate.scm                              |     2 +-
 gnu/packages/matrix.scm                            |   141 +-
 gnu/packages/messaging.scm                         |     4 +-
 gnu/packages/minetest.scm                          |    25 +
 gnu/packages/music.scm                             |   108 +
 gnu/packages/networking.scm                        |    10 +-
 gnu/packages/package-management.scm                |    10 +-
 .../patches/alpine-fix-privacy-policy-crash.patch  |    39 +
 gnu/packages/patches/aws-c-auth-cmake-prefix.patch |    13 +
 .../aws-c-auth-disable-networking-tests.patch      |    64 +
 .../patches/aws-c-compression-cmake-prefix.patch   |    13 +
 gnu/packages/patches/aws-c-http-cmake-prefix.patch |    13 +
 .../aws-c-http-disable-networking-tests.patch      |    48 +
 .../aws-c-io-disable-networking-tests.patch        |    28 +-
 gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch |    13 +
 gnu/packages/patches/aws-c-s3-cmake-prefix.patch   |    13 +
 .../aws-c-s3-disable-networking-tests.patch        |   153 +
 .../patches/aws-crt-cpp-cmake-prefix.patch         |    13 +
 .../aws-crt-cpp-disable-networking-tests.patch     |    47 +
 .../patches/aws-sdk-cpp-cmake-prefix.patch         |    18 +
 .../aws-sdk-cpp-disable-networking-tests.patch     |    44 +
 .../patches/aws-sdk-cpp-disable-werror.patch       |    11 +
 .../patches/libhx-fix-double-free-bug.patch        |    80 -
 .../mixxx-link-qtscriptbytearray-qtscript.patch    |    25 +
 .../mixxx-system-googletest-benchmark.patch        |    43 +
 .../patches/retroarch-LIBRETRO_DIRECTORY.patch     |    32 +-
 gnu/packages/python-check.scm                      |   112 +
 gnu/packages/python-crypto.scm                     |     6 +-
 gnu/packages/python-web.scm                        |    48 +-
 gnu/packages/python-xyz.scm                        |   399 +-
 gnu/packages/radio.scm                             |    24 +-
 gnu/packages/rpm.scm                               |     4 +-
 gnu/packages/security-token.scm                    |     4 +-
 gnu/packages/shellutils.scm                        |    16 +-
 gnu/packages/tls.scm                               |    83 +-
 gnu/packages/version-control.scm                   |    17 +-
 gnu/packages/video.scm                             |    19 +-
 gnu/packages/vim.scm                               |    77 +-
 gnu/packages/virtualization.scm                    |     4 +-
 gnu/packages/web-browsers.scm                      |    10 +-
 gnu/packages/web.scm                               |     4 +-
 gnu/packages/wm.scm                                |     4 +-
 gnu/packages/xdisorg.scm                           |     9 +-
 gnu/packages/xiph.scm                              |    12 +-
 gnu/services/xorg.scm                              |     2 +-
 gnu/system/hurd.scm                                |     4 +-
 gnu/system/images/hurd.scm                         |     1 +
 gnu/tests/install.scm                              |     4 +-
 guix/build-system/go.scm                           |     4 +-
 guix/build/download.scm                            |     4 +-
 guix/build/go-build-system.scm                     |     6 +-
 guix/build/minetest-build-system.scm               |    25 +-
 guix/build/po.scm                                  |   117 +-
 guix/download.scm                                  |    45 +-
 guix/import/pypi.scm                               |     9 +-
 guix/lint.scm                                      |     2 +-
 guix/scripts/refresh.scm                           |    52 +-
 guix/self.scm                                      |    82 +-
 guix/swh.scm                                       |    11 +
 po/doc/guix-cookbook.de.po                         |  1439 +-
 po/doc/guix-cookbook.fa.po                         |  1381 +-
 po/doc/guix-cookbook.fr.po                         |  1416 +-
 po/doc/guix-cookbook.ko.po                         |  1397 +-
 po/doc/guix-cookbook.ru.po                         |  1396 +-
 po/doc/guix-cookbook.sk.po                         |  1383 +-
 po/doc/guix-cookbook.zh_Hans.po                    |  1381 +-
 po/doc/guix-manual.de.po                           | 25336 +++++----
 po/doc/guix-manual.es.po                           | 24535 ++++----
 po/doc/guix-manual.fa.po                           | 24137 ++++----
 po/doc/guix-manual.fr.po                           | 24500 ++++----
 po/doc/guix-manual.it.po                           | 24143 ++++----
 po/doc/guix-manual.ko.po                           | 24257 ++++----
 po/doc/guix-manual.pt_BR.po                        | 24245 ++++----
 po/doc/guix-manual.ru.po                           | 55996 +++++++++++++------
 po/doc/guix-manual.sk.po                           | 24160 ++++----
 po/doc/guix-manual.zh_CN.po                        | 24207 ++++----
 po/guix/cs.po                                      |  1202 +-
 po/guix/da.po                                      |  1282 +-
 po/guix/de.po                                      |  1365 +-
 po/guix/eo.po                                      |  1239 +-
 po/guix/es.po                                      |  1281 +-
 po/guix/fr.po                                      |  1228 +-
 po/guix/hu.po                                      |  1227 +-
 po/guix/it.po                                      |  1184 +-
 po/guix/ko.po                                      |  1218 +-
 po/guix/nl.po                                      |  1301 +-
 po/guix/oc.po                                      |  1167 +-
 po/guix/pl.po                                      |  1208 +-
 po/guix/pt_BR.po                                   |  1313 +-
 po/guix/ru.po                                      |  1187 +-
 po/guix/si.po                                      |  1166 +-
 po/guix/sk.po                                      |  1332 +-
 po/guix/sr.po                                      |  1228 +-
 po/guix/sv.po                                      |  1235 +-
 po/guix/ta.po                                      |  1242 +-
 po/guix/vi.po                                      |  1223 +-
 po/guix/zh_CN.po                                   |  1192 +-
 po/packages/da.po                                  |  3333 +-
 po/packages/de.po                                  |  3333 +-
 po/packages/eo.po                                  |  3326 +-
 po/packages/es.po                                  |  3360 +-
 po/packages/fr.po                                  |  3564 +-
 po/packages/hu.po                                  |  3333 +-
 po/packages/it.po                                  |  3332 +-
 po/packages/ko.po                                  |  3334 +-
 po/packages/nl.po                                  |  3332 +-
 po/packages/oc.po                                  |  3332 +-
 po/packages/pl.po                                  |  3324 +-
 po/packages/pt_BR.po                               |  3324 +-
 po/packages/sk.po                                  |  3332 +-
 po/packages/sr.po                                  |  3324 +-
 po/packages/zh_CN.po                               |  3332 +-
 155 files changed, 209786 insertions(+), 155518 deletions(-)

diff --cc gnu/local.mk
index c1f2399,142ce24..3155338
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1470,9 -1491,11 +1483,11 @@@ dist_patch_DATA =                             
                
    %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/mixxx-link-qtscriptbytearray-qtscript.patch    \
+   %D%/packages/patches/mixxx-system-googletest-benchmark.patch        \
    %D%/packages/patches/mpc123-initialize-ao.patch             \
    %D%/packages/patches/mpg321-CVE-2019-14247.patch            \
 +  %D%/packages/patches/mpg321-gcc-10.patch                    \
    %D%/packages/patches/module-init-tools-moduledir.patch      \
    %D%/packages/patches/monero-use-system-miniupnpc.patch                      
\
    %D%/packages/patches/mono-mdoc-timestamping.patch           \
diff --cc gnu/packages/adns.scm
index 1b71d01,b003511..a5de4a1
--- a/gnu/packages/adns.scm
+++ b/gnu/packages/adns.scm
@@@ -65,7 -65,7 +65,7 @@@ scripts."
  (define-public c-ares
    (package
      (name "c-ares")
-     (version "1.17.1")
 -    (version "1.16.0")
++    (version "1.17.2")
      (source (origin
                (method url-fetch)
                (uri (string-append
@@@ -73,15 -73,9 +73,17 @@@
                      ".tar.gz"))
                (sha256
                 (base32
-                 "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp"))))
 -                "129sm0wzij0mp8vdv68v18hnykcjb6ivi66wnqnnw598q7bql1fy"))))
 -    (replacement c-ares/fixed)
++                "0gcincjvpll2qmlc906jx6mfq97s87mgi0zby0753ki0rr2ch0s8"))))
      (build-system gnu-build-system)
 +    (arguments
-      '(#:phases
++     '(;; FIXME: Some tests require network access
++       #:tests? #f
++       #:phases
 +       (modify-phases %standard-phases
 +         (add-before 'check 'filter-live-tests
 +           (lambda _
 +             ;; Filter tests that require internet access.
 +             (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*"))))))
      (native-inputs
       `(("pkg-config" ,pkg-config)))
      (home-page "https://c-ares.haxx.se/";)
diff --cc gnu/packages/benchmark.scm
index d9796d2,a422073..dda0123
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@@ -104,8 -103,7 +102,7 @@@
                             "fiologparser.py"))
                 ;; Make sure numpy et.al is found.
                 (wrap-program (string-append newbin "/fiologparser_hist.py")
-                  `("GUIX_PYTHONPATH" ":" prefix (,(getenv 
"GUIX_PYTHONPATH"))))
-                #t))))))
 -                 `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))))))))
++                 `("GUIX_PYTHONPATH" ":" prefix (,(getenv 
"GUIX_PYTHONPATH"))))))))))
      (outputs '("out" "utils"))
      (inputs
       `(("ceph" ,ceph "lib")
diff --cc gnu/packages/check.scm
index c839f83,1f9cc26..c6c078b
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@@ -2122,6 -2142,29 +2122,17 @@@ seamlessly into your existing Python un
      (license license:mpl2.0)
      (properties `((python2-variant . ,(delay python2-hypothesis))))))
  
 -(define-public python-hypothesis-5.23
 -  (package
 -    (inherit python-hypothesis)
 -    (version "5.23.0")
 -    (source (origin
 -              (method url-fetch)
 -              (uri (pypi-uri "hypothesis" version))
 -              (sha256
 -               (base32
 -                "0sy1v6nyxg4rjcf3rlr8nalb7wqd9nccpb2lzkchbj5an13ysf1h"))))
 -    (home-page "https://github.com/HypothesisWorks/hypothesis";)))
 -
+ (define-public python-hypothesis-6.23
+   (package
+     (inherit python-hypothesis)
+     (version "6.23.2")
+     (source (origin
+               (method url-fetch)
+               (uri (pypi-uri "hypothesis" version))
+               (sha256
+                (base32
+                 "0lqhfrqsd81apchz93pdqfn85kx0p790w8hhd9qq85692rwja6xp"))))))
+ 
  ;; This is the last version of Hypothesis that supports Python 2.
  (define-public python2-hypothesis
    (let ((hypothesis (package-with-python2
diff --cc gnu/packages/gnuzilla.scm
index 89f0b22,872e477..d32815b
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -1613,9 -1594,9 +1613,9 @@@ standards of the IceCat project."
               (file-name (string-append "thunderbird-" version "-checkout"))
               (sha256
                (base32
-                "1dahf3y8bm3kh7amf341wnmh82a2r0ksqihc6dwiakh6x86a94cm")))))
+                "0ww1rgm8hpmji9fjhinqrwf07j2jikdq8j2x87h5s3naw5898fr3")))))
         ("autoconf" ,autoconf-2.13)
 -       ("cargo" ,rust-1.41 "cargo")
 +       ("cargo" ,rust "cargo")
         ("clang" ,clang)
         ("llvm" ,llvm)
         ("nasm" ,nasm)
diff --cc gnu/packages/gtk.scm
index 4c5d43e,243a7de..4b95392
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -361,65 -314,54 +361,65 @@@ applications."
  
  (define-public pango
    (package
 -   (name "pango")
 -   (version "1.44.7")
 -   (source (origin
 -            (method url-fetch)
 -            (uri (string-append "mirror://gnome/sources/pango/"
 -                                (version-major+minor version) "/"
 -                                name "-" version ".tar.xz"))
 -            (patches (search-patches "pango-skip-libthai-test.patch"))
 -            (sha256
 -             (base32
 -              "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))
 -   (build-system meson-build-system)
 -   (arguments
 -    '(#:phases (modify-phases %standard-phases
 -                 (add-after 'unpack 'disable-cantarell-tests
 -                   (lambda _
 -                     (substitute* "tests/meson.build"
 -                       ;; XXX FIXME: These tests require 
"font-abattis-cantarell", but
 -                       ;; adding it here would introduce a circular 
dependency.
 -                       (("\\[ 'test-harfbuzz'.*") "")
 -                       (("\\[ 'test-itemize'.*") "")
 -                       (("\\[ 'test-layout'.*") ""))
 -                     #t)))))
 -   (propagated-inputs
 -    ;; These are all in Requires or Requires.private of the '.pc' files.
 -    `(("cairo" ,cairo)
 -      ("fribidi" ,fribidi)
 -      ("fontconfig" ,fontconfig)
 -      ("freetype" ,freetype)
 -      ("glib" ,glib)
 -      ("harfbuzz" ,harfbuzz)
 -
 -      ;; Some packages, such as Openbox, expect Pango to be built with the
 -      ;; optional libxft support.
 -      ("libxft" ,libxft)))
 -   (inputs
 -    `(("zlib" ,zlib)))
 -   (native-inputs
 -    `(("pkg-config" ,pkg-config)
 -      ("glib" ,glib "bin")                               ; glib-mkenums, etc.
 -      ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
 -   (synopsis "GNOME text and font handling library")
 -   (description
 -    "Pango is the core text and font handling library used in GNOME
 -applications.  It has extensive support for the different writing systems
 -used throughout the world.")
 -   (license license:lgpl2.0+)
 -   (home-page "https://developer.gnome.org/pango/";)))
 +    (name "pango")
 +    (version "1.48.9")
 +    (source (origin
 +              (method url-fetch)
 +              (uri (string-append "mirror://gnome/sources/pango/"
 +                                  (version-major+minor version) "/"
 +                                  name "-" version ".tar.xz"))
 +              (patches (search-patches "pango-skip-libthai-test.patch"))
 +              (sha256
 +               (base32
 +                "1akj11n0ycqrm1rvi0fdfldqk7l5zk9vb8sq77009ap57xyna4x9"))))
 +    (build-system meson-build-system)
 +    (arguments
 +     '(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
 +       #:phases (modify-phases %standard-phases
 +                  (add-after 'unpack 'disable-cantarell-tests
 +                    (lambda _
 +                      (substitute* "tests/meson.build"
-                         ;; XXX FIXME: These tests require "font-cantarell", 
but
++                        ;; XXX FIXME: These tests require 
"font-abattis-cantarell", but
 +                        ;; adding it here would introduce a circular 
dependency.
 +                        (("\\[ 'test-layout'.*") "")
 +                        (("\\[ 'test-itemize'.*") "")
 +                        (("\\[ 'test-font'.*") "")
 +                        (("\\[ 'test-harfbuzz'.*") ""))
 +                      #t)))))
 +    (propagated-inputs
 +     ;; These are all in Requires or Requires.private of the '.pc' files.
 +     `(("cairo" ,cairo)
 +       ("fontconfig" ,fontconfig)
 +       ("freetype" ,freetype)
 +       ("fribidi" ,fribidi)
 +       ("glib" ,glib)
 +       ("harfbuzz" ,harfbuzz)
 +       ("libthai" ,libthai)
 +       ;; Some packages, such as Openbox, expect Pango to be built with the
 +       ;; optional libxft support.
 +       ("libxft" ,libxft)
 +       ("libxrender" ,libxrender)))
 +    (inputs
 +     ;; TODO(core-updates): Unconditionally add "bash-minimal"
 +     `(,@(if (%current-target-system)
 +             `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap
 +             '())
 +       ("zlib" ,zlib)))
 +    (native-inputs
 +     `(("glib" ,glib "bin")             ; glib-mkenums, etc.
 +       ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler, etc.
 +       ("help2man" ,help2man)
 +       ("perl" ,perl)
 +       ("pkg-config" ,pkg-config)
 +       ("python" ,python-wrapper)))
 +    (synopsis "Text and font handling library")
 +    (description "Pango is a library for laying out and rendering of text, 
with
 +an emphasis on internationalization.  Pango can be used anywhere that text
 +layout is needed, though most of the work on Pango so far has been done in the
 +context of the GTK+ widget toolkit.  Pango forms the core of text and font
 +handling for GTK+-2.x.")
 +    (home-page "https://pango.gnome.org/";)
 +    (license license:lgpl2.0+)))
  
  (define-public pango-1.42
    (package
diff --cc gnu/packages/linux.scm
index bcb3232,5c21515..669db96
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -8023,66 -7895,61 +8039,69 @@@ the superuser to make device nodes."
                 ;; We don't have the name of the daemon user, so use IDs.
                 (("daemon:sys") "1:3")
                 (("daemon:") "1:"))
-               ;; We don't have an /etc/passwd entry for "root" - use numeric 
IDs.
-               (substitute* "test/compare-tar"
+              ;; We don't have an /etc/passwd entry for "root" - use numeric 
IDs.
+              (substitute* "test/compare-tar"
                 (("tar -tvf") "tar --numeric-owner -tvf")))))))
-       (native-inputs
-        `(;; For bootstrapping the package.
-          ("autoconf" ,autoconf)
-          ("automake" ,automake)
-          ("libtool" ,libtool)
-          ("gettext" ,gettext-minimal)
-          ("po4a" ,po4a)
- 
-          ;; For tests.
-          ("sharutils" ,sharutils)
-          ("xz" ,xz)))
-       (inputs
-        `(("acl" ,acl)
-          ("libcap" ,libcap)
-          ("util-linux" ,util-linux)
-          ("sed" ,sed)
-          ("coreutils" ,coreutils)))
-       (synopsis "Provides a fake root environment")
-       (description "@command{fakeroot} runs a command in an environment where
- it appears to have root privileges for file manipulation. This is useful
- for allowing users to create archives (tar, ar, .deb etc.) with files in
- them with root permissions/ownership. Without fakeroot one would have to
- have root privileges to create the constituent files of the archives with
- the correct permissions and ownership, and then pack them up, or one would
- have to construct the archives directly, without using the archiver.")
-       (home-page "http://freshmeat.sourceforge.net/projects/fakeroot";)
-       (license license:gpl3+))))
+     (native-inputs
+      `(;; For bootstrapping the package.
+        ("autoconf" ,autoconf-2.71)
+        ("automake" ,automake)
+        ("libtool" ,libtool)
+        ("gettext" ,gettext-minimal)
+        ("po4a" ,po4a)
+ 
+        ;; For tests.
+        ("sharutils" ,sharutils)
+        ("xz" ,xz)))
+     (inputs
+      `(("acl" ,acl)
+        ("libcap" ,libcap)
+        ("util-linux" ,util-linux)
+        ("sed" ,sed)
+        ("coreutils" ,coreutils)))
+     (synopsis "Run commands in an environment with fake root privileges")
+     (description
+      "@command{fakeroot} runs a command in an environment where it appears to
+ have root privileges for file manipulation.  This is useful for allowing users
+ to create archives (@file{tar}, @file{ar}, @file{deb}, etc.)  with files in
+ them with root permissions and/or ownership.
+ 
+ Without fakeroot, one would have to have root privileges to create the
+ constituent files of the archives with the correct permissions and ownership,
+ and then pack them up, or one would have to construct the archives directly,
+ without using the archiver.")
+     (home-page "http://freshmeat.sourceforge.net/projects/fakeroot";)
+     (license license:gpl3+)))
  
  (define-public fakechroot
 -  (package
 -    (name "fakechroot")
 -    (version "2.20.1")
 -    (source (origin
 -              (method url-fetch)
 -              (uri (string-append
 -                    "https://github.com/dex4er/fakechroot/releases/download/";
 -                    version "/fakechroot-" version ".tar.gz"))
 -              (sha256
 -               (base32
 -                "1aijkd0b45wav25v01qhw8zxwa3pl0nnp9fabmmy1nlx7hr09gas"))))
 -    (build-system gnu-build-system)
 -    (arguments
 -     ;; XXX: The tests heavily assume they run on an FHS system so for now
 -     ;; skip them.
 -     '(#:tests? #f
 -       #:configure-flags '("--disable-static")))
 -    (synopsis "Emulate @code{chroot} by overriding file system calls")
 -    (description
 -     "@command{fakechroot} runs a command in an environment were is additional
 +  ;; XXX: Build from the change submitted at
 +  ;; <https://github.com/dex4er/fakechroot/pull/85> to allow compilation
 +  ;; against glibc 2.33.  Switch back to the official repository on the next
 +  ;; release.
 +  (let ((commit "e7c1f3a446e594a4d0cce5f5d499c9439ce1d5c5")
 +        (revision "0"))
 +    (package
 +      (name "fakechroot")
 +      (version (git-version "2.20.1" revision commit))
 +      (source (origin
 +                (method git-fetch)
 +                (uri (git-reference
 +                      (url "https://github.com/lipnitsk/fakechroot";)
 +                      (commit commit)))
 +                (file-name (git-file-name name version))
 +                (sha256
 +                 (base32
 +                  "0gac6a6djx3nf343vd33sr5qqngz8ss3aij54zl8x9wb47pc11kb"))))
 +      (build-system gnu-build-system)
 +      (arguments
 +       ;; XXX: The tests heavily assume they run on an FHS system so for now
 +       ;; skip them.
 +       '(#:tests? #f
 +         #:configure-flags '("--disable-static")))
 +      (native-inputs (list autoconf automake libtool perl))
 +      (synopsis "Emulate @code{chroot} by overriding file system calls")
 +      (description
 +       "@command{fakechroot} runs a command in an environment were is 
additional
  possibility to use @code{chroot} command without root privileges.  This is
  useful for allowing users to create own chrooted environment with possibility
  to install another packages without need for root privileges.
diff --cc gnu/packages/python-xyz.scm
index ff5b0f0,c335dea..2dee3dc
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -4358,22 -4467,24 +4436,23 @@@ ecosystem, but can naturally be used al
                          (invoke "invoke" "library-docs" "all")
                          (mkdir-p doc)
                          (copy-recursively "doc/libraries"
-                                           (string-append doc "/libraries"))
-                         #t)))
+                                           (string-append doc "/libraries")))))
                    (replace 'check
 -                    (lambda* (#:key inputs tests? #:allow-other-keys)
 -                      (when tests?
 -                        ;; Some tests require timezone data.  Otherwise, they
 -                        ;; look up /etc/localtime, which doesn't exist, and
 -                        ;; fail with:
 -                        ;;
 -                        ;; OverflowError: mktime argument out of range
 -                        (setenv "TZDIR"
 -                                (string-append (assoc-ref inputs "tzdata")
 -                                               "/share/zoneinfo"))
 -                        (setenv "TZ" "Europe/Paris")
 -                        (invoke "python" "utest/run.py")))))))
 +                    (lambda* (#:key inputs #:allow-other-keys)
 +                      ;; Some tests require timezone data.  Otherwise, they
 +                      ;; look up /etc/localtime, which doesn't exist, and fail
 +                      ;; with:
 +                      ;;
 +                      ;; OverflowError: mktime argument out of range
 +                      (setenv "TZDIR"
 +                              (search-input-directory inputs 
"share/zoneinfo"))
 +                      (setenv "TZ" "Europe/Paris")
 +
 +                      (invoke "python" "utest/run.py"))))))
      (native-inputs
-      `(("python-invoke" ,python-invoke)
+      `(("python-docutils" ,python-docutils)
+        ("python-jsonschema" ,python-jsonschema)
+        ("python-invoke" ,python-invoke)
         ("python-rellu" ,python-rellu)
         ("python:tk" ,python "tk")             ;used when building the HTML doc
         ("tzdata" ,tzdata-for-tests)))
diff --cc gnu/packages/version-control.scm
index d29319a,d7b1ada..ef0fe86
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -40,7 -40,7 +40,8 @@@
  ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
  ;;; Copyright © 2021 François J. <francois-oss@avalenn.eu>
  ;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
 +;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+ ;;; Copyright © 2021 jgart <jgart@dismail.de>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/wm.scm
index 5b92099,891a796..eb03b36
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@@ -963,9 -967,11 +963,9 @@@ experience."
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                 "1xaz13iry3fdjhqk9xzg29kbv7hqj8dzzqxr5mhrj8f2m013jdc3"))))
+                 "0vkwyci4z4jj2aczxkrmj0861j5jczjr8isasa7gml93nlvyw7gv"))))
      (build-system meson-build-system)
 -    (arguments
 -     `( #:meson ,meson-0.55
 -        #:build-type "release"))
 +    (arguments `(#:build-type "release"))
      (native-inputs
       `(("pkg-config" ,pkg-config)
         ("wayland-protocols" ,wayland-protocols)
diff --cc gnu/packages/xdisorg.scm
index aeaec8b,50b4d5d..53a9793
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@@ -50,7 -49,7 +50,8 @@@
  ;;; Copyright © 2021 Niklas Eklund <niklas.eklund@posteo.net>
  ;;; Copyright © 2021 Nikita Domnitskii <nikita@domnitskii.me>
  ;;; Copyright © 2021 ikasero <ahmed@ikasero.com>
 +;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
+ ;;; Copyright © 2021 jgart <jgart@dismail.de>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/xiph.scm
index 0bc7447,0c9c799..04dd0b8
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@@ -11,7 -11,7 +11,8 @@@
  ;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
  ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
  ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
 +;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
+ ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]