ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-08 07:56:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
59498 commits 1 branch 0 tags 448 MiB
Commit graph

329 commits

Author SHA1 Message Date
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
Marius Bakke
4bd428a7ce
gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo'. 
* gnu/packages/abiword.scm (abiword)[inputs]: Change from LIBJPEG to
LIBJPEG-TURBO.
* gnu/packages/admin.scm (testdisk)[inputs]: Likewise.
* gnu/packages/algebra.scm (giac)[inputs]: Likewise.
* gnu/packages/animation.scm (synfig)[inputs]: Likewise.
* gnu/packages/astronomy.scm (gnuastro, celestia)[inputs]: Likewise.
* gnu/packages/cdrom.scm (dvdstyler)[inputs]: Likewise.
* gnu/packages/cran.scm (r-jpeg, r-tiff, r-readbitmap)[inputs]: Likewise.
* gnu/packages/cups.scm (cups-filters, hplip)[inputs]: Likewise.
* gnu/packages/display-managers.scm (slim)[inputs]: Likewise.
* gnu/packages/ebook.scm (fbreader)[inputs]: Likewise.
* gnu/packages/emacs.scm (emacs)[inputs]: Likewise.
* gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise.
* gnu/packages/fltk.scm (fltk, ntk)[inputs]: Likewise.
* gnu/packages/fontutils.scm (fontforge)[inputs]: Likewise.
* gnu/packages/freedesktop.scm (weston)[inputs]: Likewise.
* gnu/packages/game-development.scm (sfml, allegro, aseprite, python-pygame,
eureka, ioquake3)[inputs]: Likewise.
* gnu/packages/games.scm (adanaxisgpl, freedroidrpg, irrlicht, minetest,
fizmo, supertuxkart, gzdoom, xmoto, xonotic)[inputs]: Likewise.
* gnu/packages/gd.scm (gd, perl-gd)[inputs]: Likewise.
* gnu/packages/ghostscript.scm (lcms)[inputs]: Likewise.
(ghostscript)[inputs, native-inputs]: Likewise.
* gnu/packages/gimp.scm (gegl, gimp)[inputs]: Likewise.
* gnu/packages/gnome.scm (libgnomeui, eog, tracker-miners, gthumb)[inputs]: Likewise.
* gnu/packages/gnunet.scm (libextractor)[inputs]: Likewise.
* gnu/packages/gnustep.scm (windowmaker)[inputs]: Likewise.
* gnu/packages/graphics.scm (blender, blender-2.79, openimageio,
openscenegraph, openscenegraph-3.4, povray, fgallery)[inputs]: Likewise.
* gnu/packages/graphviz.scm (graphviz)[inputs]: Likewise.
* gnu/packages/gstreamer.scm (gst-plugins-good)[inputs]: Likewise.
* gnu/packages/gtk.scm (gdk-pixbuf)[inputs]: Likewise.
* gnu/packages/image-processing.scm (dcmtk, mia, vtk, opencv, vips, nip2, vxl,
insight-toolkit)[inputs]: Likewise.
* gnu/packages/image-viewers.scm (gpicview, luminance-hdr)[inputs]: Likewise.
* gnu/packages/image.scm (jpegoptim, libtiff, leptonica, imlib2, freeimage,
vigra, libwebp, libmng, jasper, steghide, jp2a)[inputs]: Likewise.
* gnu/packages/imagemagick.scm (imagemagick, graphicsmagick)[inputs]: Likewise.
* gnu/packages/java.scm (icedtea-6, icedtea-7, openjdk9, openjdk11,
openjdk12)[inputs]: Likewise.
* gnu/packages/kde-frameworks.scm (khtml)[inputs]: Likewise.
* gnu/packages/kodi.scm (kodi)[inputs]: Likewise.
* gnu/packages/machine-learning.scm (dlib, tensorflow)[inputs]: Likewise.
* gnu/packages/mate.scm (atril, eom)[inputs]: Likewise.
* gnu/packages/maths.scm (hdf4, hdf-java, hdf-eos2, netcdf)[inputs]: Likewise.
* gnu/packages/netpbm.scm (netpbm)[inputs]: Likewise.
* gnu/packages/pdf.scm (zathura-pdf-mupdf, podofo, mupdf, fbida)[inputs]: Likewise.
* gnu/packages/photo.scm (libraw, libpano13, enblend-enfuse, darktable, hugin,
rawtherapee)[inputs]: Likewise.
* gnu/packages/prolog.scm (swi-prolog)[native-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-hdf4, python-pillow)[inputs]: Likewise.
* gnu/packages/qt.scm (qtbase, qtwebkit)[inputs]: Likewise.
* gnu/packages/rdesktop.scm (freerdp)[inputs]: Likewise.
* gnu/packages/scanner.scm (sane-backends, xsane)[inputs]: Likewise.
* gnu/packages/scheme.scm (racket)[inputs]: Likewise.
* gnu/packages/scribus.scm (scribus)[inputs]: Likewise.
* gnu/packages/sdl.scm (sdl-image)[propagated-inputs]: Likewise.
(guile-sdl)[native-inputs]: Likewise.
* gnu/packages/spice.scm (spice-gtk)[inputs]: Likewise.
* gnu/packages/statistics.scm (r-with-tests)[inputs]: Likewise.
* gnu/packages/tcl.scm (perl-tk)[inputs]: Likewise.
* gnu/packages/upnp.scm (readymedia)[inputs]: Likewise.
* gnu/packages/video.scm (mplayer, mpv, v4l-utils, motion)[inputs]: Likewise.
* gnu/packages/web-browsers.scm (dillo, links)[inputs]: Likewise.
* gnu/packages/web.scm (netsurf)[inputs]: Likewise.
* gnu/packages/webkit.scm (webkitgtk)[inputs]: Likewise.
* gnu/packages/wine.scm (wine)[inputs]: Likewise.
* gnu/packages/wv.scm (wv)[inputs]: Likewise.
* gnu/packages/wxwidgets.scm (wxwidgets, wxwidgets-2)[inputs]: Likewise.
* gnu/packages/xdisorg.scm (xscreensaver)[inputs]: Likewise.
* gnu/packages/xfce.scm (tumbler)[inputs]: Likewise.
* gnu/packages/xfig.scm (xfig, transfig)[inputs]: Likewise.
* gnu/packages/xorg.scm (xpra)[inputs]: Likewise.
 2020-01-22 22:12:34 +01:00
