Branch: refs/heads/release-15.09
Home: https://github.com/NixOS/nixpkgs
Commit: 1944d289615cabb8c8c62ca727fe64588c6c42fc
https://github.com/NixOS/nixpkgs/commit/1944d289615cabb8c8c62ca727fe64588c6c42fc
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/qt-env.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
qt5Full: only include derivations
(cherry picked from commit e5b124e492fbf546cbc8cb216801755828d3107f)
Commit: 5d550918e57d995b8473b1cfe94e533a08a03ff1
https://github.com/NixOS/nixpkgs/commit/5d550918e57d995b8473b1cfe94e533a08a03ff1
Author: Bjørn Forsman <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
A pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
Log Message:
-----------
qt55: apply mkspecs-libgl.patch from qt54
(cherry picked from commit 3dec100104bf790d5ccc78dc554dca27ec0b738e)
Commit: 22da1ba93f2989e399e7cb9d0a3ebc81230c013d
https://github.com/NixOS/nixpkgs/commit/22da1ba93f2989e399e7cb9d0a3ebc81230c013d
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
Log Message:
-----------
qtbase: include current package in runtime paths
The runtime paths QT_PLUGIN_PATH, QML_IMPORT_PATH, QML2_IMPORT_PATH, and
XDG_DATA_DIRS did not include the appropriate paths from the current
package being built because addToSearchPath does not add directories
which don't exist.
(cherry picked from commit b44923561b49595d5f3d5727c1d3971029f9f6dc)
Commit: 3aed93ee4d91b727fe00898870edb0057f6776fe
https://github.com/NixOS/nixpkgs/commit/3aed93ee4d91b727fe00898870edb0057f6776fe
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
Log Message:
-----------
qtbase: remove redundant directory checks
addToSearchPath already checks if the directory exists before adding it
to the path; it's not necessary to check it again.
(cherry picked from commit ebb9c071685cd92fc5148c3f4da898b1235caee0)
Commit: c805a0c36ffa3490d4490aece5365dede4394d96
https://github.com/NixOS/nixpkgs/commit/c805a0c36ffa3490d4490aece5365dede4394d96
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
Log Message:
-----------
qt55.qtbase: add makeQtWrapper
(cherry picked from commit a122ca8ba3363b4c595e036099c073c1d61dc77f)
Commit: 6736fbe5064be9cb31a7d7ef55e185f3a237bdb8
https://github.com/NixOS/nixpkgs/commit/6736fbe5064be9cb31a7d7ef55e185f3a237bdb8
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/default.nix
M pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
Log Message:
-----------
qtmultimedia: build with gstreamer-1.0
Fixes #10289.
(cherry picked from commit 89d31daa8f5b76bb9f4704d4cef0258f7380e10e)
Commit: 88ab75fe39a6072dcea03c76c149731b4562f30b
https://github.com/NixOS/nixpkgs/commit/88ab75fe39a6072dcea03c76c149731b4562f30b
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/default.nix
A pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
M pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
Log Message:
-----------
separate makeQtWrapper from qtbase setup-hook
(cherry picked from commit d57e50d840589db867397cac29d1fd88092fbfd9)
I resolved some trivial conflicts: drop changes to packages that have
been switched to qt55 in master, but not in release-15.09.
Commit: 5371ddd5ea39ac1db056ab757325a814107bb8f2
https://github.com/NixOS/nixpkgs/commit/5371ddd5ea39ac1db056ab757325a814107bb8f2
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch
A pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch
A
pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch
R pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
Log Message:
-----------
qt55: set library paths from NIX_PROFILES
(cherry picked from commit a3855ef9aee3ffebc41ce1ed07e2aad176ad2808)
Commit: e1046843ce49528acdc4d63a258978cbdd17a918
https://github.com/NixOS/nixpkgs/commit/e1046843ce49528acdc4d63a258978cbdd17a918
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/default.nix
R pkgs/development/libraries/qt-5/5.5/qtquick1.nix
A
pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch
A pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
Log Message:
-----------
qt55: set Qt Quick import paths from NIX_PROFILES
(cherry picked from commit b1f904f69a61ad5faeb7bf84cfd14782bef9f069)
Commit: f0c0b7a942ab332600fb131984757c7f4f697ae7
https://github.com/NixOS/nixpkgs/commit/f0c0b7a942ab332600fb131984757c7f4f697ae7
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/default.nix
R pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix
A
pkgs/development/libraries/qt-5/5.5/qtdeclarative/0001-nix-profiles-import-paths.patch
A pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
Log Message:
-----------
qt55: set QML import paths from NIX_PROFILES
(cherry picked from commit fb375f1a2eb64517df81ae9ff909461c60910c0c)
Commit: 22471e4979ee948ad95c39accf0a7ff64be7d267
https://github.com/NixOS/nixpkgs/commit/22471e4979ee948ad95c39accf0a7ff64be7d267
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
Log Message:
-----------
makeQtWrapper: always wrap impurely
(cherry picked from commit 5a2c45427b391a6ac4431db8cb49563d2dc624ca)
Resolve plasma-5.4/plasma-workspace conflict by dropping the change
(doesn't exist in release-15.09 branch).
Commit: aa7b051c415ecae7661391c0fb8417d3d94e3cb1
https://github.com/NixOS/nixpkgs/commit/aa7b051c415ecae7661391c0fb8417d3d94e3cb1
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
Log Message:
-----------
kdoctools: set XDG_DATA_DIRS in setupHook
(cherry picked from commit 9fa17aa2933cb1e5048d6de3713cb65f562d81f6)
Resolve conflicts in kde-frameworks by removing the change (that
package/version doesn't exist in release-15.09).
Commit: 0fd7664a41b34446a7fa8bd07f3067fc12356337
https://github.com/NixOS/nixpkgs/commit/0fd7664a41b34446a7fa8bd07f3067fc12356337
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
Log Message:
-----------
qtbase: propagate runtime dependencies
This is done so that makeQtWrapper works correctly.
(cherry picked from commit 361b1165efc6202bb1bf0b862ef5ef9a61d9d5cd)
Commit: 287a4ce71f7f50cd31ed674862962e001d8c1df7
https://github.com/NixOS/nixpkgs/commit/287a4ce71f7f50cd31ed674862962e001d8c1df7
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
Log Message:
-----------
qtbase: copy qmake to temp dir
Fixes #10273.
(cherry picked from commit dcd70c54aa85582bf84923789593da99099f3d28)
Commit: 46217b9b01eec726bc9361409834c60f464ee7ae
https://github.com/NixOS/nixpkgs/commit/46217b9b01eec726bc9361409834c60f464ee7ae
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
M pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
Log Message:
-----------
makeQtWrapper: wrap XDG directories
(cherry picked from commit 24babaad9ab3e157d1bbb97531536ab6741511de)
Commit: c44a129bb92be755edab216a7a718c926ce9f141
https://github.com/NixOS/nixpkgs/commit/c44a129bb92be755edab216a7a718c926ce9f141
Author: Bjørn Forsman <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
Log Message:
-----------
qt55: fix qtmultimedia gstreamer support
Without this, configure will say:
Checking for openal... no
/tmp/nix-build-qtmultimedia-5.5.0.drv-0/qtmultimedia-opensource-src-5.5.0/qtmultimedia.pro:28:
Variable GST_VERSION is not defined.
Checking for resourcepolicy... no
And there may be application runtime errors like
defaultServiceProvider::requestService(): no service found for -
"org.qt-project.qt.camera"
After this fix, configure will say:
Checking for openal... no
Checking for gstreamer... yes
Checking for gstreamer_photography... no
Checking for gstreamer_encodingprofiles... yes
Checking for gstreamer_appsrc... yes
Checking for linux_v4l... yes
Checking for resourcepolicy... no
And the above runtime error will not appear.
This fix is similar to 449b6028 ("qt5.multimedia: fix gstreamer
support."), except with Qt 5.5 we also need to set GST_VERSION.
(cherry picked from commit 2cec70ce6c8432b3707b02ec3f96279e253975ce)
Commit: 59ad6a4dfeb9709986083fd6fabac41fc1e6df6d
https://github.com/NixOS/nixpkgs/commit/59ad6a4dfeb9709986083fd6fabac41fc1e6df6d
Author: Bjørn Forsman <[email protected]>
Date: 2015-11-09 (Mon, 09 Nov 2015)
Changed paths:
M pkgs/development/qtcreator/default.nix
Log Message:
-----------
qtcreator: add qtdeclarative to QML2_IMPORT_PATH
When building with Qt 5.4 this is not a problem, but with Qt 5.5 (tested
locally), it is clear that this dependency is missing:
$ ./result/bin/qtcreator
file:///nix/store/zmpf6ydrjdydd85wh6splpywv6aj4782-qtcreator-3.4.2/share/qtcreator/welcomescreen/welcomescreen.qml:31:1:
module "QtQuick" is not installed
import QtQuick 2.1
^
With Qt 5.4 something else is pulling in the qtdeclarative dependency,
it can be seen in the qtcreator wrapper script.
Note to self: "import QtQuick" != qtquickcontrols. QtQuick is
apparently located in the qtdeclarative module.
(cherry picked from commit ff4d8513b435cbb9858a6e714f5e50e0d9ae069a)
Commit: 45128deb40788b95a58f3c34bd1ed9829a9ba95e
https://github.com/NixOS/nixpkgs/commit/45128deb40788b95a58f3c34bd1ed9829a9ba95e
Author: Thomas Tuegel <[email protected]>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M pkgs/development/libraries/qt-5/5.5/default.nix
A pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
M pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch
A pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch
A
pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch
M pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
M pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
R pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix
A
pkgs/development/libraries/qt-5/5.5/qtdeclarative/0001-nix-profiles-import-paths.patch
A pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
M pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
R pkgs/development/libraries/qt-5/5.5/qtquick1.nix
A
pkgs/development/libraries/qt-5/5.5/qtquick1/0001-nix-profiles-import-paths.patch
A pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
M pkgs/development/libraries/qt-5/qt-env.nix
M pkgs/development/qtcreator/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge pull request #10918 from bjornfor/backport-qt55-improvements
Backport Qt 5.5 improvements to release-15.09
Compare: https://github.com/NixOS/nixpkgs/compare/ef7a81396b14...45128deb4078_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
