Merge branch 'master' into fix9151

haskell · Oct 17, 2023 · 36641d6 · 36641d6
2 parents 47570b1 + 9f37325
commit 36641d6
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 22 deletions.
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -38,7 +38,7 @@ library
     array      >= 0.4.0.1  && < 0.6,
     base       >= 4.9      && < 5,
     bytestring >= 0.10.0.0 && < 0.13,
-    containers >= 0.5.0.0  && < 0.7,
+    containers >= 0.5.0.0  && < 0.8,
     deepseq    >= 1.3.0.1  && < 1.6,
     directory  >= 1.2      && < 1.4,
     filepath   >= 1.3.0.1  && < 1.5,

diff --git a/Cabal/src/Distribution/Simple/Haddock.hs b/Cabal/src/Distribution/Simple/Haddock.hs
@@ -866,25 +866,32 @@ renderPureArgs version comp platform args =
     , ["--since-qual=external" | isVersion 2 20]
     , [ "--quickjump" | isVersion 2 19, True <- flagToList . argQuickJump $ args
       ]
-    , [ "--hyperlinked-source" | isVersion 2 17, True <- flagToList . argLinkedSource $ args
-      ]
+    , ["--hyperlinked-source" | isHyperlinkedSource]
     , (\(All b, xs) -> bool (map (("--hide=" ++) . prettyShow) xs) [] b)
         . argHideModules
         $ args
     , bool ["--ignore-all-exports"] [] . getAny . argIgnoreExports $ args
-    , maybe
-        []
-        ( \(m, e, l) ->
-            [ "--source-module=" ++ m
-            , "--source-entity=" ++ e
-            ]
-              ++ if isVersion 2 14
-                then ["--source-entity-line=" ++ l]
-                else []
-        )
-        . flagToMaybe
-        . argLinkSource
-        $ args
+    , -- Haddock's --source-* options are ignored once --hyperlinked-source is
+      -- set.
+      -- See https://haskell-haddock.readthedocs.io/en/latest/invoking.html#cmdoption-hyperlinked-source
+      -- To avoid Haddock's warning, we only set --source-* options if
+      -- --hyperlinked-source is not set.
+      if isHyperlinkedSource
+        then []
+        else
+          maybe
+            []
+            ( \(m, e, l) ->
+                [ "--source-module=" ++ m
+                , "--source-entity=" ++ e
+                ]
+                  ++ if isVersion 2 14
+                    then ["--source-entity-line=" ++ l]
+                    else []
+            )
+            . flagToMaybe
+            . argLinkSource
+            $ args
     , maybe [] ((: []) . ("--css=" ++)) . flagToMaybe . argCssFile $ args
     , maybe [] ((: []) . ("--use-contents=" ++)) . flagToMaybe . argContents $ args
     , bool ["--gen-contents"] [] . fromFlagOrDefault False . argGenContents $ args
@@ -965,6 +972,10 @@ renderPureArgs version comp platform args =
       | otherwise = "--verbose"
     haddockSupportsVisibility = version >= mkVersion [2, 26, 1]
     haddockSupportsPackageName = version > mkVersion [2, 16]
+    haddockSupportsHyperlinkedSource = isVersion 2 17
+    isHyperlinkedSource =
+      haddockSupportsHyperlinkedSource
+        && fromFlagOrDefault False (argLinkedSource args)
 
 ---------------------------------------------------------------------------------
 

diff --git a/Cabal/src/Distribution/Simple/Setup/Install.hs b/Cabal/src/Distribution/Simple/Setup/Install.hs
@@ -77,8 +77,8 @@ installCommand =
         "Copy the files into the install locations. Run register."
     , commandDescription = Just $ \_ ->
         wrapText $
-          "Unlike the copy command, install calls the register command."
-            ++ "If you want to install into a location that is not what was"
+          "Unlike the copy command, install calls the register command. "
+            ++ "If you want to install into a location that is not what was "
             ++ "specified in the configure step, use the copy command.\n"
     , commandNotes = Nothing
     , commandUsage = \pname ->

diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal
@@ -109,7 +109,7 @@ library
     , bytestring    >=0.10.6.0 && <0.13
     , Cabal         ^>=3.11
     , Cabal-syntax  ^>=3.11
-    , containers    >=0.5.6.2  && <0.7
+    , containers    >=0.5.6.2  && <0.8
     , edit-distance ^>= 0.2.2
     , filepath      ^>=1.4.0.0
     , mtl           >=2.0      && <2.4

diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -210,7 +210,7 @@ library
         base64-bytestring >= 1.0 && < 1.3,
         binary     >= 0.7.3    && < 0.9,
         bytestring >= 0.10.6.0 && < 0.13,
-        containers >= 0.5.6.2  && < 0.7,
+        containers >= 0.5.6.2  && < 0.8,
         cryptohash-sha256 >= 0.11 && < 0.12,
         directory  >= 1.3.7.0  && < 1.4,
         echo       >= 0.1.3    && < 0.2,

diff --git a/doc/requirements.in b/doc/requirements.in
@@ -6,3 +6,5 @@ sphinxnotes-strike
 Pygments >= 2.7.4
 # CVE-2023-37920
 certifi >= 2023.07.22
+# CVE-2023-43804
+urllib3 >= 2.0.6
diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -69,5 +69,7 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 sphinxnotes-strike==1.2
     # via -r requirements.in
-urllib3==2.0.2
-    # via requests
+urllib3==2.0.6
+    # via
+    #   -r requirements.in
+    #   requests