Compare commits
15 Commits
alpine-bin
...
CI
| Author | SHA1 | Date | |
|---|---|---|---|
| a046f16308 | |||
| 97cd43792d | |||
| 08693e6d3a | |||
| e2227da8d2 | |||
| 5f20e4c583 | |||
| f82f1a12dd | |||
| 53148fd1c9 | |||
| 8985101b2a | |||
| d1949c8490 | |||
| b7faae1203 | |||
| b6a9d35c3e | |||
| 6cb6c7a448 | |||
| 22a5ad739e | |||
| 14c91bdd78 | |||
| 2c638cd2e2 |
@@ -97,7 +97,7 @@ variables:
|
||||
test:linux:recommended:
|
||||
extends: .test_ghcup_version:linux
|
||||
variables:
|
||||
GHC_VERSION: "8.8.3"
|
||||
GHC_VERSION: "8.8.4"
|
||||
CABAL_VERSION: "3.2.0.0"
|
||||
|
||||
test:linux:latest:
|
||||
@@ -113,7 +113,7 @@ test:linux:latest:
|
||||
test:mac:recommended:
|
||||
extends: .test_ghcup_version:darwin
|
||||
variables:
|
||||
GHC_VERSION: "8.8.3"
|
||||
GHC_VERSION: "8.8.4"
|
||||
CABAL_VERSION: "3.2.0.0"
|
||||
|
||||
test:mac:latest:
|
||||
@@ -129,7 +129,7 @@ test:mac:latest:
|
||||
test:freebsd:recommended:
|
||||
extends: .test_ghcup_version:freebsd
|
||||
variables:
|
||||
GHC_VERSION: "8.8.3"
|
||||
GHC_VERSION: "8.8.4"
|
||||
CABAL_VERSION: "3.2.0.0"
|
||||
|
||||
test:freebsd:latest:
|
||||
@@ -150,7 +150,7 @@ release:linux:64bit:
|
||||
- ./.gitlab/before_script/linux/alpine/install_deps.sh
|
||||
variables:
|
||||
ARTIFACT: "x86_64-linux-ghcup"
|
||||
GHC_VERSION: "8.8.3"
|
||||
GHC_VERSION: "8.8.4"
|
||||
CABAL_VERSION: "3.2.0.0"
|
||||
|
||||
|
||||
@@ -162,7 +162,7 @@ release:linux:32bit:
|
||||
- ./.gitlab/before_script/linux/alpine/install_deps.sh
|
||||
variables:
|
||||
ARTIFACT: "i386-linux-ghcup"
|
||||
GHC_VERSION: "8.8.3"
|
||||
GHC_VERSION: "8.8.4"
|
||||
CABAL_VERSION: "3.2.0.0"
|
||||
|
||||
|
||||
|
||||
@@ -18,10 +18,6 @@ apk add --no-cache \
|
||||
tar \
|
||||
perl
|
||||
|
||||
ln -sf libncurses.so /usr/lib/libtinfo.so
|
||||
ln -sf libncursesw.so.6 /usr/lib/libtinfow.so.6
|
||||
ln -sf libtinfow.so.6 /usr/lib/libtinfow.so
|
||||
|
||||
if [ "${BIT}" = "32" ] ; then
|
||||
curl -sSfL https://downloads.haskell.org/ghcup/i386-linux-ghcup > ./ghcup-bin
|
||||
else
|
||||
@@ -49,5 +45,3 @@ apk add --no-cache \
|
||||
xz-dev \
|
||||
ncurses-static
|
||||
|
||||
ln -sf libncursesw.a /usr/lib/libtinfow.a
|
||||
|
||||
|
||||
12
3rdparty/libarchive/c/archive_write_disk_posix.c
vendored
12
3rdparty/libarchive/c/archive_write_disk_posix.c
vendored
@@ -546,6 +546,7 @@ _archive_write_disk_header(struct archive *_a, struct archive_entry *entry)
|
||||
{
|
||||
struct archive_write_disk *a = (struct archive_write_disk *)_a;
|
||||
struct fixup_entry *fe;
|
||||
const char *linkname;
|
||||
int ret, r;
|
||||
|
||||
archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
|
||||
@@ -590,6 +591,17 @@ _archive_write_disk_header(struct archive *_a, struct archive_entry *entry)
|
||||
if (ret != ARCHIVE_OK)
|
||||
return (ret);
|
||||
|
||||
/*
|
||||
* Check if we have a hardlink that points to itself.
|
||||
*/
|
||||
linkname = archive_entry_hardlink(a->entry);
|
||||
if (linkname != NULL && strcmp(a->name, linkname) == 0) {
|
||||
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
||||
"Skipping hardlink pointing to itself: %s",
|
||||
a->name);
|
||||
return (ARCHIVE_WARN);
|
||||
}
|
||||
|
||||
/*
|
||||
* Query the umask so we get predictable mode settings.
|
||||
* This gets done on every call to _write_header in case the
|
||||
|
||||
11
CHANGELOG.md
11
CHANGELOG.md
@@ -1,5 +1,16 @@
|
||||
# Revision history for ghcup
|
||||
|
||||
## 0.1.7 -- 2020-07-20
|
||||
|
||||
* Fix a bug in libarchive not unpacking some uncleanly packed bindists
|
||||
* Improved fish support in bootstrap-haskell
|
||||
* Only check for upgrades when not upgrading
|
||||
* Fix platform detection for i386 docker images
|
||||
* Improve alpine support
|
||||
- more/proper bindists
|
||||
- don't fall back to glibc based bindists
|
||||
- install bindists with `--disable-ld-override` to avoid ld.gold bugs
|
||||
|
||||
## 0.1.6 -- 2020-07-13
|
||||
|
||||
* Create a new curses (brick) based TUI, accessible via `ghcup tui` #24
|
||||
|
||||
@@ -28,7 +28,7 @@ eghcup() {
|
||||
download_ghcup() {
|
||||
_plat="$(uname -s)"
|
||||
_arch=$(uname -m)
|
||||
_ghver="0.1.6"
|
||||
_ghver="0.1.7"
|
||||
_base_url="https://downloads.haskell.org/~ghcup"
|
||||
|
||||
case "${_plat}" in
|
||||
|
||||
@@ -214,7 +214,7 @@
|
||||
"A_64": {
|
||||
"Linux_Alpine": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "325b48b2ea199b4f62c16dc9c3ff99b42ea6bb1dde5a74fa640dfeb8d63894d0",
|
||||
"dlHash": "517783b660a27ebf95b2568d47292fd633d5f9a4de4c80ad1ccf05e1b9d7313f",
|
||||
"dlSubdir": "ghc-8.0.2",
|
||||
"dlUri": "https://files.hasufell.de/ghc/ghc-8.0.2-x86_64-alpine-linux.tar.xz"
|
||||
}
|
||||
@@ -744,6 +744,13 @@
|
||||
}
|
||||
},
|
||||
"A_32": {
|
||||
"Linux_Alpine": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "7360cc6b29e9b4ab08f6ea5bc3bcca6f5c216933e81ef1620dcdd700f1fdb289",
|
||||
"dlSubdir": "ghc-8.10.1",
|
||||
"dlUri": "https://files.hasufell.de/ghc/ghc-8.10.1-i386-alpine-linux.tar.xz"
|
||||
}
|
||||
},
|
||||
"Linux_Debian": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "8b53eef2c827b5f634d72920a93c0c9dd66ea288691a2bfe28def45d3c686ee2",
|
||||
@@ -887,6 +894,13 @@
|
||||
}
|
||||
},
|
||||
"A_32": {
|
||||
"Linux_Alpine": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "3737837550d9b177acfe150e3a3cd4545427ded020487c2ed5194d7b8f116349",
|
||||
"dlSubdir": "ghc-8.6.5",
|
||||
"dlUri": "https://files.hasufell.de/ghc/ghc-8.6.5-i386-alpine-linux.tar.xz"
|
||||
}
|
||||
},
|
||||
"Linux_Debian": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "1cddb907393a669342b1a922dd16d505d9d93d50bd9433a54a8162f8701250dc",
|
||||
@@ -1256,6 +1270,13 @@
|
||||
}
|
||||
},
|
||||
"A_32": {
|
||||
"Linux_Alpine": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "1d18e89ee031197e55c48683e78a7ffc67601ac5fd9f73aac555eb064b3859a2",
|
||||
"dlSubdir": "ghc-8.8.4",
|
||||
"dlUri": "https://files.hasufell.de/ghc/ghc-8.8.4-i386-alpine-linux.tar.xz"
|
||||
}
|
||||
},
|
||||
"Linux_Debian": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0",
|
||||
@@ -1293,6 +1314,7 @@
|
||||
},
|
||||
"viChangeLog": "https://downloads.haskell.org/~ghc/8.8.4/docs/html/users_guide/8.8.4-notes.html",
|
||||
"viTags": [
|
||||
"Recommended",
|
||||
"base-4.13.0.0"
|
||||
]
|
||||
},
|
||||
@@ -1755,6 +1777,13 @@
|
||||
"8.2.2": {
|
||||
"viArch": {
|
||||
"A_64": {
|
||||
"Linux_Alpine": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "adcf3a320a3c402aba07ae9586990dc3c0b550e96aeffb1b9e194313d3ba716d",
|
||||
"dlSubdir": "ghc-8.2.2",
|
||||
"dlUri": "https://files.hasufell.de/ghc/ghc-8.2.2-x86_64-alpine-linux.tar.xz"
|
||||
}
|
||||
},
|
||||
"FreeBSD": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "cd351c704b92b9af23994024df07de8ca7090ea7675d5c8b14b2be857a46d804",
|
||||
@@ -1956,6 +1985,13 @@
|
||||
}
|
||||
},
|
||||
"A_32": {
|
||||
"Linux_Alpine": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "892888d388ef5c9cadf5cfba1146d62237c25b9b066fb62fee940b2b285fd308",
|
||||
"dlSubdir": "ghc-8.4.4",
|
||||
"dlUri": "https://files.hasufell.de/ghc/ghc-8.4.4-i386-alpine-linux.tar.xz"
|
||||
}
|
||||
},
|
||||
"Linux_Debian": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "678bafaabea6af70ba71ccf0210bb437f9f5591ec28ac1cbbbd5f7aa6894e450",
|
||||
@@ -2123,7 +2159,6 @@
|
||||
},
|
||||
"viChangeLog": "https://downloads.haskell.org/~ghc/8.8.3/docs/html/users_guide/8.8.3-notes.html",
|
||||
"viTags": [
|
||||
"Recommended",
|
||||
"base-4.13.0.0"
|
||||
]
|
||||
}
|
||||
@@ -2298,37 +2333,37 @@
|
||||
}
|
||||
},
|
||||
"GHCup": {
|
||||
"0.1.6": {
|
||||
"0.1.7": {
|
||||
"viArch": {
|
||||
"A_64": {
|
||||
"FreeBSD": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "6bbfb1047691ff3ae9249e8805cf9f37bab30a008dae130cb2a4b3aa5253e6e5",
|
||||
"dlHash": "54b9b6f98908f6679dda6db025b4047dfe82e6b57ae82c547a9d611b9e4ff105",
|
||||
"dlSubdir": null,
|
||||
"dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/x86_64-portbld-freebsd-ghcup-0.1.6"
|
||||
"dlUri": "https://downloads.haskell.org/~ghcup/0.1.7/x86_64-portbld-freebsd-ghcup-0.1.7"
|
||||
}
|
||||
},
|
||||
"Darwin": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "1e025e66d7f7b75d94f17a7da6120efd7e2df918a8eac88c4711ed11d2aac4ec",
|
||||
"dlHash": "00b2c04755d2b40e568afbfc2a485c36697fc55f210eae0d4cd80413c71032ed",
|
||||
"dlSubdir": null,
|
||||
"dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/x86_64-apple-darwin-ghcup-0.1.6"
|
||||
"dlUri": "https://downloads.haskell.org/~ghcup/0.1.7/x86_64-apple-darwin-ghcup-0.1.7"
|
||||
}
|
||||
},
|
||||
"Linux_UnknownLinux": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "bdbec0cdf4c8511c4082dd83993d15034c0fbcb5722ecf418c1cee40667da8af",
|
||||
"dlHash": "a1d1e8b3c2b00186957c927d09f2cfb457bbfa65c1ab562ff5683963e205bdd5",
|
||||
"dlSubdir": null,
|
||||
"dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/x86_64-linux-ghcup-0.1.6"
|
||||
"dlUri": "https://downloads.haskell.org/~ghcup/0.1.7/x86_64-linux-ghcup-0.1.7"
|
||||
}
|
||||
}
|
||||
},
|
||||
"A_32": {
|
||||
"Linux_UnknownLinux": {
|
||||
"unknown_versioning": {
|
||||
"dlHash": "0366ed6c00862c3c002cdefc3e37523ad80e655387956c7ab58b268aaa6fae5d",
|
||||
"dlHash": "1651cc196e4fdd18995054edebe109833535961f0e2b0d505f1714e83f3e8808",
|
||||
"dlSubdir": null,
|
||||
"dlUri": "https://downloads.haskell.org/~ghcup/0.1.6/i386-linux-ghcup-0.1.6"
|
||||
"dlUri": "https://downloads.haskell.org/~ghcup/0.1.7/i386-linux-ghcup-0.1.7"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
cabal-version: 3.0
|
||||
name: ghcup
|
||||
version: 0.1.6
|
||||
version: 0.1.7
|
||||
synopsis: ghc toolchain installer as an exe/library
|
||||
description:
|
||||
A rewrite of the shell script ghcup, for providing
|
||||
|
||||
@@ -137,13 +137,18 @@ installGHCBin bDls ver pfreq@(PlatformRequest {..}) = do
|
||||
lift $ $(logInfo) "Installing GHC (this may take a while)"
|
||||
lEM $ execLogged "./configure"
|
||||
False
|
||||
["--prefix=" <> toFilePath inst]
|
||||
(["--prefix=" <> toFilePath inst] ++ alpineArgs)
|
||||
[rel|ghc-configure|]
|
||||
(Just path)
|
||||
Nothing
|
||||
lEM $ make ["install"] (Just path)
|
||||
pure ()
|
||||
|
||||
alpineArgs
|
||||
| ver >= [vver|8.2.2|]
|
||||
, Linux Alpine <- _rPlatform = ["--disable-ld-override"]
|
||||
| otherwise = []
|
||||
|
||||
|
||||
installCabalBin :: ( MonadMask m
|
||||
, MonadCatch m
|
||||
|
||||
@@ -110,7 +110,7 @@ ghc_802_64_alpine :: DownloadInfo
|
||||
ghc_802_64_alpine = DownloadInfo
|
||||
[uri|https://files.hasufell.de/ghc/ghc-8.0.2-x86_64-alpine-linux.tar.xz|]
|
||||
(Just [rel|ghc-8.0.2|])
|
||||
"325b48b2ea199b4f62c16dc9c3ff99b42ea6bb1dde5a74fa640dfeb8d63894d0"
|
||||
"517783b660a27ebf95b2568d47292fd633d5f9a4de4c80ad1ccf05e1b9d7313f"
|
||||
|
||||
ghc_802_32_alpine :: DownloadInfo
|
||||
ghc_802_32_alpine = DownloadInfo
|
||||
@@ -180,6 +180,13 @@ ghc_822_32_alpine = DownloadInfo
|
||||
(Just [rel|ghc-8.2.2|])
|
||||
"467534c32552cfd318753112dbc70af003693aad4b0081f2a07e61f5b5ea2c22"
|
||||
|
||||
ghc_822_64_alpine :: DownloadInfo
|
||||
ghc_822_64_alpine = DownloadInfo
|
||||
[uri|https://files.hasufell.de/ghc/ghc-8.2.2-x86_64-alpine-linux.tar.xz|]
|
||||
(Just [rel|ghc-8.2.2|])
|
||||
"adcf3a320a3c402aba07ae9586990dc3c0b550e96aeffb1b9e194313d3ba716d"
|
||||
|
||||
|
||||
|
||||
|
||||
-----------------
|
||||
@@ -352,6 +359,11 @@ ghc_844_64_freebsd = DownloadInfo
|
||||
(Just [rel|ghc-8.4.4|])
|
||||
"44fbd142d1c355d6110595c59c760e2c73866ff9259ec85ebf814edb244d1940"
|
||||
|
||||
ghc_844_32_alpine :: DownloadInfo
|
||||
ghc_844_32_alpine = DownloadInfo
|
||||
[uri|https://files.hasufell.de/ghc/ghc-8.4.4-i386-alpine-linux.tar.xz|]
|
||||
(Just [rel|ghc-8.4.4|])
|
||||
"892888d388ef5c9cadf5cfba1146d62237c25b9b066fb62fee940b2b285fd308"
|
||||
|
||||
|
||||
|
||||
@@ -569,6 +581,12 @@ ghc_865_64_alpine = DownloadInfo
|
||||
(Just [rel|ghc-8.6.5|])
|
||||
"b9d3ed7f7aa24ef2d58bb579252289caa0b8877adee3685e3af2fb73d440afdc"
|
||||
|
||||
ghc_865_32_alpine :: DownloadInfo
|
||||
ghc_865_32_alpine = DownloadInfo
|
||||
[uri|https://files.hasufell.de/ghc/ghc-8.6.5-i386-alpine-linux.tar.xz|]
|
||||
(Just [rel|ghc-8.6.5|])
|
||||
"3737837550d9b177acfe150e3a3cd4545427ded020487c2ed5194d7b8f116349"
|
||||
|
||||
ghc_865_64_freebsd :: DownloadInfo
|
||||
ghc_865_64_freebsd = DownloadInfo
|
||||
[uri|https://files.hasufell.de/ghc/ghc-8.6.5-x86_64-portbld-freebsd.tar.xz|]
|
||||
@@ -771,6 +789,13 @@ ghc_884_64_alpine = DownloadInfo
|
||||
(Just [rel|ghc-8.8.4|])
|
||||
"90c6a1661de7f20c7d169cd6270125035b3332063e45103ce028df0beecf434e"
|
||||
|
||||
ghc_884_32_alpine :: DownloadInfo
|
||||
ghc_884_32_alpine = DownloadInfo
|
||||
[uri|https://files.hasufell.de/ghc/ghc-8.8.4-i386-alpine-linux.tar.xz|]
|
||||
(Just [rel|ghc-8.8.4|])
|
||||
"1d18e89ee031197e55c48683e78a7ffc67601ac5fd9f73aac555eb064b3859a2"
|
||||
|
||||
|
||||
|
||||
|
||||
-----------------
|
||||
@@ -827,6 +852,11 @@ ghc_8101_64_alpine = DownloadInfo
|
||||
(Just [rel|ghc-8.10.1-x86_64-unknown-linux|])
|
||||
"cb13b645d103e2fba2eb8dfcc4e5f2fbd9550c00c4df42f342b4210436dcb8a8"
|
||||
|
||||
ghc_8101_32_alpine :: DownloadInfo
|
||||
ghc_8101_32_alpine = DownloadInfo
|
||||
[uri|https://files.hasufell.de/ghc/ghc-8.10.1-i386-alpine-linux.tar.xz|]
|
||||
(Just [rel|ghc-8.10.1|])
|
||||
"7360cc6b29e9b4ab08f6ea5bc3bcca6f5c216933e81ef1620dcdd700f1fdb289"
|
||||
|
||||
ghc_8101_64_freebsd :: DownloadInfo
|
||||
ghc_8101_64_freebsd = DownloadInfo
|
||||
@@ -966,32 +996,32 @@ cabal_3200_64_alpine = DownloadInfo
|
||||
-------------
|
||||
|
||||
|
||||
ghcup_016_32_linux :: DownloadInfo
|
||||
ghcup_016_32_linux = DownloadInfo
|
||||
[uri|https://downloads.haskell.org/~ghcup/0.1.6/i386-linux-ghcup-0.1.6|]
|
||||
ghcup_017_32_linux :: DownloadInfo
|
||||
ghcup_017_32_linux = DownloadInfo
|
||||
[uri|https://downloads.haskell.org/~ghcup/0.1.7/i386-linux-ghcup-0.1.7|]
|
||||
Nothing
|
||||
"0366ed6c00862c3c002cdefc3e37523ad80e655387956c7ab58b268aaa6fae5d"
|
||||
"1651cc196e4fdd18995054edebe109833535961f0e2b0d505f1714e83f3e8808"
|
||||
|
||||
|
||||
ghcup_016_64_linux :: DownloadInfo
|
||||
ghcup_016_64_linux = DownloadInfo
|
||||
[uri|https://downloads.haskell.org/~ghcup/0.1.6/x86_64-linux-ghcup-0.1.6|]
|
||||
ghcup_017_64_linux :: DownloadInfo
|
||||
ghcup_017_64_linux = DownloadInfo
|
||||
[uri|https://downloads.haskell.org/~ghcup/0.1.7/x86_64-linux-ghcup-0.1.7|]
|
||||
Nothing
|
||||
"bdbec0cdf4c8511c4082dd83993d15034c0fbcb5722ecf418c1cee40667da8af"
|
||||
"a1d1e8b3c2b00186957c927d09f2cfb457bbfa65c1ab562ff5683963e205bdd5"
|
||||
|
||||
|
||||
ghcup_016_64_freebsd :: DownloadInfo
|
||||
ghcup_016_64_freebsd = DownloadInfo
|
||||
[uri|https://downloads.haskell.org/~ghcup/0.1.6/x86_64-portbld-freebsd-ghcup-0.1.6|]
|
||||
ghcup_017_64_freebsd :: DownloadInfo
|
||||
ghcup_017_64_freebsd = DownloadInfo
|
||||
[uri|https://downloads.haskell.org/~ghcup/0.1.7/x86_64-portbld-freebsd-ghcup-0.1.7|]
|
||||
Nothing
|
||||
"6bbfb1047691ff3ae9249e8805cf9f37bab30a008dae130cb2a4b3aa5253e6e5"
|
||||
"54b9b6f98908f6679dda6db025b4047dfe82e6b57ae82c547a9d611b9e4ff105"
|
||||
|
||||
|
||||
ghcup_016_64_darwin10_13 :: DownloadInfo
|
||||
ghcup_016_64_darwin10_13 = DownloadInfo
|
||||
[uri|https://downloads.haskell.org/~ghcup/0.1.6/x86_64-apple-darwin-ghcup-0.1.6|]
|
||||
ghcup_017_64_darwin10_13 :: DownloadInfo
|
||||
ghcup_017_64_darwin10_13 = DownloadInfo
|
||||
[uri|https://downloads.haskell.org/~ghcup/0.1.7/x86_64-apple-darwin-ghcup-0.1.7|]
|
||||
Nothing
|
||||
"1e025e66d7f7b75d94f17a7da6120efd7e2df918a8eac88c4711ed11d2aac4ec"
|
||||
"00b2c04755d2b40e568afbfc2a485c36697fc55f210eae0d4cd80413c71032ed"
|
||||
|
||||
|
||||
|
||||
@@ -1130,6 +1160,7 @@ ghcupDownloads = M.fromList
|
||||
, (Just [vers|11|], ghc_822_64_freebsd11)
|
||||
]
|
||||
)
|
||||
, (Linux Alpine , M.fromList [(Nothing, ghc_822_64_alpine)])
|
||||
]
|
||||
)
|
||||
, ( A_32
|
||||
@@ -1331,6 +1362,7 @@ ghcupDownloads = M.fromList
|
||||
, (Linux Ubuntu, M.fromList [(Nothing, ghc_844_32_deb8)])
|
||||
, (Linux Mint , M.fromList [(Nothing, ghc_844_32_deb8)])
|
||||
, (Linux Debian, M.fromList [(Nothing, ghc_844_32_deb8)])
|
||||
, (Linux Alpine, M.fromList [(Nothing, ghc_844_32_alpine)])
|
||||
]
|
||||
)
|
||||
]
|
||||
@@ -1575,6 +1607,7 @@ ghcupDownloads = M.fromList
|
||||
, (Linux Ubuntu, M.fromList [(Nothing, ghc_865_32_deb9)])
|
||||
, (Linux Mint , M.fromList [(Nothing, ghc_865_32_deb9)])
|
||||
, (Linux Debian, M.fromList [(Nothing, ghc_865_32_deb9)])
|
||||
, (Linux Alpine, M.fromList [(Nothing, ghc_865_32_alpine)])
|
||||
]
|
||||
)
|
||||
]
|
||||
@@ -1685,7 +1718,7 @@ ghcupDownloads = M.fromList
|
||||
)
|
||||
, ( [vver|8.8.3|]
|
||||
, VersionInfo
|
||||
[Recommended, Base [pver|4.13.0.0|]]
|
||||
[Base [pver|4.13.0.0|]]
|
||||
(Just
|
||||
[uri|https://downloads.haskell.org/~ghc/8.8.3/docs/html/users_guide/8.8.3-notes.html|]
|
||||
)
|
||||
@@ -1738,7 +1771,7 @@ ghcupDownloads = M.fromList
|
||||
)
|
||||
, ( [vver|8.8.4|]
|
||||
, VersionInfo
|
||||
[Base [pver|4.13.0.0|]]
|
||||
[Recommended, Base [pver|4.13.0.0|]]
|
||||
(Just
|
||||
[uri|https://downloads.haskell.org/~ghc/8.8.4/docs/html/users_guide/8.8.4-notes.html|]
|
||||
)
|
||||
@@ -1786,6 +1819,7 @@ ghcupDownloads = M.fromList
|
||||
, (Linux Ubuntu, M.fromList [(Nothing, ghc_884_32_deb9)])
|
||||
, (Linux Mint , M.fromList [(Nothing, ghc_884_32_deb9)])
|
||||
, (Linux Debian, M.fromList [(Nothing, ghc_884_32_deb9)])
|
||||
, (Linux Alpine, M.fromList [(Nothing, ghc_884_32_alpine)])
|
||||
]
|
||||
)
|
||||
]
|
||||
@@ -1856,6 +1890,7 @@ ghcupDownloads = M.fromList
|
||||
, (Just [vers|9|], ghc_8101_32_deb9)
|
||||
]
|
||||
)
|
||||
, (Linux Alpine, M.fromList [(Nothing, ghc_8101_32_alpine)])
|
||||
]
|
||||
)
|
||||
]
|
||||
@@ -1963,7 +1998,7 @@ ghcupDownloads = M.fromList
|
||||
)
|
||||
, ( GHCup
|
||||
, M.fromList
|
||||
[ ( [vver|0.1.6|]
|
||||
[ ( [vver|0.1.7|]
|
||||
, VersionInfo
|
||||
[Recommended, Latest]
|
||||
(Just
|
||||
@@ -1974,16 +2009,16 @@ ghcupDownloads = M.fromList
|
||||
[ ( A_64
|
||||
, M.fromList
|
||||
[ ( Linux UnknownLinux
|
||||
, M.fromList [(Nothing, ghcup_016_64_linux)]
|
||||
, M.fromList [(Nothing, ghcup_017_64_linux)]
|
||||
)
|
||||
, (Darwin , M.fromList [(Nothing, ghcup_016_64_darwin10_13)])
|
||||
, (FreeBSD, M.fromList [(Nothing, ghcup_016_64_freebsd)])
|
||||
, (Darwin , M.fromList [(Nothing, ghcup_017_64_darwin10_13)])
|
||||
, (FreeBSD, M.fromList [(Nothing, ghcup_017_64_freebsd)])
|
||||
]
|
||||
)
|
||||
, ( A_32
|
||||
, M.fromList
|
||||
[ ( Linux UnknownLinux
|
||||
, M.fromList [(Nothing, ghcup_016_32_linux)]
|
||||
, M.fromList [(Nothing, ghcup_017_32_linux)]
|
||||
)
|
||||
]
|
||||
)
|
||||
|
||||
@@ -270,7 +270,10 @@ getDownloadInfo :: Tool
|
||||
getDownloadInfo t v (PlatformRequest a p mv) dls = maybe
|
||||
(Left NoDownload)
|
||||
Right
|
||||
(with_distro <|> without_distro_ver <|> without_distro)
|
||||
(case p of
|
||||
-- non-musl won't work on alpine
|
||||
Linux Alpine -> with_distro <|> without_distro_ver
|
||||
_ -> with_distro <|> without_distro_ver <|> without_distro)
|
||||
|
||||
where
|
||||
with_distro = distro_preview id id
|
||||
|
||||
@@ -16,7 +16,7 @@ ghcupURL :: URI
|
||||
ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.2.json|]
|
||||
|
||||
ghcUpVer :: PVP
|
||||
ghcUpVer = [pver|0.1.6|]
|
||||
ghcUpVer = [pver|0.1.7|]
|
||||
|
||||
numericVer :: String
|
||||
numericVer = T.unpack . prettyPVP $ ghcUpVer
|
||||
|
||||
Reference in New Issue
Block a user