Commit graph

729 commits

Author SHA1 Message Date
Bernardo Meurer b95c84c964
qt5.qtwebkit: remove flashplayerFix 2021-02-08 09:38:47 -08: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
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
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
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
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 bec5405fc5449f5eb9103249bf2c5dfed9fdcce9.

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