diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix | 54 |
1 files changed, 46 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix index 5ca033816181..d47f9705d212 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,10 +1,8 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.5"; - overrides = { - qtscript.version = "5.15.4"; - }; + version = "5.15.9"; + overrides = {}; mk = name: args: let @@ -16,7 +14,7 @@ let fetchgit { inherit (args) url rev sha256; fetchLFS = false; - fetchSubmodules = false; + fetchSubmodules = true; deepClone = false; leaveDotGit = false; }; @@ -24,6 +22,29 @@ let in lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) // { + # qtpim has no official releases + qtpim = { + version = "unstable-2020-11-02"; + src = fetchFromGitHub { + owner = "qt"; + repo = "qtpim"; + # Last commit before Qt5 support was broken + rev = "f9a8f0fc914c040d48bbd0ef52d7a68eea175a98"; + hash = "sha256-/1g+vvHjuRLB1vsm41MrHbBZ+88Udca0iEcbz0Q1BNQ="; + }; + }; + + # Has no kde/5.15 branch + qtpositioning = rec { + version = "5.15.2"; + src = fetchFromGitHub { + owner = "qt"; + repo = "qtpositioning"; + rev = "v${version}"; + hash = "sha256-L/P+yAQItm3taPpCNoOOm7PNdOFZiIwJJYflk6JDWvU="; + }; + }; + # qtwebkit does not have an official release tarball on the qt mirror and is # mostly maintained by the community. qtwebkit = rec { @@ -36,9 +57,26 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) version = "5.212.0-alpha4"; }; + # qtsystems has no official releases + qtsystems = { + version = "unstable-2019-01-03"; + src = fetchFromGitHub { + owner = "qt"; + repo = "qtsystems"; + rev = "e3332ee38d27a134cef6621fdaf36687af1b6f4a"; + hash = "sha256-P8MJgWiDDBCYo+icbNva0LODy0W+bmQTS87ggacuMP0="; + }; + }; + + catapult = fetchgit { + url = "https://chromium.googlesource.com/catapult"; + rev = "5eedfe23148a234211ba477f76fc2ea2e8529189"; + hash = "sha256-LPfBCEB5tJOljXpptsNk0sHGtJf/wIRL7fccN79Nh6o="; + }; + qtwebengine = let - branchName = "5.15.8"; + branchName = "5.15.13"; rev = "v${branchName}-lts"; in { @@ -46,11 +84,11 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) src = fetchgit { url = "https://github.com/qt/qtwebengine.git"; - sha256 = "04xhg5qpnxm8hzgkanml45za64c9i5pbxhki2l2wcq4b4y7f3hyr"; + sha256 = "sha256-gZmhJTA5A3+GeySJoppYGffNC6Ych2pOYlsu3w+fnmw="; inherit rev branchName; fetchSubmodules = true; leaveDotGit = true; - name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz"; + name = "qtwebengine-${lib.substring 0 8 rev}.tar.gz"; postFetch = '' # remove submodule .git directory rm -rf "$out/src/3rdparty/.git" |