Merge remote-tracking branch 'origin/master' into core-updates-frozen.
authorMathieu Othacehe <othacehe@gnu.org>
Tue, 12 Oct 2021 16:50:47 +0000 (16:50 +0000)
committerMathieu Othacehe <othacehe@gnu.org>
Tue, 12 Oct 2021 17:46:23 +0000 (17:46 +0000)
126 files changed:
1  2 
Makefile.am
doc/guix-cookbook.texi
doc/guix.texi
etc/news.scm
gnu/ci.scm
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/algebra.scm
gnu/packages/android.scm
gnu/packages/astronomy.scm
gnu/packages/audio.scm
gnu/packages/autotools.scm
gnu/packages/backup.scm
gnu/packages/bioinformatics.scm
gnu/packages/bootloaders.scm
gnu/packages/build-tools.scm
gnu/packages/check.scm
gnu/packages/chemistry.scm
gnu/packages/chromium.scm
gnu/packages/ci.scm
gnu/packages/code.scm
gnu/packages/compression.scm
gnu/packages/cpp.scm
gnu/packages/cran.scm
gnu/packages/crates-io.scm
gnu/packages/crypto.scm
gnu/packages/cups.scm
gnu/packages/databases.scm
gnu/packages/education.scm
gnu/packages/emacs-xyz.scm
gnu/packages/emacs.scm
gnu/packages/emulators.scm
gnu/packages/engineering.scm
gnu/packages/file-systems.scm
gnu/packages/file.scm
gnu/packages/finance.scm
gnu/packages/flashing-tools.scm
gnu/packages/fontutils.scm
gnu/packages/freedesktop.scm
gnu/packages/game-development.scm
gnu/packages/games.scm
gnu/packages/geo.scm
gnu/packages/gimp.scm
gnu/packages/gl.scm
gnu/packages/gnome-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/golang.scm
gnu/packages/gps.scm
gnu/packages/graphics.scm
gnu/packages/graphviz.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/guile-xyz.scm
gnu/packages/haskell-xyz.scm
gnu/packages/haskell.scm
gnu/packages/image-processing.scm
gnu/packages/image-viewers.scm
gnu/packages/irc.scm
gnu/packages/java.scm
gnu/packages/kde.scm
gnu/packages/less.scm
gnu/packages/linux.scm
gnu/packages/lisp-xyz.scm
gnu/packages/lisp.scm
gnu/packages/llvm.scm
gnu/packages/machine-learning.scm
gnu/packages/mail.scm
gnu/packages/man.scm
gnu/packages/maths.scm
gnu/packages/messaging.scm
gnu/packages/mpd.scm
gnu/packages/music.scm
gnu/packages/networking.scm
gnu/packages/ocaml.scm
gnu/packages/package-management.scm
gnu/packages/password-utils.scm
gnu/packages/patchutils.scm
gnu/packages/pdf.scm
gnu/packages/photo.scm
gnu/packages/php.scm
gnu/packages/python-check.scm
gnu/packages/python-crypto.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/radio.scm
gnu/packages/ruby.scm
gnu/packages/rust-apps.scm
gnu/packages/sdl.scm
gnu/packages/serialization.scm
gnu/packages/shells.scm
gnu/packages/spice.scm
gnu/packages/ssh.scm
gnu/packages/statistics.scm
gnu/packages/storage.scm
gnu/packages/sync.scm
gnu/packages/syndication.scm
gnu/packages/telephony.scm
gnu/packages/terminals.scm
gnu/packages/tex.scm
gnu/packages/text-editors.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/video.scm
gnu/packages/vim.scm
gnu/packages/virtualization.scm
gnu/packages/vpn.scm
gnu/packages/web.scm
gnu/packages/wget.scm
gnu/packages/wm.scm
gnu/packages/xdisorg.scm
gnu/packages/xfce.scm
gnu/packages/xorg.scm
gnu/system.scm
gnu/tests/ganeti.scm
guix/build-system/linux-module.scm
guix/build-system/renpy.scm
guix/import/hackage.scm
guix/import/pypi.scm
guix/packages.scm
po/guix/POTFILES.in
tests/lint.scm
tests/opam.scm
tests/pypi.scm

diff --cc Makefile.am
Simple merge
Simple merge
diff --cc doc/guix.texi
@@@ -96,7 -96,8 +96,9 @@@ Copyright @copyright{} 2021 Domagoj Sto
  Copyright @copyright{} 2021 Hui Lu@*
  Copyright @copyright{} 2021 pukkamustard@*
  Copyright @copyright{} 2021 Alice Brenon@*
 +Copyright @copyright{} 2021 Josselin Poiret@*
