Fix header reading wrt #213

Add some unit tests
Merge branch '9.2.0.20210821'
2021-08-23 23:16:32 +02:00 · 2021-08-23 23:16:14 +02:00 · 2021-08-23 13:37:44 +02:00 · 2021-08-23 13:16:18 +02:00 · 2021-08-21 14:46:43 +02:00 · 2021-08-21 14:34:47 +02:00
6 changed files with 171 additions and 98 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -255,7 +255,7 @@ test:windows:bootstrap_powershell_script:

 ######## linux test ########

-test:linux:recommended:
+test:linux:
  stage: test
  extends: .test_ghcup_version:linux
  variables:
@@ -263,14 +263,6 @@ test:linux:recommended:
    CABAL_VERSION: "3.4.0.0"
  needs: []

-test:linux:latest:
-  stage: test
-  extends: .test_ghcup_version:linux
-  variables:
-    GHC_VERSION: "9.0.1"
-    CABAL_VERSION: "3.4.0.0"
-  needs: []
-
 test:linux:cross-armv7:
  stage: test
  extends:
@@ -311,7 +303,7 @@ test:linux:git:hadrian:

 ######## linux 32bit test ########

-test:linux:recommended:32bit:
+test:linux:32bit:
  stage: test
  extends: .test_ghcup_version:linux32
  variables:
@@ -321,7 +313,7 @@ test:linux:recommended:32bit:

 ######## arm tests ########

-test:linux:recommended:armv7:
+test:linux:armv7:
  stage: test
  extends: .test_ghcup_version:armv7
  variables:
@@ -331,7 +323,7 @@ test:linux:recommended:armv7:
  when: manual
  needs: []

-test:linux:recommended:aarch64:
+test:linux:aarch64:
  stage: test
  extends: .test_ghcup_version:aarch64
  variables:
@@ -343,7 +335,7 @@ test:linux:recommended:aarch64:

 ######## darwin test ########

-test:mac:recommended:
+test:mac:
  stage: test
  extends: .test_ghcup_version:darwin
  variables:
@@ -351,15 +343,7 @@ test:mac:recommended:
    CABAL_VERSION: "3.4.0.0"
  needs: []

-test:mac:latest:
-  stage: test
-  extends: .test_ghcup_version:darwin
-  variables:
-    GHC_VERSION: "9.0.1"
-    CABAL_VERSION: "3.4.0.0"
-  needs: []
-
-test:mac:recommended:aarch64:
+test:mac:aarch64:
  stage: test
  extends: .test_ghcup_version:darwin:aarch64
  variables:
@@ -371,7 +355,7 @@ test:mac:recommended:aarch64:

 ######## freebsd test ########

-test:freebsd:recommended:
+test:freebsd:
  stage: test
  extends: .test_ghcup_version:freebsd
  variables:
@@ -383,7 +367,7 @@ test:freebsd:recommended:

 ######## windows test ########

-test:windows:recommended:
+test:windows:
  stage: test
  extends: .test_ghcup_version:windows
  variables:
@@ -400,7 +384,7 @@ test:windows:recommended:

 release:linux:64bit:
  stage: release
-  needs: ["test:linux:recommended", "test:linux:latest"]
+  needs: ["test:linux"]
  extends:
    - .alpine:64bit
    - .release_ghcup
@@ -414,7 +398,7 @@ release:linux:64bit:

 release:linux:32bit:
  stage: release
-  needs: ["test:linux:recommended:32bit"]
+  needs: ["test:linux:32bit"]
  extends:
    - .alpine:32bit
    - .release_ghcup
@@ -427,7 +411,7 @@ release:linux:32bit:

 release:linux:armv7:
  stage: release
-  needs: ["test:linux:recommended:armv7"]
+  needs: ["test:linux:armv7"]
  extends:
    - .linux:armv7
    - .release_ghcup
@@ -441,7 +425,7 @@ release:linux:armv7:

 release:linux:aarch64:
  stage: release
