Skip to content

Commit 87ce0fc

Browse files
geekosaurMikolaj
geekosaur
authored and
Mikolaj
committed
fix unix dependency correctly
Patching `cabal.release.project` still allows the buggy `unix` release to be installed via Hackage.
1 parent 3792794 commit 87ce0fc

9 files changed

+320
-200
lines changed

‎Cabal/Cabal.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ library
5454
if os(windows)
5555
build-depends: Win32 >= 2.3.0.0 && < 2.15
5656
else
57-
build-depends: unix >= 2.6.0.0 && < 2.9
57+
build-depends: unix >= 2.8.6.0 && < 2.9
5858

5959
if flag(git-rev)
6060
build-depends: githash ^>= 0.1.7.0

‎bootstrap/linux-9.0.2.json

+63-60
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",
@@ -175,19 +184,21 @@
175184
"version": "3.15.0.0"
176185
},
177186
{
178-
"cabal_sha256": "684028fb5ac3d1c7657fe516f2a442d95a53ae2fcf6f6151544f3ed5289f6320",
187+
"cabal_sha256": "9a0b2ef8096517fa0e0c7a5e9a5c2ae5744ed824c3331005f9408245810df345",
179188
"component": "lib:process",
180189
"flags": [],
181190
"package": "process",
182191
"revision": 0,
183192
"source": "hackage",
184-
"src_sha256": "a816655978c2527d8d7a6ebfd6f1ca79027f27ac4f2f28888f1581b2d558aea5",
185-
"version": "1.6.23.0"
193+
"src_sha256": "496fe0566c3915b112e9772ac9c967dfeb8d5ca04895e54ae0160522bee76e65",
194+
"version": "1.6.25.0"
186195
},
187196
{
188197
"cabal_sha256": null,
189198
"component": "lib:Cabal",
190-
"flags": [],
199+
"flags": [
200+
"-git-rev"
201+
],
191202
"package": "Cabal",
192203
"revision": null,
193204
"source": "local",
@@ -205,28 +216,28 @@
205216
"version": "3.16"
206217
},
207218
{
208-
"cabal_sha256": "60e78b6c60dc32a77ce6c37ed5ca4e838fc5f76f02836ef64d93cd21cc002325",
219+
"cabal_sha256": "276325277350cd2c2c88916ed3ae5cd35b2b4f494ec594fbd9534081eb7fb759",
209220
"component": "exe:hsc2hs",
210221
"flags": [
211222
"-in-ghc-tree"
212223
],
213224
"package": "hsc2hs",
214-
"revision": 2,
225+
"revision": 3,
215226
"source": "hackage",
216227
"src_sha256": "6f4e34d788fe2ca7091ee0a10307ee8a7c060a1ba890f2bffad16a7d4d5cef76",
217228
"version": "0.68.10"
218229
},
219230
{
220-
"cabal_sha256": "17b834d2b75df8a8aef05de523280f613bb9c9aa9c31f269d5b90c1431a3749b",
231+
"cabal_sha256": "b0fafb2834530084f6406017500ae619f9e5e2049787a6750c68e0d331fd62dc",
221232
"component": "lib:network",
222233
"flags": [
223234
"-devel"
224235
],
225236
"package": "network",
226237
"revision": 0,
227238
"source": "hackage",
228-
"src_sha256": "efb04947946f52cccba802c2a8fc2f4259f0bdfd0bce95094c84e71583647f0c",
229-
"version": "3.2.2.0"
239+
"src_sha256": "dbd8a10456908294eb5ab9c522bf2da75444d958429a643a821464213698523e",
240+
"version": "3.2.6.0"
230241
},
231242
{
232243
"cabal_sha256": "129a59ba3ccfcd06192fd6da899e2711ae276a466915a047bd6727e4a0321d2e",
@@ -274,27 +285,27 @@
274285
"version": "0.9.2"
275286
},
276287
{
277-
"cabal_sha256": "573f3ab242f75465a0d67ce9d84202650a1606575e6dbd6d31ffcf4767a9a379",
288+
"cabal_sha256": "50b2f002c68fe67730ee7a3cd8607486197dd99b084255005ad51ecd6970a41b",
278289
"component": "lib:hashable",
279290
"flags": [
280-
"-arch-native",
291+
"+containers",
281292
"+integer-gmp",
282293
"-random-initial-seed"
283294
],
284295
"package": "hashable",
285296
"revision": 0,
286297
"source": "hackage",
287-
"src_sha256": "3baee4c9027a08830d148ec524cbc0471de645e1e8426d46780ef2758df0e8da",
288-
"version": "1.4.7.0"
298+
"src_sha256": "e1b305c280e66ad827edeaedd6933b9fc4174f626882877eab2a08344e665e87",
299+
"version": "1.4.1.0"
289300
},
290301
{
291-
"cabal_sha256": "cf9e6afba8e01830ca0d32a12b98d481cf389688762c80d1870a1db2061ebf35",
302+
"cabal_sha256": "b7648c6165729a973d95cb328f9fd874813a81c727707e8b2552b4f03399763b",
292303
"component": "lib:async",
293304
"flags": [
294305
"-bench"
295306
],
296307
"package": "async",
297-
"revision": 2,
308+
"revision": 3,
298309
"source": "hackage",
299310
"src_sha256": "1818473ebab9212afad2ed76297aefde5fae8b5d4404daf36939aece6a8f16f7",
300311
"version": "2.2.5"
@@ -416,16 +427,6 @@
416427
"src_sha256": "72d86f8aa625b461f4397f737346f78a1700a7ffbff55cf6375c5e18916e986d",
417428
"version": "0.1.2"
418429
},
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-
},
429430
{
430431
"cabal_sha256": "e9f151d9999be8953443e730524b2792e9c0a4fb5b1463097fa1a8230870fd8a",
431432
"component": "lib:tar-internal",
@@ -447,15 +448,15 @@
447448
"version": "0.6.3.0"
448449
},
449450
{
450-
"cabal_sha256": "bae1c5a6092d65c5e763246f91e04fef3f43e37cb055130725c9a973c88a250f",
451+
"cabal_sha256": "85e64a75c0b490506a7edaa2d54950c668e66b65758bb08bb14cd31faf53a206",
451452
"component": "lib:zlib",
452453
"flags": [
453454
"-bundled-c-zlib",
454455
"+non-blocking-ffi",
455456
"+pkg-config"
456457
],
457458
"package": "zlib",
458-
"revision": 1,
459+
"revision": 2,
459460
"source": "hackage",
460461
"src_sha256": "6edd38b6b81df8d274952aa85affa6968ae86b2231e1d429ce8bc9083e6a55bc",
461462
"version": "0.7.1.0"
@@ -506,11 +507,11 @@
506507
"version": "0.96.0.1"
507508
},
508509
{
509-
"cabal_sha256": "4868265ab5760d2fdeb96625b138c8df25d41b9ee2651fa299ed019a69403045",
510+
"cabal_sha256": "3e196e1362e4d0ec9dfcd7f8d58b24fac91beafaa1c8ee34dc9dee489c362377",
510511
"component": "lib:resolv",
511512
"flags": [],
512513
"package": "resolv",
513-
"revision": 3,
514+
"revision": 4,
514515
"source": "hackage",
515516
"src_sha256": "880d283df9132a7375fa28670f71e86480a4f49972256dc2a204c648274ae74b",
516517
"version": "0.2.0.2"
@@ -539,6 +540,7 @@
539540
"cabal_sha256": null,
540541
"component": "lib:cabal-install",
541542
"flags": [
543+
"-git-rev",
542544
"+lukko",
543545
"+native-dns"
544546
],
@@ -552,6 +554,7 @@
552554
"cabal_sha256": null,
553555
"component": "exe:cabal",
554556
"flags": [
557+
"-git-rev",
555558
"+lukko",
556559
"+native-dns"
557560
],

0 commit comments

Comments
 (0)