me
/
guix
Archived
1
0
Fork 0
Commit Graph

505 Commits (925c0a9283c55488f940c0876f03bf3484f9a415)

Author SHA1 Message Date
Efraim Flashner 322917aeb8
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	gnu/packages/gnuzilla.scm
	gnu/packages/graphics.scm
	gnu/packages/gstreamer.scm
	gnu/packages/gtk.scm
	gnu/packages/kde-frameworks.scm
	gnu/packages/video.scm
2022-10-12 14:36:44 +03:00
Hilton Chain a70c67cfe7
gnu: Add qtwayland, version 6.3.1.
* gnu/packages/qt.scm (qtwayland): New variable.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-09-29 23:19:55 -04:00
Hilton Chain 034f68bac3
gnu: qtwayland: Rename to qtwayland-5.
Automated via:

  git grep -l qtwayland | xargs sed 's/\qtwayland\b/\0-5/g' -i
  git checkout NEWS

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-09-29 23:19:55 -04:00
Marius Bakke f66067febc
Merge branch 'master' into staging 2022-09-29 07:26:37 +02:00
Guillaume Le Vaillant a9c4040710
gnu: Add python-qt.py.
* gnu/packages/qt.scm (python-qt.py): New variable.
2022-09-28 11:31:49 +02:00
Maxim Cournoyer 3d297a0017
Merge branch 'master' into staging
With resolved conflicts in:
	gnu/local.mk
	gnu/packages/freedesktop.scm
	gnu/packages/gnuzilla.scm
2022-09-15 10:20:32 -04:00
Christopher Baines fa4fffbd08
gnu: Add comments to the bottom of a few more package modules.
This will hopefully discourage patches which add new packages to the bottom of
files, as this increases the likelihood of conflicts when applying patches.

If there are more specific ways that packages should be arranged in specific
modules, this message can be updated accordingly.

* gnu/packages/crates-graphics.scm: Add comment discouraging adding packages
to the bottom of the file.
* gnu/packages/crates-gtk.scm: ditto.
* gnu/packages/games.scm: ditto.
* gnu/packages/music.scm: ditto.
* gnu/packages/qt.scm: ditto.
* gnu/packages/web.scm: ditto.
2022-09-14 09:33:11 +01:00
Ludovic Courtès e61c581805
gnu: qtshadertools: Fix 'license' field.
Fixes <https://issues.guix.gnu.org/57581>.
Reported by Julien Lepiller <julien@lepiller.eu>.
Fix provided by Florian Pelz <pelzflorian@pelzflorian.de>.

* gnu/packages/qt.scm (qtshadertools)[license]: Fix value.
2022-09-13 16:38:08 +02:00
Marius Bakke fa894b3f4d
Merge branch 'master' into staging 2022-09-08 20:56:57 +02:00
Zhu Zihao c8621fa193
gnu: python-pyside-2-tools: Fix synopsis and description.
* gnu/packages/qt.scm (python-pyside2-tools)[synopsis]: Use more descriptive
words.
[description]: Ditto.

Signed-off-by: Marius Bakke <marius@gnu.org>
2022-09-07 22:02:42 +02:00
Zhu Zihao e2e351cb45
gnu: python-pyside-2-tools: Use G-expressions.
* gnu/packages/qt.scm (python-pyside2-tools)[native-inputs]: Use label-less
style.
[arguments]: Use G-expressions.
<#:configure-flags>: Use SEARCH-INPUT-FILE.

Signed-off-by: Marius Bakke <marius@gnu.org>
2022-09-07 22:02:42 +02:00
Zhu Zihao 7c9ac0468b
gnu: Add python-pyside-6.
* gnu/packages/qt.scm (python-pyside-6): New variable.

Signed-off-by: Marius Bakke <marius@gnu.org>
2022-09-07 22:02:42 +02:00
Zhu Zihao 5c08546558
gnu: python-pyside-2: Use "this-package-input" instead of "assoc-ref".
* gnu/packages/qt.scm (python-pyside-2)[arguments]<#:configure-flags>: Use
SEARCH-INPUT-FILE.
<#:phases>: In phase "fix-qt-module-detection", use "this-package-input".