Marius Bakke
8ed9be3fac
Merge branch 'staging' into core-updates 2020-01-21 22:39:42 +01:00
Marius Bakke
715110a8a2
Merge branch 'master' into staging 2020-01-21 21:34:41 +01:00
Marius Bakke
89595f98d0
gnu: qt@4: Build with libjpeg-turbo. 
* gnu/packages/qt.scm (qt-4)[inputs]: Change from LIBJPEG-8 to LIBJPEG-TURBO.
 2020-01-20 21:53:52 +01:00
Mike Rosset
eb5af18e7e
gnu: Add python-pyqtwebengine. 
* gnu/packages/qt.scm (python-pyqtwebengine): New variable.
 2020-01-15 16:29:45 +01:00
Mike Rosset
9deae98281
gnu: python-pyqt: Substitute the full path of <qprinter.h>. 
* gnu/packages/qt.scm (python-pyqt)[phases]: When building
  python-pyqtwebengine, qprinter.h can not be found.  This substitutes the full
  path of qprinter.h in the qprinter sip specification file.
 2020-01-15 16:29:45 +01:00
Marius Bakke
3cfe76bec0
Merge branch 'master' into core-updates 2020-01-15 00:09:46 +01:00
Jakub Kądziołka
6e332fd370
gnu: qtbase: Open links properly without xdg-utils in profile 
* gnu/packages/qt.scm (qtbase)[inputs]: Add XDG-UTILS.
  [arguments](patch-xdg-open): New phase.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
 2020-01-13 23:28:03 +01:00
Ludovic Courtès
9b65dea806
gnu: Use the two-element 'define-deprecated' form where applicable. 
* gnu/packages/guile.scm (guile-json): Use the two-element
'define-deprecated' form.
* gnu/packages/kde.scm (kdevplatform): Likewise.
* gnu/packages/mpi.scm (hwloc-2.0): Likewise.
* gnu/packages/qt.scm (qt): Likewise.
 2020-01-12 00:19:09 +01:00