-  needs: ["test:linux:recommended:aarch64"]
+  needs: ["test:linux:aarch64"]
  extends:
    - .linux:aarch64
    - .release_ghcup
@@ -457,7 +441,7 @@ release:linux:aarch64:

 release:darwin:
  stage: release
-  needs: ["test:mac:recommended", "test:mac:latest"]
+  needs: ["test:mac"]
  extends:
    - .darwin
    - .release_ghcup
@@ -472,7 +456,7 @@ release:darwin:

 release:darwin:aarch64:
  stage: release
-  needs: ["test:mac:recommended:aarch64"]
+  needs: ["test:mac:aarch64"]
  extends:
    - .darwin:aarch64
    - .release_ghcup
@@ -509,7 +493,7 @@ release:darwin:aarch64:

 release:freebsd:
  stage: release
-  needs: ["test:freebsd:recommended"]
+  needs: ["test:freebsd"]
  extends:
    - .freebsd
    - .release_ghcup
@@ -526,7 +510,7 @@ release:freebsd:

 release:windows:
  stage: release
-  needs: ["test:windows:recommended"]
+  needs: ["test:windows"]
  extends:
    - .windows
    - .release_ghcup
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ Similar in scope to [rustup](https://github.com/rust-lang-nursery/rustup.rs), [p
     * [XDG support](#xdg-support)
     * [Env variables](#env-variables)
     * [Installing custom bindists](#installing-custom-bindists)
+     * [Isolated Installs](#isolated-installs)
     * [Tips and tricks](#tips-and-tricks)
   * [Design goals](#design-goals)
   * [How](#how)
@@ -160,6 +161,36 @@ and produce the binaries `ghc-8.10.2-eff` and `ghc-head` respectively.
 GHCup always needs to know which version the bindist corresponds to (this is not automatically
 detected).

+### Isolated installs
+
+Ghcup also enables you to install a tool (GHC, Cabal, HLS, Stack) at an isolated location of your choosing.
+These installs, as the name suggests, are separate from your main installs and DO NOT conflict with them.
+
+
+- No symlinks are made to these isolated installed tools, you'd have to manually point to them wherever you intend to use them.
+
+- These installs, can also NOT be deleted from ghcup, you'd have to go and manually delete these.
+
+You need to use the `--isolate` or `-i` flag followed by the directory path.
+
+Examples:-
+
+1. install an isolated GHC version at location /home/user/isolated_dir/ghc/  
+   - `ghcup install ghc 8.10.5 --isolate /home/user/isolated_dir/ghc`
+
+2. isolated install Cabal at a location you desire  
+   - `ghcup install cabal --isolate /home/username/my_isolated_dir/`
+
+3. do an isolated install with a custom bindist  
+   - `ghcup install ghc --isolate /home/username/my_isolated_dir/ -u 'https://gitlab.haskell.org/api/v4/projects/1/jobs/artifacts/master/raw/ghc-x86_64-fedora27-linux.tar.xz?job=validate-x86_64-linux-fedora27' head`
+
+4. isolated install HLS  
+   - `ghcup install hls --isolate /home/username/dir/hls/`
+
+5. you can even compile ghc to an isolated location.  
+   - `ghcup compile ghc -j 4 -v 9.0.1 -b 8.10.5 -i /home/username/my/dir/ghc` 
+   ---  
+   
 ### Tips and tricks

 #### with_ghc wrapper (e.g. for HLS)
--- a/2
+++ b/2
@@ -275,6 +275,8 @@ find_shell() {
 ask_bashrc() {
 	if [ -n "${BOOTSTRAP_HASKELL_ADJUST_BASHRC}" ] ; then
 		return 1
+	elif [ -z "${MY_SHELL}" ] ; then
+		return 0
 	fi

 	while true; do
--- a/ghcup-0.0.6.yaml
+++ b/ghcup-0.0.6.yaml
@@ -19,6 +19,18 @@ toolRequirements:
          - libncurses5
          - libtinfo5
          notes: ''
+        ">= 11":
+          distroPKGs:
+          - build-essential
+          - curl
+          - libffi-dev
+          - libffi7
+          - libgmp-dev
+          - libgmp10
+          - libncurses-dev
+          - libncurses5
+          - libtinfo5
+          notes: ''
      Linux_Ubuntu:
        unknown_versioning:
          distroPKGs:
@@ -1872,96 +1884,81 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghc/9.0.1/ghc-9.0.1-armv7-deb9-linux.tar.xz
              dlSubdir: ghc-9.0.1
              dlHash: 6f404f9b88468407b3a9ec5800bcc2d01dd453ef3d63414853b4fbbd4d8df496
-    9.2.0.20210422:
+    9.2.0.20210821:
      viTags:
      - Prerelease
      - base-4.16.0.0
-      viChangeLog: https://downloads.haskell.org/~ghc/9.2.1-alpha2/docs/html/users_guide/index.html
+      viChangeLog: https://downloads.haskell.org/~ghc/9.2.1-rc1/docs/html/users_guide/index.html
      viSourceDL:
-        dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-src.tar.xz
-        dlSubdir: ghc-9.2.0.20210422
-        dlHash: 69be189e6e7f8d51a9078ac8f177176bc5bff54edc8352974c50c1f0e110df27
+        dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-src.tar.xz
+        dlSubdir: ghc-9.2.0.20210821
+        dlHash: 7c4772d9a22a1774a13f67a570719c339f744b1607fbddfdf4702bb1fbbd57e0
      viPostRemove: *ghc-post-remove
      viArch:
        A_64:
          Linux_Debian:
-            '( >= 9 && < 10 )': &ghc-921-alpha2-64-deb9
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-deb9-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210422
-              dlHash: 7262f3a230cd6945c588882e03941301877a9eb12e58c5975ad264596c2e12f2
-            '( >= 10 && < 11 )': &ghc-921-alpha2-64-deb10
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-deb10-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210422
-              dlHash: 6d36cd08576bdee7473fee66b4b8ceb72011983a7d5aa3ec587403815a73e37b
-            unknown_versioning: *ghc-921-alpha2-64-deb9
+            '( >= 9 && < 10 )': &ghc-921-rc1-64-deb9
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-x86_64-deb9-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210821
+              dlHash: 4a561cb97f0cbe51de676d4e29968d49beb415a0190514d8f1a8f8ae0405f313
+            '( >= 10 && < 11 )': &ghc-921-rc1-64-deb10
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-x86_64-deb10-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210821
+              dlHash: 28112271739b490635e7fd6ed1936949c3a3c41d4a7d95833bb47f420dd1a815
+            unknown_versioning: *ghc-921-rc1-64-deb9
          Linux_Ubuntu:
-            unknown_versioning: &ghc-921-alpha2-64-fedora
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-fedora27-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210422
-              dlHash: 95624192ff0982690bc9093632d6351fdc6f72e6df380b392449229c39a0354b
-            '( >= 16 && < 19 )': *ghc-921-alpha2-64-deb9
+            unknown_versioning: &ghc-921-rc1-64-fedora
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-x86_64-fedora27-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210821
+              dlHash: 3c4d3874e4438baf54bdf8bcbdca60a7416ca88c32da1823127dd3159bbede62
+            '( >= 16 && < 19 )': *ghc-921-rc1-64-deb9
          Linux_Mint:
-            unknown_versioning: *ghc-921-alpha2-64-deb10
+            unknown_versioning: *ghc-921-rc1-64-deb10
          Linux_Fedora:
-            '( >= 27 && < 28 )': *ghc-921-alpha2-64-fedora
-            unknown_versioning: *ghc-921-alpha2-64-fedora
-          Linux_CentOS:
-            '( >= 7 && < 8 )': &ghc-921-alpha2-64-centos
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-centos7-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210422
-              dlHash: dee4f158f2d59bfe97ec3f5773b6b31aa911f9b128a5e56eeefa2dccc754d295
-            unknown_versioning: *ghc-921-alpha2-64-centos
-          Linux_RedHat:
-            unknown_versioning: *ghc-921-alpha2-64-centos
-          Linux_Alpine:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-alpine3.10-linux-integer-simple.tar.xz
-              dlSubdir: ghc-9.2.0.20210422-x86_64-unknown-linux
-              dlHash: f61ae72925325ca7b316e40121e8d6bad94794016d3fa59bcbc8dbe116a7f13c
-          Linux_AmazonLinux:
-            unknown_versioning: *ghc-921-alpha2-64-centos
+            '( >= 27 && < 28 )': *ghc-921-rc1-64-fedora
+            unknown_versioning: *ghc-921-rc1-64-fedora
          Linux_UnknownLinux:
-            unknown_versioning: *ghc-921-alpha2-64-fedora
+            unknown_versioning: *ghc-921-rc1-64-fedora
          FreeBSD:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-unknown-freebsd.tar.xz
-              dlSubdir: ghc-9.2.0.20210422
-              dlHash: 195728e02398ea6154fe713b7782a0cae856eb0d9d90f5d09cd0cca610c985e2
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-x86_64-unknown-freebsd.tar.xz
+              dlSubdir: ghc-9.2.0.20210821
+              dlHash: ed31d0ca40588fcbed4f03e83e49abea7babb37e528bb36ab3c1fb6191c4c422
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-apple-darwin.tar.xz
-              dlSubdir: ghc-9.2.0.20210422
-              dlHash: 8884c059f2b76e4c4309ff6bd7a7dde37663f751fd26220e9a2bcabb4d69a401
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-x86_64-apple-darwin.tar.xz
+              dlSubdir: ghc-9.2.0.20210821-x86_64-apple-darwin
+              dlHash: 38199ca35117cc1f4372a4b6692596f8639688c286d2a0d09bc7336826c05e10
          Windows:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-unknown-mingw32.tar.xz
-              dlSubdir: ghc-9.2.0.20210422-x86_64-unknown-mingw32
-              dlHash: 33f173b754d18f26bb27f52bb77a92fd22a48675daa2b43a1879bf01dddd7e8f
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-x86_64-unknown-mingw32.tar.xz
+              dlSubdir: ghc-9.2.0.20210821-x86_64-unknown-mingw32
+              dlHash: 3926620698cb43b9e9a5381b4c3b7b84d22c67b3509a546581aa17afecd6a846
        A_32:
          Linux_Debian:
-            '( >= 9 && < 10 )': &ghc-921-alpha2-32-deb9
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-i386-deb9-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210422
-              dlHash: a378ec3fd31a9fa2a7134e98159e189362fe969f04031515616e9cc3182c861a
-            unknown_versioning: *ghc-921-alpha2-32-deb9
+            '( >= 9 && < 10 )': &ghc-921-rc1-32-deb9
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-i386-deb9-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210821
+              dlHash: 30b25b787a787473988a785606b01099ce077f99d5c08940c0024537433f5084
+            unknown_versioning: *ghc-921-rc1-32-deb9
          Linux_Ubuntu:
-            unknown_versioning: *ghc-921-alpha2-32-deb9
+            unknown_versioning: *ghc-921-rc1-32-deb9
          Linux_Mint:
-            unknown_versioning: *ghc-921-alpha2-32-deb9
+            unknown_versioning: *ghc-921-rc1-32-deb9
          Linux_UnknownLinux:
-            unknown_versioning: *ghc-921-alpha2-32-deb9
+            unknown_versioning: *ghc-921-rc1-32-deb9
        A_ARM64:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-aarch64-deb10-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210422
-              dlHash: fd2f4d0f6122f752aca396fe1a13e7d14d037dc45806bb0404a031eeeeb1994c
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-aarch64-deb10-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210821
+              dlHash: 289fc361be4a3199ac15449e30405a9831454811dd454e81eab73bfcdd2c4088
        A_ARM:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-armv7-deb10-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210422
-              dlHash: dab7d7785d6ccafb130526b666669fc974ba5c90fc9aaf2024f9c65bcbd097d3
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-rc1/ghc-9.2.0.20210821-armv7-deb10-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210821
+              dlHash: 9ff0be63191181700a1f51c453056c2dab16e11ecb7a4b1dd72e4b7aad5999a6
  Cabal:
    2.4.1.0:
      viTags:
--- a/lib/GHCup/Download.hs
+++ b/lib/GHCup/Download.hs
@@ -368,7 +368,7 @@ download uri eDigest dest mfn etags

                          -- this nonsense is necessary, because some older versions of curl would overwrite
                          -- the destination file when 304 is returned
-                          case fmap T.words . listToMaybe . fmap T.strip . T.lines $ headers of
+                          case fmap T.words . listToMaybe . fmap T.strip . T.lines . getLastHeader $ headers of
                            Just (http':sc:_)
                              | sc == "304"
                              , T.pack "HTTP" `T.isPrefixOf` http' -> $logDebug [i|Status code was 304, not overwriting|]
@@ -447,7 +447,7 @@ download uri eDigest dest mfn etags

  parseEtags :: (MonadLogger m, MonadIO m, MonadThrow m) => T.Text -> m (Maybe T.Text)
  parseEtags stderr = do
-    let mEtag = find (\line -> T.pack "etag:" `T.isPrefixOf` T.toLower line) . fmap T.strip . T.lines $ stderr
+    let mEtag = find (\line -> T.pack "etag:" `T.isPrefixOf` T.toLower line) . fmap T.strip . T.lines . getLastHeader $ stderr
    case T.words <$> mEtag of
      (Just []) -> do
        $logDebug "Couldn't parse etags, no input: "
@@ -585,7 +585,21 @@ getWgetOpts =
    Nothing -> pure []


+-- | Get the url base name.
+--
+-- >>> urlBaseName "/foo/bar/baz"
+-- "baz"
 urlBaseName :: ByteString  -- ^ the url path (without scheme and host)
            -> ByteString
 urlBaseName = snd . B.breakEnd (== _slash) . urlDecode False

+
+-- | Curl saves all intermediate connect headers as well, not just the last one, so we make an effort to take the
+-- last HTTP block only. Passing '--suppress-connect-headers' would be better, but it isn't supported by all versions,
+-- also see:
+--   https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/213
+--
+-- >>> getLastHeader "\n\nHTTP/1.0 200 Connection established\n\nHTTP/1.1 304 Not Modified\n"
+-- "HTTP/1.1 304 Not Modified\n"
+getLastHeader :: T.Text -> T.Text
+getLastHeader = T.unlines . lastDef [] . filter (\x -> not (null x)) . splitOn [""] . fmap T.stripEnd . T.lines
--- a/lib/GHCup/Utils/Prelude.hs
+++ b/lib/GHCup/Utils/Prelude.hs
@@ -68,6 +68,14 @@ import qualified System.Win32.File             as Win32
 #endif


+-- $setup
+-- >>> import Data.ByteString.Internal (c2w, w2c)
+-- >>> import Test.QuickCheck
+-- >>> import Data.Word8
+-- >>> import Data.Word8
+-- >>> import qualified Data.Text as T
+-- >>> instance Arbitrary T.Text where arbitrary = T.pack <$> arbitrary
+

 fS :: IsString a => String -> a
 fS = fromString
@@ -489,7 +497,14 @@ recover action =
 #endif


-- Gathering monoidal values
+-- | Gathering monoidal values
+--
+-- >>> traverseFold (pure . (:["0"])) ["1","2"]
+-- ["1","0","2","0"]
+-- >>> traverseFold Just ["1","2","3","4","5"]
+-- Just "12345"
+--
+-- prop> \t -> traverseFold Just t === Just (mconcat t)
 traverseFold :: (Foldable t, Applicative m, Monoid b) => (a -> m b) -> t a -> m b
 traverseFold f = foldl (\mb a -> (<>) <$> mb <*> f a) (pure mempty)

@@ -499,6 +514,16 @@ forFold = \t -> (`traverseFold` t)


 -- | Strip @\\r@ and @\\n@ from 'ByteString's
+--
+-- >>> stripNewline "foo\n\n\n"
+-- "foo"
+-- >>> stripNewline "foo\r"
+-- "foo"
+-- >>> stripNewline "foo"
+-- "foo"
+--
+-- prop> \t -> stripNewline (t <> "\n") === stripNewline t
+-- prop> \t -> not (any (isNewLine . c2w) t) ==> stripNewline t == t
 stripNewline :: String -> String
 stripNewline s
  | null s               = []
@@ -507,6 +532,16 @@ stripNewline s


 -- | Strip @\\r@ and @\\n@ from 'ByteString's
+--
+-- >>> stripNewline' "foo\n\n\n"
+-- "foo"
+-- >>> stripNewline' "foo\r"
+-- "foo"
+-- >>> stripNewline' "foo"
+-- "foo"
+--
+-- prop> \t -> stripNewline' (t <> "\n") === stripNewline' t
+-- prop> \t -> not (T.any (isNewLine . c2w) t) ==> stripNewline' t == t
 stripNewline' :: T.Text -> T.Text
 stripNewline' s
  | T.null s               = mempty
@@ -514,6 +549,14 @@ stripNewline' s
  | otherwise              = T.singleton (T.head s) <> stripNewline' (T.tail s)


+-- | Is the word8 a newline?
+--
+-- >>> isNewLine (c2w '\n')
+-- True
+-- >>> isNewLine (c2w '\r')
+-- True
+--
+-- prop> \w -> w /= _lf && w /= _cr ==> not (isNewLine w)
 isNewLine :: Word8 -> Bool
 isNewLine w
  | w == _lf = True
@@ -523,8 +566,10 @@ isNewLine w

 -- | Split on a PVP suffix.
 --
-- >>> splitOnPVP "-" "ghc-iserv-dyn-9.3.20210706" == ("ghc-iserv-dyn", "9.3.20210706")
-- >>> splitOnPVP "-" "ghc-iserv-dyn"              == ("ghc-iserv-dyn", "")
+-- >>> splitOnPVP "-" "ghc-iserv-dyn-9.3.20210706"
+-- ("ghc-iserv-dyn","9.3.20210706")
+-- >>> splitOnPVP "-" "ghc-iserv-dyn"
+-- ("ghc-iserv-dyn","")
 splitOnPVP :: String -> String -> (String, String)
 splitOnPVP c s = case Split.splitOn c s of
  []  -> def
Author	SHA1	Message	Date
Julian Ospald	951e676bee	Fix header reading wrt #213	2021-08-23 23:16:32 +02:00
Julian Ospald	281f310394	Add some unit tests	2021-08-23 23:16:14 +02:00
Julian Ospald	c029713f23	Merge branch '9.2.0.20210821'	2021-08-23 13:37:44 +02:00
Julian Ospald	b86e2a1d5b	Add GHC-9.2.0.20210821 rc1	2021-08-23 13:16:18 +02:00
Julian Ospald	099a6b9dcd	Merge branch 'fixes'	2021-08-21 14:46:43 +02:00
Julian Ospald	3b13624117	Clean up CI	2021-08-21 14:34:47 +02:00
Julian Ospald	fad1efcefa	Fix wrong libffi dependency version for Debian 11 (bullseye) Fixes #209	2021-08-21 14:28:53 +02:00
Julian Ospald	1701b8a2f4	Fix bootstrap-haskell prompts when no shell is detected	2021-08-21 14:28:31 +02:00
Julian Ospald	608ee07940	Merge remote-tracking branch 'origin/merge-requests/146'	2021-08-21 09:28:56 +02:00
Arjun Kathuria	a0c2a5ccec	Adds isolated installs documentation in readme	2021-08-16 22:08:44 +05:30
Julian Ospald	cd41d3af97	Merge branch 'fix-CI'	2021-08-16 14:18:58 +02:00