Signed-off-by: Marius Bakke <marius@gnu.org>
2022-09-07 22:02:42 +02:00
Zhu Zihao 39647c9741
gnu: python-pyside-2: Clarify the package inputs.
The module "PySide.PyQtUiTools" depends on "qttools-5", it should be an input,
not a native input.

libxml2, libxslt, clang-toolchain is only used by python-shiboken-2.

cmake-minimal is not used.

* gnu/packages/qt.scm (python-pyside-2): [inputs]: Remove libxml2, libxslt,
clang-toolchain. Add qttools-5.
[native-inputs]: Remove cmake-minimal, qttools-5.
[arguments]<#:phases>: Remove phase "set-clang-dir".

Signed-off-by: Marius Bakke <marius@gnu.org>
2022-09-07 22:02:41 +02:00
Zhu Zihao 00652ce2ee
gnu: python-pyside-2: Use G-expressions.
* gnu/packages/qt.scm (python-pyside-2)[native-inputs]: Use label-less input
style.
[arguments]: Use G-expressions.

Signed-off-by: Marius Bakke <marius@gnu.org>
2022-09-07 22:02:41 +02:00
Zhu Zihao a69581f17c
gnu: Add python-shiboken-6
* gnu/packages/qt.scm (python-shiboken-6): New variable.

Signed-off-by: Marius Bakke <marius@gnu.org>
2022-09-07 22:02:41 +02:00
Zhu Zihao f1bbdefd9e
gnu: python-shiboken-2: Use G-expressions.
* gnu/packages/qt.scm (python-shiboken-2)[arguments]: Use G-expressions.
<#:phases>: In phase "set-build-env", Replace (assoc-ref inputs ...) with
(this-package-input ...).

Signed-off-by: Marius Bakke <marius@gnu.org>
2022-09-07 22:02:41 +02:00
Efraim Flashner 83be24a13f
gnu: qtdeclarative-5: Fix linking on riscv64-linux.
* gnu/packages/qt.scm (qtdeclarative-5)[arguments]: Add phase when
building for riscv64-linux to adjust the linker flags.
2022-09-02 08:28:17 +03:00
Marius Bakke c4ce54055a
Merge branch 'master' into staging 2022-09-01 16:24:18 +02:00
Brendan Tildesley 39460eac6d
gnu: Add kdsoap.
* gnu/packages/qt.scm (kdsoap): New variable.

Signed-off-by: Marius Bakke <marius@gnu.org>
2022-09-01 16:08:16 +02:00
Brendan Tildesley 8e6af98fbb
gnu: libdbusmenu-qt: Move to (gnu packages qt).
*  gnu/packages/lxqt.scm: Remove libdbusmenu-qt.
*  gnu/packages/qt.scm: Re-add libdbusmenu-qt.

Signed-off-by: Marius Bakke <marius@gnu.org>
2022-09-01 16:08:15 +02:00
Marius Bakke dedbaa3a69
Merge branch 'master' into staging 2022-08-28 15:43:30 +02:00
Zhu Zihao 69820ecfd9
gnu: qtwebengine: Fix QTWEBENGINEPROCESS_PATH specification.
* gnu/packages/qt.scm (qtwebengine)[native-search-paths]: Use
"lib/qt6/libexec/QtWebEngineProcess" for search path.

Signed-off-by: Marius Bakke <marius@gnu.org>
2022-08-27 23:48:56 +02:00
Marius Bakke 1fd262e8d3
Merge branch 'master' into staging 2022-08-27 00:17:57 +02:00
Zhu Zihao af9a49e42e
gnu: python-qtpy: Update to 2.2.0.
* gnu/packages/qt.scm (python-qtpy): Update to 2.2.0.

Signed-off-by: Marius Bakke <marius@gnu.org>
2022-08-27 00:09:03 +02:00
Zhu Zihao 31339f5f5f
gnu: Rename procedure "qt5-urls" to "qt-urls" in (gnu packages qt).
This procedure now used by Qt5 and Qt6. "qt-urls" is more neutral than
original one.

