diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2013-08-26 22:03:25 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2013-08-26 23:18:07 +0200 |
| commit | 795fe083e59fa22055cca53fadc36ebd26b0d2a5 (patch) | |
| tree | 35c7e51458133455d779535ecbcfd1b5763c5de2 /utils | |
| parent | 4b5238a47be6f4778c5c6edbd46b3ee3bc9d3251 (diff) | |
| download | haskell-795fe083e59fa22055cca53fadc36ebd26b0d2a5.tar.gz | |
Sync Cabal to upstream version 1.18 pre-release
Apart from bumping build-dep version bounds, `ghc-cabal` is adapted to
some minor Cabal API changes, and `bin-package-db` is made aware of
Cabal's recently added AGPL licence support.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 13 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 9a76d6b93d..7d1d9bcc92 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -167,7 +167,7 @@ doCopy directory distDir (installDirTemplates lbi) progs = withPrograms lbi stripProgram' = stripProgram { - programFindLocation = \_ -> return (Just strip) } + programFindLocation = \_ _ -> return (Just strip) } progs' <- configureProgram verbosity stripProgram' progs let lbi' = lbi { @@ -205,12 +205,13 @@ doRegister directory distDir ghc ghcpkg topdir progs = withPrograms lbi ghcpkgconf = topdir </> "package.conf.d" ghcProgram' = ghcProgram { - programPostConf = \_ _ -> return ["-B" ++ topdir], - programFindLocation = \_ -> return (Just ghc) } + programPostConf = \_ cp -> return cp { programDefaultArgs = ["-B" ++ topdir] }, + programFindLocation = \_ _ -> return (Just ghc) } ghcPkgProgram' = ghcPkgProgram { - programPostConf = \_ _ -> return $ ["--global-package-db", ghcpkgconf] - ++ ["--force" | not (null myDestDir) ], - programFindLocation = \_ -> return (Just ghcpkg) } + programPostConf = \_ cp -> return cp { programDefaultArgs = + ["--global-package-db", ghcpkgconf] + ++ ["--force" | not (null myDestDir) ] }, + programFindLocation = \_ _ -> return (Just ghcpkg) } configurePrograms ps conf = foldM (flip (configureProgram verbosity)) conf ps progs' <- configurePrograms [ghcProgram', ghcPkgProgram'] progs diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal index 864620487d..10d6e0a9e4 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.10 && < 1.18, + Cabal >= 1.18 && < 1.19, directory >= 1.1 && < 1.3, filepath >= 1.2 && < 1.4 |