guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge branch 'master' into staging


From: guix-commits
Subject: 01/01: Merge branch 'master' into staging
Date: Mon, 25 Jan 2021 15:41:49 -0500 (EST)

lfam pushed a commit to branch staging
in repository guix.

commit 68dd78e2e47248b3e1e7ba1807a92a8374b39097
Merge: 8b55544 3f0af15
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Mon Jan 25 15:21:09 2021 -0500

    Merge branch 'master' into staging

 Makefile.am                                        |   10 +-
 doc/contributing.texi                              |    4 +-
 doc/guix-cookbook.texi                             |  217 +++-
 doc/guix.texi                                      |  492 +++++---
 etc/news.scm                                       |  102 +-
 gnu/bootloader/grub.scm                            |   26 +-
 gnu/installer.scm                                  |    2 +-
 gnu/installer/newt/keymap.scm                      |   21 +-
 gnu/local.mk                                       |   16 +-
 gnu/packages/admin.scm                             |   74 +-
 gnu/packages/algebra.scm                           |   23 +-
 gnu/packages/aspell.scm                            |    4 +-
 gnu/packages/assembly.scm                          |   35 +-
 gnu/packages/astronomy.scm                         |   97 ++
 gnu/packages/audio.scm                             |   59 +-
 gnu/packages/autotools.scm                         |   49 +
 gnu/packages/bioinformatics.scm                    |  520 ++++-----
 gnu/packages/bootloaders.scm                       |  125 +-
 gnu/packages/busybox.scm                           |    6 +-
 gnu/packages/check.scm                             |   51 +-
 gnu/packages/chromium.scm                          |    8 +-
 gnu/packages/compression.scm                       |    8 +-
 gnu/packages/cpp.scm                               |   22 +
 gnu/packages/cran.scm                              |  693 ++++++++----
 gnu/packages/crates-graphics.scm                   |    4 +-
 gnu/packages/crates-io.scm                         | 1188 ++++++++++++++++----
 gnu/packages/cups.scm                              |   72 +-
 gnu/packages/databases.scm                         |  125 +-
 gnu/packages/diffoscope.scm                        |    4 +-
 gnu/packages/disk.scm                              |    8 +-
 gnu/packages/dns.scm                               |   12 +-
 gnu/packages/docbook.scm                           |  163 +++
 gnu/packages/education.scm                         |   18 +-
 gnu/packages/efi.scm                               |   41 +-
 gnu/packages/elf.scm                               |    4 +-
 gnu/packages/elixir.scm                            |    5 +-
 gnu/packages/emacs-xyz.scm                         |  361 +++++-
 gnu/packages/engineering.scm                       |   16 +-
 gnu/packages/enlightenment.scm                     |   13 +-
 gnu/packages/erlang.scm                            |   15 +-
 gnu/packages/file-systems.scm                      |   37 +-
 gnu/packages/finance.scm                           |   50 -
 gnu/packages/games.scm                             |  215 +++-
 gnu/packages/genimage.scm                          |    3 +-
 gnu/packages/gl.scm                                |    5 +-
 gnu/packages/gnome-xyz.scm                         |   51 +-
 gnu/packages/gnome.scm                             |   34 +-
 gnu/packages/gnupg.scm                             |   79 +-
 gnu/packages/gnuzilla.scm                          |    8 +-
 gnu/packages/gps.scm                               |    6 +-
 gnu/packages/graphics.scm                          |   39 +-
 gnu/packages/guile-xyz.scm                         |   79 +-
 gnu/packages/guile.scm                             |   27 +-
 gnu/packages/idris.scm                             |   12 +-
 gnu/packages/image-viewers.scm                     |    4 +-
 gnu/packages/image.scm                             |    4 +-
 gnu/packages/inkscape.scm                          |    4 +-
 gnu/packages/java.scm                              |    5 +-
 gnu/packages/kde-frameworks.scm                    |    7 +-
 gnu/packages/kde.scm                               |   64 +-
 gnu/packages/libreoffice.scm                       |    6 +-
 gnu/packages/libunwind.scm                         |    4 +-
 gnu/packages/libusb.scm                            |    4 +-
 gnu/packages/license.scm                           |    6 +-
 gnu/packages/linux.scm                             |   85 +-
 gnu/packages/lisp-xyz.scm                          |  852 ++++++++++++--
 gnu/packages/lisp.scm                              |   47 +-
 gnu/packages/lua.scm                               |   30 +-
 gnu/packages/mail.scm                              |    7 +-
 gnu/packages/maths.scm                             |   30 +-
 gnu/packages/matrix.scm                            |    6 +-
 gnu/packages/messaging.scm                         |   16 +-
 gnu/packages/mp3.scm                               |    8 +
 gnu/packages/mpd.scm                               |   76 +-
 gnu/packages/music.scm                             |   12 +-
 gnu/packages/musl.scm                              |    4 +-
 gnu/packages/nano.scm                              |    6 +-
 gnu/packages/networking.scm                        |   33 +-
 gnu/packages/node.scm                              |    4 +-
 gnu/packages/ocaml.scm                             |  135 +++
 gnu/packages/onc-rpc.scm                           |    4 +-
 gnu/packages/package-management.scm                |   51 +-
 gnu/packages/password-utils.scm                    |    6 +-
 gnu/packages/patches/freebayes-devendor-deps.patch |  152 +++
 gnu/packages/patches/guile-2.2-skip-so-test.patch  |   23 +
 gnu/packages/patches/idris-disable-test.patch      |   19 +
 .../patches/ipxe-reproducible-geniso.patch         |   77 ++
 gnu/packages/patches/mutt-CVE-2021-3181.patch      |   45 +
 gnu/packages/patches/podofo-cmake-3.12.patch       |   19 -
 ...v.patch => r-httpuv-1.5.5-unvendor-libuv.patch} |    0
 .../patches/tipp10-disable-downloader.patch        |  165 +++
 gnu/packages/patches/tipp10-qt5.patch              |   69 ++
 .../patches/vcflib-use-shared-libraries.patch      |  135 ---
 gnu/packages/pdf.scm                               |   11 +-
 gnu/packages/perl.scm                              |   33 +
 gnu/packages/printers.scm                          |   72 --
 gnu/packages/python-xyz.scm                        |    8 +-
 gnu/packages/qt.scm                                |  170 +--
 gnu/packages/radio.scm                             |   40 +-
 gnu/packages/rdf.scm                               |   10 +-
 gnu/packages/ruby.scm                              |   12 +-
 gnu/packages/rust-apps.scm                         |  155 ++-
 gnu/packages/samba.scm                             |   87 +-
 gnu/packages/scribus.scm                           |   26 +-
 gnu/packages/search.scm                            |    6 +-
 gnu/packages/shells.scm                            |    4 +-
 gnu/packages/skarnet.scm                           |   38 +-
 gnu/packages/statistics.scm                        |  155 +--
 gnu/packages/syndication.scm                       |    5 +-
 gnu/packages/terminals.scm                         |    4 +-
 gnu/packages/tex.scm                               |  181 ++-
 gnu/packages/text-editors.scm                      |    6 +-
 gnu/packages/version-control.scm                   |   17 +-
 gnu/packages/video.scm                             |   25 +-
 gnu/packages/virtualization.scm                    |   37 +-
 gnu/packages/web.scm                               |   10 +-
 gnu/packages/wm.scm                                |    6 +-
 gnu/packages/xdisorg.scm                           |    5 +-
 gnu/packages/xfce.scm                              |  138 ++-
 gnu/packages/xml.scm                               |  176 ++-
 gnu/packages/xorg.scm                              |    9 +-
 gnu/services/base.scm                              |   32 +-
 gnu/services/cups.scm                              |   12 +-
 gnu/services/networking.scm                        |   65 +-
 gnu/services/shepherd.scm                          |   14 +-
 gnu/services/syncthing.scm                         |   89 ++
 gnu/services/virtualization.scm                    |    8 +-
 gnu/services/web.scm                               |   27 +-
 gnu/system.scm                                     |    6 +-
 gnu/system/examples/bare-hurd.tmpl                 |    2 +-
 gnu/system/image.scm                               |   18 +-
 gnu/system/images/novena.scm                       |    2 +-
 gnu/system/images/pine64.scm                       |    2 +-
 gnu/system/images/pinebook-pro.scm                 |    6 +-
 gnu/system/install.scm                             |    6 +-
 gnu/system/linux-container.scm                     |    7 +-
 gnu/system/mapped-devices.scm                      |    5 +-
 gnu/system/shadow.scm                              |   46 +-
 gnu/tests/install.scm                              |    4 +-
 guix/cache.scm                                     |    9 +-
 guix/git.scm                                       |   44 +-
 guix/import/cpan.scm                               |    3 +-
 guix/import/cran.scm                               |    8 +-
 guix/import/gem.scm                                |    5 +-
 guix/import/texlive.scm                            |   28 +-
 guix/licenses.scm                                  |   10 +-
 guix/modules.scm                                   |    4 +-
 guix/narinfo.scm                                   |  326 ++++++
 guix/packages.scm                                  |   38 +-
 guix/repl.scm                                      |    8 +-
 guix/scripts/archive.scm                           |    4 +-
 guix/scripts/challenge.scm                         |    1 +
 guix/scripts/environment.scm                       |    2 +-
 guix/scripts/publish.scm                           |   31 +-
 guix/scripts/substitute.scm                        |  298 +----
 guix/scripts/system.scm                            |   23 +-
 guix/scripts/weather.scm                           |    1 +
 guix/self.scm                                      |    6 +-
 guix/serialization.scm                             |   16 +-
 guix/store.scm                                     |   17 +-
 guix/swh.scm                                       |    3 +-
 guix/transformations.scm                           |   49 +-
 guix/upstream.scm                                  |   28 +-
 guix/utils.scm                                     |   23 +-
 po/guix/POTFILES.in                                |    1 +
 tests/challenge.scm                                |    2 +-
 tests/crate.scm                                    |    2 +-
 tests/guix-environment.sh                          |    8 +-
 tests/guix-system.sh                               |    9 +-
 tests/inferior.scm                                 |   34 +-
 tests/networking.scm                               |    3 +-
 tests/publish.scm                                  |   16 +
 tests/store.scm                                    |   13 +-
 tests/substitute.scm                               |    1 +
 tests/swh.scm                                      |   37 +-
 tests/transformations.scm                          |   19 +-
 tests/utils.scm                                    |   49 +-
 177 files changed, 7931 insertions(+), 2627 deletions(-)