* gnu/packages/qt.scm (qt5-urls): Rename to "qt-urls".
(qtbase-5)[source]: Use "qt-urls" for uri field.
(qtbase)[source]: Ditto.
(qt5compat)[source]: Ditto.
(qtsvg-5)[source]: Ditto.
(qtsvg)[source]: Ditto.
(qtimageformats)[source]: Ditto.
(qtx11extras)[source]: Ditto.
(qtxmlpatterns)[source]: Ditto.
(qtdeclarative-5)[source]: Ditto.
(qtdeclarative)[source]: Ditto.
(qtconnectivity)[source]: Ditto.
(qtwebsockets-5)[source]: Ditto.
(qtwebsockets)[source]: Ditto.
(qtsensors)[source]: Ditto.
(qtmultimedia-5)[source]: Ditto.
(qtshadertools)[source]: Ditto.
(qtmultimedia)[source]: Ditto.
(qtwayland)[source]: Ditto.
(qtserialport)[source]: Ditto.
(qtserialbus)[source]: Ditto.
(qtwebchannel-5)[source]: Ditto.
(qtwebchannel)[source]: Ditto.
(qtwebglplugin)[source]: Ditto.
(qtwebview)[source]: Ditto.
(qtlottie)[source]: Ditto.
(qttools-5)[source]: Ditto.
(qttools)[source]: Ditto.
(qtscript)[source]: Ditto.
(qtquickcontrols-5)[source]: Ditto.
(qtquickcontrols2-5)[source]: Ditto.
(qtgraphicaleffects)[source]: Ditto.
(qtgamepad)[source]: Ditto.
(qtscxml)[source]: Ditto.
(qtpositioning)[source]: Ditto.
(qtpurchasing)[source]: Ditto.
(qtcharts)[source]: Ditto.
(qtdatavis3d)[source]: Ditto.
(qtnetworkauth-5)[source]: Ditto.
(qtnetworkauth)[source]: Ditto.
(qtremoteobjects)[source]: Ditto.
(qtspeech)[source]: Ditto.
(qtwebengine-5)[source]: Ditto.
(qtwebengine)[source]: Ditto.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
2022-08-25 08:50:02 +08:00
Zhu Zihao 9ebed88cf6
gnu: dotherside: Update to 0.9.0.
* gnu/packages/qt.scm (dotherside): Update to 0.9.0.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
2022-08-22 14:06:02 +08:00
Marius Bakke b9a3083db3
gnu: qtscxml: Fix build failure.
This fixes a faulty conflict resolution from the merge in commit
b50eaa6764.

* gnu/packages/qt.scm (qtscxml)[arguments]: Substitute arguments from QTSVG-5,
not QTSVG.
2022-08-12 13:19:30 +02:00
Marius Bakke b50eaa6764
Merge branch 'master' into staging 2022-08-11 22:15:22 +02:00
Marius Bakke 0a078b5a31
gnu: qtwayland: Remove input labels.
* gnu/packages/qt.scm (qtwayland)[inputs]: Remove labels.
2022-08-11 00:21:11 +02:00
Marius Bakke 88f976d160
gnu: qtwayland: Fix build with GCC 11.
* gnu/packages/patches/qtwayland-gcc-11.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/qt.scm (qtwayland)[source](patches): New field.
2022-08-11 00:21:11 +02:00
Guillaume Le Vaillant 0aa98e0646
gnu: python-pyside-2: Fix build.
* gnu/packages/qt.scm (python-pyside-2)[arguments]: Use the correct names for
  Qt inputs in the 'fix-qt-module-detection' phase.
