New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Meged upstream cabal updates #5
Commits on Oct 11, 2012
Commits on Oct 12, 2012
-
When dynamic-by-default, build the dynamic library first
This is particularly important when TH is being used, as we need the dynamic library built before the other ways try to do TH.
Ian Lynagh committedOct 12, 2012
Commits on Oct 13, 2012
Commits on Oct 14, 2012
Commits on Oct 15, 2012
-
-
-
-
Actually implement the 'sandbox-init' command.
Additionally, change the search location for the package environment file to the project directory instead of the sandbox directory.
-
-
-
-
-
Commits on Oct 16, 2012
Commits on Oct 17, 2012
Commits on Oct 18, 2012
-
Replace fragile GHC manual section references by urls
This replaces the GHC/Hugs manual references in the Haddock comments for the `Language.Haskell.Extension.Extension` enum constructors, as in ```haskell -- | [GHC § 7.6.3.4] Allow overlapping class instances, -- provided there is a unique most specific instance for each use. OverlappingInstances ``` which urls pointing directly to the section containing further documentation (assuming the urls are more immune to section reorderings), e.g.: ```haskell -- | Allow overlapping class instances, provided there is a unique -- most specific instance for each use. -- -- * <http://www.haskell.org/ghc/docs/latest/html/users_guide/type-class-extensions.html#instance-overlap> OverlappingInstances ```
-
Merge pull request haskell#1072 from hvr/lang-ext
Replace fragile GHC manual section references by urls
-
Merge pull request haskell#1021 from merijn/master
Fix for autoconf misbehaviour caused by cabal
Commits on Oct 19, 2012
-
Add a couple of new language extension flags known by GHC 7.[46]
Specifically, - `CApiFFI` - `DataKinds` - `DefaultSignatures` - `DeriveGeneric` - `InstanceSigs` - `InterruptibleFFI` - `LambdaCase` - `MonadComprehensions` - `MultiWayIf` - `ParallelArrays` - `PolyKinds` - `TraditionalRecordSyntax` - `Unsafe` This addresses haskell#1050
-
Merge pull request haskell#1073 from hvr/lang-exts-ghc76
Add a couple of new language extension flags known by GHC 7.[46]
Commits on Oct 23, 2012
-
Force a recompile when updating the setup exe cache.
See the discussion in haskell#1076.
-
Try harder to pick the correct version in cabalLibVersionToUse.
See the discussion in haskell#1076.
Commits on Oct 24, 2012
Commits on Oct 25, 2012
-
Fix abi-hashing when the vanilla way is disabled
Ian Lynagh committedOct 25, 2012 -
Merge branch 'master' of git://github.com/haskell/cabal
Ian Lynagh committedOct 25, 2012 -
Revert "Fixed warnings on the generated Paths module."
This reverts commit df6fe40. It broke the build on Windows, e.g.: utils\hsc2hs\dist\build\autogen\Paths_hsc2hs.hs:45:34: Not in scope: `fromIntegral'
Commits on Oct 26, 2012
Commits on Oct 29, 2012
-
Merge pull request haskell#1015 from arunchaganty/master
Partial Fix for haskell#543
Commits on Oct 30, 2012
-
Fix bug in preprocessing test suites and benchmarks
Preprocessed files would be written to dist/build instead of dist/build/my-test-suite/my-test-suite-tmp, causing them not to be found during compilation. Fixes haskell#1087.
-
Revert "Revert "Fixed warnings on the generated Paths module.""
This reverts commit 98e37ca.
-
-
Revert "Revert "Revert "Fixed warnings on the generated Paths module."""
This reverts commit 49de83a.
-
-
-
Commits on Oct 31, 2012
Commits on Nov 2, 2012
-
cabal-install: Use LANGUAGE pragma instead of Cabal extensions
The main motivation for this change is to make it more convenient to use GHCi.
-
-
Commits on Nov 3, 2012
-
-
-
-
Reduce duplication between parser of instances for Text of BenchmarkT…
…ype and TestType
-
Use Data.List ( intercalate ) which is exported for more than the las…
…t 3 years instead of reimplementing it all over the place
-
-
-
-
Commits on Nov 5, 2012
-
-
-
Remove the elaborate upgrade action code that just calls code that di…
…es. Instead, die immediately in Main.hs
-
-
-
-
Commits on Nov 6, 2012
-
-
Re-enable setting jobs: $nprocs in the default ~/.cabal/config.
This feature was disabled because it doesn't work with Cabal-1.16, but the cabal-install in master has a '>= 1.17.0 & < 1.18' dependency.
-
Revert "Fixed warnings on the generated Paths module."
This commit breaks the path module on Windows. This reverts commit df6fe40.
-
-
Commits on Nov 7, 2012
Commits on Nov 8, 2012
-
-
-
Use showCommandForUser when it's available (GHC >= 7.2)
Ian Lynagh committedNov 8, 2012 -
Add support for keeping temporary files
Currently only the haddock command has a flag to enable it
Ian Lynagh committedNov 8, 2012 -
-
Fix haddocking when we only have dynamic libraries
Ian Lynagh committedNov 8, 2012 -
Ian Lynagh committed
Nov 8, 2012 -
Merge git://github.com/haskell/cabal
Ian Lynagh committedNov 8, 2012
Commits on Nov 13, 2012
-
Replace QSem with MSem from the SafeSemaphore package.
Control.Concurrent.QSem is deprecated and will be removed in GHC 7.8. The documentation recommends using the SafeSemaphore package instead. Since this package is not in the platform, we add the relevant module to Distribution.Compat. Tested by running `cabal install -j2 ghc-core` on a fresh ~/.cabal. SafeSemaphore uses the same 3-clause BSD license as Cabal.
Commits on Nov 14, 2012
-
-
-
Remove the getSandboxInfo function.
It did reduce duplication, but made the code harder to read.
-
Filter autogen files (such as Path_foo) from exposed-modules when run…
…ning sdist. Previously autogen files were only filtered from other-modules.
-
-
Instead of always using './.cabal-sandbox', load the sandbox path from 'cabal.sandbox.config'.
Commits on Nov 15, 2012
-
JobControl: Use STM-based QSem and add stm dependency
This is in place of the deprecated implementation from Control.Concurrent. New implementation due to Simon Marlow. Note that this has only been tested against stm-2.4 despite the permissive version bounds given in the cabal file and bootstrap script.
-
Revert "Replace QSem with MSem from the SafeSemaphore package."
This reverts commit ea1f338. Conflicts: cabal-install/Distribution/Client/JobControl.hs
-
-
-
-
-
Fix a bug that caused important debugging info to be deleted in modul…
…ar solver. The question is whether or not cabal-install will tell you why it tries a particular goal (i.e., because it's the dependency of something else). This regression was introduced between 0.14.0 and 1.16.0 of cabal-install in order to fix a space leak. Restoring the information actually costs some space again (although not as much as was required back in 0.14.0). I think the extra info is worth it though.
-
Undo some hlint-related changes in the modular solver.
I think the extra parentheses in the type signatures help to understand the intended use of functions.
Commits on Nov 16, 2012
-
Use settings from ~/.cabal/config when creating a sandbox.
This way, the user won't be required to set things like 'split-objs' individually for each sandbox.
-
Commits on Nov 17, 2012
-
Add a cross-platform setenv implementation.
This is a simplified version of Simon Hengel's patch for the 'base' library [1] (without unsetEnv and the unix dependency). Tested on Windows and Linux. [1] http://thread.gmane.org/gmane.comp.lang.haskell.libraries/18001
Commits on Nov 18, 2012
Commits on Nov 22, 2012
-
-
Merge pull request haskell#1128 from BardurArantsson/typo-fix-1
Fix a typo in Cabal/README
Commits on Nov 24, 2012
Commits on Nov 26, 2012
-
Keep the full build component dependency graph
Plus add functions for finding all the deps of one or more components, in dependency order. This will be useful for building individual targets, e.g. cabal build foo.
-
New module for handling build targets given on the command line
This will be used for the new "cabal build [target]" feature and similarly for "cabal repl [target]". That is we can actually specify what we want to build, like a proper build system. Targets can be components, modules or files. We go to some effort to allow targets to be specified in a short convenient form. We allow case insensitive matching. We only complain when the given form is ambiguous (and note that we don't let the case insensitive matching add artificial ambiguity). If it is ambiguous we report the non-ambigious qualified forms of the targets it could be, e.g.: Ambiguous build target 'darcs'. It could be: exe:darcs (component) lib:darcs (component) We note the kind of target here (component, module, file) since it's possible to have ambiguities between them, like a component called 'Foo' and a module 'Foo' if the user entered 'foo'.
-
Further tweaks to the LocalBuildInfo component info utils
Needed to support the "cabal build [target]" feature. Also move an existing util function so we can reuse it.
-
Add 'cabal build [target]' feature
Allows users to specify what targets to build. It builds the given target and the dependent components. Currently only component targets are fully supported. Currently using an individual module or file target will give a warning and it will build the whole component the module or file belongs to.
-
Do not link with threaded RTS on ARM.
GHC on ARM doesn't have a threaded RTS, which makes it impossible to build cabal-install without editing the source by hand (see haskell#1129). This patch makes cabal-install compile out of the box on ARM.
-
Merge pull request haskell#1132 from 23Skidoo/no-threaded
Do not link with threaded RTS on ARM.
-
Merge pull request haskell#1134 from 23Skidoo/show-config-file
Show '--config-file' in 'cabal help' output.
-
Don't pass unsupported flags to setups built with old Cabal versions.
We must not pass '--disable-benchmarks' to setup scripts built with Cabal < 1.14; the same is also true for '--disable-tests' and Cabal < 1.10. Fixes haskell#932 and haskell#1004. Without this patch: $ cabal install -w /path/to/ghc-7.2.1/bin/ghc syb [...] unrecognized option `--disable-benchmarks' Failed to install syb-0.3.7 With this patch: $ cabal install -w /path/to/ghc-7.2.1/bin/ghc syb [...] Registering syb-0.3.7... Installed syb-0.3.7
-
Commits on Nov 27, 2012
-
Fix mistake about which set of components to build
Was accidentally using the targets rather than the dependencies and the targets.
Commits on Nov 29, 2012
Commits on Nov 30, 2012
Commits on Dec 5, 2012
-
Use userInstallDirs as the sandbox location.
We set both globalInstallDirs and userInstallDirs to the same value, but using '--global' makes cabal-install want to do unnecessary things like invoking itself with 'sudo'.
Commits on Dec 8, 2012
Commits on Dec 9, 2012
-
parse potential module names with simpleParse instead of fromString (f…
…ixes haskell#1052)
Brent Yorgey committedDec 9, 2012 -
-
-
Separate compiling and linking phases for bulding exes with ghc
And move compiling of C files after the compile of Haskell modules, just like we do for libraries. Reversing the order is important because C files can depend on headers generated for Haskell FFI exports. This is based on a patch by Edward Z. Yang <ezyang@mit.edu>
-
Rename 'InstallContext' to 'InstallArgs'.
The name 'InstallContext' will be used for common data shared between lower-level install functions.
-
Add an alternative interface for 'D.C.Install.install'.
Splits 'D.C.Install.install' into three parts: * makeInstallContext - load common data * makeInstallPlan - produce the install plan * processInstallPlan - actually perform the installations This allows to manipulate the install plan produced with 'makeInstallPlan' before performing the installations with 'processInstallPlan'. The high-level 'install' action is still present; most clients should use it instead.
-
Rebuild source directories added to sandbox.
Implemented by creating an install plan for ["add-source-dep-1", ..., "add-source-dep-N", "."], pruning "." from this plan and then doing all remaining installs in the plan before building the current package. This way, all reverse dependencies of add-source packages needed to install the current package are also reinstalled.
Commits on Dec 10, 2012
-
Support for C/C++/Obj-C as main
This allows specifying the main-is field as a C file. This is closely based on patches by Edward Z. Yang, who in turn credits and earlier set of patches by Irene Knapp. The slight difference in this version of the patch is that it is adjusted to work with the new approach where we have separate hs compile; c compile; and link phases.
-
Add a check for main-is C files, only ok with cabal-version >= 1.18
For compatability, we need to make sure people using C files for the main-is field, also have to specify the right cabal version.
-
Adjust the error text wrapping so it preserves blank lines
This lets us use it for the package check in configure.
-
Merge pull request haskell#1140 from byorgey/master
cabal init: parse module names with simpleParse instead of fromString
-
Commits on Dec 13, 2012
-
-
Add a default value for the --jobs flag
This will allow it to be set in config files too.
-
-
Commits on Dec 14, 2012
-
Sync bootstrap.sh with platform 2012.4.0.0
Tuncer Ayaz committedDec 14, 2012 -
Merge pull request haskell#1151 from tuncer/sync-2012.4.0.0
Sync bootstrap.sh with platform 2012.4.0.0
Commits on Dec 17, 2012
Commits on Dec 18, 2012
-
cabal init: simple heuristic for guessing common extra-source-files
Brent Yorgey committedDec 18, 2012
Commits on Dec 22, 2012
-
Improve warning for old versions of HPC
Now the warning message includes mention of the input data that is being ignored because hpc can't deal with it. This involves a change of behaviour: when the HPC version cannot be determined, this is now a fatal error, rather than just assuming an old version.
Commits on Dec 28, 2012
Commits on Dec 29, 2012
-
Merge pull request haskell#1161 from dagit/patch-1
Fix path (mis)handling when scanning for modules (fixes haskell#1160)
Commits on Dec 31, 2012
-
Split cabal-install into library and executable components.
Makes it possible to write unit tests for code under Distribution.Client.*.
Commits on Jan 1, 2013
-
Merge pull request haskell#1162 from 23Skidoo/split-cabal-install
Split cabal-install into library and executable components.
-
Merge pull request haskell#1155 from benmachine/hpcmsg
Improve warning for old versions of HPC
-
-
Make the UserConstraint parser non-ambiguous.
`+++` and `<++` are right-associative, so `a +++ b +++ c <++ d` is parsed as `(a +++ (b +++ (c <++ d)))`. Fixes haskell#1159.
-
-
Merge pull request haskell#1163 from 23Skidoo/sandbox-constraints-error
Make the UserConstraint parser non-ambiguous.
Commits on Jan 2, 2013
-
Update syntax of Haddock module attributes
This re-hides several modules that had been inadvertently unhidden by the change in attribute syntax in Haddock 2.0.0.0 (nearly five years ago!)
-
Merge pull request haskell#1153 from benmachine/haddockattributes
Haddock module attributes specified with old syntax
-
-
-
Commits on Jan 3, 2013
-
Two more Haddock module attribute syntax updates
cf. revision 47cd57c
Commits on Jan 4, 2013
-
Merge pull request haskell#1165 from benmachine/haddockattributes
Two more Haddock module attribute syntax updates
-
Drop code to handle unsupported compilers
This means tweaking CPP conditionals and file pragmas to remove handling of compilers other than GHC, and GHC versions before LANGUAGE pragmas existed.
Commits on Jan 8, 2013
-
-
Merge pull request haskell#1166 from benmachine/nohugs
Drop code to handle unsupported compilers
-
Merge pull request haskell#1157 from byorgey/master
Add simple heuristic to cabal init to guess common extra-source-files
-
-
Merge pull request haskell#1169 from benmachine/unused-env
Removing unused stuff in Distribution.Compat.Env
-
Broken by 481c421 back in 2008, and no longer necessary.
-
Merge pull request haskell#1172 from benmachine/bitrot
Remove now-unused runTests.sh
Commits on Jan 9, 2013
-
Omit comments from the default cabal.sandbox.config.
Since this file is not intended to be edited by hand, don't print the default values for empty fields in comments (just like cabal-dev).
-
Generalise 'ppField' and friends and remove customised copies from D.C.PackageEnvironment.
-
Re-enable -threaded for the cabal-install exe.
I forgot to enable -threaded for the cabal-install exe when I split cabal-install into an exe and a library part. Thanks to Tuncer Ayaz for the heads-up.
Commits on Jan 11, 2013
-
Replace the 'unpack' command with a more general 'get'.
'cabal get PACKAGE' is the new name of 'cabal unpack'. 'cabal get --source-repository' reads the source-repositories from a package's description, determines which VCS to use, and then creates a local repository or branch of the package's repository. 'cabal get --source-repository=[head|this|...]' additionally allows to specify which source-repository to use. Based on the code originally written by John Millikin <jmillikin@gmail.com>.
-
-
-
-
Merge pull request haskell#1075 from 23Skidoo/cabal-get
Replace the 'unpack' command with a more general 'get'.
Commits on Jan 13, 2013
-
My investigation suggests it became unnecessary for the build with revision 21dc557 (named DefaultSetup.lhs at the time) but has hung around ever since.
-
Merge pull request haskell#1180 from benmachine/springclean
Remove DefaultSetup.hs
Commits on Jan 14, 2013
-
Add extra-html-files, for installing extra html files
For example, you might have an images/ directory in your project, with images that you refer to from Haddock with: <<images/foo.png>> Then in your Cabal file you would include: extra-html-files: images/*.png And these would both be packaged by sdist, and "cabal haddock" will install them in: ~/.cabal/share/doc/PROJECT/html/images/*.png Fixes haskell#1167
John Wiegley committedJan 14, 2013 -
A few more code simplifications
John Wiegley committedJan 14, 2013 -
Updated documentation for extra-html-files
John Wiegley committedJan 14, 2013
Commits on Jan 16, 2013
-
Change more flip mapM_ to forM_
John Wiegley committedJan 16, 2013
Commits on Jan 17, 2013
Commits on Jan 23, 2013
-
Merge remote-tracking branch 'upstream/master' into extra-html-files
John Wiegley committedJan 23, 2013 -
Installation extra-html-docs via proper mechanism
John Wiegley committedJan 23, 2013
Commits on Jan 27, 2013
-
Bump zlib dependency to 0.5.3, as cabal-install doesn't even build ag…
…ainst zlib-0.5.0.0. Fixes haskell#866.
Commits on Jan 28, 2013
-
Let the user know that ~/.cabal/config will be created on "cabal update"
during --help. Fixes haskell#535.
-
Windows: generate the .exe extension even if the executable name cont…
…ains a dot. Fixes haskell#711. (Hopefully)
-
-
-
-
Commits on Jan 31, 2013
Commits on Feb 6, 2013
-
Merge pull request haskell#1182 from jwiegley/extra-html-files
Add extra-html-files, for installing extra html files
-
Commits on Feb 8, 2013
-
remove no longer relevant comment
Brent Yorgey committedFeb 8, 2013 -
init: put in place most of the scaffolding to guess other-extensions …
…field Only remaining thing is to actually parse LANGUAGE pragmas in source files.
Brent Yorgey committedFeb 8, 2013
Commits on Feb 9, 2013
Commits on Feb 10, 2013
-
Merge pull request haskell#1188 from chreekat/git-authorname-heuristics
RFC: Adding git prefs to 'cabal init' author-lookup heuristics
Commits on Feb 11, 2013
-
Much faster Distribution.Client.Dependency.Modular.PSQ.splits
This reduces the runtime of "cabal install --dry-run" on a large cabal file (550 dependencies) from ~12s to 2.1s. Equivalency with previous implementation verified with QuickCheck in ghci. This is a guess: The speedup is mostly due to how to the previous entries are added to the result of the recursive call. Previously, for every entry to be added, the whole result list is mapped over (lots of allocations), and then each tuple is taken apart and reconstructed with a changed right value (again, lots of allocations). The new code assembles a function in an accumulator that represents the required update and applies it where needed, hence building the list and tuples only once.
Commits on Feb 12, 2013
-
Merge branch 'master' into init-other-extensions.
Want to make use of chreekat's recent refactorings+additions in Init/Heuristics.hs.
Brent Yorgey committedFeb 12, 2013 -
implement a poor man's LANGUAGE pragma parser
Brent Yorgey committedFeb 12, 2013 -
-
Merge pull request haskell#1193 from nomeata/fast-splits
Add test case for new splits implementation
Commits on Feb 17, 2013
-
Update build-depends for ghc-7.7.x
Tuncer Ayaz committedFeb 17, 2013 -
-
Merge pull request haskell#1205 from benmachine/unnecessary-pragma
Remove unused ScopedTypeVariables
Commits on Feb 18, 2013
-
-
Merge pull request haskell#1208 from alexanderkjeldaas/master
Update time version
-
Merge pull request haskell#1203 from tuncer/ghc-7.7
Update build-depends for ghc-7.7.x
Commits on Feb 19, 2013
-
-
Merge pull request haskell#1209 from benmachine/oldbuildflags
Remove flags for unsupported compilers from Cabal.cabal
Commits on Feb 20, 2013
-
cabal-install: put the Paths_cabal_install.hs and Paths_Cabal.hs in p…
…lace as expected
-
disable hackage's preferred-versions (as we don't use it when merge e…
…builds) hackage.haskell.org/00-index.tar contains preferred-versions for some interesting packages. For now it's 'base-3'. Otherwise depends generated by hackport differ from ones pulled by ./Setup.hs.
-
cabal/cabal-install: renamed D.C.Exception -> D.C.ExceptionCI to avoi…
…d clash with Cabal's one Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
Fix error messages with "cabal update" -> "hackport update" Same fix …
…as marty.rosenberg@gmail.com once did for cabal-install-0.8.2, which we now are replacing.
-
cabal/cabal-install: renamed D.C.Exception -> D.C.ExceptionCI to avoi…
…d clash with Cabal's one Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-