diff --cc gnu/local.mk
index ba95aec,0553c12..f71d751
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1703,8 -1706,6 +1710,7 @@@ dist_patch_DATA =                               
                
    %D%/packages/patches/vboot-utils-fix-format-load-address.patch      \
    %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch      \
    %D%/packages/patches/vboot-utils-skip-test-workbuf.patch    \
-   %D%/packages/patches/vcflib-use-shared-libraries.patch      \
 +  %D%/packages/patches/vlc-qt-5.15.patch                      \
    %D%/packages/patches/vigra-python-compat.patch              \
    %D%/packages/patches/vinagre-newer-freerdp.patch             \
    %D%/packages/patches/vinagre-newer-rdp-parameters.patch      \
diff --cc gnu/packages/databases.scm
index 1d12ae6,ee883c1..e24eb20
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -1276,8 -1248,89 +1279,91 @@@ pictures, sounds, or video."
                 (base32
                  "1rr2dgv4ams8r2lp13w85c77rkmzpb88fjlc28mvlw6zq2fblv2w"))))))
  
 +(define-public postgresql postgresql-13)
 +
+ (define-public pgloader
+   (package
+     (name "pgloader")
+     (version "3.6.2")
+     (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/dimitri/pgloader";)
+              (commit (string-append "v" version))))
+        (sha256
+         (base32 "06i1jd2za3ih5caj2b4vzlzags5j65vv8dfdbz0ggdrp40wfd5lh"))
+        (file-name (git-file-name name version))))
+     (build-system gnu-build-system)
+     (arguments
+      ;; NOTE: (Sharlatan-20210119T211511+0000) Tests are disabled due to being
+      ;; dependent on Quicklisp, main build target is `pgloader-standalone' 
which
+      ;; does not require Quicklisp workarounds. There is no `install' target
+      ;; configured in Makefile.
+      `(#:tests? #f
+        #:strip-binaries? #f
+        #:make-flags
+        (list "pgloader-standalone" "BUILDAPP_SBCL=buildapp")
+        #:phases
+        (modify-phases %standard-phases
+          (delete 'configure)
+          (add-after 'unpack 'set-home
+            (lambda _
+              (setenv "HOME" "/tmp")
+              #t))
+          (add-after 'unpack 'patch-Makefile
+            (lambda _
+              (substitute* "Makefile"
+                (("--sbcl.*") "--sbcl $(CL) --asdf-path . \\\n"))
+              #t))
+          (replace 'install
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
+                (mkdir-p bin)
+                (install-file "build/bin/pgloader"  bin))
+              #t)))))
+     (native-inputs
+      `(("buildapp" ,buildapp)
+        ("sbcl" ,sbcl)))
+     (inputs
+      `(("alexandria" ,sbcl-alexandria)
+        ("cl-abnf" ,sbcl-cl-abnf)
+        ("cl-base64" ,sbcl-cl-base64)
+        ("cl-csv" ,sbcl-cl-csv)
+        ("cl-fad" ,sbcl-cl-fad)
+        ("cl-log" ,sbcl-cl-log)
+        ("cl-markdown" ,sbcl-cl-markdown)
+        ("cl-mustache" ,sbcl-cl-mustache)
+        ("cl-ppcre" ,sbcl-cl-ppcre)
+        ("cl-sqlite" ,sbcl-cl-sqlite)
+        ("closer-mop" ,sbcl-closer-mop)
+        ("command-line-arguments" ,sbcl-command-line-arguments)
+        ("db3" ,sbcl-db3)
+        ("drakma" ,sbcl-drakma)
+        ("esrap" ,sbcl-esrap)
+        ("flexi-streams" ,sbcl-flexi-streams)
+        ("ixf" ,sbcl-ixf)
+        ("local-time" ,sbcl-local-time)
+        ("lparallel" ,sbcl-lparallel)
+        ("metabang-bind" ,sbcl-metabang-bind)
+        ("mssql" ,sbcl-mssql)
+        ("postmodern" ,sbcl-postmodern)
+        ("py-configparser" ,sbcl-py-configparser)
+        ("qmynd" ,sbcl-qmynd)
+        ("quri" ,sbcl-quri)
+        ("split-sequence" ,sbcl-split-sequence)
+        ("trivial-backtrace" ,sbcl-trivial-backtrace)
+        ("usocket" ,sbcl-usocket)
+        ("uuid" ,sbcl-uuid)
+        ("yason" ,sbcl-yason)
+        ("zs3" ,sbcl-zs3)))
+     (home-page "https://pgloader.io/";)
+     (synopsis "Tool to migrate data to PostgreSQL")
+     (description
+      "@code{pgloader} is a program that can load data or migrate databases 
from
+ CSV, DB3, iXF, SQLite, MS-SQL or MySQL to PostgreSQL.")
+     (license (license:x11-style "file://LICENSE"))))
+ 
  (define-public python-pymysql
    (package
      (name "python-pymysql")
diff --cc gnu/packages/kde-frameworks.scm
index 5482400,8c2028b..70cf346
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@@ -1,6 -1,6 +1,6 @@@
  ;;; GNU Guix --- Functional package management for GNU
  ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
- ;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
 -;;; Copyright © 2016, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
++;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
  ;;; Copyright © 2016-2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
  ;;; Copyright © 2016 David Craven <david@craven.ch>
  ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
diff --cc gnu/packages/qt.scm
index 526054c,96a28ce..012f9a1
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@@ -346,16 -364,13 +364,13 @@@ developers using C++ or QML, a CSS & Ja
  (define-public qtbase
    (package
      (name "qtbase")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8"))
 +               "1y70libf2x52lpbqvhz10lpk7nyl1ajjwzjxly9pjdpfj4jsv7wh"))
               ;; Use TZDIR to avoid depending on package "tzdata".
               (patches (search-patches "qtbase-use-TZDIR.patch"
                                        "qtbase-moc-ignore-gcc-macro.patch"
@@@ -607,16 -623,13 +622,13 @@@ developers using C++ or QML, a CSS & Ja
  (define-public qtsvg
    (package (inherit qtbase)
      (name "qtsvg")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "18dmfc8s428fzbk7k5vl3212b25455ayrz7s716nwyiy3ahgmmy7"))))
 +               "0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb"))))
      (propagated-inputs `())
      (native-inputs `(("perl" ,perl)))
      (inputs
@@@ -682,16 -695,13 +694,13 @@@ HostData=lib/qt
  (define-public qtimageformats
    (package (inherit qtsvg)
      (name "qtimageformats")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "132g4rlm61pdcpcrclr1rwpbrxn7va4wjfb021mh8pn1cl0wlgkk"))
 +               "1msk8a0z8rr16hkp2fnv668vf6wayiydqgc2mcklaa04rv3qb0mz"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@@ -723,16 -733,13 +732,13 @@@ support for MNG, TGA, TIFF and WBMP ima
  (define-public qtx11extras
    (package (inherit qtsvg)
      (name "qtx11extras")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "0njlh6d327nll7d8qaqrwr5x15m9yzgyar2j45qigs1f7ah896my"))))
 +               "0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@@ -747,16 -754,13 +753,13 @@@ from within Qt 5."))
  (define-public qtxmlpatterns
    (package (inherit qtsvg)
      (name "qtxmlpatterns")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "1dyg1z4349k04yyzn8xbp4f5qjgm60gz6wgzp80khpilcmk8g6i1"))))
 +               "1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:tests? _ #f) #f) ; TODO: Enable the tests
@@@ -778,16 -782,13 +781,13 @@@ xmlpatternsvalidator."))
  (define-public qtdeclarative
    (package (inherit qtsvg)
      (name "qtdeclarative")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "0l0nhc2si6dl9r4s1bs45z90qqigs8jnrsyjjdy38q4pvix63i53"))))
 +               "0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:tests? _ #f) #f)             ;TODO: Enable the tests
@@@ -822,16 -823,13 +822,13 @@@ with JavaScript and C++."))
  (define-public qtconnectivity
    (package (inherit qtsvg)
      (name "qtconnectivity")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "0a5wzin635b926b8prdwfazgy1vhyf8m6an64wp2lpkp78z7prmb"))))
 +               "185zci61ip1wpjrygcw2m6v55lvninc0b8y2p3jh6qgpf5w35003"))))
      (native-inputs
       `(("perl" ,perl)
         ("pkg-config" ,pkg-config)
@@@ -846,16 -844,13 +843,13 @@@ with Bluetooth and NFC."))
  (define-public qtwebsockets
    (package (inherit qtsvg)
      (name "qtwebsockets")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "116amx4mnv50k0fpswgpr5x8wjny8nbffrjmld01pzhkhfqn4vph"))))
 +               "0gr399fn5n8j3m9d3vv01vcbr1cb7pw043j04cnnxzrlvn2jvd50"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@@ -873,16 -868,13 +867,13 @@@ consume data received from the server, 
  (define-public qtsensors
    (package (inherit qtsvg)
      (name "qtsensors")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "0qccpgbhyg9k4x5nni7xm0pyvaqia3zrcd42cn7ksf5h21lwmkxw"))))
 +               "0fa81r7bn1mf9ynwsx524a55dx1q0jb4vda6j48ssb4lx7wi201z"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:parallel-tests? _ #f) #f) ; can lead to race condition