+ Copyright @copyright{} 2021 Andrew Tropin@*
+ Copyright @copyright{} 2021 Sarah Morgensen@*
  
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.3 or
diff --cc etc/news.scm
  
  (channel-news
   (version 0)
+ (entry (commit "a2324d8b56eabf8117bca220a507cc791edffd2e")
+         (title
+          (en "Guix Home is a part of GNU Guix")
+          (de "Guix Home ist jetzt Teil von GNU Guix")
+          (ru "Guix Home теперь поставляется в составе GNU Guix"))
+         (body
+          (en "Guix Home splitted out from rde project and now is a part of
+ Guix proper.  It is available as a @emph{technology preview} and thus subject
+ to change.
+ The new @command{guix home} command with its actions allows users to
+ manage their packages and configurations (aka. dotfiles) in a declarative way,
+ similar to how many people manage their system with @command{guix system}.
+ Take a look at available actions and arguments:
+ @example
+ guix home --help
+ @end example
+ See @command{info \"(guix) Home Configuration\"} for more information.")
+          (de "Guix Home ist aus dem rde-Projekt ins offizielle Guix übernommen
+ worden. Es ist als @emph{Technologievorschau} bereits verfügbar, aber die
+ Schnittstelle kann sich in Zukunft noch ändern.
+ Der neue Befehl @command{guix home} ermöglicht es, die Pakete und
+ Konfigurationsdateien (Dotfiles) für ein Benutzerkonto im deklarativen Stil zu
+ verwalten. Es ist analog dazu, wie man @command{guix system} benutzen kann, um
+ sein System zu verwalten.
+ Werfen Sie einen Blick auf die verfügbaren Aktionen und Argumente:
+ @example
+ guix home --help
+ @end example
+ Führen Sie für mehr Informationen @command{info \"(guix) Home Configuration\"}
+ aus.")
+          (ru "Guix Home отделился от проекта rde и теперь является частью
+ Guix.  Новая команда @command{guix home} даёт возможность пользователям
+ управлять их пакетами и конфигурациями (дотфайлами) для них в декларативном
+ стиле, аналогично тому, как многие люди управляют своими системами с помощью
+ @command{guix system}.
+ Чтобы получить список доступных действий и аргументов:
+ @example
+ guix home --help
+ @end example
+ Смотрите @command{info \"(guix) Home Configuration\"} для получения более
+ детальных сведений.")))
+  (entry (commit "5b32ad4f6f555d305659cee825879df075b06331")
+         (title
+          (en "New @option{--max-depth} option for @command{guix graph}")
+          (de "Neue Option @option{--max-depth} für @command{guix graph}")
+          (fr "Nouvelle option @option{--max-depth} pour @command{guix graph}"))
+         (body
+          (en "The @command{guix graph} command has a new @option{--max-depth}
+ (or @option{-M}) option, which allows you to restrict a graph to the given
+ depth---very useful when visualizing large graphs.  For example, the command
+ below displays, using the @code{xdot} package, the dependency graph of
+ LibreOffice, including only nodes that are at most at distance 2 of
+ LibreOffice itself:
+ @example
+ guix graph -M 2 libreoffice | xdot -
+ @end example
+ See @command{info \"(guix) Invoking guix graph\"} for more information.")
+          (de "Der Befehl @command{guix graph} verfügt über eine neue
+ Befehlszeilenoption @option{--max-depth} (oder @option{-M}), mit der
+ Sie einen Graphen auf die angegebene Tiefe einschränken. Das ist vor
+ allem bei großen Graphen nützlich; zum Beispiel zeigt der folgende
+ Befehl, unter Verwendung des Pakets @code{xdot}, den
+ Abhängigkeitsgraphen von LibreOffice unter Ausschluss der Knoten, die
+ eine Distanz größer als 2 von LibreOffice selbst haben:
+ @example
+ guix graph -M 2 libreoffice | xdot -
+ @end example
+ Führen Sie @code{info \"(guix.de) Aufruf von guix graph\"} aus, um mehr zu
+ erfahren.")
+          (fr "La commande @command{guix graph} dispose d'une nouvelle option
+ @option{--max-depth} (ou @option{-M}) pour restreindre la profondeur d'un
+ graphe---très utile pour visualiser des gros graphes.  Par exemple, la
+ commande ci-dessous affiche, en utilisant @code{xdot}, le graphe de dépendance
+ de LibreOffice en n'incluant que les nœuds qui sont au plus à distance 2 de
+ LibreOffice soi-même :
+ @example
+ guix graph -M 2 libreoffice | xdot -
+ @end example
+ Voir @command{info \"(guix.fr) Invoquer guix graph\"} pour plus
+ d'informations.")))
+  (entry (commit "05f44c2d858a1e7b13c90362c35fa86bdc4d5a24")
+         (title
+          (en "Channel clones fall back to Software Heritage")
+          (de "Zum Klonen von Kanälen wird notfalls auf Software Heritage zurückgegriffen")
+          (fr "Les clones de canaux peuvent recourir à Software Heritage"))
+         (body
+          (en "When @command{guix time-machine} or @command{guix pull} fetches
+ a channel pinned to a specific commit, it now automatically falls back to
+ cloning it from the Software Heritage archive if the original URL is
+ unreachable.  This contributes to long-term reproducibility.  See
+ @command{info \"(guix) Replicating Guix\"}.
+ Automatic fallback also works for other Git clones made on your behalf, such
+ as when using @option{--with-commit} and related package transformation
+ options.")
+          (de "Wenn bei @command{guix time-machine} oder @command{guix
+ pull} ein bestimmter Commit eines Kanals bezogen werden soll, wird
+ jetzt für den Fall, dass die ursprüngliche URL unerreichbar ist,
+ automatisch vom Software-Heritage-Archiv geklont. Das trägt zur
+ langfristigen Reproduzierbarkeit bei. Siehe @command{info \"(guix.de)
+ Guix nachbilden\"}.
+ Der automatische Rückgriff auf Software Heritage findet auch
+ Verwendung bei anderen Arten von Git-Klon, die Guix durchführt, z.B.@:
+ wenn Sie @option{--with-commit} und ähnliche Paketumwandlungsoptionen
+ einsetzen.")
+          (fr "Quand la commande @command{guix time-machine} ou @command{guix
+ pull} récupère un canal fixé à une révision spécifique, elle est maintenant
+ capable de le cloner depuis l'archive Software Heritage si l'URL initiale
+ n'est plus disponible.  Cela contribue à la reproductibilité à long terme.
+ Voir @command{info \"(guix.fr) Répliquer Guix\"}.
+ Ce recours à Software Heritage fonctionne aussi pour les autres clones Git que
+ Guix peut faire, comme lorsqu'on utilise @option{--with-commit} et les options
+ de transformation de paquet similaires.")))
  
 + (entry (commit "f23803af2018a148fb088f2516d79c20d6bf95f0")
 +        (title
 +         (en "Input labels can now be omitted in package definitions"))
 +        (body
 +         (en "If you have written package definitions before, you may know
 +that package inputs required a bit of boilerplate: each input needs to have an
 +associated label (a string), which you can refer to in ``build-side code''.
 +
 +Input labels are now unnecessary, meaning that you can write code like:
 +
 +@lisp
 +(package
 +  ;; @dots{}
 +  (inputs (list libunistring libffi libgc)))
 +@end lisp
 +
 +Notice that the @code{inputs} field is simplified compared to the ``old
 +style''.  When needed, you can now use g-expressions (gexps) to refer to
 +another package in build-side code.  Additionally, the new
 +@code{modify-inputs} macro facilitates common operations on inputs---deleting,
 +replacing, adding inputs.
 +
 +To ease transition to the ``new style'', a new @command{guix style} command is
 +provided.  Run @command{info \"(guix) Invoking guix style\"} for more info.")))
 +
   (entry (commit "82daab42811a2e3c7684ebdf12af75ff0fa67b99")
          (title
           (en "New @samp{deb} format for the @command{guix pack} command")
diff --cc gnu/ci.scm
Simple merge
diff --cc gnu/local.mk
@@@ -910,7 -924,7 +927,8 @@@ dist_patch_DATA =                                          
    %D%/packages/patches/cdparanoia-fpic.patch                  \
    %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch    \
    %D%/packages/patches/ceph-disable-cpu-optimizations.patch   \
 +  %D%/packages/patches/cheese-vala-update.patch                       \
+   %D%/packages/patches/ceph-fix-snappy-breaking-change.patch  \
    %D%/packages/patches/chez-scheme-build-util-paths-backport.patch      \
    %D%/packages/patches/chmlib-inttypes.patch                  \
    %D%/packages/patches/cl-asdf-config-directories.patch               \
    %D%/packages/patches/fuse-overlapping-headers.patch                         \
    %D%/packages/patches/fxdiv-system-libraries.patch           \
    %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch   \
-   %D%/packages/patches/ganeti-deterministic-manual.patch      \
    %D%/packages/patches/ganeti-disable-version-symlinks.patch  \
-   %D%/packages/patches/ganeti-drbd-compat.patch                       \
+   %D%/packages/patches/ganeti-haskell-compat.patch            \
    %D%/packages/patches/ganeti-haskell-pythondir.patch         \
-   %D%/packages/patches/ganeti-os-disk-size.patch              \
 -  %D%/packages/patches/ganeti-preserve-PYTHONPATH.patch               \
    %D%/packages/patches/ganeti-shepherd-master-failover.patch  \
    %D%/packages/patches/ganeti-shepherd-support.patch          \
    %D%/packages/patches/gash-utils-ls-test.patch                       \
    %D%/packages/patches/geoclue-config.patch                   \
    %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch       \
    %D%/packages/patches/ghc-testsuite-dlopen-pie.patch         \
-   %D%/packages/patches/ghc-diff-swap-cover-args.patch         \
-   %D%/packages/patches/ghc-haddock-api-fix-haddock.patch      \
-   %D%/packages/patches/ghc-hpack-fix-tests.patch              \
-   %D%/packages/patches/ghc-microlens-aeson-fix-tests.patch    \
+   %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch    \
    %D%/packages/patches/ghc-monad-par-fix-tests.patch          \
-   %D%/packages/patches/ghc-pandoc-fix-html-tests.patch                \
-   %D%/packages/patches/ghc-pandoc-fix-latex-test.patch                \
 -  %D%/packages/patches/ghostscript-CVE-2020-15900.patch               \
 -  %D%/packages/patches/ghostscript-freetype-compat.patch      \
    %D%/packages/patches/ghostscript-no-header-id.patch         \
    %D%/packages/patches/ghostscript-no-header-uuid.patch               \
    %D%/packages/patches/ghostscript-no-header-creationdate.patch \
    %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch     \
    %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch    \
    %D%/packages/patches/ngircd-handle-zombies.patch            \
+   %D%/packages/patches/ngless-unliftio.patch          \
    %D%/packages/patches/network-manager-plugin-path.patch      \
    %D%/packages/patches/nginx-socket-cloexec.patch             \
+   %D%/packages/patches/nnpack-system-libraries.patch          \
    %D%/packages/patches/nsis-env-passthru.patch                        \
    %D%/packages/patches/nsis-source-date-epoch.patch           \
 +  %D%/packages/patches/nss-getcwd-nonnull.patch                       \
    %D%/packages/patches/nss-increase-test-timeout.patch                \
    %D%/packages/patches/nss-3.56-pkgconfig.patch                       \
-   %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch            \
    %D%/packages/patches/nvi-assume-preserve-path.patch         \
    %D%/packages/patches/nvi-dbpagesize-binpower.patch          \
    %D%/packages/patches/nvi-db4.patch                          \
@@@ -3103,9 -3087,8 +3102,8 @@@ done with the @code{auditctl} utility."
                   "install-nping")
                 (make ndiff "install-ndiff")
                 (wrap-program (string-append ndiff "/bin/ndiff")
 -                 `("PYTHONPATH" prefix
 +                 `("GUIX_PYTHONPATH" prefix
-                    (,(python-path ndiff)))))
-              #t))
+                    (,(python-path ndiff)))))))
           ;; These are the tests that do not require network access.
           (replace 'check
             (lambda _ (invoke "make"
Simple merge
@@@ -4,14 -4,12 +4,13 @@@
  ;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
  ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
  ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
- ;;; Copyright © 2017, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
- ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 -;;; Copyright © 2017, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
++;;; Copyright © 2017, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
  ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
  ;;; Copyright © 2019, 2020 Andreas Enge <andreas@enge.fr>
  ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
- ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
  ;;; Copyright © 2020 Sergey Trofimov <sarg@sarg.org.ru>
 +;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -10558,10 -10682,12 +10615,12 @@@ in an easily configurable manner."
             (lambda* (#:key inputs #:allow-other-keys)
               (setenv "TZ" "UTC+1")
               (setenv "TZDIR"
 -                     (string-append (assoc-ref inputs "tzdata")
 -                                    "/share/zoneinfo")))))))
 +                     (search-input-directory inputs
 +                                             "share/zoneinfo")))))))
      (native-inputs
-      `(("tzdata" ,tzdata)))
+      `(("tzdata" ,tzdata)
+        ("automake" ,automake)
+        ("autoconf" ,autoconf)))
      (inputs
       `(("coreutils" ,coreutils)
         ("sed" ,sed)
Simple merge
Simple merge
@@@ -969,21 -948,20 +969,29 @@@ standard library."
  (define-public python-pytest
    (package
      (name "python-pytest")
-     (version "6.2.1")
 -    (version "5.3.5")
++    (version "6.2.4")
      (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "pytest" version))
         (sha256
          (base32
-          "01n3jny7m05r6g7gphbkj2xdms75ql93x69crd377hlvi6qikr36"))))
 -         "139i9cjhrv5aici3skq8iihvfb3lq0d8xb5j7qycr2hlk8cfjpqd"))))
++         "0jy5f83la1864ss42dhsi1mcm5nl79d8bjg7wk474nlw1c5avg2h"))))
      (build-system python-build-system)
      (arguments
       `(#:phases
         (modify-phases %standard-phases
++         (add-after 'unpack 'fix-version
++           ;; The version string is usually derived via setuptools-scm, but
++           ;; without the git metadata available, the version string is set to
++           ;; '0.0.0'.
++           (lambda _
++             (substitute* "setup.py"
++               (("setup\\(\\)")
++                (format #f "setup(version=~s)" ,version)))))
           (replace 'check
             (lambda* (#:key (tests? #t) #:allow-other-keys)
 +             (setenv "TERM" "dumb")     ;attempt disabling markup tests
               (if tests?
                   (invoke "pytest" "-vv" "-k"
                           (string-append
Simple merge
         ("gdk-pixbuf" ,gdk-pixbuf)
         ("glib" ,glib)
         ("gtk+" ,gtk+)
-        ("harfbuzz" ,harfbuzz)
+        ("harfbuzz" ,harfbuzz-3.0)
 -       ("icu4c" ,icu4c-69)
 +       ("icu4c" ,icu4c)
         ("lcms" ,lcms)
         ("libevent" ,libevent)
         ("libffi" ,libffi)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -23766,11 -23856,10 +23849,10 @@@ processes for Emacs"
                 (chmod "src/elisp/treemacs-customization.el" #o644)
                 (emacs-substitute-variables "src/elisp/treemacs-customization.el"
                   ("treemacs-python-executable"
 -                  (string-append (assoc-ref inputs "python") "/bin/python3")))
 +                  (search-input-file inputs "/bin/python3")))
                 (chmod "src/elisp/treemacs-async.el" #o644)
                 (substitute* "src/elisp/treemacs-async.el"
-                  (("src/scripts") (string-append "share/" ,name "/scripts"))))
-              #t))
+                  (("src/scripts") (string-append "share/" ,name "/scripts"))))))
           (add-after 'install 'install-data
             (lambda* (#:key outputs #:allow-other-keys)
               (let ((out (assoc-ref outputs "out")))
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1,10 -1,8 +1,10 @@@
  ;;; GNU Guix --- Functional package management for GNU
  ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
  ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
- ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
  ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 +;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
 +;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
Simple merge
Simple merge
@@@ -855,8 -808,10 +855,8 @@@ maintain the Noto Fonts project."
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                 "00rwh5qfayihrq0wjx8pxqw5ah6g5ym6raxvdbqb6g6rk7m2j423"))))
+                 "0z4bqap88pydkgcxrsvm3fmcyhi9x7z8knliarvdcvqlk7qnyzfh"))))
      (build-system meson-build-system)
 -    (arguments
 -     `(#:meson ,meson-0.55))
      (native-inputs
       `(("check" ,check)
         ("gcc" ,gcc-10)    ;TODO: Remove when the default compiler is > GCC 7.
  ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
  ;;; Copyright © 2020 Anders Thuné <asse.97@gmail.com>
  ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
- ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
  ;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
 +;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
  ;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
 +;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
Simple merge
  ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
  ;;; Copyright © 2019, 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com>
  ;;; Copyright © 2019 Dan Frumin <dfrumin@cs.ru.nl>
 -;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
 +;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
  ;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar@araneo.si>
  ;;; Copyright © 2019 Josh Holland <josh@inv.alid.pw>
+ ;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
  ;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
  ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx>
  ;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
@@@ -1259,13 -1418,9 +1404,13 @@@ map display.  Downloads map data from 
         ("libnova" ,libnova)
         ("libpng" ,libpng)
         ("openjpeg" ,openjpeg)
-        ("proj.4" ,proj.4)
+        ("proj" ,proj)
         ("qtbase" ,qtbase-5)
         ("zlib" ,zlib)))
 +    (native-search-paths
 +     (list (search-path-specification
 +            (variable "XDG_DATA_DIRS")
 +            (files '("share")))))
      (synopsis "Weather Forecast Visualization")
      (description
       "XyGrib is a Grib file reader and visualizes meteorological data providing
@@@ -182,14 -187,14 +187,16 @@@ of a larger interface."
                                          "/babl-" version ".tar.xz")))
                (sha256
                 (base32
-                 "1w68h81kqkqnziixrx21qs0gfv2z79651h19sxn226xdb58mjgqb"))))
+                 "0fbh2ss1dy3sba4xjmfm4vxxjmx9a6rzgba9ycjygchbm957y3ag"))))
      (build-system meson-build-system)
      (arguments
 -     `(#:meson ,meson-0.55))
 +     `(#:configure-flags
 +       (list "-Denable-gir=false"
 +             "-Dwith-docs=false")))
      (native-inputs
-      `(("pkg-config" ,pkg-config)))
+      `(("gobject-introspection" ,gobject-introspection)
+        ("pkg-config" ,pkg-config)
+        ("vala" ,vala)))
      (propagated-inputs
       ;; Propagated to satisfy ‘babl.pc’.
       `(("lcms" ,lcms)))
@@@ -222,11 -227,10 +229,11 @@@ provided, as well as a framework to ad
                                          "/gegl-" version ".tar.xz")))
                (sha256
                 (base32
-                 "1pd8xkx70k0fsi1hrzrmaify7112wjmxzk0p6bi6js89yhn7h4n1"))))
+                 "18cg566lplw7y7dn5v05pal24vxbfiic6097a40gnxdgkxmkr3k6"))))
      (build-system meson-build-system)
      (arguments
 -     `(#:meson ,meson-0.55
 +     `(#:configure-flags
 +       (list "-Dintrospection=false")
         #:phases
         (modify-phases %standard-phases
           (add-after 'unpack 'extend-test-time-outs
Simple merge
Simple merge
  ;;; Copyright © 2020, 2021 Sébastien Lerique <sl@eauchat.org>
  ;;; Copyright © 2021 Trevor Hass <thass@okstate.edu>
  ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
 +;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 +;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 +;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 +;;; Copyright © 2021 Josselin Poiret <josselin.poiret@protonmail.ch>
+ ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
@@@ -12498,45 -12336,31 +12504,74 @@@ world."
  Document Analysis and Recognition program.")
      (license license:gpl3+)))
  
 +(define-public libadwaita
 +  (let ((commit "8d66b987a19979d9d7b85dacc6bad5ce0c8743fe")
 +        (revision "1"))
 +    (package
 +      (name "libadwaita")
 +      (version (git-version "0.0.1" revision commit))
 +      (source (origin
 +                (method git-fetch)
 +                (uri (git-reference
 +                      (url "https://gitlab.gnome.org/GNOME/libadwaita.git")
 +                      (commit commit)))
 +                (file-name (git-file-name name version))
 +                (sha256
 +                 (base32
 +                  "0i3wav6jsyi4w4i2r1rad769m5y5s9djj4zqb7dfyh0bad24ba3q"))))
 +      (build-system meson-build-system)
 +      (arguments
 +       `(#:phases
 +         (modify-phases %standard-phases
 +           (add-before 'check 'pre-check
 +             (lambda* (#:key inputs #:allow-other-keys)
 +               ;; Tests require a running X server.
 +               (system "Xvfb :1 &")
 +               (setenv "DISPLAY" ":1"))))))
 +      (native-inputs
 +       `(("sassc" ,sassc)
 +         ("glib:bin" ,glib "bin")
 +         ("gtk-doc" ,gtk-doc/stable)
 +         ("pkg-config" ,pkg-config)
 +         ("vala" ,vala)
 +         ("xvfb" ,xorg-server-for-tests)))
 +      (inputs
 +       `(("gtk" ,gtk)
 +         ("gobject-introspection" ,gobject-introspection)
 +         ("libportal" ,libportal)))
 +      (home-page "https://gnome.pages.gitlab.gnome.org/libadwaita/")
 +      (synopsis "Building blocks for GNOME applications")
 +      (description
 +       "@code(libadwaita) offers widgets and objects to build GNOME
 +applications scaling from desktop workstations to mobile phones.  It is the
 +successor of @code{libhandy} for GTK4.")
 +      (license license:lgpl2.1+))))
++
+ (define-public gnome-power-manager
+   (package
+     (name "gnome-power-manager")
+     (version "3.32.0")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append "mirror://gnome/sources/" name "/"
+                                   (version-major+minor version) "/"
+                                   name "-" version ".tar.xz"))
+               (sha256
+                (base32
+                 "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g"))))
+     (build-system meson-build-system)
+     (inputs
+      `(("upower" ,upower)
+        ("gtk+" ,gtk+)
+        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+        ("adwaita-icon-theme" ,adwaita-icon-theme)))
+     (native-inputs
+      `(("desktop-file-utils" ,desktop-file-utils)
+        ("glib:bin" ,glib "bin")
+        ("gettext" ,gettext-minimal)
+        ("pkg-config" ,pkg-config)))
+     (home-page "https://gitlab.gnome.org/GNOME/gnome-power-manager")
+     (synopsis "Power management daemon for the GNOME desktop")
+     (description "@code{gnome-power-manager} is a tool for viewing present and
+ historical battery usage and related statistics.")
+     (license license:gpl2)))
Simple merge
Simple merge
Simple merge
@@@ -282,10 -280,9 +280,9 @@@ such as elevation, speed, heart rate, p
                                               ":")))
                 (for-each (lambda (script)
                             (wrap-program (string-append out "/bin/" script)
 -                             `("PYTHONPATH" ":" prefix (,pythonpath))))
 +                             `("GUIX_PYTHONPATH" ":" prefix (,pythonpath))))
                           '("gegps" "gpscat" "gpsfake" "gpsprof"
-                            "ubxtool" "xgps" "xgpsspeed" "zerk")))
-              #t)))))
+                            "ubxtool" "xgps" "xgpsspeed" "zerk"))))))))
      (synopsis "GPS service daemon")
      (description
       "@code{gpsd} is a service daemon that monitors one or more GPSes or AIS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -20,7 -20,7 +20,8 @@@
  ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
  ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
  ;;; Copyright © 2021 jgart <jgart@dismail.de>
 +;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+ ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1400,24 -1403,12 +1405,11 @@@ other XUnit testing frameworks."
      (arguments
       `(#:phases
         (modify-phases %standard-phases
-          (delete 'configure)
-          (add-after 'install 'install-camlzip
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let* ((out (assoc-ref outputs "out"))
-                     (dir (string-append out "/lib/ocaml/site-lib/camlzip")))
-                (mkdir-p dir)
-                (call-with-output-file (string-append dir "/META")
-                  (lambda (port)
-                    (format port "version=\"1.06\"\n")
-                    (format port "requires=\"unix\"\n")
-                    (format port "archive(byte)=\"zip.cma\"\n")
-                    (format port "archive(native)=\"zip.cmxa\"\n")
-                    (format port "archive(native,plugin)=\"zip.cmxs\"\n")
-                    (format port "directory=\"../zip\"\n")))))))
+          (delete 'configure))
         #:install-target "install-findlib"
         #:make-flags
 -       (list "all" "allopt"
 -             (string-append "INSTALLDIR=" (assoc-ref %outputs "out")
 -                            "/lib/ocaml"))))
 +       ,#~(list "all" "allopt"
 +                (string-append "INSTALLDIR=" #$output "/lib/ocaml"))))
      (home-page "https://github.com/xavierleroy/camlzip")
      (synopsis "Provides easy access to compressed files")
      (description "Provides easy access to compressed files in ZIP, GZIP and
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -25246,10 -25735,11 +25692,11 @@@ By default it uses the open Python vuln
      (propagated-inputs
       `(("wheel" ,python-wheel)))
      (native-inputs
 -     `(("texlive" ,(texlive-union (list texlive-amsfonts/patched
 +     `(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
                                          texlive-fonts-ec
 -                                        texlive-iftex
 -                                        texlive-latex-hyperref
 -                                        texlive-latex-oberdiek
++                                        texlive-generic-iftex
 +                                        texlive-hyperref
 +                                        texlive-oberdiek
                                          texlive-lm
                                          texlive-xcolor)))))
      (arguments
  ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
  ;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
  ;;; Copyright © 2016 David Craven <david@craven.ch>
 -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
 +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
  ;;; Copyright © 2016, 2017 Stefan Reichör <stefan@xsteve.at>
- ;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
  ;;; Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com>
  ;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
 -;;; Copyright © 2016, 2017, 2018 Julien Lepiller <julien@lepiller.eu>
  ;;; Copyright © 2016–2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 +;;; Copyright © 2016, 2017, 2018, 2021 Julien Lepiller <julien@lepiller.eu>
  ;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
  ;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
  ;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com>
Simple merge
@@@ -1151,21 -1149,14 +1151,13 @@@ structure.  Supports custom object form
           "03a11clhycyn0jhc7g9davpqd83sn60jqwjy1y145ag9sq6sp935"))))
      (build-system ruby-build-system)
      (arguments
-      `(#:phases
+      `(#:tests? #f ; Disable tests since they depend on pandoc behavior
+                    ; and there are no upstream releases.
+        #:phases
         (modify-phases %standard-phases
-          (add-after 'unpack 'disable-failing-tests
-            ;; TODO: Remove this phase after ghc-pandoc gets upgraded to 2.9.2+
-            ;; (see: https://github.com/xwmx/pandoc-ruby/issues/39).
-            (lambda _
-              (substitute* "test/test_conversions.rb"
-                (("next if from == to.*" all)
-                 (string-append
-                  all
-                  "      next if ['plain', 'beamer'].include? to\n")))
-              #t))
           (add-after 'unpack 'patch-pandoc-path
             (lambda* (#:key inputs #:allow-other-keys)
 -             (let ((pandoc (string-append (assoc-ref inputs "pandoc")
 -                                          "/bin/pandoc")))
 +             (let ((pandoc (search-input-file inputs "/bin/pandoc")))
                 (substitute* "lib/pandoc-ruby.rb"
                   (("@@pandoc_path = 'pandoc'")
                    (format #f "@@pandoc_path = '~a'" pandoc)))
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -342,13 -334,23 +342,12 @@@ resolution scaling on graphical consol
                (method url-fetch)
                (uri (string-append
                      "https://gitlab.freedesktop.org/spice/libcacard/uploads/"
-                     "9d8f24b131bcbbd7846727ea92952cb5"
+                     "13b249e695a0d9aa7cb501b1a85ebab1"
                      "/libcacard-" version ".tar.xz"))
-               (patches (search-patches "libcacard-unknown-variable.patch"))
                (sha256
                 (base32
-                 "0azj3rqr2smg0lai24xrn3zr628xmjfrzcggay877zrr64ybj1c0"))))
+                 "1rrjlclm6ad63gah1fa4yfwrz4z6vgq2yrybbvzvvdbxrgl4vgzv"))))
      (build-system meson-build-system)
 -    (arguments
 -     '(#:tests? #f                      ; TODO Tests require gnutls built with
 -                                        ; p11-kit
 -       #:phases
 -       (modify-phases %standard-phases
 -         (add-after 'unpack 'patch-tests
 -           (lambda* (#:key inputs #:allow-other-keys)
 -             (substitute* "tests/setup-softhsm2.sh"
 -               (("\\/usr\\/lib64\\/pkcs11\\/libsofthsm2\\.so")
 -                (string-append (assoc-ref inputs "softhsm")
 -                               "/lib/softhsm/libsofthsm2.so"))))))))
      (propagated-inputs
       `(("glib" ,glib)                   ; Requires: in the pkg-config file
         ("nss" ,nss)                     ; Requires.private: in the pkg-config
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1,8 -1,7 +1,8 @@@
  ;;; GNU Guix --- Functional package management for GNU
  ;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
- ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+ ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
  ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
 +;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -53,7 -52,7 +52,8 @@@
  ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
  ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
  ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
 +;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
+ ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
Simple merge
@@@ -449,11 -524,10 +523,9 @@@ firmware blobs.  You ca
                (file-name (git-file-name name version))
                (patches (search-patches "ganeti-shepherd-support.patch"
                                         "ganeti-shepherd-master-failover.patch"
-                                        "ganeti-deterministic-manual.patch"
-                                        "ganeti-drbd-compat.patch"
-                                        "ganeti-os-disk-size.patch"
+                                        "ganeti-haskell-compat.patch"
                                         "ganeti-haskell-pythondir.patch"
 -                                       "ganeti-disable-version-symlinks.patch"
 -                                       "ganeti-preserve-PYTHONPATH.patch"))))
 +                                       "ganeti-disable-version-symlinks.patch"))))
      (build-system gnu-build-system)
      (arguments
       `(#:imported-modules (,@%gnu-build-system-modules
@@@ -1385,12 -1614,10 +1574,11 @@@ domains, their live performance and res
               ;; /usr/include/..., which obviously does not exist.
               (let* ((file "google/protobuf/descriptor.proto")
                      (target (string-append "images/" file))
 -                    (source (string-append (assoc-ref inputs "protobuf")
 -                                           "/include/" file)))
 +                    (source (search-input-file
 +                             inputs
 +                             (string-append "include/" file))))
                 (delete-file target)
-                (symlink source target)
-                #t)))
+                (symlink source target))))
           (add-after 'install 'wrap
             (lambda* (#:key inputs outputs #:allow-other-keys)
               ;; Make sure 'crit' runs with the correct PYTHONPATH.
                                           (string-take (string-take-right
                                                         (assoc-ref inputs "python") 5) 3)
                                           "/site-packages:"
 -                                         (getenv "PYTHONPATH"))))
 +                                         (or (getenv "GUIX_PYTHONPATH") ""))))
                 (wrap-program (string-append out "/bin/crit")
-                  `("GUIX_PYTHONPATH" ":" prefix (,path))))
-              #t)))))
 -                 `("PYTHONPATH" ":" prefix (,path))))))
++                 `("GUIX_PYTHONPATH" ":" prefix (,path))))))
+          (add-after 'install 'delete-static-libraries
+            ;; Not building/installing these at all doesn't seem to be supported.
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out")))
+                (for-each delete-file (find-files out "\\.a$"))))))))
      (inputs
       `(("protobuf" ,protobuf)
         ("python" ,python-2)
@@@ -1058,16 -1053,17 +1056,18 @@@ WireGuard was added to Linux 5.6."
             (lambda* (#:key inputs outputs #:allow-other-keys)
               (let* ((out (assoc-ref outputs "out"))
                      (inputs-sbin (map (lambda (input)
-                                         (string-append (assoc-ref inputs input) "/sbin"))
-                                       (list "resolvconf" "iproute" "procps"
-                                             "iptables")))
-                    (coreutils (string-append (assoc-ref inputs "coreutils")
-                                              "/bin")))
+                                         (string-append (assoc-ref inputs input)
+                                                        "/sbin"))
+                                       (list "iproute"
+                                             "iptables"
+                                             "procps"
+                                             "resolvconf")))
+                     (coreutils (string-append (assoc-ref inputs "coreutils")
+                                               "/bin")))
                 (wrap-program (string-append out "/bin/wg-quick")
 +                 #:sh (search-input-file inputs "bin/bash")
                   `("PATH" ":" prefix ,(append inputs-sbin
-                                               (list coreutils))))
-                #t))))))
+                                               (list coreutils))))))))))
      (inputs
       `(("resolvconf" ,openresolv)
         ("coreutils" ,coreutils)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gnu/system.scm
Simple merge
Simple merge
@@@ -1,7 -1,7 +1,8 @@@
  ;;; GNU Guix --- Functional package management for GNU
  ;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
  ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
 +;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+ ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
      (build (if target linux-module-build-cross linux-module-build))
      (arguments (strip-keyword-arguments private-keywords arguments))))
  
 -(define* (linux-module-build store name inputs
 +(define* (linux-module-build name inputs
                               #:key
 -                             target
 +                             source target
                               (search-paths '())
                               (tests? #t)
 -                             (phases '(@ (guix build linux-module-build-system)
 -                                         %standard-phases))
 +                             (phases '%standard-phases)
                               (outputs '("out"))
                               (make-flags ''())
+                              (parallel-build? #t)
                               (system (%current-system))
                               (source-directory ".")
                               (guile #f)
                                          (guix build utils))))
    "Build SOURCE using LINUX, and with INPUTS."
    (define builder
 -    `(begin
 -       (use-modules ,@modules)
 -       (linux-module-build #:name ,name
 -                     #:source ,(match (assoc-ref inputs "source")
 -                                      (((? derivation? source))
 -                                       (derivation->output-path source))
 -                                      ((source)
 -                                       source)
 -                                      (source
 -                                       source))
 -                     #:source-directory ,source-directory
 -                     #:search-paths ',(map search-path-specification->sexp
 -                                           search-paths)
 -                     #:phases ,phases
 -                     #:system ,system
 -                     #:target ,target
 -                     #:arch ,(system->arch (or target system))
 -                     #:tests? ,tests?
 -                     #:outputs %outputs
 -                     #:make-flags ,make-flags
 -                     #:parallel-build? ,parallel-build?
 -                     #:inputs %build-inputs)))
 +    (with-imported-modules imported-modules
 +      #~(begin
 +          (use-modules #$@(sexp->gexp modules))
 +          (linux-module-build #:name #$name
 +                              #:source #+source
 +                              #:source-directory #$source-directory
 +                              #:search-paths '#$(sexp->gexp
 +                                                 (map search-path-specification->sexp
 +                                                      search-paths))
 +                              #:phases #$phases
 +                              #:system #$system
 +                              #:target #$target
 +                              #:arch #$(system->arch (or target system))
 +                              #:tests? #$tests?
 +                              #:outputs #$(outputs->gexp outputs)
 +                              #:make-flags #$make-flags
++                              #:parallel-build? #$parallel-build?
 +                              #:inputs #$(input-tuples->gexp inputs)))))
  
 -  (define guile-for-build
 -    (match guile
 -      ((? package?)
 -       (package-derivation store guile system #:graft? #f))
 -      (#f                                         ; the default
 -       (let* ((distro (resolve-interface '(gnu packages commencement)))
 -              (guile  (module-ref distro 'guile-final)))
 -         (package-derivation store guile system #:graft? #f)))))
 -
 -  (build-expression->derivation store name builder
 -                                #:system system
 -                                #:inputs inputs
 -                                #:modules imported-modules
 -                                #:outputs outputs
 -                                #:guile-for-build guile-for-build
 -                                #:substitutable? substitutable?))
 +  (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
 +                                                  system #:graft? #f)))
 +    (gexp->derivation name builder
 +                      #:system system
 +                      #:guile-for-build guile
 +                      #:substitutable? substitutable?)))
  
  (define* (linux-module-build-cross
 -          store name
 +          name
            #:key
 -          target native-drvs target-drvs
 +          source target
 +          build-inputs target-inputs host-inputs
            (guile #f)
            (outputs '("out"))
            (make-flags ''())
@@@ -1,6 -1,5 +1,7 @@@
  ;;; GNU Guix --- Functional package management for GNU
 +;;; Copyright © 2021 Leo Prikler <leo.prikler@student.tugraz.at>
 +;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+ ;;; Copyright © 2021 Liliana Marie Prikler <liliana.prikler@gmail.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tests/lint.scm
Simple merge
diff --cc tests/opam.scm
Simple merge
diff --cc tests/pypi.scm
Simple merge