From 23c13a07a942e9a9372534db9f69af8cd58bb0dd Mon Sep 17 00:00:00 2001 From: Sigmund Vestergaard Date: Thu, 11 Jun 2020 17:41:26 +0100 Subject: [PATCH 1/3] Added support for RedHat in lib/GHCup/Data/GHCupDownloads.hs --- lib/GHCup/Data/GHCupDownloads.hs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/GHCup/Data/GHCupDownloads.hs b/lib/GHCup/Data/GHCupDownloads.hs index e2d692f..052e6cd 100644 --- a/lib/GHCup/Data/GHCupDownloads.hs +++ b/lib/GHCup/Data/GHCupDownloads.hs @@ -1360,6 +1360,7 @@ ghcupDownloads = M.fromList , M.fromList [(Nothing, ghc_844_64_fedora)] ) , (Linux CentOS, M.fromList [(Nothing, ghc_844_64_centos)]) + , (Linux RedHat, M.fromList [(Nothing, ghc_844_64_centos)]) , ( Linux AmazonLinux , M.fromList [(Nothing, ghc_844_64_centos)] ) @@ -1509,6 +1510,7 @@ ghcupDownloads = M.fromList ) , (Linux Fedora, M.fromList [(Nothing, ghc_863_64_fedora)]) , (Linux CentOS, M.fromList [(Nothing, ghc_863_64_centos)]) + , (Linux RedHat, M.fromList [(Nothing, ghc_863_64_centos)]) , ( Linux AmazonLinux , M.fromList [(Nothing, ghc_863_64_centos)] ) @@ -1612,6 +1614,7 @@ ghcupDownloads = M.fromList ) , (Linux Fedora, M.fromList [(Nothing, ghc_865_64_fedora)]) , (Linux CentOS, M.fromList [(Nothing, ghc_865_64_centos)]) + , (Linux RedHat, M.fromList [(Nothing, ghc_865_64_centos)]) , ( Linux AmazonLinux , M.fromList [(Nothing, ghc_865_64_centos)] ) @@ -1665,6 +1668,7 @@ ghcupDownloads = M.fromList ) , (Linux Fedora, M.fromList [(Nothing, ghc_881_64_fedora)]) , (Linux CentOS, M.fromList [(Nothing, ghc_881_64_centos)]) + , (Linux RedHat, M.fromList [(Nothing, ghc_881_64_centos)]) , ( Linux AmazonLinux , M.fromList [(Nothing, ghc_881_64_centos)] ) @@ -1718,6 +1722,7 @@ ghcupDownloads = M.fromList ) , (Linux Fedora, M.fromList [(Nothing, ghc_882_64_fedora)]) , (Linux CentOS, M.fromList [(Nothing, ghc_882_64_centos)]) + , (Linux RedHat, M.fromList [(Nothing, ghc_882_64_centos)]) , ( Linux AmazonLinux , M.fromList [(Nothing, ghc_882_64_centos)] ) @@ -1771,6 +1776,7 @@ ghcupDownloads = M.fromList ) , (Linux Fedora, M.fromList [(Nothing, ghc_883_64_fedora)]) , (Linux CentOS, M.fromList [(Nothing, ghc_883_64_centos)]) + , (Linux RedHat, M.fromList [(Nothing, ghc_883_64_centos)]) , ( Linux AmazonLinux , M.fromList [(Nothing, ghc_883_64_centos)] ) @@ -1834,6 +1840,12 @@ ghcupDownloads = M.fromList , (Just [vers|7|], ghc_8101_64_centos) ] ) + , ( Linux RedHat + , M.fromList + [ (Nothing , ghc_8101_64_centos) + , (Just [vers|7|], ghc_8101_64_centos) + ] + ) , ( Linux AmazonLinux , M.fromList [(Nothing, ghc_8101_64_centos)] ) From ad53b141c71c91731b2fa4e08a6adbc2703f1711 Mon Sep 17 00:00:00 2001 From: Sigmund Vestergaard Date: Thu, 18 Jun 2020 21:04:29 +0100 Subject: [PATCH 2/3] Removed reference to specific version of RHEL in GHCupDownloads.hs --- lib/GHCup/Data/GHCupDownloads.hs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/GHCup/Data/GHCupDownloads.hs b/lib/GHCup/Data/GHCupDownloads.hs index 052e6cd..5beae00 100644 --- a/lib/GHCup/Data/GHCupDownloads.hs +++ b/lib/GHCup/Data/GHCupDownloads.hs @@ -1840,12 +1840,7 @@ ghcupDownloads = M.fromList , (Just [vers|7|], ghc_8101_64_centos) ] ) - , ( Linux RedHat - , M.fromList - [ (Nothing , ghc_8101_64_centos) - , (Just [vers|7|], ghc_8101_64_centos) - ] - ) + , ( Linux RedHat, M.fromList [(Nothing, ghc_8101_64_centos)]) , ( Linux AmazonLinux , M.fromList [(Nothing, ghc_8101_64_centos)] ) From d07ad3eb2628a0b133aca7fa2dd20679e7f54421 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 11 Jun 2020 23:08:21 +0200 Subject: [PATCH 3/3] Update ghcup-0.0.2.json with redhat wrt #29 --- ghcup-0.0.2.json | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/ghcup-0.0.2.json b/ghcup-0.0.2.json index 8bd5bd6..b171967 100644 --- a/ghcup-0.0.2.json +++ b/ghcup-0.0.2.json @@ -597,6 +597,13 @@ "dlUri": "https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-x86_64-apple-darwin.tar.xz" } }, + "Linux_RedHat": { + "unknown_versioning": { + "dlHash": "355bd85c69933c31bbe99b4269ce719acfd0aad0b45e359ac39b9bb13996acc6", + "dlSubdir": "ghc-8.6.3", + "dlUri": "https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-x86_64-centos7-linux.tar.xz" + } + }, "Linux_UnknownLinux": { "unknown_versioning": { "dlHash": "52ae92f4e8bb2ac0b7847287ea3da37081f5f7bf8bbb7c78ac35fde537d1a89f", @@ -732,6 +739,13 @@ "dlUri": "https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-apple-darwin.tar.xz" } }, + "Linux_RedHat": { + "unknown_versioning": { + "dlHash": "0618b94854edc6be5302489df905e627820b71be6b66c950f5e3088fe92df0a1", + "dlSubdir": "ghc-8.10.1", + "dlUri": "https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-centos7-linux.tar.xz" + } + }, "Linux_UnknownLinux": { "unknown_versioning": { "dlHash": "3c4cd72b4806045779739e8f5d1658e30e57123d88c2c8966422cdbcae448470", @@ -871,6 +885,13 @@ "dlUri": "https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-apple-darwin.tar.xz" } }, + "Linux_RedHat": { + "unknown_versioning": { + "dlHash": "80ab566f4411299f9e5922d60749ca80f989d697db19e03ed875619d699f0edf", + "dlSubdir": "ghc-8.6.5", + "dlUri": "https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-centos7-linux.tar.xz" + } + }, "Linux_UnknownLinux": { "unknown_versioning": { "dlHash": "cf78b53eaf336083e7a05f4a3000afbae4abe5bbc77ef80cc40e09d04ac5b4a1", @@ -1124,6 +1145,13 @@ "dlUri": "https://downloads.haskell.org/~ghc/8.8.1/ghc-8.8.1-x86_64-apple-darwin.tar.xz" } }, + "Linux_RedHat": { + "unknown_versioning": { + "dlHash": "6cdd34e4dbaeb801e805811f91cf43a2d5f64b22f884718ffbd3542a2f4dd14f", + "dlSubdir": "ghc-8.8.1", + "dlUri": "https://downloads.haskell.org/~ghc/8.8.1/ghc-8.8.1-x86_64-centos7-linux.tar.xz" + } + }, "Linux_UnknownLinux": { "unknown_versioning": { "dlHash": "851a78df620bc056c34b252c97040d5755e294993fa8afa5429708b5229204d6", @@ -1493,6 +1521,13 @@ "dlUri": "https://downloads.haskell.org/~ghc/8.8.2/ghc-8.8.2-x86_64-apple-darwin.tar.xz" } }, + "Linux_RedHat": { + "unknown_versioning": { + "dlHash": "f065a017d7a38f235f186ffe32d8261a4fd39c7e945d5cde85c0984c2569db99", + "dlSubdir": "ghc-8.8.2", + "dlUri": "https://downloads.haskell.org/~ghc/8.8.2/ghc-8.8.2-x86_64-centos7-linux.tar.xz" + } + }, "Linux_UnknownLinux": { "unknown_versioning": { "dlHash": "dbe2db717b33460f790e155e487d2a31c9b21a9d245f0c9490ad65844c3ea21f", @@ -1866,6 +1901,13 @@ "dlUri": "https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-x86_64-apple-darwin.tar.xz" } }, + "Linux_RedHat": { + "unknown_versioning": { + "dlHash": "83a96650f5a92b1e4d7651d256d6438624342d40e780e68125033435a54cd674", + "dlSubdir": "ghc-8.4.4", + "dlUri": "https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-x86_64-centos70-linux.tar.xz" + } + }, "Linux_UnknownLinux": { "unknown_versioning": { "dlHash": "8ab2befddc14d1434d0aad0c5d3c7e0c2b78ff84caa3429fa62527bfc6b86095", @@ -1996,6 +2038,13 @@ "dlUri": "https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-x86_64-apple-darwin.tar.xz" } }, + "Linux_RedHat": { + "unknown_versioning": { + "dlHash": "4b2b5313f7c12b81e54efcb26705fa9e4ad5b98f2b58bfc76fb0c9ba1d55eb1f", + "dlSubdir": "ghc-8.8.3", + "dlUri": "https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-x86_64-centos7-linux.tar.xz" + } + }, "Linux_UnknownLinux": { "unknown_versioning": { "dlHash": "45ee1de3bfc98cbcc4886b65fc7651ade2d3820aa85eac2dbe9bc7bf91e7c818",