From 02588b80251f8937d5191a8a1e3940e42fb0851c Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Wed, 14 Sep 2022 11:06:35 +0200 Subject: [PATCH 1/9] Added metadata for HLS 1.8.0.0 --- hls-metadata-0.0.1.json | 104 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 103 insertions(+), 1 deletion(-) diff --git a/hls-metadata-0.0.1.json b/hls-metadata-0.0.1.json index 938cfec..7c3fa05 100644 --- a/hls-metadata-0.0.1.json +++ b/hls-metadata-0.0.1.json @@ -516,5 +516,107 @@ "9.2.2" ] } - } + }, + "1.8.0.0": { + "A_64": { + "Darwin": [ + "8.6.5", + "8.8.4", + "8.10.7", + "9.0.2", + "9.2.3", + "9.2.4", + "9.4.1", + "9.4.2" + ], + "Linux_CentOS": [ + "8.6.5", + "8.8.4", + "8.10.7", + "9.0.2", + "9.2.3", + "9.2.4", + "9.4.1", + "9.4.2" + ], + "Linux_Debian": [ + "8.6.5", + "8.8.4", + "8.10.7", + "9.0.2", + "9.2.3", + "9.2.4", + "9.4.1", + "9.4.2" + ], + "Linux_Fedora": [ + "8.6.5", + "8.8.4", + "8.10.7", + "9.0.2", + "9.2.3", + "9.2.4", + "9.4.1", + "9.4.2" + ], + "Linux_Mint": [ + "8.6.5", + "8.8.4", + "8.10.7", + "9.0.2", + "9.2.3", + "9.2.4", + "9.4.1", + "9.4.2" + ], + "Linux_Ubuntu": [ + "8.6.5", + "8.8.4", + "8.10.7", + "9.0.2", + "9.2.3", + "9.2.4", + "9.4.1", + "9.4.2" + ], + "Linux_UnknownLinux": [ + "8.6.5", + "8.8.4", + "8.10.7", + "9.0.2", + "9.2.3", + "9.2.4", + "9.4.1", + "9.4.2" + ], + "Windows": [ + "8.6.5", + "8.8.4", + "8.10.7", + "9.0.2", + "9.2.3", + "9.2.4", + "9.4.1", + "9.4.2" + ] + }, + "A_ARM64": { + "Darwin": [ + "8.10.7", + "9.0.2", + "9.2.3", + "9.2.4", + "9.4.1", + "9.4.2" + ], + "Linux_UnknownLinux": [ + "8.10.7", + "9.0.2", + "9.2.3", + "9.2.4", + "9.4.1", + "9.4.2" + ] + } + } } From 99133d949ad1cc5bb73597ff52c391591906cd11 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Wed, 14 Sep 2022 11:29:05 +0200 Subject: [PATCH 2/9] add ghcup metadata --- ghcup-0.0.7.yaml | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/ghcup-0.0.7.yaml b/ghcup-0.0.7.yaml index 556056e..ed9c8a0 100644 --- a/ghcup-0.0.7.yaml +++ b/ghcup-0.0.7.yaml @@ -3375,6 +3375,65 @@ ghcupDownloads: dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.7.0.0/haskell-language-server-1.7.0.0-aarch64-darwin.tar.xz dlSubdir: haskell-language-server-1.7.0.0 dlHash: d82030533f69b862cc6149d7a9b32dfa81fc6a803cb089c59f00ef94efcce3bb + 1.8.0.0: + viTags: + - Recommended + - Latest + viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#1800 + viPostInstall: *hls-post-install + viSourceDL: + dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-src.tar.gz + dlSubdir: haskell-language-server-1.8.0.0 + dlHash: 7066158f973d2935c067cedef855a9d7c1f702f2 + viArch: + A_64: + Linux_Debian: + '< 10': &hls-180-64-deb9 + dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-x86_64-linux-deb9.tar.xz + dlSubdir: haskell-language-server-1.8.0.0 + dlHash: e2ae05f021223bfa11c52d9e0359a837630527e1 + '>= 10': &hls-180-64-deb10 + dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-x86_64-linux-deb10.tar.xz + dlSubdir: haskell-language-server-1.8.0.0 + dlHash: cb5ef73dd399f5ff3c22552493fc98fa7c635bd4 + unknown_versioning: *hls-180-64-deb9 + Linux_Ubuntu: + unknown_versioning: &hls-180-64-fedora + dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-x86_64-linux-fedora33.tar.xz + dlSubdir: haskell-language-server-1.8.0.0 + dlHash: c314ca451a935e42ee74a770a67960f1403a5d73 + '( >= 16 && < 19 )': *hls-180-64-deb9 + Linux_Mint: + '< 20': *hls-180-64-deb9 + '>= 20': *hls-180-64-fedora + Linux_Fedora: + '( >= 27 && < 34 )': *hls-180-64-fedora + unknown_versioning: *hls-180-64-fedora + Linux_CentOS: + '( >= 7 && < 8 )': &hls-180-64-centos + dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-x86_64-linux-centos7.tar.xz + dlSubdir: haskell-language-server-1.8.0.0 + dlHash: 1adbac1507e75c8c9e24468ce45aa2cbb95663aa + unknown_versioning: *hls-180-64-centos + Linux_RedHat: + unknown_versioning: *hls-180-64-centos + Linux_UnknownLinux: + unknown_versioning: *hls-180-64-fedora + Darwin: + unknown_versioning: + dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-x86_64-darwin.tar.xz + dlSubdir: haskell-language-server-1.8.0.0 + dlHash: 23eea8d97dd8ebebe1d334e607c110f7b4443388 + Windows: + unknown_versioning: + dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/hls/1.7.0.0/haskell-language-server-1.8.0.0-x86_64-windows.zip + dlHash: a4d843cc4a1b493e126a8c15c407d1824117a676 + A_ARM64: + Darwin: + unknown_versioning: + dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-aarch64-darwin.tar.xz + dlSubdir: haskell-language-server-1.8.0.0 + dlHash: 4099e9ae242925736caf7d7788d62b23e62900cb Stack: 2.5.1: viTags: From ab7231f10f61d295849b1ac903532c9fb507b2e2 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Wed, 14 Sep 2022 11:30:31 +0200 Subject: [PATCH 3/9] fix Windows dlUri --- ghcup-0.0.7.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghcup-0.0.7.yaml b/ghcup-0.0.7.yaml index ed9c8a0..fb1d383 100644 --- a/ghcup-0.0.7.yaml +++ b/ghcup-0.0.7.yaml @@ -3426,7 +3426,7 @@ ghcupDownloads: dlHash: 23eea8d97dd8ebebe1d334e607c110f7b4443388 Windows: unknown_versioning: - dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/hls/1.7.0.0/haskell-language-server-1.8.0.0-x86_64-windows.zip + dlUri: https://downloads.haskell.org/~hls/haskell-language-server/1.8.0.0/haskell-language-server-1.8.0.0-x86_64-windows.zip dlHash: a4d843cc4a1b493e126a8c15c407d1824117a676 A_ARM64: Darwin: From ca7416674e051663a4c00565164423098fd70b9d Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Wed, 14 Sep 2022 11:32:30 +0200 Subject: [PATCH 4/9] fix Windows dlSubdir --- ghcup-0.0.7.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ghcup-0.0.7.yaml b/ghcup-0.0.7.yaml index fb1d383..3726c5a 100644 --- a/ghcup-0.0.7.yaml +++ b/ghcup-0.0.7.yaml @@ -3427,6 +3427,7 @@ ghcupDownloads: Windows: unknown_versioning: dlUri: https://downloads.haskell.org/~hls/haskell-language-server/1.8.0.0/haskell-language-server-1.8.0.0-x86_64-windows.zip + dlSubdir: haskell-language-server-1.8.0.0 dlHash: a4d843cc4a1b493e126a8c15c407d1824117a676 A_ARM64: Darwin: From 7381149b4e6f538ef743d00788eb5b7a828e158b Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Wed, 14 Sep 2022 11:43:45 +0200 Subject: [PATCH 5/9] remove recommended tags from 1.7.0.0 --- ghcup-0.0.7.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ghcup-0.0.7.yaml b/ghcup-0.0.7.yaml index 3726c5a..921cff7 100644 --- a/ghcup-0.0.7.yaml +++ b/ghcup-0.0.7.yaml @@ -3313,8 +3313,6 @@ ghcupDownloads: dlHash: ea174e82678c25a017ff564c5329a80dc18030139b9bfcad2da8fe888617446b 1.7.0.0: viTags: - - Recommended - - Latest viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#1700 viPostInstall: *hls-post-install viSourceDL: From e8336c30939cf125190e0bcf0baba54cc7d3d0c5 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Wed, 14 Sep 2022 11:45:29 +0200 Subject: [PATCH 6/9] Fixes for Windows and Arm linux binaries --- hls-metadata-0.0.1.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/hls-metadata-0.0.1.json b/hls-metadata-0.0.1.json index 7c3fa05..b00d1f6 100644 --- a/hls-metadata-0.0.1.json +++ b/hls-metadata-0.0.1.json @@ -590,8 +590,6 @@ "9.4.2" ], "Windows": [ - "8.6.5", - "8.8.4", "8.10.7", "9.0.2", "9.2.3", @@ -608,15 +606,7 @@ "9.2.4", "9.4.1", "9.4.2" - ], - "Linux_UnknownLinux": [ - "8.10.7", - "9.0.2", - "9.2.3", - "9.2.4", - "9.4.1", - "9.4.2" ] } - } + } } From ba07fa8baa3aff4a087e956e4de0a701af319c11 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Wed, 14 Sep 2022 11:46:30 +0200 Subject: [PATCH 7/9] yaml syntax fix --- ghcup-0.0.7.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghcup-0.0.7.yaml b/ghcup-0.0.7.yaml index 921cff7..f3fb50a 100644 --- a/ghcup-0.0.7.yaml +++ b/ghcup-0.0.7.yaml @@ -3312,7 +3312,7 @@ ghcupDownloads: dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.6.1.0/haskell-language-server-Linux-armv7-1.6.1.0.tar.xz dlHash: ea174e82678c25a017ff564c5329a80dc18030139b9bfcad2da8fe888617446b 1.7.0.0: - viTags: + viTags: [] viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#1700 viPostInstall: *hls-post-install viSourceDL: From 7737f5decf7d35d8410f4a8b8f3e4779d9ae25f1 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Wed, 14 Sep 2022 11:56:26 +0200 Subject: [PATCH 8/9] use SHA256 hashes --- ghcup-0.0.7.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ghcup-0.0.7.yaml b/ghcup-0.0.7.yaml index f3fb50a..0dfd74e 100644 --- a/ghcup-0.0.7.yaml +++ b/ghcup-0.0.7.yaml @@ -3382,24 +3382,24 @@ ghcupDownloads: viSourceDL: dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-src.tar.gz dlSubdir: haskell-language-server-1.8.0.0 - dlHash: 7066158f973d2935c067cedef855a9d7c1f702f2 + dlHash: e1081ac581d21547d835beb8561e815573944aa0babe752a971479da3a207235 viArch: A_64: Linux_Debian: '< 10': &hls-180-64-deb9 dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-x86_64-linux-deb9.tar.xz dlSubdir: haskell-language-server-1.8.0.0 - dlHash: e2ae05f021223bfa11c52d9e0359a837630527e1 + dlHash: a888f093a7cd3b2dc11f1cdc3567c63395c7f3b2c17fab85f7591d3b40183851 '>= 10': &hls-180-64-deb10 dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-x86_64-linux-deb10.tar.xz dlSubdir: haskell-language-server-1.8.0.0 - dlHash: cb5ef73dd399f5ff3c22552493fc98fa7c635bd4 + dlHash: 63ee164e83ac76d440e0c0e777e9c7604dddff498fa53368132326d03da1817f unknown_versioning: *hls-180-64-deb9 Linux_Ubuntu: unknown_versioning: &hls-180-64-fedora dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-x86_64-linux-fedora33.tar.xz dlSubdir: haskell-language-server-1.8.0.0 - dlHash: c314ca451a935e42ee74a770a67960f1403a5d73 + dlHash: a26c8225261bbd204014eb3df18b58b45a43594b8011910f3c5f560bc7171d33 '( >= 16 && < 19 )': *hls-180-64-deb9 Linux_Mint: '< 20': *hls-180-64-deb9 @@ -3411,7 +3411,7 @@ ghcupDownloads: '( >= 7 && < 8 )': &hls-180-64-centos dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-x86_64-linux-centos7.tar.xz dlSubdir: haskell-language-server-1.8.0.0 - dlHash: 1adbac1507e75c8c9e24468ce45aa2cbb95663aa + dlHash: b437b83f5cb648421f0bb85e107de9127f195722430d8a72eed57c1e7fd8d5a2 unknown_versioning: *hls-180-64-centos Linux_RedHat: unknown_versioning: *hls-180-64-centos @@ -3421,18 +3421,18 @@ ghcupDownloads: unknown_versioning: dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-x86_64-darwin.tar.xz dlSubdir: haskell-language-server-1.8.0.0 - dlHash: 23eea8d97dd8ebebe1d334e607c110f7b4443388 + dlHash: 7c4e3e930c677e8235b9386af8748118563fc3c1797d3350e03d73022eb6bb75 Windows: unknown_versioning: dlUri: https://downloads.haskell.org/~hls/haskell-language-server/1.8.0.0/haskell-language-server-1.8.0.0-x86_64-windows.zip dlSubdir: haskell-language-server-1.8.0.0 - dlHash: a4d843cc4a1b493e126a8c15c407d1824117a676 + dlHash: a1380d992acd656b3f518d6cf9d46594f025afdb9006d6bb126c871835164836 A_ARM64: Darwin: unknown_versioning: dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-aarch64-darwin.tar.xz dlSubdir: haskell-language-server-1.8.0.0 - dlHash: 4099e9ae242925736caf7d7788d62b23e62900cb + dlHash: 89baeb96588e05785d1e75687ea220c03ceb8a513e5b28ee042f2ed5acb448b8 Stack: 2.5.1: viTags: From 03e9916d24c1977ebbd19a9818af1caf1263300a Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Wed, 14 Sep 2022 12:05:57 +0200 Subject: [PATCH 9/9] Update ghcup-0.0.7.yaml Co-authored-by: wz1000 --- ghcup-0.0.7.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghcup-0.0.7.yaml b/ghcup-0.0.7.yaml index 0dfd74e..d3691f4 100644 --- a/ghcup-0.0.7.yaml +++ b/ghcup-0.0.7.yaml @@ -3424,7 +3424,7 @@ ghcupDownloads: dlHash: 7c4e3e930c677e8235b9386af8748118563fc3c1797d3350e03d73022eb6bb75 Windows: unknown_versioning: - dlUri: https://downloads.haskell.org/~hls/haskell-language-server/1.8.0.0/haskell-language-server-1.8.0.0-x86_64-windows.zip + dlUri: https://downloads.haskell.org/~hls/haskell-language-server-1.8.0.0/haskell-language-server-1.8.0.0-x86_64-windows.zip dlSubdir: haskell-language-server-1.8.0.0 dlHash: a1380d992acd656b3f518d6cf9d46594f025afdb9006d6bb126c871835164836 A_ARM64: