Merge pull request #660 from alexfmpe/warnings

maralorn · web-flow · commit 0caafdd58fa4 · 2025-06-10T10:37:24.000+02:00
Fix warnings
diff --git a/cabal2nix/cabal2nix.cabal b/cabal2nix/cabal2nix.cabal
@@ -55,7 +55,6 @@ library
                     , Cabal                >= 3.0
                     , aeson                > 1
                     , ansi-terminal
-                    , ansi-wl-pprint
                     , bytestring
                     , containers           >= 0.5.9
                     , deepseq              >= 1.4
@@ -69,6 +68,7 @@ library
                     , lens
                     , optparse-applicative
                     , pretty               >= 1.1.2
+                    , prettyprinter
                     , process
                     , split
                     , text
diff --git a/cabal2nix/hackage2nix/HackageGit.hs b/cabal2nix/hackage2nix/HackageGit.hs
@@ -11,6 +11,7 @@ import Control.Lens hiding ( (<.>) )
 import Control.Monad
 import Data.Aeson
 import qualified Data.ByteString.Char8 as BS
+import qualified Data.List as List
 import Data.Map as Map
 import Data.Set as Set
 import Data.String
@@ -38,7 +39,7 @@ readHackage path = getSubDirs path >>= foldM discoverPackageVersions mempty
 getSubDirs :: FilePath -> IO [FilePath]
 getSubDirs path = do
   let isDirectory p = doesDirectoryExist (path </> p)
-  getDirectoryContents path >>= filterM isDirectory . Prelude.filter (\x -> head x /= '.')
+  getDirectoryContents path >>= filterM isDirectory . Prelude.filter (not . List.isPrefixOf ".")
 
 type SHA256Hash = String
 
diff --git a/cabal2nix/src/Cabal2nix.hs b/cabal2nix/src/Cabal2nix.hs
@@ -38,7 +38,7 @@ import Options.Applicative
 import Paths_cabal2nix ( version )
 import System.Environment ( getArgs )
 import System.IO ( hFlush, stdout, stderr )
