stack2cabal 1.0.12 → 1.0.13

raw patch · 4 files changed

+13/−8 lines, 4 filesdep ~hpackdep ~optparse-applicativePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: hpack, optparse-applicative

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• lib/StackageToHackage/Hackage.hs +1/−1
• lib/StackageToHackage/Stackage/YAML.hs +2/−1
• stack2cabal.cabal +6/−6

@@ -1,5 +1,9 @@ # Revision history for stack2cabal +## 1.0.13 -- 2022-03-06++- Support github field in extra-deps wrt [#39](https://github.com/hasufell/stack2cabal/pull/39), by Fumiaki Kinoshita+ ## 1.0.12 -- 2020-10-23  - Use multiple subdirs per source-repository wrt #29

@@ -95,7 +95,7 @@ printProject pinGHC indexDate (Project (Ghc ghc) pkgs srcs ghcOpts) hack = do     ghcOpts' <- printGhcOpts ghcOpts     pure $ T.concat-        $ ["-- Generated by stackage-to-hackage\n\n"]+        $ ["-- Generated by stack2cabal\n\n"]         <> withHackageIndex         <> withCompiler         <> [ "packages:\n    ", packages, "\n\n", sources

@@ -73,9 +73,10 @@  instance FromYAML Git where   parseYAML = withMap "Git" $ \m -> Git-      <$> m .: "git"+      <$> (m .: "git" <|> github m)       <*> m .: "commit"       <*> m .:? "subdirs" .!= []+    where github m = (\x -> "https://github.com/" <> x <> ".git") <$> (m .: "github")  instance FromYAML ResolverRef where   parseYAML = withStr "ResolverRef" $ \s ->

@@ -1,6 +1,6 @@ cabal-version:      2.2 name:               stack2cabal-version:            1.0.12+version:            1.0.13 synopsis:   Convert stack projects to cabal.project + cabal.project.freeze @@ -10,7 +10,7 @@ maintainer:         Julian Ospald copyright:          2018 Tseen She, 2020 Julian Ospald bug-reports:        https://github.com/hasufell/stack2cabal/issues-tested-with:        GHC ^>=8.6.5 || ^>=8.8.4 || ^>=8.10.2+tested-with:        GHC ^>=8.8.4 || ^>=8.10.7 category:           Building description:   Convert @stack.yaml@ \/ @package.yaml@ to @cabal.project@ \/ @cabal.project.freeze@\/ @*.cabal@.@@ -32,9 +32,9 @@  common deps   build-depends:-    , base                  >=4.10     && <5.0+    , base                  >=4.13     && <5.0     , bytestring-    , Cabal                 >=3.0      && <3.4+    , Cabal                 >=3.0      && <=3.4     , containers     , directory     , exceptions            ^>=0.10.4@@ -43,11 +43,11 @@     , filepattern           ^>=0.1.2     , fuzzy-dates           ^>=0.1.1.2     , hourglass             ^>=0.2.12-    , hpack                 ==0.34.2+    , hpack                 ==0.34.5     , HsYAML                ^>=0.2     , http-client           ^>=0.6.4.1     , http-client-tls       ^>=0.3.5.3-    , optparse-applicative  ^>=0.15.1.0+    , optparse-applicative  >=0.15.1.0 && < 0.17     , process               >=1.6.9.0     , safe                  ^>=0.3.19     , temporary             ^>=1.3