Marius Bakke
b7bf02a418
Merge branch 'master' into core-updates 2020-01-11 22:38:24 +01:00
Marius Bakke
2c7511fb66
gnu: qtwebengine: Purge unnecessary bundled software from the source. 
* gnu/packages/qt.scm (qtwebengine)[source](modules, snippet): New fields.
[inputs]: Add CURL and VALGRIND.
 2020-01-11 18:18:50 +01:00
Mike Rosset
db481636a5
gnu: Add qtwebengine. 
* gnu/packages/qt.scm (qtwebengine): New variable.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
 2020-01-11 18:18:50 +01:00
Guillaume Le Vaillant
3e10b2418d
gnu: qtxmlpatterns: Build QML plugin for XmlListModel. 
* gnu/packages/qt.scm (qtdeclarative)[native-inputs]: Remove qtxmlpatterns.
  (qtxmlpatterns)[native-inputs]: Add qtdeclarative.
 2020-01-09 16:03:56 +01:00
Mathieu Othacehe
ce9383c090
Merge remote-tracking branch 'master' into core-updates. 2019-12-31 11:04:51 +01:00
John Soo
43001931a2
gnu: Fix python-pyside-2. 
* gnu/packages/qt.scm (python-pyside-2)[inputs]: Remove llvm-6, clang-6.
Add clang-toolchain-6.
[arguments]: Adjust for change in inputs.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
 2019-12-19 10:36:43 +02:00
John Soo
162cc7f8a4
gnu: Fix python-shiboken-2. 
* gnu/packages/qt.scm (python-shiboken-2)[inputs]: Remove llvm-6,
clang-6. Add clang-toolchain-6.
[arguments]: Adjust for change in inputs.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
 2019-12-19 10:36:08 +02:00
Marius Bakke
9d5aa00906
Merge branch 'master' into core-updates 2019-12-05 17:57:35 +01:00
Hartmut Goebel
d733a469d7
gnu: Remove dependency on Python 2 for some Qt packages. 
* gnu/packages/qt.scm (qtbase, qtmultimedia) [native-inputs]: Replace
  python-2 by python.
  (qtdeclarative)[native-inputs]: Replace python-2 by python, add
  python-wrapper.
 2019-12-01 20:35:06 +01:00
Efraim Flashner
fad5b1a6d8
gnu: sqlite: Build with column metadata. 
* gnu/packages/sqlite.scm (sqlite)[arguments]: Add configure flag to
enable column metadata.
(sqlite-with-column-metadata): Remove variable.
* gnu/packages/fontutils.scm (fontmanager)[inputs]: Replace
sqlite-with-column-metadata with sqlite.
* gnu/packages/messaging (dino)[inputs]: Ditto.
* gnu/packages/music.scm (clementine)[inputs]: Ditto.
* gnu/packages/qt.scm (qtbase)[inputs]: Ditto.
* gnu/packages/telephony.scm (jami)[inputs]: Remove
sqlite-with-column-metadata.
[arguments]: Remove custom 'wrap phase.
 2019-11-28 15:17:42 +02:00
Marius Bakke
0897ad7fac
Merge branch 'master' into staging 2019-11-28 00:38:25 +01:00
Marius Bakke
6d460e80d1
gnu: Qt: Update to 5.12.6 LTS. 
* 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):
Update to 5.12.6.
 2019-11-27 19:40:13 +01:00
Marius Bakke
f0de36cba7
gnu: qtbase: Restore compatibility with old kernels. 
* gnu/packages/qt.scm (qtbase)[arguments]: Add 'no-feature-renameat2' to the
configure flags.
 2019-11-27 19:40:13 +01:00
Marius Bakke
a59e2dd8cd
gnu: qtbase: Use absolute references in .prl files. 
This fixes <https://bugs.gnu.org/38405>.

* gnu/packages/qt.scm (qtbase)[arguments]: Add phase 'patch-prl-files'.
 2019-11-27 19:40:13 +01:00