-import qualified Text.PrettyPrint.ANSI.Leijen as P2
+import qualified Prettyprinter as P2
 import Text.PrettyPrint.HughesPJClass ( Doc, Pretty(..), text, vcat, hcat, semi, render, prettyShow )
 
 {-# ANN module ("HLint: ignore Use Just" :: String) #-}
@@ -148,16 +148,16 @@ pinfo = info
         (  fullDesc
         <> header "cabal2nix converts Cabal files into build instructions for Nix."
         <> progDescDoc (Just (P2.vcat
-                     [ P2.text ""
-                     , P2.text "Recognized URI schemes:"
-                     , P2.text ""
-                     , P2.text "  cabal://pkgname-pkgversion     download the specified package from Hackage"
-                     , P2.text "  cabal://pkgname                download latest version of this package from Hackage"
-                     , P2.text "  file:///local/path             load the Cabal file from the local disk"
-                     , P2.text "  /local/path                    abbreviated version of file URI"
-                     , P2.text "  <git/svn/bzr/hg URL>           download the source from the specified repository"
-                     , P2.text ""
-                     , P2.fillSep (map P2.text (words (  "If the URI refers to a cabal file, information for building the package "
+                     [ ""
+                     , "Recognized URI schemes:"
+                     , ""
+                     , "  cabal://pkgname-pkgversion     download the specified package from Hackage"
+                     , "  cabal://pkgname                download latest version of this package from Hackage"
+                     , "  file:///local/path             load the Cabal file from the local disk"
+                     , "  /local/path                    abbreviated version of file URI"
+                     , "  <git/svn/bzr/hg URL>           download the source from the specified repository"
+                     , ""
+                     , P2.fillSep (map P2.pretty (words (  "If the URI refers to a cabal file, information for building the package "
                                                       ++ "will be retrieved from that file, but hackage will be used as a source "
                                                       ++ "for the derivation. Otherwise, the supplied URI will be used to as the "
                                                       ++ "source for the derivation and the information is taken from the cabal file "
diff --git a/cabal2nix/src/Distribution/Nixpkgs/Fetch.hs b/cabal2nix/src/Distribution/Nixpkgs/Fetch.hs
@@ -258,12 +258,12 @@ fetchWith (supportsRev, kind) source = do
                        []     -> error "This can't happen, but GHC doesn't know that."
                        (x:xs) -> (x,xs)
             buf'   = BS.unlines (reverse ls)
-        case length ls of
-          0 -> return Nothing
-          1 -> return (Just (DerivationSource { derivKind = Just kind
+        case ls of
+          [] -> return Nothing
+          [hash] -> return (Just (DerivationSource { derivKind = Just kind
                                               , derivUrl = sourceUrl source
                                               , derivRevision = ""
-                                              , derivHash = BS.unpack (head ls)
+                                              , derivHash = BS.unpack hash
                                               , derivSubmodule = Nothing
                                               }
                             , BS.unpack l))
diff --git a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal.hs b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal.hs
@@ -29,10 +29,12 @@ import Distribution.System
 import Distribution.Types.PackageVersionConstraint
 import Distribution.Text ( display )
 import Distribution.Types.ComponentRequestedSpec as Cabal
+#if !MIN_VERSION_Cabal(3,8,1)
 import Distribution.Types.ExeDependency as Cabal
 import Distribution.Types.LegacyExeDependency as Cabal
 import Distribution.Types.PkgconfigDependency as Cabal
 import Distribution.Types.UnqualComponentName as Cabal
+#endif
 import Distribution.Utils.ShortText ( fromShortText )
 import Distribution.Version
 import Language.Nix
diff --git a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs
@@ -25,7 +25,6 @@ import Distribution.Compiler
 import Distribution.Nixpkgs.Haskell.Constraint
 import Distribution.Nixpkgs.Meta
 import Distribution.Package
-import Distribution.System
 import GHC.Generics ( Generic )
 import Language.Nix.Identifier
 
diff --git a/distribution-nixpkgs/src/Distribution/Nixpkgs/Meta.hs b/distribution-nixpkgs/src/Distribution/Nixpkgs/Meta.hs
@@ -25,7 +25,7 @@ import Prelude hiding ( (<>) )
 #endif
 import Control.Applicative ( (<|>) )
 import Control.DeepSeq
-import Control.Lens hiding ( Strict )
+import Control.Lens hiding ( Strict, element )
 import Data.List ( stripPrefix )
 import Data.Set ( Set )
 import qualified Data.Set as Set
@@ -400,10 +400,10 @@ renderPlatforms field ps
 
         -- append lib.platforms list via nix's ++ at the end
         -- if there is no cabal platforms list, don't emit leading ++
-        appendNixpkgsP acc elem = acc $$
+        appendNixpkgsP acc element = acc $$
           if isEmpty acc && Set.null cabalPs
-          then nest 3 $ pPrint elem
-          else text "++" <+> pPrint elem
+          then nest 3 $ pPrint element
+          else text "++" <+> pPrint element
         renderedNixpkgsPs = Set.foldl' appendNixpkgsP mempty nixpkgsPs
 
         -- Helper function, roughly the inverse of nixpkgs' optionals
diff --git a/hackage-db/example/list-known-versions.hs b/hackage-db/example/list-known-versions.hs
@@ -5,7 +5,7 @@ import Distribution.Hackage.DB.Unparsed
 
 import Control.Monad
 import qualified Data.ByteString as BS
-import Data.List as List
+import qualified Data.List as List
 import Data.Map as Map
 import Distribution.Text
 
@@ -14,4 +14,4 @@ main = do
   db <- hackageTarball >>= readTarball Nothing
   forM_ (toList db) $ \(pn, PackageData vr vs) -> do
     let pref = if BS.null vr then "" else " (preferred: " ++ show vr ++ ")"
-    putStrLn $ display pn ++ ": " ++ intercalate ", " (fmap display (keys vs)) ++ pref
+    putStrLn $ display pn ++ ": " ++ List.intercalate ", " (fmap display (keys vs)) ++ pref
diff --git a/hackage-db/src/Distribution/Hackage/DB/Parsed.hs b/hackage-db/src/Distribution/Hackage/DB/Parsed.hs
@@ -14,7 +14,6 @@ import qualified Distribution.Hackage.DB.Unparsed as U
 import Distribution.Hackage.DB.Utility
 
 import Codec.Archive.Tar
-import Codec.Archive.Tar.Entry
 import Control.Exception
 import Control.Monad.Catch
 import Data.ByteString as BSS
diff --git a/hackage-db/src/Distribution/Hackage/DB/Unparsed.hs b/hackage-db/src/Distribution/Hackage/DB/Unparsed.hs
@@ -18,8 +18,6 @@ import Distribution.Hackage.DB.Builder ( Builder(..) )
 import Distribution.Hackage.DB.Utility
 
 import Codec.Archive.Tar as Tar
-import Codec.Archive.Tar.Entry as Tar
-import Control.Exception
 import Control.Monad.Catch
 import Data.ByteString ( ByteString )
 import Data.ByteString.Lazy ( toStrict )
@@ -28,7 +26,6 @@ import Data.Time.Clock
 import Distribution.Types.PackageName
 import Distribution.Types.Version
 import GHC.Generics ( Generic )
-import System.FilePath
 
 type HackageDB = Map PackageName PackageData
 
diff --git a/hackage-db/src/Distribution/Hackage/DB/Utility.hs b/hackage-db/src/Distribution/Hackage/DB/Utility.hs
@@ -10,11 +10,10 @@ import Distribution.Hackage.DB.Errors
 
 import Codec.Archive.Tar.Entry as Tar
 import Control.Exception
-import Control.Monad.Fail
 import Data.Maybe
 import Data.Time.Clock
 import Data.Time.Clock.POSIX
-import Data.Time.Format
+import Data.Time.Format.ISO8601
 import Distribution.Parsec
 
 parseText :: Parsec a => String -> String -> a
@@ -42,4 +41,4 @@ toEpochTime = floor . utcTimeToPOSIXSeconds
 -- 2018-12-21 13:17:40 UTC
 
 parseIso8601 :: MonadFail m => String -> m UTCTime
-parseIso8601 = parseTimeM False defaultTimeLocale (iso8601DateFormat (Just "%H:%M:%SZ"))
+parseIso8601 = iso8601ParseM
diff --git a/language-nix/src/Language/Nix/Binding.hs b/language-nix/src/Language/Nix/Binding.hs
@@ -6,7 +6,6 @@ module Language.Nix.Binding ( Binding, binding, localName, reference ) where
 
 import Control.DeepSeq
 import Control.Lens
-import Data.Maybe
 import Data.String
 import GHC.Generics ( Generic )
 import Language.Nix.Identifier
diff --git a/language-nix/src/Language/Nix/Path.hs b/language-nix/src/Language/Nix/Path.hs
@@ -5,7 +5,6 @@ module Language.Nix.Path ( Path, path ) where
 
 import Control.DeepSeq
 import Control.Lens
-import Data.Maybe
 import Data.String
 import GHC.Generics ( Generic )
 import Language.Nix.Identifier
