cabal-helper 0.7.1.0 → 0.7.2.0

raw patch · 3 files changed

+61/−44 lines, 3 filesdep ~Cabaldep ~directorydep ~extraPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: Cabal, directory, extra, template-haskell, temporary, unix, utf8-string

API changes (from Hackage documentation)

Files

• CabalHelper/Licenses.hs +5/−1
• CabalHelper/Main.hs +17/−12
• cabal-helper.cabal +39/−31

@@ -1,5 +1,9 @@ {-# LANGUAGE CPP #-}-module CabalHelper.Licenses where+module CabalHelper.Licenses (+    displayDependencyLicenseList+  , groupByLicense+  , getDependencyInstalledPackageInfos+  ) where  -- Copyright (c) 2014, Jasper Van der Jeugt <m@jaspervdj.be> 

@@ -306,10 +306,10 @@   readIORef lr  getLibraryClbi pd lbi = unsafePerformIO $ do-  lr <- newIORef (error "getLibraryClbi: empty IORef")+  lr <- newIORef Nothing    withLibLBI pd lbi $ \ lib clbi ->-      writeIORef lr (lib,clbi)+      writeIORef lr $ Just (lib,clbi)    readIORef lr @@ -417,21 +417,26 @@                   -> ComponentLocalBuildInfo                   -> (ComponentLocalBuildInfo, GhcOptions) removeInplaceDeps v lbi pd clbi = let-    (lib, libclbi) = getLibraryClbi pd lbi-    libbi = libBuildInfo lib-    liboutdir = componentOutDir lbi (CLib lib)-    libopts = (componentGhcOptions normal lbi libbi libclbi liboutdir) {-                                      ghcOptPackageDBs = []+    (ideps, deps) = partition isInplaceDep (componentPackageDeps clbi)+    hasIdeps = not $ null ideps+    libopts =+      case getLibraryClbi pd lbi of+        Just (lib, libclbi) | hasIdeps ->+          let+            libbi = libBuildInfo lib+            liboutdir = componentOutDir lbi (CLib lib)+          in+            (componentGhcOptions normal lbi libbi libclbi liboutdir) {+                ghcOptPackageDBs = [] #if CABAL_MAJOR == 1 && CABAL_MINOR > 22 && CABAL_MINOR < 23-                                    , ghcOptComponentId = NoFlag+              , ghcOptComponentId = NoFlag #endif-                                  } -    (ideps, deps) = partition isInplaceDep (componentPackageDeps clbi)-    hasIdeps = not $ null ideps+            }+        _ -> mempty     clbi' = clbi { componentPackageDeps = deps } -  in (clbi', if hasIdeps then libopts else mempty)+  in (clbi', libopts)   where    isInplaceDep :: (InstalledPackageId, PackageId) -> Bool

@@ -1,5 +1,5 @@ name:                cabal-helper-version:             0.7.1.0+version:             0.7.2.0 synopsis:            Simple interface to some of Cabal's configuration state used by ghc-mod description:     @cabal-helper@ provides a library which wraps the internal use of an@@ -48,13 +48,13 @@                      , CabalHelper.Sandbox   default-language:    Haskell2010   GHC-Options:         -Wall-  Build-Depends:       base >= 4.5 && < 5-                     , Cabal >= 1.14 && < 1.26-                     , directory-                     , filepath-                     , transformers-                     , mtl-                     , process+  Build-Depends:       base          < 5    && >= 4.5+                     , Cabal         < 1.26 && >= 1.14+                     , directory     < 1.3  && >= 1.1.0.2+                     , filepath      < 1.5  && >= 1.3.0.0+                     , transformers  < 0.6  && >= 0.3.0.0+                     , mtl           < 2.3  && >= 2.0+                     , process       < 1.5  && >= 1.1.0.1                      , ghc-prim  Executable cabal-helper-wrapper-v0.7@@ -71,16 +71,18 @@                        CabalHelper.Sandbox   GHC-Options:         -Wall   X-Install-Target:    $libexecdir-  Build-Depends:       base >= 4.5 && < 5-                     , bytestring-                     , Cabal >= 1.14 && < 1.26-                     , directory-                     , filepath-                     , process-                     , transformers+  Build-Depends:       base             < 5    && >= 4.5+                     , Cabal            < 1.26 && >= 1.14+                     , bytestring       < 0.11 && >= 0.9.2.1+                     , directory        < 1.3  && >= 1.1.0.2+                     , filepath         < 1.5  && >= 1.3.0.0+                     , transformers     < 0.6  && >= 0.3.0.0+                     , mtl              < 2.3  && >= 2.0+                     , process          < 1.5  && >= 1.1.0.1+                     , temporary        < 1.3  && >= 1.2.0.4+                     , utf8-string      < 1.1  && >= 1.0.1.1+                      , template-haskell-                     , temporary-                     , utf8-string                      , ghc-prim  Test-Suite spec@@ -98,21 +100,27 @@   Hs-Source-Dirs:      tests, .   GHC-Options:         -Wall   Build-Tools:         cabal-  Build-Depends:       base >= 4.5 && < 5-                     , cabal-helper-                     , extra-                     , unix-                     , Cabal >= 1.14 && < 1.26-                     , directory-                     , filepath-                     , transformers-                     , mtl-                     , process-                     , ghc-prim-                     , bytestring-                     , utf8-string+  Build-Depends:       base             < 5    && >= 4.5+                     , Cabal            < 1.26 && >= 1.14+                     , bytestring       < 0.11 && >= 0.9.2.1+                     , directory        < 1.3  && >= 1.1.0.2+                     , filepath         < 1.5  && >= 1.3.0.0+                     , transformers     < 0.6  && >= 0.3.0.0+                     , mtl              < 2.3  && >= 2.0+                     , process          < 1.5  && >= 1.1.0.1+                     , temporary        < 1.3  && >= 1.2.0.4+                     , utf8-string      < 1.1  && >= 1.0.1.1++                     -- additional test deps+                     , extra            < 1.5  && >= 1.4.10+                     , unix             < 2.8  && >= 2.5.1.0+                      , template-haskell-                     , temporary+                     , ghc-prim+                     , cabal-helper+++  -- custom-setup --   setup-depends: base,