mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 01:20:40 +00:00
Code Issues Wiki Activity
246389 commits 265 branches 124 tags 5.2 GiB
Commit graph

686 commits

Author SHA1 Message Date
Thomas Tuegel b3d72930d8 qtbase: Preserve configuration options on Qt < 5.15 2020-09-07 08:05:38 -05:00
Thomas Tuegel 017e498d02 Revert "qt514: remove" 
This reverts commit bec5405fc5.

Qt 5.14 is still supported upstream, so we will not remove it yet.
 2020-09-07 08:05:27 -05:00
Thomas Tuegel 01bcfd3579 qtwebkit: mark broken with Qt 5.15 2020-09-07 08:05:24 -05:00
Timothy DeHerrera 2a5f800520 qt514: remove 2020-09-07 08:05:11 -05:00
Timothy DeHerrera eb919fa712 qt5: 5.14.2 -> 5.15.0 2020-09-07 08:05:06 -05:00
John Ericson 1965a241fc
Merge pull request #61019 from volth/gcc.arch-amd 
platform.gcc.arch: support for AMD CPUs
 2020-09-01 22:31:16 -04:00
Frederik Rietdijk efb45f7638 Merge master into staging-next 2020-08-28 09:54:31 +02:00
Fabian Möller f82565f87d
qt5.qtwebkit: fix build with bison-3.7 2020-08-27 11:42:53 +02:00
Chuck 4bac8a7a00 qtbase: Move libtiff dependency from qtbase to qtimageformats 2020-08-27 08:47:47 +02:00
Frederik Rietdijk 081bd762e5 Merge staging-next into staging 2020-08-26 08:43:29 +02:00
Fabian Möller 90db9641cb
qt5.qtwebengine: fix build with bison-3.7 (#96295) 2020-08-25 20:13:45 +02:00
Peter Simons 7b527223fd qtdeclarative: revert "Patch for scrollbar regression" 
This reverts commit 5530043208. The change breaks the build of
qtquickcontrols. Fixes https://github.com/NixOS/nixpkgs/issues/96159.
 2020-08-25 12:02:15 +02:00
Florian Klink 40d2968ebf
Merge pull request #94354 from flokli/systemd-246 
systemd: 245.6 -> 246
 2020-08-24 12:42:24 +02:00
Jan Tojnar 91104b5417
Merge branch 'master' into staging-next 2020-08-23 02:00:50 +02:00
Ruben Maher 68bf9101d7
qtwebengine: fix build for darwin 2020-08-19 21:57:45 +09:00
Jamie 4cb5383141
qt: bring back QML import patch in 5.14 (#95772) 
This was missed in the 5.12 -> 5.14 update process.

Resolves #95636
 2020-08-19 02:56:19 +02:00
Thomas Tuegel 5530043208 qtdeclarative: Patch for scrollbar regression 2020-08-15 08:36:15 +02:00
Florian Klink 77a9788b08 qt5.qtwebengine: use lib.getLib systemd instead of systemd.lib 
This will pick the `lib` output if it exists, otherwise default to `out`.
 2020-08-13 20:51:40 +02:00
Frederik Rietdijk f707715136 Merge master into staging-next 2020-08-11 10:26:35 +02:00
Pascal Bach 2cfff96eff qtwebkit: 5.212-alpha-01-26-2018 -> 5.212.0-alpha4 2020-08-07 09:31:52 +02:00
volth cf7b63df5b gcc.arch: refactor, move tables under lib/ 2020-08-05 11:18:26 +00:00
volth 463db72e63 platform.gcc.arch: support for AMD CPUs 2020-08-05 02:32:48 +00:00
Milan Pässler d4c607aa71 qt5: 5.12.7 -> 5.14.2 
This includes contributions by @ttuegel and @DizFer. Thanks!
 2020-07-31 18:50:58 +02:00
Thomas Tuegel 9cfca08777
Merge pull request #89846 from lelongg/qtserialbus 
qt5.qtserialbus: init at 5.12
 2020-07-19 14:46:02 -05:00
Doron Behar 01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise 
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
 2020-06-12 11:55:31 -07:00
Gérald Lelong be7a8df1fa qt5.qtserialbus: init at 5.12 2020-06-08 23:25:04 +02:00
Thomas Tuegel 99d2567515
Merge pull request #86317 from xbreak/qt5-pkg-config 
qt5: Add missing include path to pkg-config files
 2020-05-28 05:46:52 -05:00
Henk Kalkwater 5ecd99b2bd qt5.qtgamepad: init at 5.12.7 2020-05-14 21:56:30 -07:00
xbreak ee5975319b
qt5: Add missing include path to pkg-config files 
This is achieved by patching qtbase `qmake/generators/makefile.cpp` to
unconditionally add the missing `-I${includedir}`. The include path is
otherwise conditioned on whether it is already available or not. Since there is
no unified set of system include paths in nix this cause problems as reported
in #52457.
 2020-05-12 06:25:28 +00:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Frederik Rietdijk 92124ed660 Merge master into staging-next 2020-04-03 21:54:40 +02:00
Aleksey Uimanov a01e8b740e qxmledit: init at 0.9.15 2020-03-22 20:01:49 +05:00
volth 4b6bbc1b4e qt512: pick upstream patch for QTBUG-78937 2020-03-12 11:30:08 +01:00
Martin Milata 80650ae4f0 qt5.qtbase: backport cmake macro fix 
Backport fix of QT5_MAKE_OUTPUT_FILE CMake macro which causes FreeCAD
build failure when building with qt-5.12.7.

https://bugreports.qt.io/browse/QTBUG-81715
 2020-02-20 00:55:57 +01:00
Tom Hall 704b49db97
qttools: Add qtdeclarative to buildInputs 
qtdeclarative is an optional dependency for some parts of qttools:
without it, the lupdate binary is not able to process qml files for
translatable strings.
 2020-02-10 15:27:41 -06:00
Will Dietz 77a6a364b8
qt-5: 5.12.6 -> 5.12.7 
https://www.qt.io/blog/qt-5.12.7-released
 2020-02-02 11:04:43 -06:00
Frederik Rietdijk dce0ca29d9 Merge master into staging-next 2020-01-28 10:46:13 +01:00
Thomas Tuegel 740c780c1d
qt5: remove last vestiges of Qt 5.11 
A file was left-over after removing Qt 5.11 at its end-of-life.
 2020-01-26 16:06:58 -06:00
Anders Kaseorg 3cd8ce3bce treewide: Fix unsafe concatenation of $LD_LIBRARY_PATH 
Naive concatenation of $LD_LIBRARY_PATH can result in an empty
colon-delimited segment; this tells glibc to load libraries from the
current directory, which is definitely wrong, and may be a security
vulnerability if the current directory is untrusted.  (See #67234, for
example.)  Fix this throughout the tree.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
 2020-01-15 09:47:03 +01:00
Luka Blaskovic 81d778466c qtwebkit: build with bison3 2020-01-13 21:35:19 +00:00
Frederik Rietdijk 8fff915659
Merge pull request #76488 from jtojnar/more-python-cleanups 
Another batch of Python 2 clean-ups
 2020-01-06 12:00:36 +01:00
Robin Gloster e9c27ed5f9
treewide: configureFlags is a flat list 2019-12-31 01:34:39 +01:00
Robin Gloster ab0cfd9e03
treewide: NIX_*_COMPILE -> string 2019-12-31 00:10:18 +01:00
Frederik Rietdijk 6d059becd3 Merge gcc-9 into staging (#68029) 2019-12-30 16:38:38 +01:00
Jan Tojnar 7e8293edcb
qt5.qtdeclarative: switch to python 3 2019-12-29 11:21:09 +01:00
Franz Pletz 77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
Graham Christensen ef96a4ad78 qt5.qtbase: python2 -> python3 
The only python reference in qtbase's dev output is a python script
which imports print from __future__ (mkspecs/features/uikit/devices.py).
It's not clear whether it depends on python or it just provides a python
script. But I believe it's still good to have in buildInputs so it has
a proper shebang.

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
 2019-12-18 21:47:05 -05:00
Bjørn Forsman 9e144d5527 wrap-qt-apps-hook.sh: wrap binaries in ./sbin/ 
wrap-qt-apps-hook.sh runs before move-sbin.sh, so programs in ./sbin are
currently not wrapped. Fix it.
 2019-12-08 20:44:29 +01:00
Sébastien Lavoie f27b686ed6 qt5.qtbase: fix darwin patches for 5.12.6 (#74911) 
qtbase was updated to 5.12.6 in https://github.com/NixOS/nixpkgs/pull/73562,
but the patch for macOS wasn't updated, causing the build to fail.
 2019-12-03 16:53:31 -05:00
Milan Pässler 2a2d3de78c qt5: remove patch merged in 5.12.6 
Patch for CVE-2019-13720 is included since QT 5.12.6, so it is unnecessary now.
 2019-11-24 11:54:39 +01:00