Skip to content

Commit cf1783e

Browse files
mergify[bot]mergify[bot]
authored
Merge pull request haskell#10679 from haskell/mergify/bp/3.14/pr-10677
Backport haskell#10677: fix unix dependency correctly
2 parents 50195d5 + b28ee38 commit cf1783e

File tree

9 files changed

+393
-280
lines changed

9 files changed

+393
-280
lines changed

‎Cabal/Cabal.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ library
4949
if os(windows)
5050
build-depends: Win32 >= 2.3.0.0 && < 2.15
5151
else
52-
build-depends: unix >= 2.6.0.0 && < 2.9
52+
build-depends: unix >= 2.8.6.0 && < 2.9
5353

5454
ghc-options:
5555
-Wall

‎bootstrap/linux-9.0.2.json‎

Lines changed: 74 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -63,62 +63,72 @@
6363
],
6464
"dependencies": [
6565
{
66-
"cabal_sha256": "a4a1975fde77e289b605c45a3ef78d731d8c1834e4cef311152d910a1e94d98c",
67-
"component": "lib:data-array-byte",
66+
"cabal_sha256": "3eee5d3658b657371d0f940f1f38feefc2ebdf8592a32d3d0734f28c61f80ba0",
67+
"component": "lib:bytestring",
6868
"flags": [],
69-
"package": "data-array-byte",
70-
"revision": 3,
69+
"package": "bytestring",
70+
"revision": 0,
7171
"source": "hackage",
72-
"src_sha256": "1bb6eca0b3e02d057fe7f4e14c81ef395216f421ab30fdaa1b18017c9c025600",
73-
"version": "0.1.0.1"
72+
"src_sha256": "6bd8fa536ed6a8278bc98dfa9fdf2c91da662bea58fde929a6ba8a38bbe9d7eb",
73+
"version": "0.11.5.3"
7474
},
7575
{
76-
"cabal_sha256": "98e79e1c97117143e4012983509ec95f7e5e4f6adff6914d07812a39f83404b9",
77-
"component": "lib:bytestring",
78-
"flags": [
79-
"-pure-haskell"
80-
],
81-
"package": "bytestring",
82-
"revision": 1,
76+
"cabal_sha256": "2efc549644dd418bad537d1601fdd437c440d807265016bd993b6996c679ad2f",
77+
"component": "lib:os-string",
78+
"flags": [],
79+
"package": "os-string",
80+
"revision": 0,
8381
"source": "hackage",
84-
"src_sha256": "ebc3b8a6ef74a5cd6ddbb8d447d1c9a5fd4964c7975ebcae0b8ab0bcc406cc8c",
85-
"version": "0.12.1.0"
82+
"src_sha256": "339c35fd3a290522f23de4e33528423cfd0b0a8f22946b0b9816a817b926cba0",
83+
"version": "2.0.7"
8684
},
8785
{
88-
"cabal_sha256": "345cbb1afe414a09e47737e4d14cbd51891a734e67c0ef3d77a1439518bb81e8",
86+
"cabal_sha256": "099c33e0e570dad93390e1c01c1f4bc6e4f13587de8e199df3c94a6cb62c7434",
8987
"component": "lib:filepath",
9088
"flags": [
9189
"-cpphs"
9290
],
9391
"package": "filepath",
9492
"revision": 0,
9593
"source": "hackage",
96-
"src_sha256": "88d6452fd199e333e66e68d2dc5d715f5c6d361661a4a8add88320a82864b788",
97-
"version": "1.4.300.2"
94+
"src_sha256": "54aa86c432f593273d7b9f607c5b5e0a1628c2674c6f4e3b5a54eb0c83db5caf",
95+
"version": "1.5.4.0"
9896
},
9997
{
100-
"cabal_sha256": "3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06",
98+
"cabal_sha256": "5b7f8afd7a879c3c8c3c636fd3c7543cdd5e0b514b7da90e76907ccd11434031",
10199
"component": "lib:unix",
102100
"flags": [
103-
"-os-string"
101+
"+os-string"
104102
],
105103
"package": "unix",
104+
"revision": 1,
105+
"source": "hackage",
106+
"src_sha256": "8117599bb3e4aa1d4656710afbc85aef2a75483eddfac5338f8cc88fb505eea2",
107+
"version": "2.8.6.0"
108+
},
109+
{
110+
"cabal_sha256": "e3e1866eab82cb28f6a5f28507643da3987008b737e66a3c7398f39f16d824dc",
111+
"component": "lib:file-io",
112+
"flags": [
113+
"+os-string"
114+
],
115+
"package": "file-io",
106116
"revision": 0,
107117
"source": "hackage",
108-
"src_sha256": "5ab6c346aef2eb9bf80b4d29ca7e22063fc23e52fd69fbc4d18a9f98b154e424",
109-
"version": "2.8.5.1"
118+
"src_sha256": "e3d9113a015c57e3d8c2294550c41544f84a265291fed96cca697f91b6e86f52",
119+
"version": "0.1.4"
110120
},
111121
{
112-
"cabal_sha256": "fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b",
122+
"cabal_sha256": "2490137bb7738bd79392959458ef5f276219ea5ba8a9a56d3e0b06315c1bb917",
113123
"component": "lib:directory",
114124
"flags": [
115-
"-os-string"
125+
"+os-string"
116126
],
117127
"package": "directory",
118-
"revision": 0,
128+
"revision": 1,
119129
"source": "hackage",
120-
"src_sha256": "e864ed54ddfc6e15d2eb02c87f4be8edd7719e1f9cea13e0f86909400b6ea768",
121-
"version": "1.3.8.5"
130+
"src_sha256": "20a24846117fc5f8751d974b7de07210a161989410467e9adca525381b8e64cc",
131+
"version": "1.3.9.0"
122132
},
123133
{
124134
"cabal_sha256": "de553eefe0b6548a560e9d8100486310548470a403c1fa21108dd03713da5fc7",
@@ -141,18 +151,17 @@
141151
"version": "0.8.9.2"
142152
},
143153
{
144-
"cabal_sha256": "78c3fb91055d0607a80453327f087b9dc82168d41d0dca3ff410d21033b5e87d",
154+
"cabal_sha256": "71b5fa8c64d3c1fd0a08f993463220867b08290a2256e94b0952bf0e8f5a45cc",
145155
"component": "lib:text",
146156
"flags": [
147157
"-developer",
148-
"-pure-haskell",
149158
"+simdutf"
150159
],
151160
"package": "text",
152161
"revision": 1,
153162
"source": "hackage",
154-
"src_sha256": "e40cdda8b285f4d72476ed35dc2f5f167d524e6b38bb5ec964d00ee1ff24feab",
155-
"version": "2.1.1"
163+
"src_sha256": "c735be650a898606ce9f2c8642bc6ac6123eea82871d5e90f92797801f59efad",
164+
"version": "2.0.2"
156165
},
157166
{
158167
"cabal_sha256": "8407cbd428d7f640a0fff8891bd2f7aca13cebe70a5e654856f8abec9a648b56",
@@ -165,34 +174,34 @@
165174
"version": "3.1.17.0"
166175
},
167176
{
168-
"cabal_sha256": null,
177+
"cabal_sha256": "557a2b20dc85f052c86c5a06dcbd7c6995f2d0391bbff8e62c90b4b5975211da",
169178
"component": "lib:Cabal-syntax",
170179
"flags": [],
171180
"package": "Cabal-syntax",
172-
"revision": null,
181+
"revision": 0,
173182
"source": "local",
174183
"src_sha256": null,
175-
"version": "3.14.0.0"
184+
"version": "3.14.1.0"
176185
},
177186
{
178-
"cabal_sha256": "e16e2fd54934028fb21665bc0045f6133487ff77f95a37643d14bfdf339cbaff",
187+
"cabal_sha256": "9a0b2ef8096517fa0e0c7a5e9a5c2ae5744ed824c3331005f9408245810df345",
179188
"component": "lib:process",
180189
"flags": [],
181190
"package": "process",
182191
"revision": 0,
183192
"source": "hackage",
184-
"src_sha256": "fa06e25ce7f59205a8f41a449654f6d1b4f79d3959193006cfbc34f4c4bc68fb",
185-
"version": "1.6.22.0"
193+
"src_sha256": "496fe0566c3915b112e9772ac9c967dfeb8d5ca04895e54ae0160522bee76e65",
194+
"version": "1.6.25.0"
186195
},
187196
{
188-
"cabal_sha256": null,
197+
"cabal_sha256": "d24c689fd4b56cd12f8225562c00657e97c528849a2fc3d535557a83ca5f8dfc",
189198
"component": "lib:Cabal",
190199
"flags": [],
191200
"package": "Cabal",
192-
"revision": null,
201+
"revision": 0,
193202
"source": "local",
194203
"src_sha256": null,
195-
"version": "3.14.0.0"
204+
"version": "3.14.1.0"
196205
},
197206
{
198207
"cabal_sha256": null,
@@ -205,28 +214,28 @@
205214
"version": "3.14"
206215
},
207216
{
208-
"cabal_sha256": "60e78b6c60dc32a77ce6c37ed5ca4e838fc5f76f02836ef64d93cd21cc002325",
217+
"cabal_sha256": "276325277350cd2c2c88916ed3ae5cd35b2b4f494ec594fbd9534081eb7fb759",
209218
"component": "exe:hsc2hs",
210219
"flags": [
211220
"-in-ghc-tree"
212221
],
213222
"package": "hsc2hs",
214-
"revision": 2,
223+
"revision": 3,
215224
"source": "hackage",
216225
"src_sha256": "6f4e34d788fe2ca7091ee0a10307ee8a7c060a1ba890f2bffad16a7d4d5cef76",
217226
"version": "0.68.10"
218227
},
219228
{
220-
"cabal_sha256": "17b834d2b75df8a8aef05de523280f613bb9c9aa9c31f269d5b90c1431a3749b",
229+
"cabal_sha256": "b0fafb2834530084f6406017500ae619f9e5e2049787a6750c68e0d331fd62dc",
221230
"component": "lib:network",
222231
"flags": [
223232
"-devel"
224233
],
225234
"package": "network",
226235
"revision": 0,
227236
"source": "hackage",
228-
"src_sha256": "efb04947946f52cccba802c2a8fc2f4259f0bdfd0bce95094c84e71583647f0c",
229-
"version": "3.2.2.0"
237+
"src_sha256": "dbd8a10456908294eb5ab9c522bf2da75444d958429a643a821464213698523e",
238+
"version": "3.2.6.0"
230239
},
231240
{
232241
"cabal_sha256": "129a59ba3ccfcd06192fd6da899e2711ae276a466915a047bd6727e4a0321d2e",
@@ -274,27 +283,27 @@
274283
"version": "0.9.2"
275284
},
276285
{
277-
"cabal_sha256": "573f3ab242f75465a0d67ce9d84202650a1606575e6dbd6d31ffcf4767a9a379",
286+
"cabal_sha256": "50b2f002c68fe67730ee7a3cd8607486197dd99b084255005ad51ecd6970a41b",
278287
"component": "lib:hashable",
279288
"flags": [
280-
"-arch-native",
289+
"+containers",
281290
"+integer-gmp",
282291
"-random-initial-seed"
283292
],
284293
"package": "hashable",
285294
"revision": 0,
286295
"source": "hackage",
287-
"src_sha256": "3baee4c9027a08830d148ec524cbc0471de645e1e8426d46780ef2758df0e8da",
288-
"version": "1.4.7.0"
296+
"src_sha256": "e1b305c280e66ad827edeaedd6933b9fc4174f626882877eab2a08344e665e87",
297+
"version": "1.4.1.0"
289298
},
290299
{
291-
"cabal_sha256": "cf9e6afba8e01830ca0d32a12b98d481cf389688762c80d1870a1db2061ebf35",
300+
"cabal_sha256": "b7648c6165729a973d95cb328f9fd874813a81c727707e8b2552b4f03399763b",
292301
"component": "lib:async",
293302
"flags": [
294303
"-bench"
295304
],
296305
"package": "async",
297-
"revision": 2,
306+
"revision": 3,
298307
"source": "hackage",
299308
"src_sha256": "1818473ebab9212afad2ed76297aefde5fae8b5d4404daf36939aece6a8f16f7",
300309
"version": "2.2.5"
@@ -352,17 +361,17 @@
352361
"version": "0.2.2.1"
353362
},
354363
{
355-
"cabal_sha256": null,
364+
"cabal_sha256": "c4c8fd9c71b9e813053d94408c621e7b13355c4ca1d3eaed35b8f8956eae9b87",
356365
"component": "lib:cabal-install-solver",
357366
"flags": [
358367
"-debug-expensive-assertions",
359368
"-debug-tracetree"
360369
],
361370
"package": "cabal-install-solver",
362-
"revision": null,
371+
"revision": 0,
363372
"source": "local",
364373
"src_sha256": null,
365-
"version": "3.14.0.0"
374+
"version": "3.14.1.0"
366375
},
367376
{
368377
"cabal_sha256": "acb64f2af52d81b0bb92c266f11d43def726a7a7b74a2c23d219e160b54edec7",
@@ -416,16 +425,6 @@
416425
"src_sha256": "72d86f8aa625b461f4397f737346f78a1700a7ffbff55cf6375c5e18916e986d",
417426
"version": "0.1.2"
418427
},
419-
{
420-
"cabal_sha256": "7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030",
421-
"component": "lib:os-string",
422-
"flags": [],
423-
"package": "os-string",
424-
"revision": 0,
425-
"source": "hackage",
426-
"src_sha256": "22fcc7d5fc66676b5dfc57b714d2caf93cce2d5a79d242168352f9eb0fe2f18a",
427-
"version": "2.0.6"
428-
},
429428
{
430429
"cabal_sha256": "e9f151d9999be8953443e730524b2792e9c0a4fb5b1463097fa1a8230870fd8a",
431430
"component": "lib:tar-internal",
@@ -447,15 +446,15 @@
447446
"version": "0.6.3.0"
448447
},
449448
{
450-
"cabal_sha256": "bae1c5a6092d65c5e763246f91e04fef3f43e37cb055130725c9a973c88a250f",
449+
"cabal_sha256": "85e64a75c0b490506a7edaa2d54950c668e66b65758bb08bb14cd31faf53a206",
451450
"component": "lib:zlib",
452451
"flags": [
453452
"-bundled-c-zlib",
454453
"+non-blocking-ffi",
455-
"-pkg-config"
454+
"+pkg-config"
456455
],
457456
"package": "zlib",
458-
"revision": 1,
457+
"revision": 2,
459458
"source": "hackage",
460459
"src_sha256": "6edd38b6b81df8d274952aa85affa6968ae86b2231e1d429ce8bc9083e6a55bc",
461460
"version": "0.7.1.0"
@@ -506,11 +505,11 @@
506505
"version": "0.96.0.1"
507506
},
508507
{
509-
"cabal_sha256": "4868265ab5760d2fdeb96625b138c8df25d41b9ee2651fa299ed019a69403045",
508+
"cabal_sha256": "3e196e1362e4d0ec9dfcd7f8d58b24fac91beafaa1c8ee34dc9dee489c362377",
510509
"component": "lib:resolv",
511510
"flags": [],
512511
"package": "resolv",
513-
"revision": 3,
512+
"revision": 4,
514513
"source": "hackage",
515514
"src_sha256": "880d283df9132a7375fa28670f71e86480a4f49972256dc2a204c648274ae74b",
516515
"version": "0.2.0.2"
@@ -536,30 +535,30 @@
536535
"version": "1.0.0"
537536
},
538537
{
539-
"cabal_sha256": null,
538+
"cabal_sha256": "3583679b022200ca7bc8cb7ff1cd254887b82af6cec5bbd404aa66ea9ea5d083",
540539
"component": "lib:cabal-install",
541540
"flags": [
542541
"+lukko",
543542
"+native-dns"
544543
],
545544
"package": "cabal-install",
546-
"revision": null,
545+
"revision": 0,
547546
"source": "local",
548547
"src_sha256": null,
549-
"version": "3.14.0.0"
548+
"version": "3.14.1.0"
550549
},
551550
{
552-
"cabal_sha256": null,
551+
"cabal_sha256": "3583679b022200ca7bc8cb7ff1cd254887b82af6cec5bbd404aa66ea9ea5d083",
553552
"component": "exe:cabal",
554553
"flags": [
555554
"+lukko",
556555
"+native-dns"
557556
],
558557
"package": "cabal-install",
559-
"revision": null,
558+
"revision": 0,
560559
"source": "local",
561560
"src_sha256": null,
562-
"version": "3.14.0.0"
561+
"version": "3.14.1.0"
563562
},
564563
{
565564
"cabal_sha256": "e4be4a206f5ab6ddb5ae4fbb39101529196e20af5670c5d33326fea6eff886fd",

0 commit comments

Comments
 (0)