JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
230,669 Commits 1 Branch 0 Tags 12 GiB
d3e1b77ac3
Commit Graph

661 Commits

Author SHA1 Message Date
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
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
adisbladis
ab3f50a1c0
qt511: Remove package sets 
Nothing depends on Qt 5.11 any more
 2019-11-18 20:10:44 +00:00
adisbladis
f70c47a901
qt59: Remove package sets 
Nothing depends on Qt 5.9 any more
 2019-11-18 20:10:43 +00:00
John Ericson
ef43c5f5d9 wrap-qt-apps-hook: qtWrapperArgs may be undefined 2019-11-17 15:48:39 -05:00
Frederik Rietdijk
73b88e17dd Merge staging-next into staging 2019-11-11 12:09:26 +01:00
adisbladis
c9774cb6e5
qt512.qtbase: Fix darwin build 2019-11-10 12:47:59 +00:00
John Ericson
784c3dc0f9 qt5 qmake setup hook: qmakeFlags may be undefined 2019-11-08 13:28:59 -05:00
Franz Pletz
1b6e97e82b
qt511.qtbase: fix build with gcc9 2019-11-05 00:49:42 +01:00
Milan Pässler
00ac18cdea qtwebengine: add patch for CVE-2019-13720 2019-11-04 22:50:00 +01:00
John Ericson
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
b7f4bda282 treewide: *Phase(s)? variables are optional 
If these aren't defined, the stdenv defaults are used in the `*Phase`
case, or no extra phases are done, in the `*Phases` case.
 2019-11-01 14:44:44 -04:00
John Ericson
2811b032d6 treewide: Make still dont* Variables are optional in most cases 
Go beyond the obvious setup hooks now, with a bit of sed, with a skipped case:

 - cc-wrapper's `dontlink`, because it already is handled.

Also, in nix files escaping was manually added.

EMP
 2019-11-01 14:44:44 -04:00
John Ericson
1290e532ea treewide: Make more dont* variables OK to be undefined in setup hooks 2019-11-01 14:44:44 -04:00
Frederik Rietdijk
12441bdf9f Merge staging-next into staging 2019-10-16 11:17:12 +02:00
Will Dietz
10f8c46e8e
Merge pull request #70689 from dtzWill/update/qt5-5.12.5 
qt5: 5.12.4 -> 5.12.5
 2019-10-14 18:54:12 -05:00
Vladimír Čunát
26ec15c267
qt511.qmake: fix after 756b46a4 
5.11 was forgotten by accident, apparently.
This fixes build of qt511.qtsvg, for example (and many reverse deps).
 2019-10-13 13:28:45 +02:00
Jan Tojnar
e2e3861d6b
Merge branch 'staging-next' into staging 2019-10-12 00:51:55 +02:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
Will Dietz
792d6a91ab
qt5: fix header_module variable typo 2019-10-07 19:25:11 -05:00
Will Dietz
d78a084846
qt5.qtbase: fix filename 2019-10-07 19:24:59 -05:00
Will Dietz
f43e0983c0
qt512.qtbase: fix new path used in header modules 2019-10-07 19:24:52 -05:00
Will Dietz
f6e8dd8bad
qt5: revert mac qtbase patch to include recent change 2019-10-07 19:24:07 -05:00
Will Dietz
35b13614b5
qt5: regen patches for 5.12.5 (conflicts/attention needed: mkspecs-mac, replace-libdir) 2019-10-07 19:22:52 -05:00
Will Dietz
b3594de31f
qt5: 5.12.4 -> 5.12.5 2019-10-07 19:21:47 -05:00