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
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
Jörg Thalheim
8f69090ba5
Merge pull request #109239 from poelzi/qt-debug-symbols
2021-01-27 10:18:26 +00: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
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
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
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
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
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
Thomas Tuegel
b3d72930d8
qtbase: Preserve configuration options on Qt < 5.15
2020-09-07 08:05:38 -05:00
Thomas Tuegel
01bcfd3579
qtwebkit: mark broken with Qt 5.15
2020-09-07 08:05:24 -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
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
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
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
Henk Kalkwater
5ecd99b2bd
qt5.qtgamepad: init at 5.12.7
2020-05-14 21:56:30 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs
2020-04-10 17:54:53 +01:00
Aleksey Uimanov
a01e8b740e
qxmledit: init at 0.9.15
2020-03-22 20:01:49 +05: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