@@@ -906,16 -898,13 +897,13 @@@ recognition API for devices."))
  (define-public qtmultimedia
    (package (inherit qtsvg)
      (name "qtmultimedia")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "1sczzcvk3c5gczz53yvp8ma6gp8aixk5pcq7wh344c9md3g8xkbs"))
 +               "1xbd6kc7i0iablqdkvfrajpi32cbq7j6ajbfyyyalcai1s0mhdqc"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@@ -957,16 -946,19 +945,13 @@@ set of plugins for interacting with pul
  (define-public qtwayland
    (package (inherit qtsvg)
      (name "qtwayland")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "0al3yypy3fin62n8d1859jh0mn0fbpa161l7f37hgd4gf75365nk"))
 -             (modules '((guix build utils)))
 -             (snippet
 -               ;; The examples try to build and cause the build to fail
 -              '(begin
 -                 (delete-file-recursively "examples")
 -                 #t))))
 +               "1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:phases phases)
@@@ -1012,16 -1003,13 +997,13 @@@ compositor libraries."))
  (define-public qtserialport
    (package (inherit qtsvg)
      (name "qtserialport")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "08ga9a1lwj83872nxablk602z1dq0la6jqsiicvd7m1sfbfpgnd6"))))
 +               "17gp5qzg4wdg8qlxk2p3mh8x1vk33rf33wic3fy0cws193bmkiar"))))
      (native-inputs `(("perl" ,perl)))
      (inputs
       `(("qtbase" ,qtbase)
@@@ -1046,16 -1034,13 +1028,13 @@@ interacting with serial ports from with
  (define-public qtserialbus
    (package (inherit qtsvg)
      (name "qtserialbus")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "14bahg82jciciqkl74q9hvf3a8kp3pk5v731vp2416k4b8bn4xqb"))))
 +               "125x6756fjpldqy6wbw6cg7ngjh2016aiq92bchh719z1mf7xsxf"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:phases phases '%standard-phases)