2022-08-03 18:36:04 +02:00
Morgan Smith 3d727b8334
gnu: qt5ct: Fix build.
* gnu/packages/qt.scm (qt5ct)[build-system]: Change to qt-build-system.
[arguments]: Adjust accordingly.
[inputs]: Remove qtbase-5.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
2022-08-03 11:12:39 +08:00
Maxim Cournoyer 4637de6a41
gnu: Add qtlottie.
* gnu/packages/qt.scm (qtlottie): New variable.
2022-08-01 17:21:01 -04:00
Maxim Cournoyer a13a687989
gnu: Add qtpositioning.
* gnu/packages/qt.scm (qtpositioning): New variable.
2022-07-31 21:55:49 -04:00
Maxim Cournoyer d9e8d7f4aa
gnu: Add qtnetworkauth, version 6.3.1.
* gnu/packages/qt.scm (qtnetworkauth): New variable.
2022-07-31 21:55:48 -04:00
Maxim Cournoyer 2e27ccec83
gnu: qtnetworkauth: Rename to qtnetworkauth-5.
Automated with:

  git grep -l qtnetworkauth | xargs sed 's/\bqtnetworkauth\b/\0-5/g' -i
2022-07-31 21:55:48 -04:00
Maxim Cournoyer a4784b3273
gnu: Add qttools, version 6.3.1.
* gnu/packages/qt.scm (qttools): New variable.
2022-07-31 21:55:48 -04:00
Maxim Cournoyer eef8e2ec46
gnu: qttools: Rename to qttools-5.
Automated with:

  git grep -l qttools | xargs sed 's/\bqttools\b/\0-5/g' -i
  git checkout NEWS
2022-07-31 21:55:48 -04:00
Maxim Cournoyer de20b74fc2
gnu: Add qt5compat.
* gnu/packages/qt.scm (qt5compat): New variable.
2022-07-31 21:55:47 -04:00
Maxim Cournoyer f1e126c03b
gnu: Add qtwebengine, version 6.3.1.
* gnu/packages/qt.scm (qtwebengine): New variable.
2022-07-31 21:55:47 -04:00
Maxim Cournoyer a0beb297a3
gnu: qtwebengine: Rename to qtwebengine-5.
Automated with:

  git grep -l qtwebengine | xargs sed 's/\bqtwebengine\b/\0-5/g' -i
  git checkout NEWS
2022-07-31 21:55:47 -04:00
Maxim Cournoyer ef648459df
gnu: Add qtwebchannel, version 6.3.1.
* gnu/packages/qt.scm (qtwebchannel): New variable.
2022-07-31 21:55:46 -04:00
Maxim Cournoyer 0938c3e34a
gnu: qtwebchannel: Rename to qtwebchannel-5.
Automated via:

  git grep -l qtwebchannel | xargs sed 's/\bqtwebchannel\b/\0-5/g' -i
  git checkout NEWS
2022-07-31 21:55:46 -04:00
Maxim Cournoyer 573055b7ef
gnu: Add qtwebsockets, version 6.3.1.
* gnu/packages/qt.scm (qtwebsockets): New variable.
2022-07-31 21:55:46 -04:00
Maxim Cournoyer d15258d991
gnu: qtwebsockets: Rename to qtwebsockets-5.
Automated via:

  git grep -l qtwebsockets | xargs sed 's/\bqtwebsockets\b/\0-5/g' -i
  git checkout NEWS
2022-07-31 21:55:46 -04:00
Maxim Cournoyer d90031f799
gnu: qtquickcontrols2: Define as obsoleted by qtdeclarative.
* gnu/packages/qt.scm (qtquickcontrols2): New variable.
2022-07-31 21:55:45 -04:00
Maxim Cournoyer 1130fc5991
gnu: qtquickcontrols2: Rename to qtquickcontrols2-5.
Automated via:

  git grep -l qtquickcontrols2 | xargs sed 's/\bqtquickcontrols2\b/\0-5/g' -i
  git checkout NEWS
2022-07-31 21:55:45 -04:00
Maxim Cournoyer 65e5e85d28
gnu: qtquickcontrols: Rename to qtquickcontrols-5.
Automated via:

  git grep -l qtquickcontrols | xargs sed 's/\bqtquickcontrols\b/\0-5/g' -i
  git checkout NEWS
2022-07-31 21:55:45 -04:00
Maxim Cournoyer 397d05a4bf
gnu: Add qtdeclarative, version 6.3.1.
* gnu/packages/qt.scm (qtdeclarative): New variable.
2022-07-31 21:55:44 -04:00