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
2f78ee7e81
pkgs/development: stdenv.lib -> lib
2021-01-24 00:16:29 +07:00
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
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
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
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
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
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
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
0392271676
qt512: 5.12.9 -> 5.12.10
2021-01-07 14:05:56 +01:00
f19eb635b4
Merge branch 'master' into staging-next
...
b04fc593e7
2021-01-07 13:04:31 +01:00
ff612c5e56
qt514.qtwebengine: fix build with gcc10
2021-01-05 17:27:41 +00:00
b03fdcc7f9
Merge pull request #108300 from siraben/parallel-cmake
...
treewide: remove enableParallelBuilding = true if using cmake
2021-01-03 13:22:09 -05:00
3ae5e6ce03
treewide: remove enableParallelBuilding = true if using cmake
2021-01-03 18:37:40 +07:00
9c04596480
qtlocation: backport upstream patch for recent GCC
2021-01-03 10:00:18 +01:00
ec161d2240
Merge master into staging-next
2021-01-02 12:24:09 +00:00
eed06a0da9
Merge pull request #107898 from SuperSandro2000/qtwebkit-darwin
...
qt514.qtwebkit: Fix patch applying
2021-01-02 05:40:09 -06:00
e48db707e4
Merge master into staging-next
2021-01-02 08:49:09 +01:00
54fff8407b
qt512.qtwebengine: update darwin patches
2021-01-01 07:58:34 -06:00
a61f20e418
qt512: fix build on darwin
2021-01-01 05:32:19 -06:00
e823016e66
Merge master into staging-next
2020-12-31 13:29:32 +01:00
d05ff6e0f4
qt514.qtwebkit: Fix patch applying
2020-12-29 19:41:51 +01:00
6d13b4c5ec
qt5: Update comment regarding updating srcs.nix
2020-12-28 19:52:06 +02:00
3db04334e3
Revert "fetch-kde-qt.sh: get hashes from metadata"
...
This reverts commit 4b7d9dc868
2020-12-26 05:24:25 -06:00
d342045066
qt512: 5.12.7 -> 5.12.9
2020-12-23 19:06:06 +02:00
aa81ee843b
qt5.qtwebengine: remove patch upstreamed in 5.12.2
2020-12-12 19:29:31 +01:00
a717b55392
Merge staging-next into staging
2020-12-11 13:24:41 +01:00
b583611cec
qt515: fix on darwin after bump to 5.15.2
2020-12-11 04:31:24 +01:00
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
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
0c74da1342
qt5{14,15}.qtbase: fix on darwin
2020-11-17 10:04:09 -05:00
986c2d36da
Merge master into staging-next
2020-11-16 09:01:53 +01:00
16075a712c
qt515.qtbase: patch framework detection to support tbd frameworks
2020-11-12 16:57:19 +09:00
1f52024720
qt514.qtbase: patch framework detection to support tbd frameworks
2020-11-12 16:57:19 +09:00
f6c54e8f08
qt512.qtbase: patch framework detection to support tbd frameworks
2020-11-12 16:57:19 +09:00
ee2501f124
qt5.qtwebengine: don't override `patches` in qtModule
...
This fixes darwin build.
Fixes: 90db9641
2020-11-09 21:11:59 -05:00
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
37d29394ec
Merge staging-next into staging
2020-09-12 10:00:45 +02:00
b3d72930d8
qtbase: Preserve configuration options on Qt < 5.15
2020-09-07 08:05:38 -05:00
017e498d02
Revert "qt514: remove"
...
This reverts commit bec5405fc5449f5eb9103249bf2c5dfed9fdcce9.
Qt 5.14 is still supported upstream, so we will not remove it yet.
2020-09-07 08:05:27 -05:00
01bcfd3579
qtwebkit: mark broken with Qt 5.15
2020-09-07 08:05:24 -05:00
2a5f800520
qt514: remove
2020-09-07 08:05:11 -05:00
eb919fa712
qt5: 5.14.2 -> 5.15.0
2020-09-07 08:05:06 -05:00
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
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
efb45f7638
Merge master into staging-next
2020-08-28 09:54:31 +02:00
f82565f87d
qt5.qtwebkit: fix build with bison-3.7
2020-08-27 11:42:53 +02:00
4bac8a7a00
qtbase: Move libtiff dependency from qtbase to qtimageformats
2020-08-27 08:47:47 +02:00
081bd762e5
Merge staging-next into staging
2020-08-26 08:43:29 +02:00
90db9641cb
qt5.qtwebengine: fix build with bison-3.7 ( #96295 )
2020-08-25 20:13:45 +02:00
7b527223fd
qtdeclarative: revert "Patch for scrollbar regression"
...
This reverts commit 5530043208https://github.com/NixOS/nixpkgs/issues/96159 .
2020-08-25 12:02:15 +02:00
40d2968ebf
Merge pull request #94354 from flokli/systemd-246
...
systemd: 245.6 -> 246
2020-08-24 12:42:24 +02:00
91104b5417
Merge branch 'master' into staging-next
2020-08-23 02:00:50 +02:00
68bf9101d7
qtwebengine: fix build for darwin
2020-08-19 21:57:45 +09:00
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
5530043208
qtdeclarative: Patch for scrollbar regression
2020-08-15 08:36:15 +02:00
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
f707715136
Merge master into staging-next
2020-08-11 10:26:35 +02:00
2cfff96eff
qtwebkit: 5.212-alpha-01-26-2018 -> 5.212.0-alpha4
2020-08-07 09:31:52 +02:00
cf7b63df5b
gcc.arch: refactor, move tables under lib/
2020-08-05 11:18:26 +00:00
463db72e63
platform.gcc.arch: support for AMD CPUs
2020-08-05 02:32:48 +00:00
d4c607aa71
qt5: 5.12.7 -> 5.14.2
...
This includes contributions by @ttuegel and @DizFer. Thanks!
2020-07-31 18:50:58 +02:00
9cfca08777
Merge pull request #89846 from lelongg/qtserialbus
...
qt5.qtserialbus: init at 5.12
2020-07-19 14:46:02 -05:00
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
be7a8df1fa
qt5.qtserialbus: init at 5.12
2020-06-08 23:25:04 +02:00
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
5ecd99b2bd
qt5.qtgamepad: init at 5.12.7
2020-05-14 21:56:30 -07:00
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
84cf00f980
treewide: Per RFC45, remove all unquoted URLs
2020-04-10 17:54:53 +01:00
92124ed660
Merge master into staging-next
2020-04-03 21:54:40 +02:00
a01e8b740e
qxmledit: init at 0.9.15
2020-03-22 20:01:49 +05:00
4b6bbc1b4e
qt512: pick upstream patch for QTBUG-78937
2020-03-12 11:30:08 +01:00
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
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
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
dce0ca29d9
Merge master into staging-next
2020-01-28 10:46:13 +01:00
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
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
81d778466c
qtwebkit: build with bison3
2020-01-13 21:35:19 +00:00
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
e9c27ed5f9
treewide: configureFlags is a flat list
2019-12-31 01:34:39 +01:00
ab0cfd9e03
treewide: NIX_*_COMPILE -> string
2019-12-31 00:10:18 +01:00
6d059becd3
Merge gcc-9 into staging ( #68029 )
2019-12-30 16:38:38 +01:00
7e8293edcb
qt5.qtdeclarative: switch to python 3
2019-12-29 11:21:09 +01:00
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9
2019-12-26 14:17:36 +01:00
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
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
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
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
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
5f8b0d7d99
Merge staging-next into staging
2019-11-19 14:53:29 +01:00
ab3f50a1c0
qt511: Remove package sets
...
Nothing depends on Qt 5.11 any more
2019-11-18 20:10:44 +00:00
f70c47a901
qt59: Remove package sets
...
Nothing depends on Qt 5.9 any more
2019-11-18 20:10:43 +00:00
ef43c5f5d9
wrap-qt-apps-hook: `qtWrapperArgs` may be undefined
2019-11-17 15:48:39 -05:00
73b88e17dd
Merge staging-next into staging
2019-11-11 12:09:26 +01:00
c9774cb6e5
qt512.qtbase: Fix darwin build
2019-11-10 12:47:59 +00:00
784c3dc0f9
qt5 qmake setup hook: `qmakeFlags` may be undefined
2019-11-08 13:28:59 -05:00
1b6e97e82b
qt511.qtbase: fix build with gcc9
2019-11-05 00:49:42 +01:00
00ac18cdea
qtwebengine: add patch for CVE-2019-13720
2019-11-04 22:50:00 +01:00
9b274e2962
qtbase-setup-hook: `postPhases` may be undefined
...
My earlier sed missed this because it already had `{..}`.
2019-11-02 19:23:44 -04:00
John Ericson
Ben Siraphob
Dmitry Kalinkin
John Ericson
Jonathan Ringer
Daniel Poelzleithner
Daniel Poelzleithner
Fabian Möller
Jan Tojnar
Orivej Desh
Thomas Tuegel
github-actions[bot]
Frederik Rietdijk
Sandro Jäckel
Doron Behar
Milan Pässler
Andreas Rammhold
Andrew Childs
Thomas Tuegel
Timothy DeHerrera
Graham Bennett
Chuck
Peter Simons
Florian Klink
Ruben Maher
Jamie
Pascal Bach
volth
Milan Pässler
Gérald Lelong
Henk Kalkwater
xbreak
Michael Reilly
Aleksey Uimanov
Martin Milata
Tom Hall
Will Dietz
Anders Kaseorg
Luka Blaskovic
Frederik Rietdijk
Robin Gloster
Franz Pletz
Graham Christensen
Bjørn Forsman
Sébastien Lavoie
adisbladis