diff options
| author | Jos van den Oever <jos@vandenoever.info> | 2014-05-14 17:46:33 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-11 21:30:21 +0200 |
| commit | 845b0e3ebc2b6e5ac30ed7f4c26405168aedc5f6 (patch) | |
| tree | 8ad2d641d072d4b59e8564319d46415b7681ad38 /pkgs/development/qtcreator | |
| parent | 8d309c37a7933a56e5d5f70ada154a332a624015 (diff) | |
qt5,qtcreator: update to qt-5.2.1 and qtcreator-3.1.
Close #2643. Testing parallel build of qt5: fine on @vcunat's 8-core (just this single task). We'll see on Hydra.
Diffstat (limited to 'pkgs/development/qtcreator')
| -rw-r--r-- | pkgs/development/qtcreator/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index b12f81db9c4c1..2b0410f0874e2 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -3,8 +3,8 @@ with stdenv.lib; let - baseVersion = "2.8"; - revision = "1"; + baseVersion = "3.1"; + revision = "0"; version = "${baseVersion}.${revision}"; in @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { + optionalString sdkBuild "-qt-${qtLib.version}"; src = fetchurl { - url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-${version}-src.tar.gz"; - sha256 = "d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9"; + url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; + sha256 = "c8c648f4988b707393e0f1958a8868718f27e59263f05f3b6599fa62290c2bbf"; }; # This property can be used in a nix development environment to refer to the Qt package |