me/guix
Archived
1
0
Fork 0
Code Activity
100339 commits 1 branch 0 tags 410 MiB
Commit graph

465 commits

Author SHA1 Message Date
Marius Bakke
997abda92b
gnu: Remove redundant MariaDB inputs. 
For well-behaved build systems, including the "dev" output suffices.

* gnu/packages/bioinformatics.scm (kentutils)[inputs]: Remove MARIADB:LIB.
* gnu/packages/cran.scm (r-rmysql)[inputs]: Likewise.
* gnu/packages/databases.scm (python-mysqlclient, soci)[inputs]: Likewise.
* gnu/packages/qt.scm (qt-4, qtbase): Likewise.
* gnu/packages/ruby.scm (ruby-mysql2)[inputs]: Likewise.
 2020-10-13 23:48:16 +02:00
Efraim Flashner
de3c03a471
Merge remote-tracking branch 'origin/master' into staging 2020-09-05 22:30:04 +03:00
Maxim Cournoyer
12bb72fb0f
gnu: qtserialbus: Add libsocketcan support. 
* gnu/packages/qt.scm (qtserialbus)[inputs]: Add libsocketcan.
[phases]{patch-libsocketcan-reference}: Add phase.
 2020-08-11 00:12:40 -04:00
Jakub Kądziołka
ab6fe9d362
gnu: qtbase: Provide debug symbols. 
* gnu/packages/qt.scm (qtbase)[outputs]: Add "debug".
[arguments]: Add "-force-debug-info" to configure flags.
 2020-08-05 02:16:17 +02:00
Michael Rohleder
a0a55309a7
gnu: qtimageformats: Fix build. 
Reported by <nefix> on IRC.

* gnu/packages/qt.scm (qtimageformats)[arguments]: Add a 'fix-build phase.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
 2020-08-01 08:53:08 +02:00
Nicolas Goaziou
23f8c10198
gnu: Update copyright. 
* gnu/packages/qt.scm: Update copyright.
 2020-07-28 12:44:54 +02:00
Nicolas Goaziou
578a1d794b
gnu: qtspell: Add missing module. 2020-07-27 11:59:14 +02:00
Nicolas Goaziou
3844166f1c
gnu: Add qtspell. 
* gnu/packages/qt.scm (qtspell): New variable.
 2020-07-27 11:57:59 +02:00
Marius Bakke
c23737d6e4
gnu: qtbase: Incorporate bugfix variants. 
* gnu/packages/qt.scm (qtbase/next, qtbase-for-krita): Remove variables.
(qtbase)[source](patches): Add "qtbase-absolute-runpath.patch" and
"qtbase-fix-krita-deadlock.patch".
(python-pyside-2-tools)[inputs]: Change from QTBASE/NEXT to QTBASE.
* gnu/packages/kde.scm (krita)[inputs]: Change from QTBASE-FOR-KRITA to QTBASE.
 2020-07-24 23:59:30 +02:00
Leo Famulari
0448bfe2d7
gnu: Fix Krita. 
Fixes <https://bugs.gnu.org/42476>.
Reported by linka on #guix.

* gnu/packages/patches/qtbase-fix-krita-deadlock.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/qt.scm (qtbase-for-krita): New variable.
* gnu/packages/kde.scm (krita)[inputs]: Replace qtbase with qtbase-for-krita.
 2020-07-23 18:14:53 -04:00
Leo Famulari
e61b3bcd79
Revert "gnu: Fix Krita." 
This reverts commit 5f63905096.

This commit caused `guix pull` to crash like this:

------
Backtrace:
In ice-9/boot-9.scm:
   222:29 19 (map1 _)
   222:29 18 (map1 _)
   222:29 17 (map1 _)
   222:29 16 (map1 _)
   222:17 15 (map1 (((gnu packages kde)) ((gnu packages libevent)) ((gnu packages libidn)) ((gnu packages #)) ((?)) ?))
  3297:17 14 (resolve-interface (gnu packages kde) #:select _ #:hide _ #:prefix _ #:renamer _ #:version _)
In ice-9/threads.scm:
    390:8 13 (_ _)
In ice-9/boot-9.scm:
  3223:13 12 (_)
In ice-9/threads.scm:
    390:8 11 (_ _)
In ice-9/boot-9.scm:
  3507:20 10 (_)
   2806:4  9 (save-module-excursion _)
  3527:26  8 (_)
In unknown file:
           7 (primitive-load-path "gnu/packages/kde" #<procedure 7f68d6fe5da0 at ice-9/boot-9.scm:3514:37 ()>)
In ice-9/eval.scm:
   626:19  6 (_ #<directory (gnu packages kde) 7f68d6175b40>)
   293:34  5 (_ #<directory (gnu packages kde) 7f68d6175b40>)
   173:47  4 (_ #(#<directory (gnu packages kde) 7f68d6175b40> #<promise #<procedure 7f68dc5a5d00 at ice-9/eval.sc?>))
    159:9  3 (_ #(#<directory (gnu packages kde) 7f68d6175b40> #<promise #<procedure 7f68dc5a5d00 at ice-9/eval.sc?>))
   191:35  2 (_ #(#<directory (gnu packages kde) 7f68d6175b40> #<promise #<procedure 7f68dc5a5d00 at ice-9/eval.sc?>))
   223:20  1 (proc #(#<directory (gnu packages kde) 7f68d6175b40> #<promise #<procedure 7f68dc5a5d00 at ice-9/eval?>))
In unknown file:
           0 (%resolve-variable (7 . qtbase) #<directory (gnu packages kde) 7f68d6175b40>)

ERROR: In procedure %resolve-variable:
error: qtbase: unbound variable
------
 2020-07-23 16:55:02 -04:00
Leo Famulari
5f63905096
gnu: Fix Krita. 
Fixes <https://bugs.gnu.org/42476>.
Reported by linka on #guix.

* gnu/packages/patches/qtbase-fix-krita-deadlock.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/kde.scm (qtbase-for-krita): New variable.
(krita)[inputs]: Replace qtbase with qtbase-for-krita.
 2020-07-23 16:43:33 -04:00
Marius Bakke
dec0217f6e
gnu: python-shiboken-2, python-pyside-2: Update to 5.14.2.3. 
* gnu/packages/patches/qtbase-absolute-runpath.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/qt.scm (qtbase/next): New variable.
* gnu/packages/qt.scm (python-shiboken-2): Update to 5.14.2.3.
[source](uri): Adjust for tarball rename.
[inputs]: Use the default CLANG-TOOLCHAIN.
(python-pyside-2)[inputs]: Likewise.
(python-pyside-2-tools)[inputs]: Change from QTBASE to QTBASE/NEXT.
 2020-07-15 20:08:10 +02:00
Ludovic Courtès
b0e7b6992f
gnu: Remove ".git" from "https://github/…/….git". 
Until now, 'lookup-origin' and thus 'lookup-origin-revision' in (guix
swh) would sometimes return #f for these because the ".git" URLs are
redirects to the non-".git" URLs.  Consequently, 'guix lint -c archival'
would keep saying "scheduled Software Heritage archival"; likewise, the
fallback download code would fail.

* gnu/packages/ada.scm,
gnu/packages/admin.scm,
gnu/packages/aidc.scm,
gnu/packages/algebra.scm,
gnu/packages/android.scm,
gnu/packages/animation.scm,
gnu/packages/arcan.scm,
gnu/packages/assembly.scm,
gnu/packages/audio.scm,
gnu/packages/authentication.scm,
gnu/packages/avr.scm,
gnu/packages/axoloti.scm,
gnu/packages/backup.scm,
gnu/packages/bash.scm,
gnu/packages/benchmark.scm,
gnu/packages/bioconductor.scm,
gnu/packages/bioinformatics.scm,
gnu/packages/bittorrent.scm,
gnu/packages/boost.scm,
gnu/packages/build-tools.scm,
gnu/packages/c.scm,
gnu/packages/calendar.scm,
gnu/packages/cdrom.scm,
gnu/packages/check.scm,
gnu/packages/chemistry.scm,
gnu/packages/chez.scm,
gnu/packages/clojure.scm,
gnu/packages/code.scm,
gnu/packages/compression.scm,
gnu/packages/compton.scm,
gnu/packages/coq.scm,
gnu/packages/cpp.scm,
gnu/packages/cran.scm,
gnu/packages/crypto.scm,
gnu/packages/curl.scm,
gnu/packages/databases.scm,
gnu/packages/datastructures.scm,
gnu/packages/debug.scm,
gnu/packages/disk.scm,
gnu/packages/distributed.scm,
gnu/packages/django.scm,
gnu/packages/dlang.scm,
gnu/packages/dns.scm,
gnu/packages/docker.scm,
gnu/packages/education.scm,
gnu/packages/efi.scm,
gnu/packages/elixir.scm,
gnu/packages/emacs-xyz.scm,
gnu/packages/embedded.scm,
gnu/packages/emulators.scm,
gnu/packages/engineering.scm,
gnu/packages/erlang.scm,
gnu/packages/fabric-management.scm,
gnu/packages/file-systems.scm,
gnu/packages/finance.scm,
gnu/packages/firmware.scm,
gnu/packages/flashing-tools.scm,
gnu/packages/fonts.scm,
gnu/packages/fontutils.scm,
gnu/packages/fpga.scm,
gnu/packages/game-development.scm,
gnu/packages/games.scm,
gnu/packages/genealogy.scm,
gnu/packages/genimage.scm,
gnu/packages/geo.scm,
gnu/packages/gimp.scm,
gnu/packages/gl.scm,
gnu/packages/gnome-xyz.scm,
gnu/packages/gnome.scm,
gnu/packages/gnuzilla.scm,
gnu/packages/golang.scm,
gnu/packages/gpodder.scm,
gnu/packages/graph.scm,
gnu/packages/graphics.scm,
gnu/packages/graphviz.scm,
gnu/packages/groff.scm,
gnu/packages/groovy.scm,
gnu/packages/gtk.scm,
gnu/packages/guile-xyz.scm,
gnu/packages/guile.scm,
gnu/packages/hardware.scm,
gnu/packages/haskell-apps.scm,
gnu/packages/haskell-xyz.scm,
gnu/packages/hexedit.scm,
gnu/packages/i2p.scm,
gnu/packages/ibus.scm,
gnu/packages/image-processing.scm,
gnu/packages/image-viewers.scm,
gnu/packages/image.scm,
gnu/packages/ipfs.scm,
gnu/packages/java-graphics.scm,
gnu/packages/java-maths.scm,
gnu/packages/java.scm,
gnu/packages/javascript.scm,
gnu/packages/jrnl.scm,
gnu/packages/julia.scm,
gnu/packages/jupyter.scm,
gnu/packages/kodi.scm,
gnu/packages/language.scm,
gnu/packages/lego.scm,
gnu/packages/less.scm,
gnu/packages/libusb.scm,
gnu/packages/linux.scm,
gnu/packages/lirc.scm,
gnu/packages/lisp-xyz.scm,
gnu/packages/llvm.scm,
gnu/packages/logging.scm,
gnu/packages/lolcode.scm,
gnu/packages/lua.scm,
gnu/packages/lxde.scm,
gnu/packages/lxqt.scm,
gnu/packages/machine-learning.scm,
gnu/packages/mail.scm,
gnu/packages/markup.scm,
gnu/packages/maths.scm,
gnu/packages/maven.scm,
gnu/packages/mes.scm,
gnu/packages/messaging.scm,
gnu/packages/monitoring.scm,
gnu/packages/mpd.scm,
gnu/packages/music.scm,
gnu/packages/networking.scm,
gnu/packages/node-xyz.scm,
gnu/packages/ocaml.scm,
gnu/packages/ocr.scm,
gnu/packages/onc-rpc.scm,
gnu/packages/opencl.scm,
gnu/packages/opencog.scm,
gnu/packages/pantheon.scm,
gnu/packages/password-utils.scm,
gnu/packages/patchutils.scm,
gnu/packages/pdf.scm,
gnu/packages/perl6.scm,
gnu/packages/phabricator.scm,
gnu/packages/popt.scm,
gnu/packages/printers.scm,
gnu/packages/prolog.scm,
gnu/packages/protobuf.scm,
gnu/packages/pulseaudio.scm,
gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm,
gnu/packages/python-xyz.scm,
gnu/packages/qt.scm,
gnu/packages/radio.scm,
gnu/packages/rails.scm,
gnu/packages/rdf.scm,
gnu/packages/rednotebook.scm,
gnu/packages/rpc.scm,
gnu/packages/rsync.scm,
gnu/packages/ruby.scm,
gnu/packages/rust.scm,
gnu/packages/scheme.scm,
gnu/packages/screen.scm,
gnu/packages/security-token.scm,
gnu/packages/selinux.scm,
gnu/packages/serialization.scm,
gnu/packages/shells.scm,
gnu/packages/shellutils.scm,
gnu/packages/simh.scm,
gnu/packages/sml.scm,
gnu/packages/ssh.scm,
gnu/packages/statistics.scm,
gnu/packages/stenography.scm,
gnu/packages/sync.scm,
gnu/packages/syncthing.scm,
gnu/packages/synergy.scm,
gnu/packages/telephony.scm,
gnu/packages/terminals.scm,
gnu/packages/tex.scm,
gnu/packages/texinfo.scm,
gnu/packages/text-editors.scm,
gnu/packages/textutils.scm,
gnu/packages/time.scm,
gnu/packages/tmux.scm,
gnu/packages/tor.scm,
gnu/packages/toys.scm,
gnu/packages/version-control.scm,
gnu/packages/video.scm,
gnu/packages/vim.scm,
gnu/packages/virtualization.scm,
gnu/packages/vlang.scm,
gnu/packages/vnc.scm,
gnu/packages/vpn.scm,
gnu/packages/web-browsers.scm,
gnu/packages/web.scm,
gnu/packages/wireservice.scm,
gnu/packages/wm.scm,
gnu/packages/wxwidgets.scm,
gnu/packages/xdisorg.scm,
gnu/packages/xml.scm,
gnu/packages/xorg.scm,
tests/lint.scm: Remove trailing ".git" from 'git-reference' URL.
 2020-07-12 23:08:15 +02:00
Marius Bakke
5ded8494ca
gnu: Add python2-pyqtwebengine. 
* gnu/packages/qt.scm (python2-pyqtwebengine): New public variable.
 2020-06-08 19:13:28 +02:00
Marius Bakke
4c1ca82487
gnu: python2-pyqt: Propagate requireed inputs. 
* gnu/packages/qt.scm (python2-pyqt)[propagated-inputs]: Add PYTHON2-SIP and
PYTHON-ENUM34.  New field.
 2020-06-08 19:12:31 +02:00
Marius Bakke
dd2d3ed2d3
Merge branch 'master' into staging 2020-06-08 19:05:56 +02:00
Marius Bakke
24b61fb8ea
gnu: python-pyqtwebengine: Remove duplicate input. 
* gnu/packages/qt.scm (python-pyqtwebengine)[inputs]: Remove PYTHON-PYQT.
 2020-06-07 22:43:00 +02:00
Marius Bakke
7c7e9ac716
gnu: python-pyqtwebengine: Update to 5.14.0. 
* gnu/packages/qt.scm (python-pyqtwebengine): Update to 5.14.0.
[source](uri): Add PyPI mirror.
 2020-06-07 22:42:27 +02:00
Marius Bakke
3c48fe3658
gnu: python-pyqt: Use PYTHON-VERSION. 
* gnu/packages/qt.scm (python-pyqt)[arguments]: Add #:modules.  Use
PYTHON-VERSION from PYTHON-BUILD-SYSTEM instead of custom implementation.
 2020-06-07 22:41:14 +02:00
Marius Bakke
fd702f8e95
gnu: python-pyqt: Update to 5.14.2. 
* gnu/packages/qt.scm (python-pyqt): Update to 5.14.2.
[source](uri): Add PyPI mirror.
[source](patches): Remove obsolete.
* gnu/packages/patches/pyqt-unbundled-qt.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
 2020-06-07 22:39:55 +02:00
Marius Bakke
8cbb32da7d
gnu: python-sip: Use PYTHON-VERSION. 
* gnu/packages/qt.scm (python-sip)[arguments]: Add #:imported-modules.
Rewrite phase to use PYTHON-VERSION instead of custom implementation.
 2020-06-07 22:38:30 +02:00
Marius Bakke
9097f99448
gnu: python-sip: Update to 4.19.22. 
* gnu/packages/qt.scm (python-sip): Update to 4.19.22.
 2020-06-07 22:36:03 +02:00
Tobias Geerinckx-Rice
d8a85f8200
gnu: qwt: Update to 6.1.5. 
* gnu/packages/qt.scm (qwt): Update to 6.1.5.
 2020-06-07 18:43:38 +02:00
Marius Bakke
0ec1622cb2
gnu: grantlee: Update to 5.2.0. 
* gnu/packages/qt.scm (grantlee): Update to 5.2.0.
[inputs]: Add QTDECLARATIVE.
[arguments]: Remove #:configure-flags.  Remove obsolete phase.
 2020-06-06 22:13:25 +02:00
Marius Bakke
7ce1b5e7b7
Merge branch 'master' into staging 2020-06-06 21:25:43 +02:00
Marius Bakke
75c5d360d9
gnu: grantlee: Correct license. 
* gnu/packages/qt.scm (grantlee)[license]: Set to LGPL2.1+.
 2020-06-06 21:14:17 +02:00
Marius Bakke
c37b621cf3
gnu: qtwebengine: Fix build failure. 
* gnu/packages/qt.scm (qtwebengine)[source](snippet): Preserve the included
Mesa headers, to avoid an incompatibility with system Mesa.  Also adjust some
files to use system Vulkan headers.  Preserve third_party/emoji-segmenter.
[inputs]: Remove obsolete comment (LCMS is already in inputs).
 2020-05-26 22:36:12 +02:00
Jonathan Brielmaier
20b5f14981
gnu: qtdeclarative: Fix reference on qmlcachegen. 
* gnu/packages/qt.scm (qtdeclarative)[arguments]: Add phase to fix the
reference on qmlcachegen in an installed cmake file.
 2020-05-26 22:36:11 +02:00
TomZ
8d1ab36a56
gnu: Qt: Update to 5.14.2. 
* gnu/packages/qt.scm (qtsvg, qtimageformats, qtx11extras,
qtxmlpatterns, qtconnectivity, qtwebsockets, qtsensors,
qtmultimedia, qtserialport, qtserialbus, qtwebchannel,
qtwebview, qtlocation, qttools, qtscript, qtquickcontrols,
qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml,
qtpurchasing, qtcharts, qtdatavis3d, qtnetworkauth,
qtspeech, qtwebengine): Update to 5.14.2.
(qtcanvas3d): Remove variable.  Upstream deprecated it.
(qtbase)[source](patches): Remove qtbase-QTBUG-81715.patch.
[arguments]: Drop X11lib substitution: patched dir no longer exists.
(qtwayland)[arguments]: Disable two tests, and add phase to prevent fatal DBus
warnings.
(qtwebglplugin)[inputs]: Add ZLIB.
(qtremoteobjects): Disable some tests that fail due to missing network.
(qtdeclarative)[native-inputs]: Add VULKAN-HEADERS.
(qtwebengine)[source](snippet): Adjust list of preserved files.
[inputs]: Add VULKAN-HEADERS.
* gnu/packages/patches/qtbase-QTBUG-81715.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.

Co-authored-by: Marius Bakke <mbakke@fastmail.com>
 2020-05-26 22:32:56 +02:00
Kei Kebreau
e792dd3244
gnu: Add libqglviewer. 
* gnu/packages/qt.scm (libqglviewer): New variable.
 2020-05-13 17:03:55 -04:00
nikita
3c986a7dc2
mailmap: Update entries for Nikita. 
* .mailmap: change email and name for Nikita.
* Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish,
gnu/packages/accessibility.scm, gnu/packages/admin.scm,
gnu/packages/audio.scm, gnu/packages/autotools.scm, gnu/packages/cdrom.scm,
gnu/packages/check.scm, gnu/packages/cinnamon.scm,
gnu/packages/compression.scm, gnu/packages/crypto.scm,
gnu/packages/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm,
gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm,
gnu/packages/enlightenment.scm, gnu/packages/erlang.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm,
gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile-xyz.scm,
gnu/packages/haskell-apps.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm, gnu/packages/haskell-xyz.scm,
gnu/packages/haskell.scm, gnu/packages/image-viewers.scm,
gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm,
gnu/packages/libcanberra.scm, gnu/packages/linux.scm,
gnu/packages/lisp-xyz.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm,
gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm,
gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm,
gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm,
gnu/packages/ncurses.scm, gnu/packages/networking.scm,
gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm,
gnu/packages/perl-check.scm, gnu/packages/perl.scm,
gnu/packages/python-compression.scm, gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm, gnu/packages/python-xyz.scm,
gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm,
gnu/packages/rust.scm, gnu/packages/scheme.scm,
gnu/packages/serialization.scm, gnu/packages/shells.scm,
gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm,
gnu/packages/telephony.scm, gnu/packages/text-editors.scm,
gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm,
gnu/packages/tor.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm,
gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm,
gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm,
gnu/services/desktop.scm, gnu/services/version-control.scm,
gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Likewise.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
 2020-05-13 09:30:26 +03:00
Marius Bakke
16fbbf6a85
gnu: re2: Update to 2020-05-01. 
* gnu/packages/regex.scm (re2): Update to 2020-05-01.
[source](modules, snippet): New fields.
* gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Add substitution
to adjust for re2 API change.
* gnu/packages/qt.scm (qtwebengine)[arguments]: Likewise.
 2020-05-11 21:55:01 +02:00
Marius Bakke
030f6f489f
Merge branch 'master' into core-updates 
Conflicts:
	etc/news.scm
	gnu/local.mk
	gnu/packages/bootloaders.scm
	gnu/packages/linphone.scm
	gnu/packages/linux.scm
	gnu/packages/tls.scm
	gnu/system.scm
 2020-04-23 13:33:09 +02:00
Marius Bakke
808d12bb08
gnu: qt@4: Update source URI. 
* gnu/packages/qt.scm (qt-4)[source](uri): Adjust to current.
 2020-04-22 16:08:26 +02:00
Marius Bakke
e5109374d8
gnu: qt@4: Hide the default GCC from CPLUS_INCLUDE_PATH. 
* gnu/packages/qt.scm (qt-4)[native-inputs]: Distinguish GCC-5.
[arguments]: Add phase to hide the default GCC from CPLUS_INCLUDE_PATH to fix
conflicting headers.
 2020-04-22 00:08:26 +02:00
Marius Bakke
c6d02bcf1b
Merge branch 'master' into core-updates 2020-04-11 17:00:30 +02:00
Marius Bakke
67950de7e8
gnu: python-pyqtwebengine: Use 'python-version'. 
* gnu/packages/qt.scm (python-pyqtwebengine)[arguments]: Add (guix build
python-build-system) to #:modules.  Adjust #:imported-modules accordingly.
Rewrite #:phases to use it instead of rolling their own, or hard-coding.
 2020-04-11 15:51:07 +02:00
Marius Bakke
c7eec67a93
gnu: qtwebengine: Fix build with Ninja >= 1.10. 
* gnu/packages/qt.scm (qtwebengine)[arguments]: Add phase
'patch-ninja-version-check'.
 2020-04-08 21:45:23 +02:00
Marius Bakke
ae0badf5bb
Merge branch 'master' into core-updates 
Conflicts:
	gnu/packages/admin.scm
	gnu/packages/commencement.scm
	gnu/packages/guile.scm
	gnu/packages/linux.scm
	gnu/packages/package-management.scm
	gnu/packages/pulseaudio.scm
	gnu/packages/web.scm
 2020-03-30 12:17:33 +02:00
Marius Bakke
e8a225268e
gnu: qtwebkit: Update to 5.212.0-alpha4. 
* gnu/packages/qt.scm (qtwebkit): Update to 5.212.0-alpha4.
[native-inputs]: Change from PYTHON-2.7 to PYTHON.
 2020-03-29 13:49:18 +02:00
Marius Bakke
26e92a3025
gnu: qtbase: Patch the 'moc' executable to cope with GCCs C++ headers. 
* gnu/packages/patches/qtbase-moc-ignore-gcc-macro.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/qt.scm (qtbase)[source](patches): Add it.
 2020-03-29 11:35:04 +02:00
Marius Bakke
c4d769d359
Merge branch 'master' into core-updates 2020-03-18 19:41:08 +01:00
Marius Bakke
961d2ee269
Merge branch 'master' into core-updates 2020-03-14 13:13:40 +01:00
Marius Bakke
76e0b5ba26
gnu: python-pyside: Update to 5.12.6. 
* gnu/packages/qt.scm (python-shiboken-2): Update to 5.12.6.
[source]: Download tarball release instead of git repository.
[arguments]: Add phase to make files writable and update timestamps.
(python-pyside-2): Inherit version and source from PYTHON-SHIBOKEN-2.
[native-inputs]: Remove LIBCXX-6.  Rename "python-wrapper" input to "python".
Change from CMAKE to CMAKE-MINIMAL.
[arguments]: Remove libcxx substitution.  Add "-DPYTHON_EXECUTABLE" in
 #:configure-flags.
(python-pyside-2-tools)[native-inputs]: Add PYTHON-WRAPPER.
[arguments]: Set "-DPYTHON_EXECUTABLE" in #:configure-flags.  Add phase
'go-to-source-dir'.
 2020-03-15 15:09:06 +01:00
Marius Bakke
ebb7cf9e21
Merge branch 'master' into core-updates 2020-03-04 23:16:17 +01:00
Marius Bakke
132c1915a5
gnu: qtbase: Remove custom 'qtbase-patched' variant. 
* gnu/packages/qt.scm (qtbase)[source](patches): Add 'qtbase-QTBUG-81715.patch.
(qtbase-patched): Remove variable.
* gnu/packages/engineering.scm (freecad)[inputs]: Change from QTBASE-PATCHED to QTBASE.
 2020-02-24 19:39:17 +01:00
John Soo
e2546bb472
gnu: qtbase: Add variant that fixes file name handling in CMake macros. 
* gnu/packages/patches/qtbase-QTBUG-81715.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/qt.scm (qtbase-patched): New public variable.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
 2020-02-24 17:10:22 +01:00
Marius Bakke
52665d2b6b
Merge branch 'staging' into core-updates 2020-02-03 15:45:44 +01:00
Marius Bakke
146d0483b0
gnu: Qt: Update to 5.12.7 [fixes CVE-2020-0569, CVE-2020-0570]. 
* gnu/packages/qt.scm (qtbase, qtsvg, qtimageformats, qtx11extras,
qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors,
qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel,
qtwebglplugin, qtwebview, qtlocation, qttools, qtscript, qtquickcontrols,
qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing,
qtcanvas3d, qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech,
qtwebengine): Update to 5.12.7.
 2020-02-03 15:22:43 +01:00