@@@ -1081,16 -1066,13 +1060,13 @@@ and others."))
  (define-public qtwebchannel
    (package (inherit qtsvg)
      (name "qtwebchannel")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "0x7q66994pw6cd0f505bmirw1sssqs740zaw8lyqqqr32m2ch7bx"))))
 +               "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj"))))
      (native-inputs
       `(("perl" ,perl)
         ("qtdeclarative" ,qtdeclarative)
@@@ -1105,16 -1087,13 +1081,13 @@@ popular web engines, Qt WebKit 2 and Q
  (define-public qtwebglplugin
    (package (inherit qtsvg)
      (name "qtwebglplugin")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "05rl657848fsprsnabdqb5z363c6drjc32k59223vl351f8ihhgb"))))
 +               "0ihlnhv8ldkqz82v3j7j22lrhk17b6ghra8sx85y2agd2ysq5rw1"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:phases phases)
@@@ -1141,16 -1120,13 +1114,13 @@@ OpenGL ES 2.0 and can be used in HTML5 
  (define-public qtwebview
    (package (inherit qtsvg)
      (name "qtwebview")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "0jzzcm7z5njkddzfhmyjz4dbbzq8h93980cci4479zc4xq9r47y6"))))
 +               "1rw1wibmbxlj6xc86qs3y8h42al1vczqiksyxzaylxs9gqb4d7xy"))))
      (native-inputs
       `(("perl" ,perl)))
      (inputs
@@@ -1194,16 -1170,13 +1164,13 @@@ positioning and geolocation plugins."))
  (define-public qttools
    (package (inherit qtsvg)
      (name "qttools")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "1iakl3hlyg51ri1czmis8mmb257b0y1zk2a2knybd3mq69wczc2v"))))
 +               "1k618f7v6jaj0ygy8d7jvgb8zjr47sn55kiskbdkkizp3z7d12f1"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@@ -1222,16 -1195,13 +1189,13 @@@ that helps in Qt development."))
  (define-public qtscript
    (package (inherit qtsvg)
      (name "qtscript")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "1zlvg3hc6h70d789g3kv6dxbwswzkskkm00bdgl01grwrdy4izg9"))
 +               "0gk74hk488k9ldacxbxcranr3arf8ifqg8kz9nm1rgdgd59p36d2"))
               (patches (search-patches "qtscript-disable-tests.patch"))))
      (native-inputs
       `(("perl" ,perl)
@@@ -1246,16 -1216,13 +1210,13 @@@ ECMAScript and Qt."))
  (define-public qtquickcontrols
    (package (inherit qtsvg)
      (name "qtquickcontrols")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "0qa4dlhn3iv9yvaic8hw86v6h8rn9sgq8xjfdaym04pfshfyypfm"))))
 +               "1dczakl868mg0lnwpf082jjc5976ycn879li1vqlgw5ihirzp4y3"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@@ -1270,16 -1237,13 +1231,13 @@@ can be used to build complete interface
  (define-public qtquickcontrols2
    (package (inherit qtsvg)
      (name "qtquickcontrols2")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "0q0mk2mjlf9ll0gdrdzxy8096s6g9draaqiwrlvdpa7lv14x7xzs"))))
 +               "06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@@ -1295,16 -1259,13 +1253,13 @@@ not available."))
  (define-public qtgraphicaleffects
    (package (inherit qtsvg)
      (name "qtgraphicaleffects")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "03xmwhapv0b2qj661iaqqrvhxc7qiid0acrp6rj85824ha2pyyj8"))))
 +               "1r6zfc0qga2ax155js7c8y5rx6vgayf582s921j09mb797v6g3gc"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@@ -1322,16 -1283,13 +1277,13 @@@ coloring, and many more."))
  (define-public qtgamepad
    (package (inherit qtsvg)
      (name "qtgamepad")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "00wd3h465waxdghg2vdhs5pkj0xikwjn88l12477dksm8zdslzgp"))))
 +               "0p07bg93fdfn4gr2kv38qgnws5znhswajrxdfs8xc9l3i7vi2xn7"))))
      (native-inputs
       `(("perl" ,perl)
         ("pkg-config" ,pkg-config)))
