fedora-dists 1.1.0 → 1.1.1

raw patch · 3 files changed

+15/−15 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−1
• FedoraDists.hs +8/−11
• fedora-dists.cabal +3/−3

@@ -2,7 +2,10 @@  `fedora-dists` uses [PVP Versioning](https://pvp.haskell.org). -## 1.1.0+## 1.1.1 (2019-12-15)+- fix read and show for RHEL++## 1.1.0 (2019-10-29) - update for Fedora 31 - haddock documentation - move distTag, distTarget and hackageRelease to fedora-haskell-tools

@@ -31,6 +31,7 @@  import Data.Version import Text.Read+import Text.ParserCombinators.ReadP (char, eof, string)  #if (defined(MIN_VERSION_base) && MIN_VERSION_base(4,8,0)) #else@@ -48,21 +49,17 @@ instance Show Dist where   show (Fedora n) = "f" ++ show n   show (EPEL n) = (if n <= 6 then "el" else "epel") ++ show n-  show (RHEL v) = "rhel-" ++ show v+  show (RHEL v) = "rhel-" ++ showVersion v  -- | Read from eg "f29", "epel7" instance Read Dist where   readPrec = choice [pFedora, pEPEL, pRHEL] where-    pChar c = do-      c' <- get-      if c == c'-        then return c-        else pfail-    pFedora = Fedora <$> (pChar 'f' *> readPrec)-    pEPEL = EPEL <$> (traverse pChar "epel" *> readPrec)-    pRHEL = RHEL <$> (traverse pChar "rhel-" *> readPrec)--  readListPrec = readListPrecDefault+    pFedora = Fedora <$> (lift (char 'f') *> readPrec)+    pEPEL = EPEL <$> (lift (string "epel") *> readPrec)+    pRHEL = RHEL <$> lift (do+      v <- string "rhel-" >> parseVersion+      eof+      return v)  -- | Current maintained distribution releases. dists :: [Dist]

@@ -1,10 +1,10 @@ cabal-version:       1.18 name:                fedora-dists-version:             1.1.0+version:             1.1.1 synopsis:            Library for Fedora distribution versions description:             This library provides the Dist datatype and various associated-            metadata functions for Red Hat distributions (Fedora, EPEL, etc)+            metadata functions for Red Hat distributions (Fedora, EPEL, RHEL)             needed for packaging development and building. homepage:            https://github.com/juhp/fedora-dists bug-reports:         https://github.com/juhp/fedora-dists/issues@@ -18,7 +18,7 @@ extra-doc-files:     README.md                    , CHANGELOG.md tested-with:         GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2,-                     GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5+                     GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.1  source-repository head   type:                git