JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
178,101 Commits 2 Branches 0 Tags 13 GiB
c3eee5d301
Commit Graph

531 Commits

Author SHA1 Message Date
Jan Tojnar
cb1a20499a
Merge branch 'master' into staging 2019-04-05 11:37:15 +02:00
nyanloutre
4b7d9dc868 fetch-kde-qt.sh: get hashes from metadata 2019-03-27 22:16:18 -04:00
Dmitry Kalinkin
0624deb5df
qt59.qtwebengine: fix on darwin 
This ports a patch that is already used in 5.11. Also one of the
substituteInPlace call fails because a file doesn't exist.
 2019-03-26 16:30:58 -04:00
Dmitry Kalinkin
ccd1bf610d
qt5.qtwebengine: refactor more things to use patches instead of substituteInPlace 
qt59.qtwebengine doesn't need those fixes (probably since the recent
minor version bump)
 2019-03-26 16:30:58 -04:00
Dmitry Kalinkin
1809832958
qt5.qtwebengine: disable platform check using patches 
The previous code using substituteInPlace was broken for both 5.9 and
5.11 (latter was broken after a minor release bump). Using patches
should make things fail loudly and prevent modules/qtwebengine.nix from
being littered with version checks.

The patch for 5.12 is only tested to apply.
 2019-03-26 16:30:50 -04:00
