diff options
author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-04-15 11:09:45 +0200 |
---|---|---|
committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-04-15 21:45:06 +0200 |
commit | e5d61a43c519d2cf6f4e84cb5ff57fb319d96ba6 (patch) | |
tree | b94573900a75dfac469f8049fbc24f712b295f63 | |
parent | ff9f9a7f2e227fcda7b8a2f52ec8be66de2e76cd (diff) | |
download | haskell-wip/Cabal-1.20.tar.gz |
Update Cabal to tip of v1.20wip/Cabal-1.20
This corresponds to the RC of the soon-to-be Cabal 1.20 release
One noteworthy change is the removal of the `--with-ranlib` flag
requiring a small adaptation in the GHC build system.
Moreover two new licences were added, MPL and BSD2.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
m--------- | libraries/Cabal | 0 | ||||
-rw-r--r-- | libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs | 6 | ||||
-rw-r--r-- | libraries/bin-package-db/bin-package-db.cabal | 2 | ||||
-rw-r--r-- | rules/build-package-data.mk | 1 | ||||
-rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 | ||||
-rw-r--r-- | utils/ghctags/Main.hs | 4 | ||||
-rw-r--r-- | utils/ghctags/ghctags.cabal | 2 |
7 files changed, 9 insertions, 8 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject c226c0de042999bbe4c5c339c6c28a9be7f0c6d +Subproject 38e361e5ad2bb52d615166a5aef3772e5856c3d diff --git a/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs b/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs index 27e23d8959..ab7fcf5652 100644 --- a/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs +++ b/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs @@ -132,7 +132,9 @@ instance Binary License where put OtherLicense = do putWord8 7 put (Apache v) = do putWord8 8; put v put (AGPL v) = do putWord8 9; put v - put (UnknownLicense str) = do putWord8 10; put str + put BSD2 = do putWord8 10 + put (MPL v) = do putWord8 11; put v + put (UnknownLicense str) = do putWord8 12; put str get = do n <- getWord8 @@ -147,6 +149,8 @@ instance Binary License where 7 -> return OtherLicense 8 -> do v <- get; return (Apache v) 9 -> do v <- get; return (AGPL v) + 10 -> return BSD2 + 11 -> do v <- get; return (MPL v) _ -> do str <- get; return (UnknownLicense str) instance Binary Version where diff --git a/libraries/bin-package-db/bin-package-db.cabal b/libraries/bin-package-db/bin-package-db.cabal index 1d3054ce85..44408a77b6 100644 --- a/libraries/bin-package-db/bin-package-db.cabal +++ b/libraries/bin-package-db/bin-package-db.cabal @@ -19,7 +19,7 @@ Library { build-depends: base >= 4 && < 5 build-depends: binary >= 0.5 && < 0.8, - Cabal >= 1.18 && < 1.19 + Cabal >= 1.20 && < 1.21 extensions: CPP } diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index aea2adbeb5..2e610014a2 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -94,7 +94,6 @@ endif $1_$2_CONFIGURE_OPTS += --configure-option=--with-cc="$$(CC_STAGE$3)" $1_$2_CONFIGURE_OPTS += --with-ar="$$(AR_STAGE$3)" -$1_$2_CONFIGURE_OPTS += --with-ranlib="$$(REAL_RANLIB_CMD)" $1_$2_CONFIGURE_OPTS += $$(if $$(ALEX),--with-alex="$$(ALEX)") $1_$2_CONFIGURE_OPTS += $$(if $$(HAPPY),--with-happy="$$(HAPPY)") diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal index 10d6e0a9e4..74399ce390 100644 --- a/utils/ghc-cabal/ghc-cabal.cabal +++ b/utils/ghc-cabal/ghc-cabal.cabal @@ -17,7 +17,7 @@ Executable ghc-cabal Build-Depends: base >= 3 && < 5, bytestring >= 0.10 && < 0.11, - Cabal >= 1.18 && < 1.19, + Cabal >= 1.20 && < 1.21, directory >= 1.1 && < 1.3, filepath >= 1.2 && < 1.4 diff --git a/utils/ghctags/Main.hs b/utils/ghctags/Main.hs index 9bf1a2d0c3..a67891e16a 100644 --- a/utils/ghctags/Main.hs +++ b/utils/ghctags/Main.hs @@ -20,7 +20,6 @@ import SrcLoc import Distribution.Simple.GHC ( componentGhcOptions ) import Distribution.Simple.Configure ( getPersistBuildConfig ) -import Distribution.Simple.Compiler ( compilerVersion ) import Distribution.Simple.Program.GHC ( renderGhcOptions ) import Distribution.PackageDescription ( library, libBuildInfo ) import Distribution.Simple.LocalBuildInfo @@ -191,8 +190,7 @@ flagsFromCabal distPref = do let bi = libBuildInfo lib odir = buildDir lbi opts = componentGhcOptions V.normal lbi bi clbi odir - version = compilerVersion (compiler lbi) - in return $ renderGhcOptions version opts + in return $ renderGhcOptions (compiler lbi) opts _ -> error "no library" ---------------------------------------------------------------- diff --git a/utils/ghctags/ghctags.cabal b/utils/ghctags/ghctags.cabal index 07221d3e08..0e97ccade6 100644 --- a/utils/ghctags/ghctags.cabal +++ b/utils/ghctags/ghctags.cabal @@ -17,6 +17,6 @@ Executable ghctags Build-Depends: base >= 4 && < 5, containers, - Cabal, + Cabal >= 1.20 && <1.21, ghc |