Hartmut Goebel
4ae8180ca6
gnu: python-pyqt: Fix output directory for plugins. 
This defaults to QT_INSTALL_PLUGINS, thus we should use the same
sub-directory ($out/lib/qt5/plugins) here.

* gnu/packages/qt.scm (python-pyqt)[arguments]<phases>{configure}:
  Change base file name for plugins.
 2019-11-26 12:31:40 +01:00
Marius Bakke
f056553c6b
Merge branch 'master' into staging 2019-11-15 20:11:35 +01:00
Efraim Flashner
53216881f1
gnu: dotherside: Update to 0.6.4. 
* gnu/packages/qt.scm (dotherside): Update to 0.6.4.
 2019-11-13 21:43:34 +02:00
Efraim Flashner
d43f173273
gnu: dotherside: Don't use unstable tarball. 
* gnu/packages/qt.scm (dotherside)[source]: Download using git-fetch.
 2019-11-13 21:41:37 +02:00
Hartmut Goebel
8bfd7c8beb
gnu: qtwebkit: Use sqlite-with-column-metadata. 
This needs to be the same variant as for qtbase, otherwise applications
might fail if libQt5WebKit is loaded prior to libQt5Sql.

* gnu/packages/qt.scm(wtwebkit)[inputs]: Replace sqlite by
  sqlite-with-column-metadata.
 2019-11-10 21:27:09 +01:00
Tobias Geerinckx-Rice
b5bf3dd996
gnu: qtwebkit: Don't use NAME in source URI. 
* gnu/packages/qt.scm (qtwebkit)[source]: Hard-code NAME.
 2019-11-10 13:35:33 +01:00
Hartmut Goebel
41ee209737
gnu: Fix deprecation of monolithic Qt 5.x package. 
* gnu/packages/qt.scm (qt): Remove wrong quote.
 2019-11-08 10:05:17 +01:00
Hartmut Goebel
ea57bb893e
gnu: grantlee: Fix build for Qt 5.12. 
Build using gnu++11 standard.

* gnu/packages/qt.scm(grantlee)[argument]<configure-flags>: New
  element.
 2019-11-06 10:26:25 +01:00
Hartmut Goebel
02511196d9
gnu: Deprecate monolithic Qt 5.x package. 
The monolithic package was not used except as a base for qt-4. Disband
this relation and make qt-4 a complete independent package definition.
Thus the monolithic package qt5 and be removed resp. deprecated.

* gnu/packages/qt.scm (qt-4): Copy all relevant package definition
  parts from 'qt' and not longer inherit from 'qt'.
  (qt): Define as a deprecated alias for 'qtbase`.
 2019-11-01 17:04:51 +01:00
Hartmut Goebel
9759dd1a8a
gnu: Remove qtdeclarative-render2d. 
This module has been merged into qtdeclarative as of Qt 5.8.0
and is not used anywhere.
 2019-11-01 17:04:51 +01:00
Marius Bakke
e8062974d5
gnu: python-pyqt: Fix runtime error. 
* gnu/packages/patches/pyqt-unbundled-qt.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/qt.scm (python-pyqt)[source](patches): Add it.
 2019-10-21 00:34:02 +02:00
Efraim Flashner
8df9249d8e
gnu: qt: Update to 5.12.5. 
* gnu/packages/qt.scm (qt, 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): Update to 5.12.5.
 2019-10-13 17:04:05 +03:00
Julien Lepiller
2b8491fbbe
gnu: mariadb: Split into out, lib and dev. 
* gnu/packages/databases.scm (mariadb): Split into out, lib and dev.
(perl-dbd-mysql, python-mysqlclient): Adjust dependencies.
* gnu/packages/bioinformatics.scm (kentutils): Adjust dependencies.
* gnu/packages/cran.scm (r-rmysql): Adjust dependencies.
* gnu/packages/emacs-xyz.scm (emacs-emacsql): Adjust dependencies.
* gnu/packages/kodi.scm (kodi): Adjust dependencies.
* gnu/packages/qt.scm (qt, qtbase): Adjust dependencies.
* gnu/packages/ruby.scm (ruby-mysql2): Adjust dependencies.
 2019-10-12 13:07:41 +02:00