pyrox.dev
Merge pull request #143852 from ttuegel/qt-5.15.3
Qt 5.15.3
authored by
Thomas Tuegel
and committed by
GitHub
de72551e
fb5f7b98
+6
pkgs/applications/display-managers/sddm/default.nix
+6
pkgs/applications/display-managers/sddm/default.nix
···
25
25
url = "https://github.com/sddm/sddm/commit/e1dedeeab6de565e043f26ac16033e613c222ef9.patch";
26
26
sha256 = "sha256-OPyrUI3bbH+PGDBfoL4Ohb4wIvmy9TeYZhE0JxR/D58=";
27
27
})
28
+
# Fix build with Qt 5.15.3
29
+
# See: https://github.com/sddm/sddm/pull/1325
30
+
(fetchpatch {
31
+
url = "https://github.com/sddm/sddm/commit/e93bf95c54ad8c2a1604f8d7be05339164b19308.patch";
32
+
sha256 = "sha256:1rh6sdvzivjcl5b05fczarvxhgpjhi7019hvf2gadnwgwdg104r4";
33
+
})
28
34
];
29
35
30
36
postPatch =
+4
-67
pkgs/development/libraries/qt-5/5.15/default.nix
+4
-67
pkgs/development/libraries/qt-5/5.15/default.nix
···
2
2
3
3
# Updates
4
4
5
-
Before a major version update, make a copy of this directory. (We like to
6
-
keep the old version around for a short time after major updates.) Add a
7
-
top-level attribute to `top-level/all-packages.nix`.
8
-
9
-
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
10
-
2. From the top of the Nixpkgs tree, run
11
-
`./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`.
12
-
3. Check that the new packages build correctly.
13
-
4. Commit the changes and open a pull request.
5
+
Run `./fetch.sh` to update package sources from Git.
6
+
Check for any minor version changes.
14
7
15
8
*/
16
9
···
28
21
29
22
let
30
23
24
+
srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; };
25
+
31
26
qtCompatVersion = srcs.qtbase.version;
32
27
33
28
stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
34
29
35
-
mirror = "https://download.qt.io";
36
-
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
37
-
# qtwebkit does not have an official release tarball on the qt mirror and is
38
-
# mostly maintained by the community.
39
-
qtwebkit = rec {
40
-
src = fetchFromGitHub {
41
-
owner = "qt";
42
-
repo = "qtwebkit";
43
-
rev = "v${version}";
44
-
sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
45
-
};
46
-
version = "5.212.0-alpha4";
47
-
};
48
-
qtwebengine =
49
-
let
50
-
branchName = "5.15.6";
51
-
rev = "v${branchName}-lts";
52
-
in
53
-
{
54
-
version = "${branchName}-${lib.substring 0 7 rev}";
55
-
56
-
src = fetchgit {
57
-
url = "https://github.com/qt/qtwebengine.git";
58
-
sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
59
-
inherit rev branchName;
60
-
fetchSubmodules = true;
61
-
leaveDotGit = true;
62
-
name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz";
63
-
postFetch = ''
64
-
# remove submodule .git directory
65
-
rm -rf "$out/src/3rdparty/.git"
66
-
67
-
# compress to not exceed the 2GB output limit
68
-
# try to make a deterministic tarball
69
-
tar -I 'gzip -n' \
70
-
--sort=name \
71
-
--mtime=1970-01-01 \
72
-
--owner=root --group=root \
73
-
--numeric-owner --mode=go=rX,u+rw,a-s \
74
-
--transform='s@^@source/@' \
75
-
-cf temp -C "$out" .
76
-
rm -r "$out"
77
-
mv temp "$out"
78
-
'';
79
-
};
80
-
};
81
-
};
82
-
83
30
patches = {
84
31
qtbase = lib.optionals stdenv.isDarwin [
85
32
./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
···
107
54
./qtbase.patch.d/0009-qtbase-qtpluginpath.patch
108
55
./qtbase.patch.d/0010-qtbase-assert.patch
109
56
./qtbase.patch.d/0011-fix-header_module.patch
110
-
(fetchpatch { # This can be removed when https://codereview.qt-project.org/c/qt/qtbase/+/339323 is included in an release.
111
-
name = "0014-gcc11-compat.patch";
112
-
url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=049e14870c13235cd066758f29c42dc96c1ccdf8";
113
-
sha256 = "1cb2hwi859hds0fa2cbap014qaa7mah9p0rcxcm2cvj2ybl33qfc";
114
-
})
115
-
(fetchpatch { # This can be removed when https://codereview.qt-project.org/c/qt/qtbase/+/363880/3 is included in an release.
116
-
name = "qtbase-mysql-version-vs-functionality-check.patch";
117
-
url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=211369133cf40b2f522caaff259c19069ed23ca4";
118
-
sha256 = "19kq9h10qm344fpdqa9basrbzh1y5kr48c6jzz3nvk61pk4ja1k4";
119
-
})
120
57
];
121
58
qtdeclarative = [ ./qtdeclarative.patch ];
122
59
qtscript = [ ./qtscript.patch ];
+17
-2
pkgs/development/libraries/qt-5/5.15/fetch.sh
+17
-2
pkgs/development/libraries/qt-5/5.15/fetch.sh
···
1
-
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/ \
2
-
-A '*.tar.xz' )
1
+
#!/usr/bin/env nix-shell
2
+
#!nix-shell -i bash -p nix-prefetch-scripts jq
3
+
4
+
set -eox pipefail
5
+
6
+
here="$(dirname "${BASH_SOURCE[0]}")"
7
+
modules="${here}/modules"
8
+
srcs="${here}/srcs-generated.json"
9
+
10
+
while read -r module; do
11
+
if [[ -z "$module" ]]; then continue; fi
12
+
url="https://invent.kde.org/qt/qt/${module}.git"
13
+
nix-prefetch-git --url $url --rev refs/heads/kde/5.15 \
14
+
| jq "{key: \"${module}\", value: {url,rev,sha256}}"
15
+
done < "$modules" | jq -s 'from_entries' > "${srcs}.tmp"
16
+
17
+
mv "${srcs}.tmp" "$srcs"
+41
pkgs/development/libraries/qt-5/5.15/modules
+41
pkgs/development/libraries/qt-5/5.15/modules
···
1
+
qt3d
2
+
qtactiveqt
3
+
qtandroidextras
4
+
qtbase
5
+
qtcharts
6
+
qtconnectivity
7
+
qtdatavis3d
8
+
qtdeclarative
9
+
qtdoc
10
+
qtgamepad
11
+
qtgraphicaleffects
12
+
qtimageformats
13
+
qtlocation
14
+
qtlottie
15
+
qtmacextras
16
+
qtmultimedia
17
+
qtnetworkauth
18
+
qtpurchasing
19
+
qtquick3d
20
+
qtquickcontrols
21
+
qtquickcontrols2
22
+
qtquicktimeline
23
+
qtremoteobjects
24
+
qtscript
25
+
qtscxml
26
+
qtsensors
27
+
qtserialbus
28
+
qtserialport
29
+
qtspeech
30
+
qtsvg
31
+
qttools
32
+
qttranslations
33
+
qtvirtualkeyboard
34
+
qtwayland
35
+
qtwebchannel
36
+
qtwebglplugin
37
+
qtwebsockets
38
+
qtwebview
39
+
qtwinextras
40
+
qtx11extras
41
+
qtxmlpatterns
+207
pkgs/development/libraries/qt-5/5.15/srcs-generated.json
+207
pkgs/development/libraries/qt-5/5.15/srcs-generated.json
···
1
+
{
2
+
"qt3d": {
3
+
"url": "https://invent.kde.org/qt/qt/qt3d.git",
4
+
"rev": "7edec6e014de27b9dd03f63875c471aac606a918",
5
+
"sha256": "0qv4vhciigqd8bnqzrs7y71ls7jx1p9cal2rh78m42qgskk1ci59"
6
+
},
7
+
"qtactiveqt": {
8
+
"url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
9
+
"rev": "f0d03da0e37a84029a4eae1733813521482ac1fb",
10
+
"sha256": "0llk76lf0mh4mzj7pwd8cs55wpmfq8v1bsdzvizb1sx0vfbjh8g6"
11
+
},
12
+
"qtandroidextras": {
13
+
"url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
14
+
"rev": "8cce1098c59534352aa0f343ea73861f603ac04a",
15
+
"sha256": "130a1yda2m7pa10as3rccz84m3617422n6s51pdn4kp8p8rk7cs6"
16
+
},
17
+
"qtbase": {
18
+
"url": "https://invent.kde.org/qt/qt/qtbase.git",
19
+
"rev": "c9fde86b0a2440133bc08f4811b6ca793be47f0a",
20
+
"sha256": "1fqhdkv3sp3nbzqi2a5wvxn5d4v0xcrq2bl609bdyj4nx367a8wp"
21
+
},
22
+
"qtcharts": {
23
+
"url": "https://invent.kde.org/qt/qt/qtcharts.git",
24
+
"rev": "130463160b4923069eb98da49edaf7d93180f4f8",
25
+
"sha256": "19g35cddbfh307mk76wac1ps03warynlsj7xi8i596bxiaf7i4pw"
26
+
},
27
+
"qtconnectivity": {
28
+
"url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
29
+
"rev": "69a87a9b831e36a578594a0a13130c384ad03121",
30
+
"sha256": "0ph07rdf9qfxnw3z2nqbmh6na65z0p2snmlzdw80amd7s0g255kw"
31
+
},
32
+
"qtdatavis3d": {
33
+
"url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
34
+
"rev": "c085311c02dd216e5a041b90c164d55b3cf3ce92",
35
+
"sha256": "0xya1m2csb42yisl90s9822p9q92n7ags909nlbapfsb49qwsqnj"
36
+
},
37
+
"qtdeclarative": {
38
+
"url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
39
+
"rev": "55324650f9e759a43dce927f823c9858574106c3",
40
+
"sha256": "0cxz4pqvb8l0wqpc4hr0xmc72csqf7dpbbzdqgil9nyyg21ihkz0"
41
+
},
42
+
"qtdoc": {
43
+
"url": "https://invent.kde.org/qt/qt/qtdoc.git",
44
+
"rev": "897e90fe304d844beaf694b82a93a50237fa8b9e",
45
+
"sha256": "1c4m9vlgg6bfw7hwzanl5s4vslg0r7xiz50lanhqrlcrr9i36xs1"
46
+
},
47
+
"qtgamepad": {
48
+
"url": "https://invent.kde.org/qt/qt/qtgamepad.git",
49
+
"rev": "64afa18a0a1e9588060e2e6d917bb01ccdd48a81",
50
+
"sha256": "1h9yb0asprynnb2qyjbmyglrkk9f9v19g6zzpk0gmixrp0h8gk46"
51
+
},
52
+
"qtgraphicaleffects": {
53
+
"url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
54
+
"rev": "c36998dc1581167b12cc3de8e4ac68c2a5d9f76e",
55
+
"sha256": "0x11n2fym765z3gyb4xnfl7v6zrip1wjkkl6nx1bxaya173fvdw8"
56
+
},
57
+
"qtimageformats": {
58
+
"url": "https://invent.kde.org/qt/qt/qtimageformats.git",
59
+
"rev": "cb82c74310837fe4e832c8ab72176a5d63e4355f",
60
+
"sha256": "0j4cv5sa6mm3adcjw8cv6kbzrslmhjc1rgxqgc130l8vm3vmgbkr"
61
+
},
62
+
"qtlocation": {
63
+
"url": "https://invent.kde.org/qt/qt/qtlocation.git",
64
+
"rev": "861e372b6ad81570d4f496e42fb25a6699b72f2f",
65
+
"sha256": "1g24pg9v6sv5zf80r48innp3h4g0hss69hnr7ygfzfvfnmmn6g52"
66
+
},
67
+
"qtlottie": {
68
+
"url": "https://invent.kde.org/qt/qt/qtlottie.git",
69
+
"rev": "fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4",
70
+
"sha256": "1xgykaw8qjnaip6h9jx0nfadc9amb6aclk758vm5pp43dvs5j96r"
71
+
},
72
+
"qtmacextras": {
73
+
"url": "https://invent.kde.org/qt/qt/qtmacextras.git",
74
+
"rev": "e72896968697e2a8af16a312e1560948e4c40f30",
75
+
"sha256": "1hndpbr1nnybn7frg76q99bk1c8fhvra6wjm0q78p4a8pinrvcms"
76
+
},
77
+
"qtmultimedia": {
78
+
"url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
79
+
"rev": "bd29c87027637a013f2c5e3b549fcda84e4d7545",
80
+
"sha256": "11pz9zzrhsr3n78ga7l3kp3gi20rpxsa4iz3wclhcbcm2xr3nd94"
81
+
},
82
+
"qtnetworkauth": {
83
+
"url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
84
+
"rev": "53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a",
85
+
"sha256": "0idaysqpwrghih7ijrm9hagj9jw3fy9nw539fr4d9rmcggnkkzn2"
86
+
},
87
+
"qtpurchasing": {
88
+
"url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
89
+
"rev": "cbf444fb570ca4f4ca21d963d2ae4010f10d473e",
90
+
"sha256": "1cki7n62wqm3xxn36mka0y67ngn7jvjkrvr08vsassbjb7kfsmxp"
91
+
},
92
+
"qtquick3d": {
93
+
"url": "https://invent.kde.org/qt/qt/qtquick3d.git",
94
+
"rev": "3e3e53c834b25dc2959dd30f319d12d6f84ee1e3",
95
+
"sha256": "1b1khfg26zl3p28yvhwjfldqy3flh10pb5hm5z0av03rz7jy7l8s"
96
+
},
97
+
"qtquickcontrols": {
98
+
"url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
99
+
"rev": "cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420",
100
+
"sha256": "1vxp0kwigwhqyyfm0xg8llyd1l1f4l18hmk6xqkm57xpi15x55bc"
101
+
},
102
+
"qtquickcontrols2": {
103
+
"url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
104
+
"rev": "be66bf9a5618c745d2a6ee2262967af6307b3b07",
105
+
"sha256": "11h3f3rb2kqgsw7njzhjwazw1k03v12i83irjndylafiaqw6c6ks"
106
+
},
107
+
"qtquicktimeline": {
108
+
"url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
109
+
"rev": "67503cdadea43b95ddad0de1a04951aff0ce1a07",
110
+
"sha256": "0h4b3ibcf6rsmqmcfbwbk9pbvw3b9cac8nx2538aqvnpyyp1vhid"
111
+
},
112
+
"qtremoteobjects": {
113
+
"url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
114
+
"rev": "4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735",
115
+
"sha256": "1zbxl5jk7x8qklrnbbaikymyviigqdq7vf0wc8gzls4126vcx146"
116
+
},
117
+
"qtscript": {
118
+
"url": "https://invent.kde.org/qt/qt/qtscript.git",
119
+
"rev": "5cec94b2c1503f106f4ef4778d016410ebb86211",
120
+
"sha256": "1xdri98cw7m78k9kfb53cgh8wyz98q3i623jhhcv01rvy1zsf8m1"
121
+
},
122
+
"qtscxml": {
123
+
"url": "https://invent.kde.org/qt/qt/qtscxml.git",
124
+
"rev": "7a15000f42c7a3171719727cd056f82a78244ed7",
125
+
"sha256": "1i2ajsj9pb1s4lk4djj1h1ay9mkz1z3m75a747cspyc1p1iymipq"
126
+
},
127
+
"qtsensors": {
128
+
"url": "https://invent.kde.org/qt/qt/qtsensors.git",
129
+
"rev": "921a31375f29e429e95352b08b2b9dbfea663cb1",
130
+
"sha256": "1ijayk6lf34nwv7s3ib3cfqx9sjrmr1c6jnziwmxa1l6fy3ik4g8"
131
+
},
132
+
"qtserialbus": {
133
+
"url": "https://invent.kde.org/qt/qt/qtserialbus.git",
134
+
"rev": "8884c5e43df846deac5a0c7c290eeb633d6bfe32",
135
+
"sha256": "1ydb5x21j26pl58mr6klnwixkqx8h119nvnzvyawz83gji3ay3a5"
136
+
},
137
+
"qtserialport": {
138
+
"url": "https://invent.kde.org/qt/qt/qtserialport.git",
139
+
"rev": "941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4",
140
+
"sha256": "0x7ly67gddmz0hqls9109bk4rgaa97ksyv24qk4brrhzkpr7q9cx"
141
+
},
142
+
"qtspeech": {
143
+
"url": "https://invent.kde.org/qt/qt/qtspeech.git",
144
+
"rev": "a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b",
145
+
"sha256": "1ljf45f65pfp8x367qnzl0ssz7n17cxhk29qvqpz9z7rh65zqix5"
146
+
},
147
+
"qtsvg": {
148
+
"url": "https://invent.kde.org/qt/qt/qtsvg.git",
149
+
"rev": "24128cdf8bef53eddf31a5709bbbc46293006b1c",
150
+
"sha256": "0vinjcbq4saxhlmvb5i93bzgg30qc3j8r2qfwrzaxc4vmfhfgi56"
151
+
},
152
+
"qttools": {
153
+
"url": "https://invent.kde.org/qt/qt/qttools.git",
154
+
"rev": "33693a928986006d79c1ee743733cde5966ac402",
155
+
"sha256": "02n0lppsp6g4s9bdvnfxpf7ndkbs9bzm0clcwvirwf2cd8q95a4n"
156
+
},
157
+
"qttranslations": {
158
+
"url": "https://invent.kde.org/qt/qt/qttranslations.git",
159
+
"rev": "8fbbdf21f127197f97b58c7d80d2fa2a59135638",
160
+
"sha256": "06r2jb2fsdr5fvxs748war0lr4mm3l3d3b37xc4n73y294vwrmn7"
161
+
},
162
+
"qtvirtualkeyboard": {
163
+
"url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
164
+
"rev": "353b75b2e34bdae901625bbddf5c5e3f3e6c0de5",
165
+
"sha256": "12nv773zc05yrbai1z6i481yinih0kxcjzgm9pa0580qz69gd9a5"
166
+
},
167
+
"qtwayland": {
168
+
"url": "https://invent.kde.org/qt/qt/qtwayland.git",
169
+
"rev": "992833ca741efe8f533c61abfaf129a1d8bfcfee",
170
+
"sha256": "1w8mq38k6s0fncqv113bw1pc7g10ysfmsbyg23hxh9fr5q4ia4q7"
171
+
},
172
+
"qtwebchannel": {
173
+
"url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
174
+
"rev": "47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38",
175
+
"sha256": "167rp43c86xr4grzxs4bl46y6sf1q9xa0641mgp4r94g2ipxyc1d"
176
+
},
177
+
"qtwebglplugin": {
178
+
"url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
179
+
"rev": "550a8cee241bbf8c11863dec9587d579dcb1108b",
180
+
"sha256": "0p1y0b8zsm7rrkhhylndp282ghgki2cjrgc4n5zhjn732ahxg515"
181
+
},
182
+
"qtwebsockets": {
183
+
"url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
184
+
"rev": "e7883bc64440b1ff4666272ac6eb710ee4bc221b",
185
+
"sha256": "1rj99y1f0wn6g1m2k53xkni5v79zgq25yv8b9wx2bz0n2r9iasca"
186
+
},
187
+
"qtwebview": {
188
+
"url": "https://invent.kde.org/qt/qt/qtwebview.git",
189
+
"rev": "920de5f1cd9f9001cfef1bfd2c19e6720793362f",
190
+
"sha256": "04hnqalabhypkd2hgl45jxf9p1p6dgjwlc5b7gs4f6588lafgd3f"
191
+
},
192
+
"qtwinextras": {
193
+
"url": "https://invent.kde.org/qt/qt/qtwinextras.git",
194
+
"rev": "3df03dab21f3e84d5a7274c64dd879854ca1bfe7",
195
+
"sha256": "12dkw982xcm7hxw3lxhg34wny4srbickxm9s3nz7bdyp9dmqnygx"
196
+
},
197
+
"qtx11extras": {
198
+
"url": "https://invent.kde.org/qt/qt/qtx11extras.git",
199
+
"rev": "3898f5484fd4864b047729bfeda9a1222f32364f",
200
+
"sha256": "04rp8arml19b03iybd7sa78dsdv7386m9ymmgqciwl13dhwjssra"
201
+
},
202
+
"qtxmlpatterns": {
203
+
"url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
204
+
"rev": "189e28d0aff1f3d7960228ba318b83e3cadac98c",
205
+
"sha256": "0vs9j2i1dnlivcrzz175zz66ql1m8mrdqkglvyqjqv6cb7mpskrq"
206
+
}
207
+
}
+65
-335
pkgs/development/libraries/qt-5/5.15/srcs.nix
+65
-335
pkgs/development/libraries/qt-5/5.15/srcs.nix
···
1
-
# DO NOT EDIT! This file is generated automatically.
2
-
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.15
3
-
{ fetchurl, mirror }:
1
+
{ lib, fetchgit, fetchFromGitHub }:
4
2
5
-
{
6
-
qt3d = {
7
-
version = "5.15.2";
8
-
src = fetchurl {
9
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz";
10
-
sha256 = "03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d";
11
-
name = "qt3d-everywhere-src-5.15.2.tar.xz";
12
-
};
13
-
};
14
-
qtactiveqt = {
15
-
version = "5.15.2";
16
-
src = fetchurl {
17
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtactiveqt-everywhere-src-5.15.2.tar.xz";
18
-
sha256 = "868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c";
19
-
name = "qtactiveqt-everywhere-src-5.15.2.tar.xz";
20
-
};
21
-
};
22
-
qtandroidextras = {
23
-
version = "5.15.2";
24
-
src = fetchurl {
25
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtandroidextras-everywhere-src-5.15.2.tar.xz";
26
-
sha256 = "5813278690d89a9c232eccf697fc280034de6f9f02a7c40d95ad5fcf8ac8dabd";
27
-
name = "qtandroidextras-everywhere-src-5.15.2.tar.xz";
28
-
};
29
-
};
30
-
qtbase = {
31
-
version = "5.15.2";
32
-
src = fetchurl {
33
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz";
34
-
sha256 = "909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8";
35
-
name = "qtbase-everywhere-src-5.15.2.tar.xz";
36
-
};
37
-
};
38
-
qtcharts = {
39
-
version = "5.15.2";
40
-
src = fetchurl {
41
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz";
42
-
sha256 = "e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11";
43
-
name = "qtcharts-everywhere-src-5.15.2.tar.xz";
44
-
};
45
-
};
46
-
qtconnectivity = {
47
-
version = "5.15.2";
48
-
src = fetchurl {
49
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz";
50
-
sha256 = "0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0";
51
-
name = "qtconnectivity-everywhere-src-5.15.2.tar.xz";
52
-
};
53
-
};
54
-
qtdatavis3d = {
55
-
version = "5.15.2";
56
-
src = fetchurl {
57
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdatavis3d-everywhere-src-5.15.2.tar.xz";
58
-
sha256 = "226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd";
59
-
name = "qtdatavis3d-everywhere-src-5.15.2.tar.xz";
60
-
};
61
-
};
62
-
qtdeclarative = {
63
-
version = "5.15.2";
64
-
src = fetchurl {
65
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz";
66
-
sha256 = "c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651";
67
-
name = "qtdeclarative-everywhere-src-5.15.2.tar.xz";
68
-
};
69
-
};
70
-
qtdoc = {
71
-
version = "5.15.2";
72
-
src = fetchurl {
73
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdoc-everywhere-src-5.15.2.tar.xz";
74
-
sha256 = "a47809f00f1bd690ca4e699cb32ffe7717d43da84e0167d1f562210da7714ce4";
75
-
name = "qtdoc-everywhere-src-5.15.2.tar.xz";
76
-
};
77
-
};
78
-
qtgamepad = {
79
-
version = "5.15.2";
80
-
src = fetchurl {
81
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz";
82
-
sha256 = "c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c";
83
-
name = "qtgamepad-everywhere-src-5.15.2.tar.xz";
84
-
};
85
-
};
86
-
qtgraphicaleffects = {
87
-
version = "5.15.2";
88
-
src = fetchurl {
89
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz";
90
-
sha256 = "ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4";
91
-
name = "qtgraphicaleffects-everywhere-src-5.15.2.tar.xz";
92
-
};
93
-
};
94
-
qtimageformats = {
95
-
version = "5.15.2";
96
-
src = fetchurl {
97
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz";
98
-
sha256 = "bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7";
99
-
name = "qtimageformats-everywhere-src-5.15.2.tar.xz";
100
-
};
101
-
};
102
-
qtlocation = {
103
-
version = "5.15.2";
104
-
src = fetchurl {
105
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz";
106
-
sha256 = "984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0";
107
-
name = "qtlocation-everywhere-src-5.15.2.tar.xz";
108
-
};
109
-
};
110
-
qtlottie = {
111
-
version = "5.15.2";
112
-
src = fetchurl {
113
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz";
114
-
sha256 = "cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517";
115
-
name = "qtlottie-everywhere-src-5.15.2.tar.xz";
116
-
};
117
-
};
118
-
qtmacextras = {
119
-
version = "5.15.2";
120
-
src = fetchurl {
121
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmacextras-everywhere-src-5.15.2.tar.xz";
122
-
sha256 = "6959b0f2cec71cd66800f36cab797430860e55fa33c9c23698d6a08fc2b8776e";
123
-
name = "qtmacextras-everywhere-src-5.15.2.tar.xz";
124
-
};
125
-
};
126
-
qtmultimedia = {
127
-
version = "5.15.2";
128
-
src = fetchurl {
129
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz";
130
-
sha256 = "0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5";
131
-
name = "qtmultimedia-everywhere-src-5.15.2.tar.xz";
132
-
};
133
-
};
134
-
qtnetworkauth = {
135
-
version = "5.15.2";
136
-
src = fetchurl {
137
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtnetworkauth-everywhere-src-5.15.2.tar.xz";
138
-
sha256 = "fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85";
139
-
name = "qtnetworkauth-everywhere-src-5.15.2.tar.xz";
140
-
};
141
-
};
142
-
qtpurchasing = {
143
-
version = "5.15.2";
144
-
src = fetchurl {
145
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtpurchasing-everywhere-src-5.15.2.tar.xz";
146
-
sha256 = "87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227";
147
-
name = "qtpurchasing-everywhere-src-5.15.2.tar.xz";
148
-
};
149
-
};
150
-
qtquick3d = {
151
-
version = "5.15.2";
152
-
src = fetchurl {
153
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquick3d-everywhere-src-5.15.2.tar.xz";
154
-
sha256 = "5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb";
155
-
name = "qtquick3d-everywhere-src-5.15.2.tar.xz";
156
-
};
157
-
};
158
-
qtquickcontrols = {
159
-
version = "5.15.2";
160
-
src = fetchurl {
161
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz";
162
-
sha256 = "c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5";
163
-
name = "qtquickcontrols-everywhere-src-5.15.2.tar.xz";
164
-
};
165
-
};
166
-
qtquickcontrols2 = {
167
-
version = "5.15.2";
168
-
src = fetchurl {
169
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz";
170
-
sha256 = "671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919";
171
-
name = "qtquickcontrols2-everywhere-src-5.15.2.tar.xz";
172
-
};
173
-
};
174
-
qtquicktimeline = {
175
-
version = "5.15.2";
176
-
src = fetchurl {
177
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz";
178
-
sha256 = "b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28";
179
-
name = "qtquicktimeline-everywhere-src-5.15.2.tar.xz";
180
-
};
181
-
};
182
-
qtremoteobjects = {
183
-
version = "5.15.2";
184
-
src = fetchurl {
185
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz";
186
-
sha256 = "6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2";
187
-
name = "qtremoteobjects-everywhere-src-5.15.2.tar.xz";
188
-
};
189
-
};
190
-
qtscript = {
191
-
version = "5.15.2";
192
-
src = fetchurl {
193
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz";
194
-
sha256 = "a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e";
195
-
name = "qtscript-everywhere-src-5.15.2.tar.xz";
196
-
};
197
-
};
198
-
qtscxml = {
199
-
version = "5.15.2";
200
-
src = fetchurl {
201
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz";
202
-
sha256 = "60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc";
203
-
name = "qtscxml-everywhere-src-5.15.2.tar.xz";
204
-
};
205
-
};
206
-
qtsensors = {
207
-
version = "5.15.2";
208
-
src = fetchurl {
209
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz";
210
-
sha256 = "3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839";
211
-
name = "qtsensors-everywhere-src-5.15.2.tar.xz";
212
-
};
213
-
};
214
-
qtserialbus = {
215
-
version = "5.15.2";
216
-
src = fetchurl {
217
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz";
218
-
sha256 = "aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88";
219
-
name = "qtserialbus-everywhere-src-5.15.2.tar.xz";
220
-
};
221
-
};
222
-
qtserialport = {
223
-
version = "5.15.2";
224
-
src = fetchurl {
225
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz";
226
-
sha256 = "59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d";
227
-
name = "qtserialport-everywhere-src-5.15.2.tar.xz";
228
-
};
229
-
};
230
-
qtspeech = {
231
-
version = "5.15.2";
232
-
src = fetchurl {
233
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtspeech-everywhere-src-5.15.2.tar.xz";
234
-
sha256 = "c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5";
235
-
name = "qtspeech-everywhere-src-5.15.2.tar.xz";
236
-
};
237
-
};
238
-
qtsvg = {
239
-
version = "5.15.2";
240
-
src = fetchurl {
241
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz";
242
-
sha256 = "8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e";
243
-
name = "qtsvg-everywhere-src-5.15.2.tar.xz";
244
-
};
245
-
};
246
-
qttools = {
247
-
version = "5.15.2";
248
-
src = fetchurl {
249
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz";
250
-
sha256 = "c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc";
251
-
name = "qttools-everywhere-src-5.15.2.tar.xz";
252
-
};
253
-
};
254
-
qttranslations = {
255
-
version = "5.15.2";
256
-
src = fetchurl {
257
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttranslations-everywhere-src-5.15.2.tar.xz";
258
-
sha256 = "d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8";
259
-
name = "qttranslations-everywhere-src-5.15.2.tar.xz";
260
-
};
261
-
};
262
-
qtvirtualkeyboard = {
263
-
version = "5.15.2";
264
-
src = fetchurl {
265
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz";
266
-
sha256 = "9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55";
267
-
name = "qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz";
268
-
};
269
-
};
270
-
qtwayland = {
271
-
version = "5.15.2";
272
-
src = fetchurl {
273
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz";
274
-
sha256 = "193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5";
275
-
name = "qtwayland-everywhere-src-5.15.2.tar.xz";
276
-
};
277
-
};
278
-
qtwebchannel = {
279
-
version = "5.15.2";
280
-
src = fetchurl {
281
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz";
282
-
sha256 = "127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1";
283
-
name = "qtwebchannel-everywhere-src-5.15.2.tar.xz";
284
-
};
285
-
};
286
-
qtwebengine = {
287
-
version = "5.15.2";
288
-
src = fetchurl {
289
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz";
290
-
sha256 = "c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0";
291
-
name = "qtwebengine-everywhere-src-5.15.2.tar.xz";
292
-
};
293
-
};
294
-
qtwebglplugin = {
295
-
version = "5.15.2";
296
-
src = fetchurl {
297
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebglplugin-everywhere-src-5.15.2.tar.xz";
298
-
sha256 = "81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446";
299
-
name = "qtwebglplugin-everywhere-src-5.15.2.tar.xz";
300
-
};
3
+
let
4
+
version = "5.15.3";
5
+
overrides = {
6
+
qtscript.version = "5.15.4";
301
7
};
302
-
qtwebsockets = {
303
-
version = "5.15.2";
304
-
src = fetchurl {
305
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz";
306
-
sha256 = "a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f";
307
-
name = "qtwebsockets-everywhere-src-5.15.2.tar.xz";
308
-
};
309
-
};
310
-
qtwebview = {
311
-
version = "5.15.2";
312
-
src = fetchurl {
313
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz";
314
-
sha256 = "be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7";
315
-
name = "qtwebview-everywhere-src-5.15.2.tar.xz";
316
-
};
317
-
};
318
-
qtwinextras = {
319
-
version = "5.15.2";
320
-
src = fetchurl {
321
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwinextras-everywhere-src-5.15.2.tar.xz";
322
-
sha256 = "65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e";
323
-
name = "qtwinextras-everywhere-src-5.15.2.tar.xz";
8
+
9
+
mk = name: args:
10
+
let
11
+
override = overrides.${name} or {};
12
+
in
13
+
{
14
+
version = override.version or version;
15
+
src = override.src or
16
+
fetchgit {
17
+
inherit (args) url rev sha256;
18
+
fetchLFS = false;
19
+
fetchSubmodules = false;
20
+
deepClone = false;
21
+
leaveDotGit = false;
22
+
};
324
23
};
325
-
};
326
-
qtx11extras = {
327
-
version = "5.15.2";
328
-
src = fetchurl {
329
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz";
330
-
sha256 = "7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e";
331
-
name = "qtx11extras-everywhere-src-5.15.2.tar.xz";
24
+
in
25
+
lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
26
+
// {
27
+
# qtwebkit does not have an official release tarball on the qt mirror and is
28
+
# mostly maintained by the community.
29
+
qtwebkit = rec {
30
+
src = fetchFromGitHub {
31
+
owner = "qt";
32
+
repo = "qtwebkit";
33
+
rev = "v${version}";
34
+
sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
332
35
};
36
+
version = "5.212.0-alpha4";
333
37
};
334
-
qtxmlpatterns = {
335
-
version = "5.15.2";
336
-
src = fetchurl {
337
-
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz";
338
-
sha256 = "76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa";
339
-
name = "qtxmlpatterns-everywhere-src-5.15.2.tar.xz";
38
+
39
+
qtwebengine =
40
+
let
41
+
branchName = "5.15.6";
42
+
rev = "v${branchName}-lts";
43
+
in
44
+
{
45
+
version = "${branchName}-${lib.substring 0 7 rev}";
46
+
47
+
src = fetchgit {
48
+
url = "https://github.com/qt/qtwebengine.git";
49
+
sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
50
+
inherit rev branchName;
51
+
fetchSubmodules = true;
52
+
leaveDotGit = true;
53
+
name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz";
54
+
postFetch = ''
55
+
# remove submodule .git directory
56
+
rm -rf "$out/src/3rdparty/.git"
57
+
58
+
# compress to not exceed the 2GB output limit
59
+
# try to make a deterministic tarball
60
+
tar -I 'gzip -n' \
61
+
--sort=name \
62
+
--mtime=1970-01-01 \
63
+
--owner=root --group=root \
64
+
--numeric-owner --mode=go=rX,u+rw,a-s \
65
+
--transform='s@^@source/@' \
66
+
-cf temp -C "$out" .
67
+
rm -r "$out"
68
+
mv temp "$out"
69
+
'';
70
+
};
340
71
};
341
-
};
342
72
}
+4
pkgs/development/libraries/qt-5/modules/qtbase.nix
+4
pkgs/development/libraries/qt-5/modules/qtbase.nix
···
115
115
sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake
116
116
sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in
117
117
sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
118
+
'' + lib.optionalString (compareVersion "5.15.0" >= 0) ''
119
+
patchShebangs ./bin
118
120
'' + (
119
121
if stdenv.isDarwin then ''
120
122
sed -i \
···
149
151
''}
150
152
151
153
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
154
+
'' + lib.optionalString (compareVersion "5.15.0" >= 0) ''
155
+
./bin/syncqt.pl -version $version
152
156
'';
153
157
154
158
postConfigure = ''
+17
pkgs/development/libraries/qt-5/qtModule.nix
+17
pkgs/development/libraries/qt-5/qtModule.nix
···
31
31
${args.preConfigure or ""}
32
32
33
33
fixQtBuiltinPaths . '*.pr?'
34
+
'' + lib.optionalString (builtins.compareVersions "5.15.0" version <= 0)
35
+
# Note: We use ${version%%-*} to remove any tag from the end of the version
36
+
# string. Version tags are added by Nixpkgs maintainers and not reflected in
37
+
# the source version.
38
+
''
39
+
if [[ -z "$dontCheckQtModuleVersion" ]] \
40
+
&& grep -q '^MODULE_VERSION' .qmake.conf 2>/dev/null \
41
+
&& ! grep -q -F "''${version%%-*}" .qmake.conf 2>/dev/null
42
+
then
43
+
echo >&2 "error: could not find version ''${version%%-*} in .qmake.conf"
44
+
echo >&2 "hint: check .qmake.conf and update the package version in Nixpkgs"
45
+
exit 1
46
+
fi
47
+
48
+
if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
49
+
syncqt.pl -version "''${version%%-*}"
50
+
fi
34
51
'';
35
52
36
53
dontWrapQtApps = args.dontWrapQtApps or true;