@@@ -1352,16 -1310,13 +1304,13 @@@ and mobile applications targeting TV-li
  (define-public qtscxml
    (package (inherit qtsvg)
      (name "qtscxml")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "141pfschv6zmcvvn3pi7f5vb4nf96zpngy80f9bly1sn58syl303"))
 +               "1p5771b9hnpchfcdgy0zkhwg09a6xq88934aggp0rij1k85mkfb0"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@@ -1383,16 -1338,13 +1332,13 @@@ also contains functionality to support 
  (define-public qtpurchasing
    (package (inherit qtsvg)
      (name "qtpurchasing")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "0lg8x7g7dkf95xwxq8b4yw4ypdz68igkscya96xwbklg3q08gc39"))))
 +               "09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7"))))
      (inputs
       `(("qtbase" ,qtbase)
         ("qtdeclarative" ,qtdeclarative)))
@@@ -1403,16 -1355,13 +1349,13 @@@ purchasing goods and services."))
  (define-public qtcharts
    (package (inherit qtsvg)
      (name "qtcharts")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "1drvm15i6n10b6a1acgarig120ppvqh3r6fqqdn8i3blx81m5cmd"))))
 +               "049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@@ -1430,16 -1379,13 +1373,13 @@@ selecting one of the charts themes."
  (define-public qtdatavis3d
    (package (inherit qtsvg)
      (name "qtdatavis3d")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "080fkpxg70m3c697wfnkjhca58b7r1xsqd559jzb21985pdh6g3j"))))
 +               "1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@@ -1457,16 -1403,13 +1397,13 @@@ customized by using themes or by addin
  (define-public qtnetworkauth
    (package (inherit qtsvg)
      (name "qtnetworkauth")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "0pi6p7bq54kzij2p69cgib7n55k69jsq0yqq09yli645s4ym202g"))))
 +               "11fdgacv4syr8bff2vdw7rb0dg1gcqpdf37hm3pn31d6z91frhpw"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:phases phases)
@@@ -1486,16 -1429,13 +1423,13 @@@ implementation of OAuth and OAuth2 auth
  (define-public qtremoteobjects
    (package (inherit qtsvg)
      (name "qtremoteobjects")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "1mhlws5w0igf5hw0l90p6dz6k7w16dqfbnk2li0zxdmayk2039m6"))))
 +               "1hngbp0vkr35rpsrac7b9vx6f360v8v2g0fffzm590l8j2ybd0b7"))))
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
         ((#:phases phases)
@@@ -1523,16 -1463,13 +1457,13 @@@ processes or computers."))
  (define-public qtspeech
    (package (inherit qtsvg)
      (name "qtspeech")
 -    (version "5.14.2")
 +    (version "5.15.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append 
"https://download.qt.io/official_releases/qt/";
-                                  (version-major+minor version) "/" version
-                                  "/submodules/" name "-everywhere-src-"
-                                  version ".tar.xz"))
+              (uri (qt5-urls name version))
               (sha256
                (base32
 -               "1nn6kspbp8hfkz1jhzc1qx1m9z7r1bgkdqgi9n4vl1q25yk8x7jy"))))
 +               "1xc3x3ghnhgchsg1kgj156yg69wn4rwjx8r28i1jd05hxjggn468"))))
  
      (arguments
       (substitute-keyword-arguments (package-arguments qtsvg)
@@@ -1591,13 -1528,10 +1522,10 @@@ using the Enchant spell-checking librar
      (source
       (origin
         (method url-fetch)
-        (uri (string-append "https://download.qt.io/official_releases/qt/";
-                            (version-major+minor version) "/" version
-                            "/submodules/" name "-everywhere-src-"
-                            version ".tar.xz"))
+        (uri (qt5-urls name version))
         (sha256
          (base32
 -         "0iy9lsl6zxlkca6x2p1506hbj3wmhnaipg23z027wfccbnkxcsg1"))
 +         "1q4idxdm81sx102xc12ixj0xpfx52d6vwvs3jpapnkyq8c7cmby8"))
         (modules '((ice-9 ftw)
                    (ice-9 match)
                    (srfi srfi-1)
diff --cc gnu/packages/video.scm
index 824ea62,97cb7d6..cebb70d
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@@ -1772,10 -1778,9 +1773,10 @@@ videoformats depend on the configuratio
                      "https://download.videolan.org/pub/videolan/vlc/";
                      (car (string-split version #\-))
                      "/vlc-" version ".tar.xz"))
 +              (patches (search-patches "vlc-qt-5.15.patch"))
                (sha256
                 (base32
-                 "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq"))))
+                 "0ygqihw2c5vvzv8950dlf7rdwz1cpz1668jgyja604ljibrmix7g"))))
      (build-system gnu-build-system)
      (native-inputs
       `(("flex" ,flex)



reply via email to

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