cabal-meta 0.1 → 0.1.1

raw patch · 3 files changed

+15/−10 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CabalMeta.hs +5/−4
• cabal-meta.cabal +6/−1
• main.hs +4/−5

@@ -145,10 +145,11 @@           go sources [] = sources           go _ ([]:_) = error "impossible"           go sources ((name:flags):more) = let c = T.head name in-            if c == '.' || c == '/'              then go sources { dirs = mkDir: dirs sources } more-              else if "http" `T.isPrefixOf` name then go sources { https = mkGit: https sources } more-              else if "git:" `T.isPrefixOf` name then go sources { gits = mkGit: gits sources } more-              else                                    go sources { hackages = mkPkg: hackages sources } more+            if c == '.' || c == '/'               then go sources { dirs = mkDir: dirs sources } more+              else if "http"  `T.isPrefixOf` name then go sources { https = mkGit: https sources } more+              else if "https" `T.isPrefixOf` name then go sources { https = mkGit: https sources } more+              else if "git:"  `T.isPrefixOf` name then go sources { gits = mkGit: gits sources } more+              else                                     go sources { hackages = mkPkg: hackages sources } more             where               mkDir = Directory (fromText name) flags               mkPkg = Package name flags

@@ -1,5 +1,5 @@ name:            cabal-meta-version:         0.1+version:         0.1.1 license:         BSD3 license-file:    LICENSE author:          Greg Weber <greg@gregweber.info>@@ -11,6 +11,7 @@ cabal-version:   >= 1.8 build-type:      Simple homepage:        http://www.yesodweb.com/+category:        Development  flag ghc7 @@ -52,3 +53,7 @@                  -- , file-location   extensions: OverloadedStrings  +source-repository head+  type:     git+  location: https://github.com/yesodweb/cabal-meta+  

@@ -50,11 +50,10 @@     let (_:args) = noDevArgs      packageSources <- readPackages True "."-    ifCabal cabal $-      when (length (packages packageSources) == length (hackages packageSources)) $ do-        mPath <- which "cabal-src-install"-        when (isNothing mPath) $-          errorExit "please run: cabal install cabal-src-install"+    ifCabal cabal $ do+      mPath <- which "cabal-src-install"+      when (isNothing mPath) $+        errorExit "please run: cabal install cabal-src"      let installs = packageList packageSources     echo "Installing packages:"