Wael M. Nasreddine
5af0780492
Merge remote-tracking branch 'origin/master' into staging 
* origin/master: (693 commits)
  buildGoModule: use go_1_12 instead of go_1_11 (#58103)
  gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091)
  signal-desktop: 1.22.0 -> 1.23.0
  added missing semicolon to documentation
  terminus_font_ttf: 4.46.0 -> 4.47.0
  buildGoModule: remove SSL env vars in favor of cacert in buildInputs (#58071)
  dav1d: init at 0.2.1
  dropbox-cli: 2018.11.28 -> 2019.02.14
  atlassian-confluence: 6.14.1 -> 6.14.2
  maintainers: update email for dywedir
  python.pkgs.hglib: use patch to specify hg path (#57926)
  chkrootkit: 0.52 -> 0.53
  radare2-cutter: 1.7.2 -> 1.8.0
  autorandr: 1.7 -> 1.8
  pythonPackages.pyhepmc: fix build
  llvm-polly/clang-polly: use latest llvm
  apulse: 0.1.11.1 -> 0.1.12, cleanup
  factorio: experimental 0.17.14 → 0.17.16 (#58000)
  sequeler: 0.6.7 -> 0.6.8
  nasc: 0.5.1 -> 0.5.2
  ...
 2019-03-21 21:01:25 -07:00
Anton Kindestam
b22d92fb6d qt512: patch qtwebengine against CVE-2019-5786 2019-03-13 22:27:01 +01:00
Matthew Bauer
37eba81c7b
Merge pull request #56391 from matthewbauer/cmake-treewide 
Add more CMake flags
 2019-03-11 12:43:46 -04:00
Matthew Bauer
6ed49262f5 treewide: remove BUILD_TESTING flag 
This is now set by CMake
 2019-03-11 10:11:28 -04:00
Frederik Rietdijk
5d7ab31949 Merge master into staging-next 2019-03-05 08:32:52 +01:00
Dmitry Kalinkin
4a62576c12
Merge pull request #55983 from veprbl/pr/qt5_qtwebkit_darwin_fix 
qt511.qtwebkit: fix on darwin
 2019-03-03 11:01:47 -05:00
Frederik Rietdijk
35e73c9dd5 Merge staging into staging-next 2019-03-03 09:35:42 +01:00
Pedro Pombeiro
080612a870
qt5.full: add qtwebview module to 5.11 and 5.12 packages 2019-03-02 09:50:08 +01:00
Will Dietz
5937a19a06 qtbase: let build use gold linker if it wants, maybe works now 2019-02-28 22:31:38 -06:00
Dmitry Kalinkin
518f997eb5
qt5.qtwebkit: don't set qmake variables for cmake build 2019-02-19 23:52:07 -05:00
Dmitry Kalinkin
4bbd00e934
qt511.qtwebkit: fix on darwin 
readline is used on macOS and iOS for some javascript console (JSC). It
seems to be easier to disable it than to fix it.
 2019-02-19 23:52:06 -05:00
Dmitry Kalinkin
67186defda
qt5.qtwebkit: refactor version comparison 
This introduces usingAnnulenWebkitFork variable. Using version
check for qtbase.version is misleading because annulen's fork is not
tied to a specific qt5 release.
 2019-02-19 23:51:24 -05:00
Dmitry Kalinkin
f212dd2e32
qt5.qtwebkit: link against libicucore.dylib from darwin.ICU instead of /usr/lib 
The impure library was introduced in

   775531c1e3 ('qt58: extend darwin compatibility')

cmake-based build can use a non-apple ICU if -DMACOS_USE_SYSTEM_ICU=OFF
is set.
 2019-02-19 23:51:19 -05:00
Matthew Bauer
8724819d94
Merge pull request #55910 from veprbl/pr/qt5_qtconnectivity_darwin_fix 
qt5.qtconnectivity: fix darwin build
 2019-02-19 22:37:15 -05:00
Dmitry Kalinkin
3e3e3918f2 qt5.qtwebengine: fail properly 
QtWebEngine's build system is setup to perform certain platform checks
(see mkspecs/features/platform.prf). But a failed check will not cause
configuration phase to fail, but instead it configures no build targets.
So in such case the build will successfully perform build and install
phases. An empty output directories will are produced and the build
succeeds.

This patches qtwebengine qmake files to properly fail during
configuration phase.

This doesn't touch qt56 as it doesn't have this mechanism.
 2019-02-19 12:28:15 -05:00
Dmitry Kalinkin
4bf4484515
qt5.qtconnectivity: fix darwin build 2019-02-16 18:13:58 -05:00
Vladimír Čunát
ff101946a8
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1503899
 2019-02-06 14:24:46 +01:00
Matthew Bauer
81531046e8 qt511: add patch for macOS sdk 
Unfortunately we don’t have access to NSWindowStyleMask. These patches
should go away once we switch to a newer SDK.
 2019-02-05 20:50:52 -05:00
Vladimír Čunát
5effa4e0f9
Merge branch 'master' into staging-next 
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
 2019-02-01 09:22:29 +01:00
Andreas Rammhold
2f5d37b77b
qt511: 5.11.1 -> 5.11.3 
This fixes

 * CVE-2018-15518, Qt Base: “double free or corruption” in QXmlStreamReader
 * CVE-2018-19873, Qt Base: QBmpHandler segfault on malformed BMP file
 * CVE-2018-19870, Qt Base: Check for QImage allocation failure in qgifhandler
 * CVE-2018-19871, Qt Imageformats: QImage: QTgaFile CPU exhaustion
 * CVE-2018-19865, Qt Virtual Keyboard: Qt Virtual Keyboard logs all key presses
 * CVE-2018-19869, Qt Svg: Fix crash when parsing malformed url reference

More details can be obtained from the Qt annoucement [1].

[1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/
 2019-01-31 11:00:27 +01:00
Andreas Rammhold
066be85d9d
qt56: fix CVE-2018-{15518,19873,19870,19871,19865,19869} 
* CVE-2018-15518, Qt Base: “double free or corruption” in QXmlStreamReader
 * CVE-2018-19873, Qt Base: QBmpHandler segfault on malformed BMP file
 * CVE-2018-19870, Qt Base: Check for QImage allocation failure in qgifhandler
 * CVE-2018-19871, Qt Imageformats: QImage: QTgaFile CPU exhaustion
 * CVE-2018-19865, Qt Virtual Keyboard: Qt Virtual Keyboard logs all key presses
 * CVE-2018-19869, Qt Svg: Fix crash when parsing malformed url reference

More details can be obtained from the Qt annoucement [1].

[1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/
 2019-01-31 00:50:29 +01:00
Andreas Rammhold
295a210a23
qt56.qtvirtualkeyboard: init at 5.6.3 
This adds the "missing" qtvirtualkeyboard module of qt56. I just add
this so I can apply (& test) the patches for a CVE in the next commit.
This might seem strange but in case anyone decided to add / use this in
the future we are on the safe(r) side.
 2019-01-31 00:21:51 +01:00
Andreas Rammhold
66601282cc
qt59.qtvirtualkeyboard: fix CVE-2018-19865 
CVE-2018-19865 tracks the issue of qtvirtualkeyboard where it logs all
user input. With this commit we are applying the recommended patches
form the upstream project.

More details can be obtained from the Qt annoucement [1].

[1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/
 2019-01-30 23:50:48 +01:00
Dmitry Kalinkin
571e44b5b8
Merge pull request #54787 from FlorianFranzen/qt59 
qt59: 5.9.3 -> 5.9.7
 2019-01-29 15:43:57 -05:00
Dmitry Kalinkin
fd75bbccb9
Revert "qt59-qtbase: fix darwin build with clang-5" 
The fix is already included in Qt 5.9.7

This reverts commit 0bf153f9c0.
 2019-01-28 19:53:52 -05:00
Silvan Mosberger
ddcf01bca6
Merge pull request #53848 from veprbl/pr/qtwebengine_darwin_fix 
qt511.qtwebengine: fix on darwin
 2019-01-28 02:41:53 +01:00
Dmitry Kalinkin
56dcf6e1f6
qt5.qtwebengine: refactor to use lib.versionOlder 2019-01-27 19:01:17 -05:00
Florian Franzen
776c96272c qt59: 5.9.3 -> 5.9.7 2019-01-26 17:01:23 +01:00
Dmitry Kalinkin
ecbb9d3639
qt5.qtwebengine: don't propagate cups dependency 2019-01-20 14:57:59 -05:00
Frederik Rietdijk
f8b45e2d84 Merge staging-next into staging 2019-01-19 09:24:01 +01:00
Anthony Cowley
5fc5f15206 qtxmlpatterns: fix dependency with qtdeclarative 
In Qt-5.12, the order of the dependency between these two packages
flipped.

A symptom of the problem is an error like, `module
"QtQuick.XmlListModel" is not installed`.

The upstream changes that this reflects are in qtxmlpatterns
<8c6e24329e>
and qtdeclarative <0477a057fd>
 2019-01-16 20:57:29 -05:00
Trolli Schmittlauch
4b76c4605e qt511.qtdeclarative: fix CMake qmlcachegen path 
This package contains several CMake files used for setting up its
provided tools for use in other projects build with CMake.
While packaging *ktouch* I found out that the ${_qt5Core_install_prefix}
variable doesn't expand at all, rendering the path to the `qmlcachegen`
binary useless. As a fix, the command itself is used instead of the path
to the binary.
 2019-01-13 00:09:38 +01:00
Dmitry Kalinkin
45ab55e6e2
qt511.qtwebengine: fix build on darwin 
Co-Authored-By: Josef Kemetmüller <josef.kemetmueller@gmail.com>
 2019-01-12 16:40:06 -05:00
Frederik Rietdijk
10afccf145 Merge staging-next into staging 2018-12-27 18:11:34 +01:00
Orivej Desh
5c5c83fb4e qt5: update nixpkgs directory in readme 2018-12-26 20:21:35 +00:00
Jörg Thalheim
1b146a8c6f
treewide: remove paxutils from stdenv 
More then one year ago we removed grsecurity kernels from nixpkgs:
https://github.com/NixOS/nixpkgs/pull/25277

This removes now also paxutils from stdenv.
 2018-12-22 12:55:05 +01:00
Bastian Köcher
8e811ec295 qt5: 5.11 -> 5.12 2018-12-19 09:15:14 +01:00
Nicolas Schneider
bf3a98ce04 Fix qtbase cmake for gui plugins [Qt 5.6, 5.9] 
This is 54377280f0 ported to Qt 5.6 and 5.9
LTS versions.
 2018-12-01 21:09:33 +01:00
Jörg Thalheim
7f2c30f851
Merge pull request #50521 from alyssais/qt-cf-private 
qt59.qtwebkit: fix build on Darwin
 2018-11-21 17:38:10 +00:00
Lluís Batlle i Rossell
54377280f0 Fix qtbase cmake for gui plugins 
It should fix "Broken cmake file with Qt5.10 full" #40706.

I leave to @ttuegel rearranging the patches.
 2018-11-18 19:29:43 +01:00
Alyssa Ross
874468f23e
qt59.qtwebkit: fix build on Darwin 2018-11-17 23:17:27 +00:00
Daiderd Jordan
942d90b282
qt5.qtmacextras: include cf-private on darwin 
Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in qmacfunctions.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in qmactoolbar.o
          objc-class-ref in qmactoolbardelegate.o
    ld: symbol(s) not found for architecture x86_64
 2018-11-17 21:02:22 +01:00
Tom Hall
230f71477b qtwebglplugin: init at 5.11 
Note: As with all Qt plugins, must set QT_QPA_PLATFORM_PLUGIN_PATH=~/.nix-profile/lib/qt-5.11/plugins for it to be found.
 2018-11-10 19:56:11 +00:00
Jan Malakhovski
c0a4e46714 qt5: use https, tiny cleanup 2018-11-08 05:20:19 +00:00
Daiderd Jordan
9a1a872b4a
qt5.qtbase: add cf-private on darwin 
Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in qcore_foundation.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in qcore_foundation.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in qcore_foundation.o
      "_CFURLCopyResourcePropertyForKey", referenced from:
          hasResourcePropertyFlag(QFileSystemMetaData const&, QFileSystemEntry const&, __CFString const*) in qfilesystemengine_unix.o
      "_CFURLCreateBookmarkDataFromFile", referenced from:
          QFileSystemEngine::getLinkTarget(QFileSystemEntry const&, QFileSystemMetaData&) in qfilesystemengine_unix.o
      "_kCFURLIsAliasFileKey", referenced from:
          QFileSystemEngine::fillMetaData(QFileSystemEntry const&, QFileSystemMetaData&, QFlags<QFileSystemMetaData::MetaDataFlag>) in qfilesystemengine_unix.o
      "_kCFURLIsHiddenKey", referenced from:
          QFileSystemEngine::fillMetaData(QFileSystemEntry const&, QFileSystemMetaData&, QFlags<QFileSystemMetaData::MetaDataFlag>) in qfilesystemengine_unix.o
      "_kCFURLIsPackageKey", referenced from:
          QFileSystemEngine::fillMetaData(QFileSystemEntry const&, QFileSystemMetaData&, QFlags<QFileSystemMetaData::MetaDataFlag>) in qfilesystemengine_unix.o
      "_CFURLCreateByResolvingBookmarkData", referenced from:
          QFileSystemEngine::getLinkTarget(QFileSystemEntry const&, QFileSystemMetaData&) in qfilesystemengine_unix.o
    ld: symbol(s) not found for architecture x86_64
 2018-11-07 00:58:04 +01:00