licensor 0.4.0 → 0.4.1

raw patch · 4 files changed

+23/−18 lines, 4 filesdep ~Cabaldep ~basedep ~cmdargs

Dependency ranges changed: Cabal, base, cmdargs

Files

• CHANGELOG.md +5/−0
• app/Main.hs +7/−8
• licensor.cabal +7/−7
• src/Licensor.hs +4/−3

@@ -1,3 +1,8 @@+# 0.4.1 (2020-04-12)++- Set resolver to LTS 15.8 (a79cb02)+  * Allow Cabal > 2.2+ # 0.4.0 (2020-02-16)  ## Enhancements

@@ -21,7 +21,6 @@ -- base import Control.Monad import Data.List-import Data.Monoid ((<>)) import qualified Data.Version as Version import System.Environment import qualified System.Exit as Exit@@ -90,15 +89,15 @@           else             Exit.die "Error: No Cabal file found." -      Just PackageDescription { license, package } -> do+      Just pd -> do         putStrLn $           "Package: "-            <> display package+            <> display (package pd)             <> " ("             <> "License: "-            <> display license+            <> display (license pd)             <> ")"-        pure (Just package)+        pure (Just $ package pd)    maybeDependencies <- getDependencies   maybeLicenses <- getLicenses@@ -111,16 +110,16 @@       let dependenciesByLicense = fmap (Set.map display) dependenciesByLicense'        forM_ (Map.keys dependenciesByLicense) $-        \license ->+        \li ->           let-            n = dependenciesByLicense Map.! license+            n = dependenciesByLicense Map.! li           in do             putStrLn "-----"             putStrLn $               show (Set.size n)                 <> (if Set.size n == 1 then " package " else " packages ")                 <> "licensed under "-                <> display license+                <> display li                 <> ": "                 <> intercalate ", " (Set.toList n) 

@@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: b5e0234d196e96476a6a70c11798ae1dd4fd24ca9ce1c11ea74d6b3422604fc8+-- hash: 6f7bb1fb7f37e3f143f35b05d83e6602a069aca2b14389e3e7ee6fe2a7b294bd  name:           licensor-version:        0.4.0+version:        0.4.1 synopsis:       A license compatibility helper description:    A license compatibility helper. category:       Distribution@@ -37,8 +37,8 @@       src   ghc-options: -Wall   build-depends:-      Cabal >=1.22 && <2.1-    , base >=4.8 && <4.11+      Cabal+    , base >=4.8 && <5     , containers     , directory     , process@@ -52,9 +52,9 @@       app   ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N   build-depends:-      Cabal >=1.22 && <2.1-    , base >=4.8 && <4.11-    , cmdargs >=0.10 && <0.11+      Cabal+    , base >=4.8 && <5+    , cmdargs     , containers     , directory     , licensor

@@ -30,9 +30,10 @@ import Distribution.License (License) import Distribution.Package (PackageIdentifier(..), PackageName) import Distribution.PackageDescription (PackageDescription, packageDescription)-import Distribution.PackageDescription.Parse (readGenericPackageDescription)+import Distribution.PackageDescription.Parsec (readGenericPackageDescription)+import Distribution.Pretty (Pretty) import Distribution.Simple.Utils (comparing, findPackageDesc)-import Distribution.Text (Text, display, simpleParse)+import Distribution.Text (display, simpleParse) import Distribution.Verbosity (silent)  -- containers@@ -56,7 +57,7 @@ --  newtype LiLicense = LiLicense { getLicense :: License }-  deriving (Eq, Read, Show, Text)+  deriving (Eq, Read, Show, Pretty)   -- |