nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-03 18:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
390,505 Commits 186 Branches 125 Tags 7.7 GiB
699a374e8a
Commit Graph

884 Commits

Author SHA1 Message Date
github-actions[bot]
6fcda9f1ec
Merge master into staging-next 2021-07-28 18:01:16 +00:00
Yuka
3ff7100f05
qt5.qtwebengine: 5.15.3 -> 5.15.5 (#131123) 2021-07-28 14:43:08 +02:00
Sandro Jäckel
3095193e7e
qtbase: format, cleanup, remove darwin from inputs 2021-07-27 15:17:41 +02:00
Sandro
4c095c59ba
Merge pull request #125572 from prusnak/qt5-darwin 2021-07-26 09:15:45 +00:00
Sandro
5bd0c66364
Merge pull request #130053 from IvarWithoutBones/fix/qtbase-gcc11 2021-07-23 14:30:18 +02:00
Pavol Rusnak
ce14ca10a6
qt5: use xcbuild on darwin, cleanup 2021-07-22 21:59:02 +02:00
Pavol Rusnak
afb3563bdc
qt5: don't use dontUseXcbuild in qtwebengine 
dontUseXcbuild was dropped in 0534ceac81
 2021-07-22 21:59:02 +02:00
Yuka
dd1b4bb133
qt5.qtwebengine: Fix invisible fonts (#131121) 
Fixes #131074
 2021-07-22 21:27:58 +02:00
IvarWithoutBones
a13ae31c53 libsForQt515.qtbase: fix gcc11 compatibility 2021-07-14 16:12:24 +02:00
Sandro Jäckel
388a4ef423
treewide: convert all links git.archlinux.org to github.com/archlinux/svntogit-* 2021-07-14 03:35:21 +02:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
Benjamin Hipple
e118da1603 qt5.qtgamepad: actually build module 
This was missing from the `callPackage` list, which meant we were not building it at all.
 2021-05-31 14:42:46 -04:00
Florian Klink
ac078761ce
Merge pull request #124078 from flokli/qtwebengine-conditional-pipewire 
qtwebengine: only set -webengine-webrtc-pipewire with qt >= 5.15
 2021-05-23 12:36:28 +02:00
Florian Klink
4cbb20402a qtwebengine: only set -webengine-webrtc-pipewire with qt >= 5.15 
This fails the build of qt514.qtwebengine otherwise:

```
QMAKEPATH=/nix/store/29n056mi3pji6si51b128pa67b1qr7wq-qtbase-5.14.2-dev:/nix/store/g7wady1f1r23wlmy4q1f3b8j2fj5q2sq-qtdeclarative-dev:/nix/store/xfqnh2pma99915d4gsanls68z1jikcpx-qtsvg-dev:/nix/store/zlnsjdj5yv1ivi1miq49j9gp382byl35-qtlocation-dev:/nix/store/lb7cidi60cabpa7swv51xnss9045vqzi-qtmultimedia-dev:/nix/store/jrk6bcqihxwsszwy6rwy2vnfc2sb4rv9-qtwebchannel-dev
qmake PREFIX=/nix/store/pa3jhipp59f6ykh9k8l8z8jf88k52bz8-qtwebengine NIX_OUTPUT_OUT=/nix/store/pa3jhipp59f6ykh9k8l8z8jf88k52bz8-qtwebengine NIX_OUTPUT_DEV=/nix/store/jngs3qilw9iiv97rawb9sb9sd6qdbp2s-qtwebengine-dev NIX_OUTPUT_BIN=/nix/store/91hqv88qvg2wb91lv1h1pd4d8wwrkd5d-qtwebengine-bin NIX_OUTPUT_DOC=/nix/store/jngs3qilw9iiv97rawb9sb9sd6qdbp2s-qtwebengine-dev/share/doc/qt-5.14.2 NIX_OUTPUT_QML=/nix/store/91hqv88qvg2wb91lv1h1pd4d8wwrkd5d-qtwebengine-bin/lib/qt-5.14.2/qml NIX_OUTPUT_PLUGIN=/nix/store/91hqv88qvg2wb91lv1h1pd4d8wwrkd5d-qtwebengine-bin/lib/qt-5.14.2/plugins CONFIG+=release -- -system-ffmpeg -webengine-webrtc-pipewire -proprietary-codecs
Info: creating stash file /build/qtwebengine-everywhere-src-5.14.2/.qmake.stash
Info: creating cache file /build/qtwebengine-everywhere-src-5.14.2/.qmake.cache
ERROR: Unknown command line option '-webengine-webrtc-pipewire'.
builder for '/nix/store/g6dvr7789sswmahlxc6zs5pr8k2g5pgy-qtwebengine.drv' failed with exit code 3
```

Also, only bring in pipewire_0_2 if we enable pipewire support.
 2021-05-23 00:44:43 +02:00
github-actions[bot]
2b12bace86
Merge master into staging-next 2021-05-21 06:22:09 +00:00
John Axel Eriksson
7a714e8ed2
qtwebengine: enable pipewire/webrtc 2021-05-20 07:58:50 +02:00
Thomas Tuegel
e45c0ea4cd
Restore version in Qt derivation names 2021-05-14 05:53:30 -05:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
Vladimír Čunát
5663b2b2d3
Merge branch 'master' into staging-next 
(a trivial conflict in transmission)
 2021-05-09 09:31:55 +02:00
Orivej Desh
7c46cfbc02
qtwebkit: fix linux build with glib 2.68 (#122259) 2021-05-09 04:55:05 +00:00
OPNA2608
77b148ddd7 qt5.qtwebengine: remove syncqt workaround 2021-05-08 20:40:44 -07:00
OPNA2608
8307e6dc20 qt515.qtbase: Fix qtPrepareTool function 2021-05-08 20:40:44 -07:00
OPNA2608
bca2dfc7de qt514.qtbase: Fix qtPrepareTool function 2021-05-08 20:40:44 -07:00
OPNA2608
e7333f7a5e qt512.qtbase: Fix qtPrepareTool function 2021-05-08 20:40:44 -07:00
github-actions[bot]
c63e69cd89
Merge staging-next into staging 2021-05-06 12:23:32 +00:00
Robert Schütz
6ba83717fe libsForQt5.qtwebengine: always use system ffmpeg 2021-05-01 16:10:26 +02:00
Robert Schütz
6de7e0d758 libsForQt5.qtwebengine: use ffmpeg instead of ffmpeg_3 2021-04-25 23:08:55 +02:00
github-actions[bot]
96df3c3794
Merge staging-next into staging 2021-04-19 12:06:26 +00:00
Vladimír Čunát
b0dae10ba7
qt5.qtwebengine, webkitgtk: try harder to avoid timeouts 
I hope this will improve the situation on aarch64-linux.
I don't think it could make anything worse.
Recent staging-next timeouts:
https://hydra.nixos.org/build/141551270
https://hydra.nixos.org/build/141547098

For now let's not touch meta.timeout, as there's less consensus and the
setting seems less reliable in practice, too.
 2021-04-19 13:21:48 +02:00
Thomas Tuegel
0765db9135
Merge pull request #119526 from dotlambda/qtModule-pname 
qtModule: use pname and version
 2021-04-17 17:57:37 -05:00
Robert Schütz
d0568d305a qtModule: use pname and version 2021-04-15 11:38:45 +02:00
Gabriel Ebner
1cf80c56e3 qt514.qtwayland: fix build 2021-04-09 09:26:12 +02:00
rnhmjoj
97904f8424
qt5.qtwebengine: fix Qt version number in cmake 
This fixes the build failures in packages depending on qtwebengine and
using cmake to find the Qt dependencies (like libsForQt5.messagelib).
 2021-03-31 12:32:21 +02:00
rnhmjoj
a1452f6ed0
qt5.qtwebengine: fix source exceeding output limit 
This hack reduces the source derivation size from 3.7G to 450M by
removing the src/3rparty submodule .git directory and compressing
the whole directory. This is needed to avoid the 2G limit on hydra.
 2021-03-29 10:37:34 +02:00
rnhmjoj
3aba63ab29 qt5.qtwebengine: 5.15.2 -> 5.15.3-a059e740 
This updates the base chromium branch from 83 to 87, which fixes
approximately a few hundreds CVEs.
 2021-03-27 12:35:06 +01:00
Dylan Baker
5cd983f6d3 qt5: Include the "out" derivation as well as the "dev" in qt5.full 
Without a number of important Qt libraries (all of those with a "dev"
derivation) are not included in the bundled package, and qmake can't
find them.

Fixes #110199
 2021-03-23 13:37:20 -07:00
Andrew Childs
a5979a4f99 qtwebengine: switch to pure sandbox on darwin 2021-03-20 11:32:32 -04:00
Bastian Köcher
96a0d6a810
qtwebkit: Fix build with icu 68 2021-02-28 13:35:55 +01:00
github-actions[bot]
79b7a67b55
Merge master into staging-next 2021-02-17 00:36:31 +00:00
Robert Hensing
46a4d53063 qtwebengine: Increase build timeout to 24h 
The default 10h timeout caused the cancellation of builds on
aarch64-linux builders.
Perhaps counterintuitively, this wastes resources because it
requires a restart, but never completes.

https://hydra.nixos.org/build/136917190
 2021-02-16 10:17:55 +01:00
github-actions[bot]
30dddce5e8
Merge master into staging-next 2021-02-09 06:16:02 +00:00
Bernardo Meurer
b95c84c964
qt5.qtwebkit: remove flashplayerFix 2021-02-08 09:38:47 -08:00
github-actions[bot]
f9141c9fc1
Merge staging-next into staging 2021-02-03 00:39:57 +00:00
Dmitry Kalinkin
6ba1fbdd37
Merge pull request #110605 from veprbl/pr/qt515_qtwebengine_darwin_patch_update 
qt515.qtwebengine: update darwin patches
 2021-02-02 13:34:18 -05:00
github-actions[bot]
104c56e909
Merge staging-next into staging 2021-02-01 00:47:02 +00:00
Thomas Tuegel
f3f4cbfc07
Merge pull request #108687 from B4dM4n/qt512-update 
qt512: 5.12.9 -> 5.12.10
 2021-01-31 14:16:17 -06:00
Jörg Thalheim
d72ebead34
Revert "Merge pull request #109239 from poelzi/qt-debug-symbols" 
This reverts commit 8f69090ba5, reversing
changes made to e6a852714a.

In 13e3ec0d58 this was already addressed
 2021-01-27 14:27:45 +01:00
github-actions[bot]
1b5da764a7
Merge staging-next into staging 2021-01-27 12:24:09 +00:00
Jörg Thalheim
8f69090ba5
Merge pull request #109239 from poelzi/qt-debug-symbols 2021-01-27 10:18:26 +00:00
Sandro
ad97ca4e51
Merge pull request #110912 from siraben/stdenv-lib-inherit 
treewide: remove inherited stdenv.lib
 2021-01-27 10:28:55 +01:00
Ben Siraphob
3bbad8b041 treewide: remove inherited stdenv.lib 2021-01-27 12:44:43 +07:00
Thomas Tuegel
0e418a1a18
Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation 
Qt: Do not require mkDerivation
 2021-01-26 16:24:41 -06:00
Thomas Tuegel
13e3ec0d58
qtbase: Keep debug symbols with developerBuild 2021-01-25 15:56:21 -06:00
Thomas Tuegel
5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
Thomas Tuegel
67b7cffaec
wrapQtAppsHook: only run the hook once 2021-01-25 15:56:15 -06:00
Thomas Tuegel
3320cdf9f1
qt5.mkDerivation: enableParallelBuilding is default 2021-01-25 15:56:14 -06:00
Thomas Tuegel
7744998f04
qtbase: Set cmakeFlags and NIX_CFLAGS_COMPILE in setupHook 2021-01-25 15:56:05 -06:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Thomas Tuegel
b80ce0aeca
qmake: Select debug or release build 
The qmake hook sets its own `CONFIG+=debug` or `CONFIG+=release` depending on
how `qtbase` was built. We no longer rely on using the custom deriver for this
feature.
 2021-01-24 09:51:34 -06:00
John Ericson
12881a7aa7
Merge pull request #110544 from Ericson2314/no-platform 
top-level, lib: Remove platform attribute of platforms
 2021-01-23 16:32:36 -05:00
Ben Siraphob
2f78ee7e81 pkgs/development: stdenv.lib -> lib 2021-01-24 00:16:29 +07:00
Dmitry Kalinkin
03ef3681b5
qt515.qtwebengine: update darwin patches 
A working build seems to further requre SDK 10.14+ and working that
around is not trivial.
 2021-01-23 11:45:54 -05:00
John Ericson
9c213398b3 lib: Clean up how linux and gcc config is specified 
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.

This reverts commit 0bc275e634.
 2021-01-23 10:01:28 -05:00
Jonathan Ringer
0bc275e634
Revert "lib: Clean up how linux and gcc config is specified" 
This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614.
 2021-01-22 14:07:06 -08:00
John Ericson
8929989614 lib: Clean up how linux and gcc config is specified 
The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.

This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.

`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.

The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
 2021-01-21 22:44:09 -05:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix 
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
 2021-01-19 01:16:25 -08:00
Daniel Poelzleithner
0c0d5a2dc4 Update pkgs/development/libraries/qt-5/modules/qtbase.nix 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-01-18 19:56:27 +00:00
Daniel Poelzleithner
f26043ef90 qt5: Add debugging symbols in development builds 
qt5 build with developerBuild do not contain debug information as
they are stripped by the qt build process.
 2021-01-18 19:56:27 +00:00
Fabian Möller
0392271676
qt512: 5.12.9 -> 5.12.10 2021-01-07 14:05:56 +01:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next 
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
 2021-01-07 13:04:31 +01:00
Orivej Desh
ff612c5e56 qt514.qtwebengine: fix build with gcc10 2021-01-05 17:27:41 +00:00
John Ericson
b03fdcc7f9
Merge pull request #108300 from siraben/parallel-cmake 
treewide: remove enableParallelBuilding = true if using cmake
 2021-01-03 13:22:09 -05:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Thomas Tuegel
9c04596480 qtlocation: backport upstream patch for recent GCC 2021-01-03 10:00:18 +01:00
github-actions[bot]
ec161d2240
Merge master into staging-next 2021-01-02 12:24:09 +00:00
Thomas Tuegel
eed06a0da9
Merge pull request #107898 from SuperSandro2000/qtwebkit-darwin 
qt514.qtwebkit: Fix patch applying
 2021-01-02 05:40:09 -06:00
Frederik Rietdijk
e48db707e4 Merge master into staging-next 2021-01-02 08:49:09 +01:00
Thomas Tuegel
54fff8407b
qt512.qtwebengine: update darwin patches 2021-01-01 07:58:34 -06:00
Thomas Tuegel
a61f20e418
qt512: fix build on darwin 2021-01-01 05:32:19 -06:00
Frederik Rietdijk
e823016e66 Merge master into staging-next 2020-12-31 13:29:32 +01:00
Sandro Jäckel
d05ff6e0f4
qt514.qtwebkit: Fix patch applying 2020-12-29 19:41:51 +01:00
Doron Behar
6d13b4c5ec qt5: Update comment regarding updating srcs.nix 2020-12-28 19:52:06 +02:00
Thomas Tuegel
3db04334e3
Revert "fetch-kde-qt.sh: get hashes from metadata" 
This reverts commit 4b7d9dc868.

The KDE project has changed their source index pages so that the links to
package metadata files are generated by JavaScript after the page loads. As a
result, wget is no longer able to recursively fetch the package metadata
automatically.
 2020-12-26 05:24:25 -06:00
Doron Behar
d342045066 qt512: 5.12.7 -> 5.12.9 2020-12-23 19:06:06 +02:00
Milan Pässler
aa81ee843b qt5.qtwebengine: remove patch upstreamed in 5.12.2 2020-12-12 19:29:31 +01:00
Frederik Rietdijk
a717b55392 Merge staging-next into staging 2020-12-11 13:24:41 +01:00
Dmitry Kalinkin
b583611cec qt515: fix on darwin after bump to 5.15.2 2020-12-11 04:31:24 +01:00
Andreas Rammhold
0263f626a0 qt-5: 5.15.0 -> 5.15.2 
This is a maintenance release of the Qt 5.15 release series. It focuses on
bug and security fixes. The feature that made me update this package was
the broken u2f support in QtWebEngine when used together with
Qutebrowser. It previously (on older Qt versions) used to work but
stopped working with the switch to 5.15.

As the changelog is rather extensive the reader is advised to inspect
[0] to checkout the changes to each of the components of their
interest.

This also fixes a security issue with QtWebEngine based browsers that
could be crashed by visiting a website that invokes certain WebRTC
features [1].

[0] https://wiki.qt.io/Qt_5.15.2_Change_Files
[1] https://bugreports.qt.io/browse/QTBUG-86752
 2020-12-11 04:31:24 +01:00
Doron Behar
983465f13a qt515.qtwebkit: unbreak 🎉 
A copy of #96309 essentially - fix the build of it with bison-3.7.
 2020-11-21 10:54:43 +02:00
Dmitry Kalinkin
0c74da1342
qt5{14,15}.qtbase: fix on darwin 2020-11-17 10:04:09 -05:00
Frederik Rietdijk
986c2d36da Merge master into staging-next 2020-11-16 09:01:53 +01:00
Andrew Childs
16075a712c qt515.qtbase: patch framework detection to support tbd frameworks 2020-11-12 16:57:19 +09:00
Andrew Childs
1f52024720 qt514.qtbase: patch framework detection to support tbd frameworks 2020-11-12 16:57:19 +09:00
Andrew Childs
f6c54e8f08 qt512.qtbase: patch framework detection to support tbd frameworks 2020-11-12 16:57:19 +09:00
Dmitry Kalinkin
ee2501f124
qt5.qtwebengine: don't override patches in qtModule 
This fixes darwin build.

Fixes: 90db9641 ('qt5.qtwebengine: fix build with bison-3.7')
 2020-11-09 21:11:59 -05:00
Dmitry Kalinkin
aa08b8eb73
qt5.qtwebengine: remove dead conditions for pre 5.12 support 
This doesn't change the derivation.
 2020-11-09 15:36:08 -05:00
Frederik Rietdijk
37d29394ec Merge staging-next into staging 2020-09-12 10:00:45 +02:00
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
Graham Bennett
8e4e38cdcd octave: Fix libtool framework link failure on Darwin 
This fix moves linker flags of the form `-framework foo` from dependency_libs to
inherited_linker_flags, since libtool doesn't understand them.  See #96977 for
details.

Fixes #96977
 2020-09-06 20:24:14 +01: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
Will Dietz
cc4ff0904f qt5: 5.12.5 -> 5.12.6 
https://www.qt.io/blog/qt-5.12.6-released
 2019-11-24 09:56:30 +01:00
Frederik Rietdijk
5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00