pristine:0000000632-18e3399c3d873ea4481f18138ab2245467667206d36c7dc1bc39560a843c83cb Starting with inventory: 0000294121-843acee919cee5674bde54a3f3104efd3356a3507438c7b10d3775e515133c21 [TAG cabal-install merged Duncan Coutts **20110619135228 Ignore-this: 58d670de46a24046d0b869dc2b88e13a We now have both the Cabal library and the cabal-install tool together in the same repo, each in a subdir. The idea is that this will make splitting packages and moving code between package rather easier in future. ] hash: 0000051912-9553f4008a0160b2b78d38c7406df9319a8b9732723d89c6f0c4f44b8fbc710c [Update changelog for 1.10.2.0 Duncan Coutts **20110618190748 Ignore-this: 64129f45dd16d2d93c82097530dc15d1 ] hash: 0000000448-30a82df5ede9abf74ba33e1213b526aab07eb7753a68145bbf5a2e57fdd054c0 [Add a dash separator for pid in createTempDirectory and openBinaryTempFile too Jens Petersen **20110519021658 Ignore-this: ee0c842388212326579309ac6f93408f ] hash: 0000000550-b923fe207786a8126d7228f736453d96a4716b3821a089af7bac9de41ec35052 [Add files needed by the GHC build system Ian Lynagh **20110624003654 Ignore-this: a40dd98104e994d1a1648c3ce2676a45 ] hash: 0000001861-f2fe513e1ac78f0250a4e74099c6c4f4dec0ee49321f8310de6ad7e3926014f7 [Relax some dependencies Ian Lynagh **20110706192619 Ignore-this: 6353c1d64a2fff3cef3ca0d8a9f2e95e ] hash: 0000000489-afe362c854efc0c85b218534e2e836a7ad943569bc42873ca72126ffe54d75c3 [Fix withComponentsLBI and move Components to LocalBuildInfo module Duncan Coutts **20110708012122 Ignore-this: 57217119f7825c9bcd3824a34ecd0c8f An annoyance of the current Simple build system is that each phase (build, install, etc) can be passed additional HookedBuildInfo which gets merged into the PackageDescription. This means that we cannot process the PackageDescription up front at configure time and just store and reuse it later, we have to work from it each time afresh. The recent addition of Components (libs, exes, test suites) and a topoligical sort of the components in the LocalBuildInfo fell foul of this annoyance. The LocalBuildInfo stored the entire component which meant they were not updated with the HookedBuildInfo. This broke packages with custom Setup.hs scripts that took advantage of the HookedBuildInfo feature, including those with configure scripts. The solution is to store not the list of whole components but the list of component names. Then withComponentsLBI retrieves the actual components from the PackageDescription which thus includes the HookedBuildInfo. Also moved the Components into an internal module because (for the moment at least) it is part of the Simple build system, not part of the package description. ] hash: 0000014854-64d4da30471e91cdbb3a8a98daf667307d26516b03c270fc371748baef7784e2 [Couple of trivial code changes Duncan Coutts **20110708013012 Ignore-this: b98aaac9e33f8c684cefedcd05d37ee2 ] hash: 0000000790-dceb30a72d2c041f24f1d34d2fba3b1f26a919916628640a43b3490e3f03cc2b [Bump Cabal lib version Duncan Coutts **20110708013245 Ignore-this: e01c7efbb68856167c227ba118ddce33 ] hash: 0000000254-e514bdb2c63f2579cbf042abe93a6fc1ced957a372beb0f9637629d3b221a5ca [Bump cabal-install version Duncan Coutts **20110708013248 Ignore-this: 16626faad564787fc5ae3808d1e6ccc9 ] hash: 0000000572-f54f5e6791abb91b446297cfc69e37101ce325089780cd5cb0e5ae6428ba818e [Fail gracefully when running "setup test" before "setup build". Thomas Tuegel **20110303164611 Ignore-this: a4d818cd7702ddbbbbffc8679abeb85d ] hash: 0000000465-019032504d7ec4b3e5fb38911c43357772d66d0eb5e5ca2516817a104d367d89 [Don't prefix test output with ">>>". Thomas Tuegel **20110708035007 Ignore-this: a9d417eb836c641339a0203d1c36e82e Ticket #848. Removing the prefix brings "cabal test" in line with other cabal commands, which do not prefix their output, either. Prior to this patch, the summary notices which appear before and after each test suite were written to the temporary log file along with the stdio from the test executable; this would lead to duplicate notices when the contents of the temporary log file are read onto the console. After this patch, the summary notices are never written to the temporary log file, only to the console and the final log file (which is never read by Cabal), removing the confusing duplicate notices. ] hash: 0000001868-af011796464773a258b1b3440d71de2d5f2dd1607486fd1c93e232e9f5b9e563 [Fix use of multiple test options. Thomas Tuegel **20110521223029 Ignore-this: c694ad21faab23abb7157ccec700ccf2 ] hash: 0000001178-bc0eb465be53f0d2beb46c84878ba458e9f2d30a1609da51e3b1ec3f61eab456 [Stop cabal-install from duplicating test options. Thomas Tuegel **20110521232047 Ignore-this: 55b98ab47306178e355cacedc7a5a6d2 ] hash: 0000000266-b88e73a939e2e35bff5a3010b26c08943abf317b8984981e40b04b105282c0f0 [Fixed crash on Windows due to file handle leak. Thomas Tuegel **20110518030422 Ignore-this: c94eb903aef9ffcf52394a821d245dda Ticket #843. Cabal test crashed when trying to delete a temporary log file because 'readFile' reads unnecessarily lazily and was keeping a file handle open during attempted deletion. This patch forces the entire file to be read so the handle will be closed. ] hash: 0000000595-dd5bc6ca0a839a6e2df1dcce87e67abe67d2b03927ff6a5428ca6ebdf3c6c524 [Added unit test for test options. Thomas Tuegel **20110521164529 Ignore-this: 3dc94c06cdfacf20cf000682370fbf3 ] hash: 0000003379-d6447429e418010e113dc46f5550bcee05a547e3485d1d8f475a38c148bc0a60 [Update cabal sdist to follow the changes in the Cabal lib Duncan Coutts **20110717223648 Ignore-this: 1136aa98cb024a10250ea75ec8633a2c ] hash: 0000004679-56cf3c89446df6faaf93c49e08f5cb741740e52c0ebeba720518d49f6dc3829c [Fix cabal haddock for packages with internal dependencies Duncan Coutts **20110718235728 Ignore-this: 86cdab6325a86875e9ae592881b4f54f ] hash: 0000001477-043b514550cf84f21a0d7b903bd6331867c362296e1661d94cdcfa167e3b4b1b [Invoke HPC using D.S.Program utilities. Thomas Tuegel **20110718045949 Ignore-this: 37e1f01f594dd522c5328b397ac0e94d This patch also reorganizes the HPC output directories for consistency. All files related to HPC are now located in the "dist/hpc" directory. ] hash: 0000008484-9bd524f9d94cb6da8a137fde2aa28b624a1b1fbcfeb924cd644de4c89e85c72a [Generate aggregate coverage statistics from all test suites in package. Thomas Tuegel **20110718050448 Ignore-this: bff5f3167ab61da015b8fcb7c4f77cdc ] hash: 0000004364-3ac3e45525609a93d05ca73421cb03ca5191118b62321745e7fac97db636b762 [Fix executable test suite unit test for improved HPC interface. Thomas Tuegel **20110718033150 Ignore-this: b543b01721940b23aac7bd46282425b1 ] hash: 0000000520-6810d12cd3f0cb211215e25dad1fab61c3f02615d7a151b049a35202e509ea75 [Restore graceful failure upon invoking "cabal test" before "cabal build". Thomas Tuegel **20110719002218 Ignore-this: 2096a4cfad17eb67ef26bb15a8b3a066 ] hash: 0000000475-65d81c01fc14b0a6dd63d6148652657fc7b826933ced1eb5c243e4b125b88988 [Added Distribution.Simple.Program.Hpc. Thomas Tuegel **20110719004251 Ignore-this: a988f4262e4f52c8ae0a3ca5715a636e ] hash: 0000003374-bb424427ba014c72a050e421665672e28b610cd69d67167025188b78e8a9d862 [Simplify some code in Program.Hpc slightly Duncan Coutts **20110726001531 Ignore-this: d7ea77d1f072f7071fc709e0c9a38ded ] hash: 0000001836-ea8e2cbf460d6adf9c14e521050ebdce839197c821e070a9536471393fe8789f [Fix for intra-package build-tools dependencies Duncan Coutts **20110808165045 Ignore-this: 83f148981c7d8d3c616027975ee8f59a ] hash: 0000009043-a0c330fc33a173b166d8fdf969f364a6a93638a10891d3975c458404f64d5287 [Change trusted property to be true by default David Terei **20110808223228 Ignore-this: c46cf169c46b809cf457678f77e02b20 ] hash: 0000000661-1528e713dd7703331a2036133b8b5cd998106a5a6eaddda3115352c2076f0067 [Add Safe Haskell flags to known extensions David Terei **20110810201543 Ignore-this: 9e0a42de1539e1a56d72f9a7ecdf554c ] hash: 0000000841-a68aa7c7b5c91ff772e518b0d7e3d1fbc1e65d36e47607ef4e85cd65c416fad2 [Improve the error message emitted when multiple .cabal files are found Duncan Coutts **20110508223014 Ignore-this: 1c96d4f42fe55094f07b0573bb80fda1 ] hash: 0000000301-6a951ebd8ce561d4c865a9af5df72d762668bd3c46a8ffc42232a31e942237a5 [Fix the repo location Duncan Coutts **20110812110820 Ignore-this: 1ed9152864fc3336c82495904b1e5612 ] hash: 0000000352-36e8008e5d1140b882de236c9363e0adc46b705e7fcc5b0c0ba0ccbd10c7e0db [Relax cabal-install's deps for ghc-7.2 Duncan Coutts **20110812110846 Ignore-this: 1524732bffa5cc04e5d475ec4c4f12d8 ] hash: 0000000574-41b836efaaad39c1612765cb826fcde9cdb1241e1d501ad29fb42d4504ad0a5e [Add cabal sdist --zip flag for creating zip archives Duncan Coutts **20110818171721 Ignore-this: 86469c0f4f4b72d58b6278c3ef692901 Handy if you want to send sources to people who do not grok .tar.gz Requires that the 'zip' program be installed (unlike for .tar.gz where we do it internally so that it works on all systems). ] hash: 0000006347-aae9664c18596b2baac5810b8ebd2e0b63a3fad4b4968ef6c80f93f0fa0bec22 [Update version constraint on the Cabal library, for 1.12 release. Duncan Coutts **20110818171955 Ignore-this: 870a523382e1e0cec2b5cd033c778359 ] hash: 0000000326-feeae515dd0b6a1434480138db758606e25bad1084bcda020bce44936397d6d3 [Drop assertion checking in the old solver Duncan Coutts **20110818172118 Ignore-this: a516461e7f19e2aa2109fc905ac85 Make it a bit faster. ] hash: 0000000432-00489f9dbb3b205c8a3b1e0c276718bbfc4513dad97c142515d1841568228603 [Consistent import of Text.PrettyPrint David Terei **20110825180411 Ignore-this: 785b7c0aaad8b997678c1e68b90502f8 ] hash: 0000001958-5d535f2cfe67e9050b52cafd83a5e2429a21017ca3c96cd4d853c689ddd66ab3 [Better error message for unknown build types Duncan Coutts **20110901114046 Ignore-this: 91989561ff78edbe3d72b7d569db4561 ] hash: 0000000942-b7c11869d3b1bc433c4d690a15e9391650769cb0c3100843f1b21eb18190f207 [Fix a typo in a QA message Duncan Coutts **20110905001515 Ignore-this: e906b589e4acea1121ac193998696751 ] hash: 0000000350-a323a045e3a437a1450b15f5221596ffb5fa0423a4cbb7ef20fb52887ebee973 [Add the ConstraintKind extension Max Bolingbroke **20110906094145 Ignore-this: 838aa67afada51bc8f023a24531a0d0d ] hash: 0000000471-6c82ee3cb1b521ff695914a20ed4d4bacd29636e888cfa98d2065654696c378a [Change extension name to "ConstraintKinds" Duncan Coutts **20110908220819 Ignore-this: a5faf4ded03ba1394278c810a8136bf2 For consistency with the rest of the extensions. Requested by SPJ. ] hash: 0000000309-a13e6ef30a96e589a71285f9fbb98ed199a9f54aa3e683e6b762b4cb6e3af372 [Filter autogenerated modules from test suite build info when doing sdist. Thomas Tuegel **20110923201806 Ignore-this: 6f1eb9a1af8fad0442544d05d2568db9 ] hash: 0000000491-358f0a7dbfb94e6b57cf913455d8a6ffdc37488f41773dbf9fda2a0644f1feea [Use a PVP-style version as the default for cabal init Duncan Coutts **20110925021722 Ignore-this: 58c054d082254c4bcf26cd4601317f2 ] hash: 0000000610-34c627a48c8379dc5b1fde98d088d046d848fbbd325f66507138685e6987aa89 [GHC 7.2+ no longer generates _stub.o files Duncan Coutts **20110910195329 Ignore-this: e7b432affc79e4d7c418c03be7e55acc So stop looking for them. This could otherwise cause problems if one switches ghc version without cleaning the build dir since we'll pick up the old _stub.o files and end up with duplicate linker symbols. ] hash: 0000000987-ce1bef7b734552c614f3300874aecda62c5af1b489181760a3305008b48f551d [Use the configured proxy even for uploading build reports Max Bolingbroke **20110928210859 Ignore-this: 189a21577bfe5a651850feda891955e2 ] hash: 0000003288-1cb2c6aaacdf33a9255aca2e50473551f5d90f1283313d522ced1f9142537a17 [Add a Benchmark data type for representing 'benchmark' sections Johan Tibell **20111011175849 Ignore-this: aba4698167e15db635302e577b871b1b ] hash: 0000005173-da37cfd98a37ca2fe3f04394fb400cdee5c1ee7739570e3a7e1b4fd5331a9596 [Parse 'benchmark' sections and handle configurations (flags) for benchmarks Johan Tibell **20111011191515 Ignore-this: e6b671538374a5db09b995ab1a233ce2 ] hash: 0000016973-90e5a072bbeb5f08130591765fffd89a4ba6e0ec5048372e52b29304c224eaab [Parse the --{enable,disable}-benchmarks command line flag Johan Tibell **20111011192349 Ignore-this: 268674c925d07184b6efc11a38d65d6f ] hash: 0000000995-5fbd152dc87def099abbd74291c91b8d8088ab43b06031bbb70c5af16da2a44e [Implement 'configure' and preprocessing for benchmarks Johan Tibell **20111011194838 Ignore-this: 519cfe1fd6bb6ac0ccc4f10d2d037897 ] hash: 0000005604-819e7a78be68909e854702508987abcea69a0df6fa9dde8228dc7141e27ca6b7 [Add unit test for benchmark section Johan Tibell **20111011195847 Ignore-this: 672f8848e5ce9cb2e321894506176b3e ] hash: 0000004261-e4e17f634becc875714b85b6c5ac2d07629b9930f650ff66bc96469bf501e041 [Build executable benchmarks Johan Tibell **20111012143034 Ignore-this: 26ba0c0ab2476bef33c2e4c0b2e0c8d9 Benchmarks are treated just like test suites in that a dummy Executable is created and built. ] hash: 0000001667-1905b90513f9b2c283ca30febb1db08909decf4731c6a4ba25e09cb712f01a6b [Add unit test for building benchmarks Johan Tibell **20111012154138 Ignore-this: b66404f7b8829e67223c0222cbc98b10 ] hash: 0000002574-12c11d75fb2b22e5a395c4e046a374c2f1cec1fe19e0ca48a98a784bc76794a4 [Include benchmarks in product of 'setup sdist' Johan Tibell **20111012205036 Ignore-this: 216583b2d9ae5312aaf3da043bf45b6 ] hash: 0000002034-55c856f6216de9183dc7da5f8584715a96db003ca0d34bdae49236db7ed08a2f [Install phase pulls in benchmark dependencies when necessary Johan Tibell **20111012210035 Ignore-this: 9b055441a6fec970fbb2aaa6f4cb4406 ] hash: 0000001518-bfe17fbf8ca33d237823a9ed538ac2f58a4cdd00b6c2080163aa48eefa1ccb45 [Change Safe Haskell package trust default to untrusted David Terei **20111018033319 Ignore-this: 2b7ea14f983abf92b8c7dca67b280d4a ] hash: 0000000794-f5d7ff901187952377c5d5811afe1b6de01b0a5c29b2bf5b3a7302ed1469d8ca [Rename the cabal directory to Cabal Ian Lynagh **20111023151002 Ignore-this: ff444b152bfc981496c6e2d2206a4953 Makes things a little simpler in GHC's build system if libraries are in the same directory as their name. ] hash: 0000000414-05a084836533e0b0568ba89d2815e002c98cad93e3eff4669198284b99622a48 [Allow Haddock to be configured from the 'install' command Max Bolingbroke **20111015170101 Ignore-this: af173867f239b0259490445f27756ad9 ] hash: 0000006227-b56db7d7b108284d259aaec51a2623f5e9fdbfc252977d3e2a81242fc592f3a5 [Add a (substituted) flag to allow configuration of Haddock's --use-contents flag Max Bolingbroke **20111016110852 Ignore-this: 33d1cc9683e9e3e421c2ca54dc745de0 ] hash: 0000002854-5941be661f294b5a33ee4cd6846d8214d18e53a7ead133e02ca2aaccecc081f3 [Uploading build reports shouldn't fail if there are no reports Max Bolingbroke **20111016143819 Ignore-this: 7423a9c3a67a581c04502912fc08f460 ] hash: 0000002173-fe5d3d58246311052cdd20807bd0c6f70e08f7f0829af5615914adeb9e948337 [Add package checks for benchmarks Johan Tibell **20111012201604 Ignore-this: ce4094004ab81b6f60d69a30f6f16247 Refactor duplicate names check to avoid having to manually write all O(n^2) possible collision cases between executables, test suites, and benchmarks. ] hash: 0000003993-cfe5d2f3262e845e6c87155abd955ed0d1054627640559b8dad11a2110ea0d00 [Implement 'cabal bench' command Johan Tibell **20111013225615 Ignore-this: 34a2e6e5bdc13d16eaadc48a2efe2d75 The only implement benchmark interface so far is exitcode-stdio-1.0, which forwards the output of the benchmark executable being run to the parent process' stdout/stderr. ] hash: 0000013694-8cd370a6a9019b92e44a47b3138918bb5d60572fdf612b38aae82e4765db05ee [Add unit test for 'cabal bench' command-line flags Johan Tibell **20111013232109 Ignore-this: fc3e53a768c3c971a8f5e3a6e187ba2d ] hash: 0000003787-1d8002a07c2a6e4cf5ea8756585f8e7ee49158d9aa6d410a4971328afe235f6e [Fail gracefully if 'cabal bench' is run before 'cabal build' Johan Tibell **20111013232847 Ignore-this: 9c73bb0b650fe4b06a5515bef7587cfd ] hash: 0000000597-1637d75c2b9f385ab9c8265dc8dc1d41f735060394ea36f401d69d640582a59a [Bump versions of Cabal and cabal-install Duncan Coutts **20111023213924 Ignore-this: b298e60d9b5eada94f0f40edf942f031 Latest cabal-install requires latest Cabal due to api addition ] hash: 0000000527-b3f53f7e0559f45c5bca4b5c439318694d781c8d79fa2d60b0b52962a5f45d7a [Add a source package index cache to speed up reading Duncan Coutts **20111023213253 Ignore-this: d35c7eeaba12305fc9a5f1b1c146c902 e.g. about 3x faster for cabal info pkgname ] hash: 0000013725-989d2070a90388653c77c13235587636b3233dce03f14f5835ece71d62b0c93d [Fix source repo subdir name after cabal->Cabal dir rename Duncan Coutts **20111023214425 Ignore-this: e1e0327576da9bfc45056ef69c74e28a ] hash: 0000000234-a3f8299ce15ae718805e9a7438fbc70d3b2b00de5174f7503d6435f2b5f8d685 [Describe benchmark sections in the user guide Johan Tibell **20111019153233 Ignore-this: 349a426ca769cfea19c5f784846e8a95 ] hash: 0000002664-cc7b48dfee87ff09fd26343075a8867522c26c6866cdc86f57878208ad24177e [typos in benchmarks documentation/help Simon Meier **20111025183032 Ignore-this: 3f6ecc518bce2d1d07380e35c1b7f160 ] hash: 0000000500-8b213c39e595bf03b00a54e1c01f1f4351ecdd720b909ae9f396bb1922f04140 [Small doc fix in Benchmarks section Bas van Dijk **20111025184055 Ignore-this: 5512c7f5d959335d73a8b9c427193d36 ] hash: 0000000336-f3ffdeacaa5c883702ca66ff96898d5c5effbdcd1bd614e3647f5a2b6ce20396 [Briefly document 'cabal test' and 'cabal bench' Johan Tibell **20111026002738 Ignore-this: ccfb88fa6bec02eef62cf2dee34807c2 ] hash: 0000000868-056d83054e9fdf28e07465f1c4283fb8d60079a672a1d0cef4c667fd61a9c9fe [Register 'bench' command with the CLI Johan Tibell **20111026005309 Ignore-this: 69168a6e951f5dcea6e9826704487d47 ] hash: 0000000361-c9a542c56e7e5ec00fec2e7f9f987abefceb1e5eb7a58e3ec0bfb6e53e309123 [Bump major version to 1.13 Duncan Coutts **20111026204346 Ignore-this: 143bf697f22b7225757c9907b37d8fbb Since 1.12 got released with ghc-7.2.x ] hash: 0000000545-2a69e1a0cb433f1cdba4a2baa3a7d5f979e0e2d5348316aa1b0e76536c8f0e89 [updated Cabal file to include modular solver modules Andres Loeh **20110605100942 Ignore-this: 2a99b8c12681530e795cd16450877de6 ] hash: 0000001090-91512f724d8ac1350f5b22bf38a697d1022e55ba385e37b87c29f42aedb4f471 [moving PackagesPreferenceDefault Andres Loeh **20110605110028 Ignore-this: a2e86dd13af1622856626a7f8cbb909c ] hash: 0000002261-74a7047b763561244a1dac0492ec90fe4c0c4b6d4474fd1e46edf4713cbe253a [include the new solver in the dependency hierarchy Andres Loeh **20110605110052 Ignore-this: 5d8dc387d44ffe7917d70d92bccf34ee ] hash: 0000000465-e51bdc92bfb6559e75a84e69e0a027cc8c8038beb935987db6d04e870ffabc29 [reordering Andres Loeh **20110605110341 Ignore-this: bb889dea57cc8b9dbf63a8a3685d2433 ] hash: 0000000557-acb04e5f83107394619ace7be5b0b367a852813a33b0dc619440b27ce85f657a [added Progress instances Andres Loeh **20110605112809 Ignore-this: 9ec44d6bceb4fd8310d2770843d818a6 ] hash: 0000000645-052faefbe728483e30bf063a3f557835d6c796dc490951e06b8099832eb3a236 [integrated index conversion functions Andres Loeh **20110605122430 Ignore-this: c6a3427e1e068b6bec8aba54c9e587e4 ] hash: 0000000375-fbcda068e7c187c17f2123a910db4e1fa9062eaf72e7a3b34138b9285a786823 [added a module for the interface to the new solver Andres Loeh **20110605124213 Ignore-this: 1b43f04a29a8f4c88b94cb9d20fa0854 ] hash: 0000001031-a17951be95d693d99ce57d4772d7f0faab89ecd8a2edb56f5178728a8f85fb8f [started the solver interface conversion Andres Loeh **20110605125221 Ignore-this: 24e988891e3b3a91645763f1a54c3de1 ] hash: 0000001390-8e12e4a65b39f6d110b7a77f53c4099d77ca9455edd4fa5fb3327859c9adccdc [use InstalledPackageIndex throughout Andres Loeh **20110614101525 Ignore-this: 6a86fd2d78b38815be8026314488c5db ] hash: 0000018492-88f8c883225e8ae35c237ef2a21cef32c107f6a1538241562ccca93e4bd445c6 [modular resolver now standard Andres Loeh **20110614101850 Ignore-this: fcf6d1d7443720e26f4ad5d9b8f944bb ] hash: 0000001902-221807d8007c42ed230f0ea8369fea62cac2eb70ef9ecefacf7ff00716c3cec5 [whitespace Andres Loeh **20110614101908 Ignore-this: a6215083dd56f50cf21ff813d8d9a7b2 ] hash: 0000000200-53f52bf1dadf024b9b904886f8bfdf38e1c3bc14d0780610f8350f32b81df23d [properly translate package constraints Andres Loeh **20110614212736 Ignore-this: 518cb0e05af8e163235528c495d4ec4 ] hash: 0000001416-cee62013d02a58e543b8450f09edd6b1ee05acd9ab489ea75d84a4d9fd57aaca [updated Cabal file Andres Loeh **20110614213015 Ignore-this: a0a208a6c8d57efb50a6ef28b9b9f80c ] hash: 0000000233-2edca3801d5f1bd21c21d549d49ad4b912eb73c986cb06b4a1e05951033df314 [New solver now respects preferences. Andres Loeh **20110615070343 Ignore-this: 9442ddf244f28a0447560a54ffe3928b ] hash: 0000001630-48123d2b27ea035275a29ebf2710809457afdb389b6703b9c71470e0173a15a3 [integrate the modular solver into cabal-install repo Andres Loeh **20110615070720 Ignore-this: c9dd7139bf2d29114991b2f23a9989f3 ] hash: 0000070419-4fada5b1c172f1fdaf96270eb4171bcc9ec567e8d593f35f8c840f47dda0b799 [change avoidReinstalls default, to match old Cabal solver Andres Loeh **20110615072835 Ignore-this: cf1e95a0f3cf1d8ea2186dae35e35861 ] hash: 0000000297-3311f50f3faef5296fe1aceded3b657ef51cda80099a2bc594fbf88cc33ff29d [fix package ordering bug Andres Loeh **20110615073630 Ignore-this: 945f696c0467974e9463c4b8efb1d1d2 ] hash: 0000000736-3016e1d3c61105f67a0d24835c5ee893356b85dc4b0d779628d66ba5e5c77bf2 [produce a bit more compact debugging output Andres Loeh **20110615114213 Ignore-this: d1f134808e33a47ccfe3d431eb3af44c ] hash: 0000000364-ba775914c0fea462d405458fb1a54a24191487883a2fa0f34738ed8bb20c66b1 [Bugfix: ignore broken packages. Andres Loeh **20110616065422 Ignore-this: acba4e209ac0603c295f05153c0d1dd8 ] hash: 0000002202-e9b7fc92fc21030a2049da70a0fbf14357e0305a16951543999f98563b0289fd [Bugfix: wrong flag name was used while adding new dependencies Andres Loeh **20110619154841 Ignore-this: 6d5fb52890b518bd33f9bf0c5e274c72 ] hash: 0000000347-5a90491337594b6ead9605b9bde20a99ab606e1eca00668e12bda7d5ec098f8f [Reactivate output of changes for reinstalled pkgs in install plan Andres Loeh **20110619163520 Ignore-this: 6058ad537ea93399ce1dadf677360943 ] hash: 0000001064-34a3f5e1960986a19fb4eb2b2310764c40adc871b633245ca51314da3d0a7844 [Ignore self-dependencies (of executables on libraries). Andres Loeh **20110620073104 Ignore-this: 843b67aba3b1d5d888d57445633c8161 ] hash: 0000000451-18543dbe3ac336da3ba28247b53c6d588dfd5750d435394acfeff2bcb491dfb5 [store origin info in constrained instances Andres Loeh **20110620095808 Ignore-this: 59cf77a2c8009d3061dd9bbbff3e24b6 ] hash: 0000007039-e0a65319859cb00cde41ad554509176135cdb83d25fda5021d88628e282b9f9e [proper constraint origins also for flag-introduced dependencies Andres Loeh **20110620100852 Ignore-this: 6cc63c642dbb2fb01c58de558c98c7b9 ] hash: 0000001051-40ce36d04aeaa7ba9c94120f27e8456769f2407d2d58d735b82579d59db535a4 [provide more info about conflicts Andres Loeh **20110620130453 Ignore-this: d83f29eb56377129b40f6038cc6b1643 ] hash: 0000007489-1524935b6e595138396832fb56e89987b8d6c3353b84800256fcade4cf520419 [build conflict sets Andres Loeh **20110620143443 Ignore-this: c648018f1a948f48bfd4780e1aab7cdd ] hash: 0000008419-af7704e4e5ce9baf5dc480f5f9db50ac2b73980d28bde05f24ea76ffc293ee03 [refactoring: change the way tree annotations are handled Andres Loeh **20110620143641 Ignore-this: 9ea74e5fed8b63b363d468f585efade2 ] hash: 0000002636-c59e10320f69951c8797da311e092fe2da86ee5cf260f4f4f65b1713e83b8cdb [no annotations needed in goal choices Andres Loeh **20110620144923 Ignore-this: 6aa29a706003651994b6493a1520af1f ] hash: 0000004624-6212276141dd461820c2c96105997e78fb586841f56ab63f7b575c39a077f614 [annotate with goal reason throughout reordering phase Andres Loeh **20110620150603 Ignore-this: d35069fa5f8da4bfdbb816e2e357675c ] hash: 0000007710-406051d6da26b2583c1d80dd0fc98f9d60d2edcef983b8d0c5094d4081f736f1 [implemented a version of backjumping Andres Loeh **20110620171957 Ignore-this: e4125293151373f684be57d233b7f536 ] hash: 0000001863-3171603964522d0032207e78859a67479753e2e61d7f2f48359e7fb1069a9919 [refactoring: conflict sets are now sets instead of lists Andres Loeh **20110620213330 Ignore-this: 5b428bd4bb4cce656fc05762bd10aa88 ] hash: 0000008106-f7f96bb0089191e4c0a881d5e0aaa190b460345d72e520d4381d60c14df4d8e8 [maintain chains of GoalReasons Andres Loeh **20110621075136 Ignore-this: 3a1301ad75703a892e10b1796d7012ac Bugfix: conflict sets now contain the transitive closure of goal reasons, which is required for completeness. We now finally have sufficient info to produce good error messages, too. At a failure site, we can trace which parts of the tree are relevant to the failure, via the correctly generated conflict sets. ] hash: 0000009376-6719c20b41f8b7f164941ce7ac62aeb3185413bb111041167999ab564b747f8a [documentation for backjumping Andres Loeh **20110621094547 Ignore-this: cf54c33b4bb632ad7dcc5429ae46189 ] hash: 0000002082-395bfb54a9f750ec2338c3d8dc49a3ed4114ad7e63a1ed86dfe531a98926b091 [debug output for backjumping Andres Loeh **20110621113210 Ignore-this: 6353021aec10f411abb2447534a151c9 ] hash: 0000006994-7dc72cac755ef0a10c9c4693442579eb2f758d489798f6a44a2c81024986f20a [more compact output for multiple subsequently rejected packages Andres Loeh **20110621133231 Ignore-this: f2cdeac0e73501ac600ff6e29daf7605 ] hash: 0000001135-c77ce8b70b5129f6d79170699a3b809990911aeef7ec83d7fcf3f66ea1ee92ee [make conflict sets slightly larger Andres Loeh **20110621140618 Ignore-this: a17f29faddb8e955bd1c0c0a2ded71f7 This is slower, however seems more correct. Larger conflict sets typically mean fewer possibilities to cut the search space. On the other hand, cutting too much risks incompleteness. At some later stage, we might want to try hard to think about how/if conflict sets could be reduced in size. ] hash: 0000001494-bef103744fecdbbbde1e5be2020f0ebf7c9e0df9c53edbae08af4e850a380a04 [adding a command-line flag to avoid reinstalls Andres Loeh **20110630101721 Ignore-this: e18974fd5c10e5b6e0a2450299b4f8a3 ] hash: 0000009110-76dc6bd9b19529076b565d37fd6bbd8b0861b96d6075ee50d9ede93a34c3246f [Refactoring: moving goals to Dependency module Andres Loeh **20110630121018 Ignore-this: 3f3e5a8debd4d6fd095f5f267a4710c7 ] hash: 0000001901-5000020a8d3276fe4ae195666989de19404603585faf2fa50d112c55b9207a8e [typo Andres Loeh **20110630121901 Ignore-this: 78cd22e1681dd9ddd9280acd764b0795 ] hash: 0000000310-9273b2199a639be809fe590cc9e4ca2166528d2b247dd69972ad7ae3eddbe9f3 [Keep better track of goal reasons. Andres Loeh **20110703101721 Ignore-this: d8b77e6b03fd089dd70095620ee49039 ] hash: 0000022303-4df7c134cc872d4f6b4a9e4a18906e18ba94998035ef26834761534c116e7be1 [better conflict reporting Andres Loeh **20110703131435 Ignore-this: f331ae416dc2606a903b7a563406a4c1 ] hash: 0000003100-ced87ac4c621003a02ceab873648c9f66f45fa81d1086f221a8393a3f2294adf [Refactoring: use toConflictSet Andres Loeh **20110703132011 Ignore-this: e5c90d6c2dfe391d8becef3e6b667e00 ] hash: 0000000390-5b79cb34a42dbfae8d05eed3896e455d284af2f52bad88fc28a570a7d5b88350 [switch to less precise, more efficient goal reordering Andres Loeh **20110703134359 Ignore-this: b9d1c7c8ce62480fb5885ef61c388677 ] hash: 0000000984-d4994fa6a1f3a89c02151d231c48cbbb5d858e360692f1caffdcac744d43288a [switch goal reordering off by default Andres Loeh **20110703135217 Ignore-this: c7bc5a87f89c49793f9171cbb8aaac6a It surprised me somewhat, but goal reordering seems to slow things down, even for backtracking packages. It was supposed to speed things up, but it's possible that backjumping works so nicely that it more than compensates for the effects. More systematic testing might be needed. ] hash: 0000000566-9f8ce5fb1e6f1601a3cf79f5f2a23fd0baaee64654c78a35a98ea2e1d746410a [Added a --reorder-goals flag. Andres Loeh **20110703143656 Ignore-this: c5a797b71d5050ac68ce4bb08b6f8bbd ] hash: 0000004324-b9e1687352ede4b1932c10b15b5f97a7a82f1c40ba9322976e0af239a7a2858a [layout Andres Loeh **20110704173553 Ignore-this: 12c8ab24e372068fdfbb2e9cc04a1590 ] hash: 0000001385-73c8ebaaec7b31dfd063c285e700cbe60cf8145021b7fbd8f06336a9c74c6b15 [Refactoring: write traversals in a nicer way Andres Loeh **20110704175631 Ignore-this: 7f9942f74e237b165c2be6c9c28431fe ] hash: 0000006338-27ebc9a921bbf54e7f05b67b5c417462939fde5f2594adcc6609ee19cc927529 [Rewrite traversals using a new combinator. Andres Loeh **20110704182930 Ignore-this: f989ec7fced87c9389fcd1a3e23b8896 The hope is that sooner or later we can apply fusion. ] hash: 0000001961-49e891be494e292a7064c3eeb52f1dffdc770879203fc4a7b2822d2e8c870df6 [Added a Functor instance for search trees. Andres Loeh **20110704184533 Ignore-this: f872a3349ccbe64de991106476586188 ] hash: 0000000554-dc411bfbc07a7c9faf1812d37f323158f5ad53961f782f47eec8867588c82bc0 [Generalized the type of traversals. Andres Loeh **20110704184550 Ignore-this: f10a367f6c95b722f381afa4396adb9 ] hash: 0000000344-aa77f23572a3c5d0a44d9c41002a14f6229fe24ee1ffd47cb301ece1dd38c831 [introduce backjump limit, and produce error messages Andres Loeh **20110705141536 Ignore-this: dce6d6d474f71e46a20c6bfc6633ee46 ] hash: 0000009178-5d8e128c7588224e4a8ee444fb693401ce2b50a0b37024bd5a567a6ae9d3ac56 [make max backjumps configurable Andres Loeh **20110707092854 Ignore-this: e57965fad997f248e5c811040b4c511b ] hash: 0000003853-513c19233c3b922c2b6fd555dfcbe9feb972246a45a4fc0f6126b68b7436984b [Fixing a few warnings. Andres Loeh **20110708074744 Ignore-this: 395c2f791da6046c3e0b4ac73392f438 ] hash: 0000000922-e8676853c0f974618b71906d87974ce9109f497e6613a87d7f74f11ace145924 [Added flag --independent-goals (not yet functioning correctly) Andres Loeh **20110709083556 Ignore-this: d420a08623f173a3483b1f8382d7af27 ] hash: 0000006081-c54c6aeb57a26f58912cd2ed2f998c8f3ac132cf694e035bc4abdcc3a72f0600 [merging modular solver with main branch Andres Loeh **20111021071736 Ignore-this: 57d24e3c979872682ee66abecbf808b2 ] hash: 0000001029-e79cc1d1428a1c847516f8bb05a92425dc4191499e9e469c4fd2d343b925663b [Added a check for destructive reinstalls. Andres Loeh **20111021120831 Ignore-this: f343899c19a1b18156c8498cc1183d08 Some refactoring in Distribution.Client.Install: * the linear representation of an install plan is now typed * it can be checked for the presence of destructive reinstalls Currently, Cabal will stop if destructive reinstalls are encountered. While this should become default behaviour, there has to be a flag that overrides it. ] hash: 0000005209-d7c2f149eddfd31855ec53ffab92e3b34bc892621d94f77fa380d2a2493f2a51 [merging changes from HEAD into modular-solver branch Andres Loeh **20111025063632 Ignore-this: 35fb9a9d8736d4b2bca35e36004d24c4 ] hash: 0000002355-e5ada3ecfff6b5bd219c8e8516e93e4b40d0f585b42c935252ef0da16154533a [treat ghc-prim like base as non-upgradeable in modular solver Andres Loeh **20111025063820 Ignore-this: 68acee21bcc5df42f4295f61a93a367d ] hash: 0000000555-1b14522599d488f2eb06d8faca07bc95dd43ebe1ed9e080799a9ce0580317440 [add --override-reinstall-check option Jens Petersen **20111026124024 Ignore-this: 176b70d8e72e4ce6b65ad21611426069 This option flag overrides the new destructive reinstalls check, allowing forcing overwriting already installed library versions. The patch also documents this flag and other softer options in the output of printPlanMessages, which is renamed to checkPrintPlan. ] hash: 0000003022-09142be145775f26cf8c6429e465ae7fcd97f4e5816a70dd11a64582955d73f2 [in parsing user constraints, require a space to separate the initial package name Andres Loeh **20111027133021 Ignore-this: 335b77cc0e2ffadd1315a8ed42925d45 ] hash: 0000000733-6cc4a780c80323756f3e8a59c496bf83432190b962d3fd00582a27f867b77f7b [there may be more than one package constraint per package Andres Loeh **20111027133108 Ignore-this: 44ba0feece724fce97f498d22bd56c93 ] hash: 0000004945-f10362b8bf4f0ad1ed140c64e29f3924f98dedeb58fab302685867003cb90bfe [removing dead code for global flag enforcement Andres Loeh **20111027133309 Ignore-this: 52be852bb715be5d83cf2e1db6169e8 This is all covered by the function that enforces package constraints, as global flag constraints are translated into package-specific flag constraints outside of the solver. ] hash: 0000001376-cc878f7b9de1eeddb00e5dc40742c5d46745be37645227894dd8b0b291c27fed [minor clarification in naming Andres Loeh **20111027134534 Ignore-this: 2bd081c6adb7a8c5c888c8069696d1ae ] hash: 0000001276-fef057a6f10c8bfde9e4a58a0b4a6207e3ff09c7c001ca8a99041bd8d273658f [adding a lookup function for PSQs Andres Loeh **20111027160924 Ignore-this: b404d9055ba4237fc4410ff8c102eb65 ] hash: 0000000285-c1791d5b500848890cf6314b90d658a24850f9c632abacc3659093c55ff1d65a [fixing warnings Andres Loeh **20111027160944 Ignore-this: 2f99859d1585045fb292c69b4431e76f ] hash: 0000000809-a24f2ebce4136ab996be6a732044edfe8353a1a075c81d7d9e1539c80e643a24 [collapse repeated flag choices Andres Loeh **20111027161120 Ignore-this: 4b6f35c49675014002c4506eb7425fd In the build phase, we allow the same flag choice to occur multiple times. This makes it easy to handle the situation where the same flag occurs several times in the condition tree, and hence new goals and dependencies might be introduced depending on the choice. Previously, we have ensured during validation that repeated flag choices are consistent. This behaviour has now been replaced by the new approach to collapse repeated flag choice nodes completely during validation. The advantage is that the tree is less deep, and that the trace output looks less strange. Repeated flag choices are no longer seen, which I think avoids confusion. ] hash: 0000004281-5ed423070bf3bdf672673b068e17258c862ed8b00ffc5f6724b0cbedd937337a [restore the index conversion utility function, but as a top-level function Andres Loeh **20111027190152 Ignore-this: 26dcf713c8075fb58f895cc55db00e98 ] hash: 0000002028-1407eab598300ab8b4b406128d377f95192a992fbb32018854af0a0e24940aa9 [reactivate (but not use) the top-down resolver Andres Loeh **20111027190304 Ignore-this: 9741619c2052d21e8a7e28d2e941b6d5 ] hash: 0000001095-f23d46a15feca91793fce19d940adc0bad6379bc8e4c291255f55ef17c685747 [make solver configurable via command-line flag Andres Loeh **20111027212705 Ignore-this: d11264b74257f61720ab58fd1f04a50d ] hash: 0000005105-dc5a6cb6f55396cc417c196c2a24ec431387183e3fda8244dca196accdc0db50 [revised solver flag configuration Andres Loeh **20111028073729 Ignore-this: 5497056c8815bd43d287ce38a1ad3589 ] hash: 0000009221-b73eef28c9811680d8602f4f2bd107d6d7a2fe304b678f0191bb09ed3218fecc [fixed a strange options handling bug Andres Loeh **20111028091727 Ignore-this: 6896824671481e929d7732b71d2a3d67 ] hash: 0000000324-d0f9ec2cbef1b0868b2edd96a30083226a75c97874b1a73b3aae59aa42713823 [removing wrong option handling fix Andres Loeh **20111028111231 Ignore-this: a1cf3dedde8b6c535be11ae8dcac6fec ] hash: 0000000322-7fd10c17d5c1e82e38ec9805cc31a4dcadba5ede9c01662c7587b859549ba0e3 [proper fix for default solver option handling Andres Loeh **20111028112358 Ignore-this: 5e5816f9eddb4cdb14196d65e3501b00 Suggested by Duncan. ] hash: 0000000579-83ab4a70c7500e0f182358edd275d8d3d67d9c4742af3372905d348b84c58538 [remove trailing whitespace Andres Loeh **20111029112245 Ignore-this: be59e8a32bf881f1d34f35aae84b8fc ] hash: 0000000463-7577c41d6de318adf28d0da8898a39dbad579282d9f30d6d1e7e2ac089ade490 [when printing the install plan, show non-default flag assignments Andres Loeh **20111029121515 Ignore-this: 4686e5efaf543c19b3435e3098609d8 ] hash: 0000001435-6e6c228dd8fdb209dcd71a20d4baf384bffd8c257f364b122c409f5be2ba6e2d [bugfix: wrong flag choice was sometimes shown in goal reasons Andres Loeh **20111029122324 Ignore-this: 6d0ea0605d767712e7d6116afd25269f ] hash: 0000000713-9a8a3a733346db739a25fe275f55cdf01beee4dbf71c8140fa289cb4ef7f45b4 [goal choice heuristic in modular solver: choose base as early as possible Andres Loeh **20111029140041 Ignore-this: 4a4113b878e041d901deed7e42837286 ] hash: 0000001314-3b83e62ffd6bad50d7e5554fcb59d3b44409e7aa310e6ccad3af46c9ec5a9d80 [removing dead code Andres Loeh **20111029141133 Ignore-this: b86c2a8dd2890059a069e54ef1a2be7 ] hash: 0000000963-f7980826953ad2ec0a839a02364852be4bc1529b60fe92ca55013936d034d2cc [change solver default to TopDown for now Andres Loeh **20111103205744 Ignore-this: 10c65a306dd53948eb025bbd8645ee11 ] hash: 0000000246-35643af521a49e5a41b76445e3e808c081548366df8aa13b6b493b75d92a5fe3 [Fix fallout of Num / Show class changes in ghc-7.4 Duncan Coutts **20111104002510 Ignore-this: 2b646b5b5e73d692192576cab62f0565 ] hash: 0000000325-67fa16f3739a175a71d3ac31cc7bbcc5d7f6292a6142a2d8d1fc48cd4f19fe0c [slightly modify a debug message in the new solver Andres Loeh **20111107101437 Ignore-this: eabc3949b3cb86235f3c2eb881ad25d8 ] hash: 0000000410-92fd2cd5828f36f8fffe19b41ea168d7d72003f9a7cc58672f9b4c08f40cfddc [do not print reinstall warning if --override-reinstall-check has been specified Andres Loeh **20111107101501 Ignore-this: 79634b89056c38a0c87ea1409762c893 ] hash: 0000000457-b0a31b17b561c7a66f331c6e599270b70bc9faf9d16527720a9c275c1192efc2 [changed --override-reinstall-check to --force-reinstalls Andres Loeh **20111107150713 Ignore-this: 8120844dc8479f7169cc8c0eb3e7bf97 Also adapted the message for the failed check. ] hash: 0000002596-fc594e7e336681ae459f3910fa02d8e1c7c64d2a7e7acf458fb8d3b6a4cd9e27 [Note in the README that you can install using the cabal program Duncan Coutts **20111111133113 Ignore-this: cbd5b54d3d120ac354bbcaed2e323e59 ] hash: 0000000557-c5cba671f9841f30dc659d1774629190e19d456a77ad88572bfa57aa2eaeedc3 [When running haddock, only pass package deps for the component only Duncan Coutts **20111116191139 Ignore-this: a489d34257850af9b0b90718ed99fbcf rather than for the union of all components in the package. ] hash: 0000003856-461fd7fa1dba723a345eddaa4df7ea24ac5ec9bf03741730934c08a7ec7821a1 [Include testsuites and benchmarks in external deps when enabled Duncan Coutts **20111116191455 Ignore-this: a6fd90e7645cbac6e5d9ad64b5991dad In particular this should fix ticket #871 where the cabal_macros.h is missing info for testsuite components. ] hash: 0000000480-fb02f407c6b813685e9c475d6b40f530ff3cf1c988689eba84f729cebc4d54d2 [Now require mtl-2 Duncan Coutts **20111117001719 Ignore-this: fd7314e32766ab9a0aa84c2138d5e393 ] hash: 0000000269-2ac55d2191664d491915f4bc3bbdf0fa3bd630e4edbbc72d2a740e3154e7a404 [removing datatype contexts Andres Loeh **20111216144355 Ignore-this: d64302ae49aaffb4e713eeecadad4689 ] hash: 0000000493-c7ae1a57167c4d98f11009840bd61ef3a14f6b4a9018438dd7dbf75bdd366a1c [removing trailing whitespace Andres Loeh **20120101153235 Ignore-this: a5345cf959661ea4fca5d00d25f08129 ] hash: 0000000923-3efca0ef0895bbf4f2292c10c15f10169e23b20254cb96657e5ba2fedf4331bf [Added a comment. Andres Loeh **20120109080907 Ignore-this: 6f16ea76d8c01423cdfb3cb1601bdf04 ] hash: 0000000281-edcad7e0ef65a8e21bc11220639bce1248881b42d04e2eea66b0df56040abefd [Bump version to 1.14.0 Ian Lynagh **20111212214416 Ignore-this: 59dcc4f7ec38576350aa2d3d5e730394 ] hash: 0000000177-36ef9db4ebdf913c7667b6fc21bf45419b4def1809da9d2854004a50287d0c32 [Update dependencies Ian Lynagh **20111212214606 Ignore-this: ccc7ed3096d33aae6115a671a0996867 ] hash: 0000000487-9c81d671684397ffeea52be99d99f10a7b89abcec641f6bf6a7c2acea79912fc [fix compilation with ghc-7.4 Andres Loeh **20120110200356 Ignore-this: c949a5ef384fb9a47fd6c6c3d1b0010 Thanks to Tuncer Ayaz. ] hash: 0000001383-d09ee010bbfb67baaeabfc76bf959688c09793f56c0cc00a7f969187b027a09a [updating dependencies in bootstrap.sh Andres Loeh **20120110203053 Ignore-this: e48d474f85eb4fd8383c0e8ded858260 Thanks to Tuncer Ayaz. ] hash: 0000001849-3b8947dacd9a4c60a385c42ac40e3bedb0c5c29bd0b6cada8ea30be0ab0ec94d [Handle test and benchmark dependencies through the resolver properly. Thomas Tuegel **20120207193958 Ignore-this: 99e675795396fc9f64741417f6d7afd5 Previously, test and benchmark dependencies were handled by editing the package description to include or exclude those stanzas before running the dependency resolver. Test and benchmark dependencies could only be installed for source packages because no package description is available for named packages before dependency resolution. Now, test and benchmark stanzas are enabled or disabled through constraints passed to the dependency resolver. This way, we can install dependencies for the test suites of target packages without propagating '--enable-tests' through the entire dependency tree; i.e., tests and benchmarks, when enabled, are built only for target packages. Later, this will allow us to automatically run test suites and, e.g., install only upon their success. ] hash: 0000012687-d126f6ca7382439009de8308b7892dbe7a8a70df8003730dc39b992be54e06f8 [Update types in modular dependency solver to compile with new test/benchmark dependency constraints. Thomas Tuegel **20120207194543 Ignore-this: ddfdb45064df125b176ade0ba19bbbbb ] hash: 0000003583-7aa3b318f9a0acd9f4ba77b5c37ff8d81d70dd4dbfbbd84238fecabef879347d [Don't build benchmarks, even if installing benchmark dependencies. Thomas Tuegel **20120207194852 Ignore-this: 994177542d8d746f5e9035450059164e ] hash: 0000000322-30e2de688aa4557845fef79554943d63ba1b81215d6f3a96833e825abf03023a [Enable tests and benchmarks in cabal-install without modifications to the Cabal library. Thomas Tuegel **20120208065701 Ignore-this: 66273287bbae4fd47a8bc16734e4b305 ] hash: 0000001159-d01b7fe08430a2f830670c1159b2a157ce041fb160966dad279b8dd0a6ab544e [Added a missing case. Andres Loeh **20120211154119 Ignore-this: 449e59fec67c986ea2804642bf02b8c3 ] hash: 0000000242-bf6f66b5697c8f038029868c144f36afd7b27b2971f420a3c6325bac5e45cd28 [show optional stanzas when printing install plans Andres Loeh **20120211155929 Ignore-this: b9d3b404ce7e58eb9368ee28670d31ae ] hash: 0000000827-037e24c9e325857857300eafe1e1c1a9a15df95f039efa170fe31d2cae25c83b [stanza support in modular solver Andres Loeh **20120212113524 Ignore-this: 9697a66807ddee3ea2de811458c2fa5a ] hash: 0000018479-7f8348ccda36370442e09752e486c831e0a000945b962b8d4318b6ff52946806 [let --reinstall imply --force-reinstalls for targets Andres Loeh **20120212134322 Ignore-this: 451afd567040c56f1eaa17bb718c15ab ] hash: 0000002194-177088dfbb145e8e6aa724e96ba17062cf55576bc3e7cbd0f314891dd04930dd [make test and bench available as user constraints Andres Loeh **20120213081641 Ignore-this: 5394dc06ba70aa9e2f2316ab1f413a27 Saying cabal install foo --enable-tests is now equivalent to saying cabal install foo --constraint="foo test" The constraint syntax in addition allows to enable tests and benchmarks for packages that are further down in the dependency chain. ] hash: 0000001629-3f47e60fc82a0cca4cc26ce7386c40597969487128ef6c6efcfbc6f099b34ef9 [Automatically run test suites when invoked with 'cabal install --enable-tests'. Do not install if tests fail. Thomas Tuegel **20120204202258 Ignore-this: 5d3cdd405559fe2ed5393b80b6414555 ] hash: 0000002540-3018beeaadd62a49b53fc278913d0ab162ec595582a3f3baf575ae34b7751ead [Fixed non-exhaustive pattern matches with new InstallOutcome. Thomas Tuegel **20120216181622 Ignore-this: 14fef6aed57bfa93dec3e8f6bcee3112 ] hash: 0000000405-96db94f086395c9ffe9c6ed808998e766d909626a27cdfeb629a0c2e73e2022d [Don't try to run test suites where none exist. Thomas Tuegel **20120216184617 Ignore-this: 46bfa99cc4f731076254755b69378c1f ] hash: 0000000698-983fc1eea02959ed1da7c241a84e075845e7bffaf38f4c0a4e13ddd516bb5d14 [added missing error message Andres Loeh **20120217072849 Ignore-this: d6771c1e4b8e9749595db25d82a92390 Thanks to Thomas Tuegel for spotting this. ] hash: 0000000360-a93588c785a7a515597f4573c14f5a1a889cc1969810f446daf8cb722a11898d [Relax containers dependency Ian Lynagh **20120222190918 Ignore-this: 8334d295f37a82a03076fbb6db3bd35a ] hash: 0000000245-4f6d39ffc781c15b63cfead9405a4a3eec549ff332ca04bffbe1165eb9bb83b0 [Fix 'cabal configure --enable-{tests,benchmarks}'. Thomas Tuegel **20120219005511 Ignore-this: 70d8481e4bbce0dcbd75af438dab0750 'cabal configure' was not adding optional stanza constraints when checking dependencies, causing '--enable-{tests,benchmarks}' to be silently ignored. ] hash: 0000000952-d8b6ddee7550e841adeab30411d0c943bbe69f2ac84971b83d4bd8f5db069b4e [Update cabal-install boostrap.sh package versions Tuncer Ayaz **20120217201457 Ignore-this: dd38533c30efa49a29438216cb73bb2d ] hash: 0000000668-e97ea3cf0c3ec28e0250073cb05114165956dbb30fcef034c1ba7164a433a499 [bootstrap with --global should still respect $PREFIX Andres Loeh **20120309083031 Ignore-this: 37e4b3b7bab5fa81d01cc26075eaed92 Thanks to milkypostman for providing the patch. Closes ticket #926. ] hash: 0000000543-27092e5506d0b6e913bdd1f6ee2d99c5dd17b8b95df5a5754fe2d644dff2092d [init: improve prompt: 'homepage' field is not for repos. Brent Yorgey **20111014202134 Ignore-this: 432aabae368e371597a384d97f1dbc21 ] hash: 0000000357-5085882c4c4ce867fd6de0e4d8b943762df9e1d3caca311d47900d56db64f20d [init: improve prompt: enclose y/n in parens Brent Yorgey **20111014202210 Ignore-this: 4925b25ef425d774333856b83fc6eb6a ] hash: 0000000341-63207534669511495a75b97fc0a84afa9ec5353ca1e4d8e7057ebfac905ee16c [init: see whether source directory 'src' exists. Brent Yorgey **20111014202230 Ignore-this: 8008fc37fad5ebe45c1a62c5ce45264b ] hash: 0000001065-733b265471a8dce13628c92abf6d324087d7112951efd823ff3015e43d1fc061 [init: guess at filling in deps in the build-depends: field Brent Yorgey **20111025050900 Ignore-this: 4adf589b96657d084c6fd72175d8ee05 ] hash: 0000010483-d29338cc2315f3d461455caf4254824b9bbb130b7cd4ebfc4e7c4695420b9f82 [Tweak the tool-finder for mingw64 Ian Lynagh **20120316233502 Ignore-this: 705a0296b1e7ffe8af62fdae1114b3d1 ] hash: 0000000983-c74b566232a8c444a42acc4c97f35e1543c8deb1891f1e95866986078e6ad32a [Fix for #917: Generated Paths module broken with NoImplicitPrelude Duncan Coutts **20120317202858 Ignore-this: d9663db5d6979bd862365a7b2067906f import Prelude explicitly ] hash: 0000000389-d5f75bc0676839466d73de9123acaf29a2bcbc5ea68a62b2aa346e933db20964 [Add strip.exe to the list of programs we look for in GHC's mingw installation Ian Lynagh **20120318170938 Ignore-this: d89f0977272ea79d80c8d67f83c38c10 In particular, this fixes the case where strip in your path is a Win32 strip, but you are using a Win64 GHC. ] hash: 0000000641-8e820ab137986e1578c1f431aea057de32480597264e6e83ae4579324b935634 [Bump versions to 1.15 and 0.15 Duncan Coutts **20120329012952 Ignore-this: b281ea31cd85401b89636ac52f03a6d1 This is the head branch, the 1.14.x and 0.14.x are in the 1.14 branch. ] hash: 0000000377-cc68c2f0fbffb4880a175f56a72d5a4e69245e2d179704c13678cb6629514af6 [Add brief description of PVP to cabal init generated .cabal files Duncan Coutts **20110925051815 Ignore-this: febca1644219556fa1b823958bf37563 ] hash: 0000001431-e856b1de975cbcb8a31afdcacf05494b225bd65d3a6d365d2c36748401728bb2 [Convert ghc option construction to use an options record Duncan Coutts **20120327225205 Ignore-this: acc812662113673a9476fcfee6aa4239 Using a structured representation of the ghc options rather than [String] makes it easier to share and reuse the code for building sets of ghc options, which makes it easier to add code for calling ghci. This is based on Sam Anklesaria's GSoC work on "cabal repl" ] hash: 0000040066-ec9b28af84a117847727ced7fac717bac5db7682d92f3b3ce2bd82179b7ca7d7 [Break up the component build code a bit Duncan Coutts **20120327233203 Ignore-this: d017f92774140a5825218df2abf6c9a5 This will make it easier to allow building individual components ] hash: 0000012796-2b6a83d317bd6dfb9d81ac562527da67c40f6443dd6bcc919a3401207515cd10 [Check for the env var GHC_PACKAGE_PATH Duncan Coutts **20120328214522 Ignore-this: 1007ec6206c782d16be5bc5c297c84b1 Based on the patch by Keegan McAllister Fixes ticket #335 ] hash: 0000001105-424f1a079fbd075de909fc513aef607202faeb92c36d3e6eaea34ff943a09383 [Fix ticket #731 Duncan Coutts **20120328220556 Ignore-this: c43dc521130cceb91f0722e0b43ab0e9 ] hash: 0000001416-7c827bef56ea7ba2c533f7ab7f2068c9f00f8cb2818b31e00b41d4182d693bef [Add back deprecated ghcVerbosityOptions and ghcPackageDbOptions Duncan Coutts **20120329010837 Ignore-this: 1a9a609654fbe32fcac5958ae34122b9 ] hash: 0000001236-8ae4f894c5dda0d291cdf1e5fce1b9107095306c061c228a6e18002f2b0c2baa [head cabal-install requires head Cabal Duncan Coutts **20120329014653 Ignore-this: 5193c3ce6957fc2fce47b0981d2232ba ] hash: 0000000298-6bcf1dd943e7919a2521a56c0f307f6742d0cef6615bdc5b0006a6c0b6eaaa04 [Extend the --package-db= feature to allow multiple dbs and start from empty Duncan Coutts **20120329020720 Ignore-this: dcc425219ebc7cbb1e7fd361d248d93b Previously only one --package-db flag was used (later ones overrode earlier). Internally we can handle stacks of package dbs, now we expose that fully in the user interface. --global sets the initial db stack to [GlobalPackageDB] --user sets the initial db stack to [GlobalPackageDB, UserPackageDB] --package-db=clear clears the db stack to [] --package-db=global pushes GlobalPackageDB on the top of the stack --package-db=user pushes UserPackageDB on the top of the stack --package-db=${file} pushes SpecificPackageDB ${file} on the top of the stack So --global and --user just affect the initial db stack, and this can be extended by the --package-db flag, or reset using --package-db=clear. Note that although this lets users tell cabal to avoid using the global package db, we cannot yet stop ghc from looking at the global package db. See http://hackage.haskell.org/trac/ghc/ticket/5977 Fixes feature request #437. ] hash: 0000005638-bd929cd3b4c515b929cbfa267b74f1c6c9d8812257279ae4e969b6864dae3a67 [Use the new --package-db flag stuff in cabal-install Duncan Coutts **20120329020752 Ignore-this: 922fc496afe50c3ab39101d12420fd97 ] hash: 0000001415-e21d276fd108119429cfd2dddf6dfe63c19a82ec50f9f3171d16e33d784f3163 [Added a comment Andres Loeh **20120315181626 Ignore-this: 50c1ea721ec654c8759ea0f174be3a2f ] hash: 0000000940-a2861c17ec0d9d800f4f721b2e16507134c99919d53113c4440e5e6d6b9beec1 [choose default solver based on compiler version Andres Loeh **20120331134211 Ignore-this: 302cf0ca02aeca77b3c2ad675b557562 GHC-6.12 has base-3 depending on base-4. This is a situation the topdown solver is hacked to deal with, but the new modular solver currently doesn't support it. We therefore switch back to the topdown solver if a GHC version before 7 is detected, but switch to the modular solver by default in all other situations. ] hash: 0000005662-5a882f52e3fe863d8d329603e1a5fba4902a58087e553547394f94d2c6188f0d [adding the possibility for index-disabled packages Andres Loeh **20120405153315 Ignore-this: d339f6b52cf895507282e89a408de1c4 In the modular solver, it's now possible to mark packages as disabled in the index conversion phase. This can be used to mark broken packages (with missing dependencies) in such a way that they can still be seen by the solver and reported in error messages. Furthermore, the feature could be used to implement shadowing restrictions. Currently, there are some things that can go wrong if multiple installed instances of the same version and package exist on the system. However, I've not enabled the use of shadowing for now, as it's hard to match the restrictions exactly, and we can end up excluding perfectly valid cases. Enabling shadowing selectively by a solver flag would be an option. ] hash: 0000007878-ac1986a7d4158622df122008c9ea3df73bf41bbbad96c842715cb5d363430cd4 [adding a solver flag for shadowing of installed packages Andres Loeh **20120406103435 Ignore-this: 8126f62c6c2c69c0a2b0724cbaf9d585 ] hash: 0000005339-dc7b4a7479d88bad1cfa5ed7e5fb14e74ca3ba7a5f63adf2ddf354ba70df9cd7 [disable line-wrapping for solver debug output Andres Loeh **20120406172403 Ignore-this: 339747737c9964abeb665d25c50dd206 ] hash: 0000001087-18211fa5db51c0bda7426d71c2c6b28f4381c9f9c76b75bec3cd1b3c53b21c6d [make the reinstall check less noisy Andres Loeh **20120406172435 Ignore-this: 87e1722393d23b633c72501fab94d71f There are two aspects to this change. The uncontroversial one is that if the install plan contains reinstalls, we now determine if there are reverse dependencies of such reinstalled packages that we can see. If so, these are likely to be broken. If we find such packages, we list them and state that we can only install the plan if --force-reinstalls is explicitly stated. The more controversial change is that if we cannot find such reverse dependencies, we now merely print a warning but continue, even though there are situations where executing the build process can still break packages. The most likely example of this is that we're installing to the global package database, and user package databases on the system have dependencies on the replaces packages -- but we cannot see these user package databases. ] hash: 0000007005-f034c7000608df57e304c035294452638f2ca9ed7656e1c06dd4fb226eb50ade [for empty install plans, print the packages that are installed Andres Loeh **20120407092829 Ignore-this: 2e058d6fc4dfecc0425b4e8ba9223371 This is a fix for #623. If we ask to install a package without --reinstall that's already there, then we'll show the package and its version in the warning message and suggest the use of the --reinstall flag. ] hash: 0000001811-5b95b3d177f2da284754a8f2dc3dfb08dc9d03f0741d7d3572179f7a4c1c5f91 [no longer pre-filter broken packages for modular solver Andres Loeh **20120408171423 Ignore-this: 89dca77a92ed810fa663d9d154b409c8 The modular solver can now deal with broken packages in the index. I have, however, discovered, that broken packages were filtered before even passing the installed package index to the solver. I have made that filtering conditional on using the topdown solver for now. Related is the issue that we should not warn about possible breakage of already broken packages. So we now exclude already broken packages when considering whether an install plan contains dangerous reinstalls. ] hash: 0000002332-f3672d6fca43b770066bdf8c9623864ce24920fb65563192ec0aff9c62957ef1 [minor wording change when printing install plans Andres Loeh **20120408171852 Ignore-this: ed5e00be940cb1c27c6b2de0fdff1da4 ] hash: 0000001259-6f46efea99e2f354f37b897c72cdde0b7c600f2afd0f368da6d8ff1e16e1929d [treat packages that are unknown no longer as an "internal error" in modular solver Andres Loeh **20120416070302 Ignore-this: f536450cab4370868edeedc154dc3ccb ] hash: 0000000520-54dc028a389b44a965dcb409e37270c1e8102938fd19f496ed87bd5813d6ea32 [Update cabal-install bootstrap.sh Tuncer Ayaz **20120412212459 Ignore-this: ed0ac98d2b6a235bd4107acf194aa0a6 ] hash: 0000000844-fd97acd801cb424572c285c0e41ca03ecc155ef8723330ded6bab255ab0c92db [handling the "optimization" option properly in config file Andres Loeh **20120416122903 Ignore-this: 53da3cf3f7bb5490286e960941704d4a ] hash: 0000002237-1efc50c0f785722abf5fc2ff89a2f7973b1221079ab739f6e010c1e875119f34 [handling the solver options properly in config file Andres Loeh **20120416123024 Ignore-this: e6238b7b2846d44dff996b0f03416d3e ] hash: 0000003417-cabab42abfd30a399363f88e2e9a24165ec803875aac79b7131ad0fda74a65a5 [added deepseq to bootstrap.sh Andres Loeh **20120416170448 Ignore-this: eb5f7ce79d96bbf6b30d9d1d16f5b2eb deepseq is a dependency of text, and not included with ghc-7.0.4. ] hash: 0000000513-b6bc2a087994ff0a2d2c3acedfa2a7efb59cdbb1890fdc603c984ca9e602b286 [updated changelog Andres Loeh **20120416171256 Ignore-this: ce3af93be513c6ce0c1c9970745b34ac ] hash: 0000000840-b79408447aa6f1d93289512bc8caeffae894ebc93ade205fd49d5afa58939d14 [updated copyright year for Duncan Andres Loeh **20120416171558 Ignore-this: b3745f5b7d78e94d872a0050ff0e5319 ] hash: 0000000331-27e64cec5dd2d4a7d83d8f8bb15cafd595aadce62f8e6a88ce251648a60b1a73 [last-minute README changes Andres Loeh **20120417151703 Ignore-this: 2ebed8c82fc6dfaf55af2dd59a38af24 ] hash: 0000001189-bf21499c30c67a6535a285e6ab5e00c3e8f896b83cdc087a8608aeecb1334a80 [version update in Cabal Makefile Andres Loeh **20120418053859 Ignore-this: 955fcfc9f97a26d11b91b671639c73b2 ] hash: 0000000190-96138b961976cea3cc65d41c1ee104db10b8436508d5301540c123977ed5f079 [Fix doc comment for ghcOptSourcePathClear Duncan Coutts **20120329030842 Ignore-this: cc5a788032aba8f3b834373f5a4d1f08 Spotted by tibbe ] hash: 0000000418-cc56c2643b52026187a15df89d212850694fd41ff14a2b24b9283e74e513a14a [New detailed test suite interface. Thomas Tuegel **20110726222923 Ignore-this: bec3232ac328ec873a4a02da35152749 This patch implements a new interface for detailed test suites based on Duncan's proposal. This implementation differs from his in a few ways: * The constructors of 'Tests' have been renamed. I think 'TestGroup' and 'ExtraTestOptions' are redundant: it is clear from context what sort of Group and what sort of ExtraOptions are being considered and qualified imports can resolve any name conflicts. Group and ExtraOptions have the advantage of improving the brevity of pattern matches on Tests, which are used very often in D.S.Test. * The 'concurrentSafe :: Bool' field of TestInstance has become the 'concurrently' field of Group, allowing package and test framework authors greater control over concurrency. * The 'Finished' constructor of 'Progress' now contains the options used to run the test in addition to the test result. Without returning the options, it would be difficult to extract the RNG seed used to run a test. * A detailed test suite module now exports the symbol 'test :: IO Tests'. This enables the use of IO to enumerate the tests in a group, suggested by Duncan as a way to accomodate the GHC test suite. ] hash: 0000026218-7d0ee4d1dbebfd6b406c7e86bf30cfb9e1a60c127a4312082736d124e8ef6de6 [Renamed Distribution.TestSuite.Tests to Test. Thomas Tuegel **20110729150238 Ignore-this: 7fe8f630c268b8c6f2bdd41e39d6a053 ] hash: 0000001107-79615ab3621a7cbb1ef0eb524ed2ff4552d7cc2c935653dfd7235cb30a0d34c4 [Removed obsolete LANGUAGE pragma from Distribution.TestSuite. Thomas Tuegel **20110729151001 Ignore-this: 9c76364855cc52b43346bb19ae4ecb5b ] hash: 0000000251-2e0cf3536bf7b40fbd804ddeffbd961c871e17ea5e2efbcdd327bb3f971f1e44 [Cleaned for warnings in D.TestSuite and D.S.Test. Thomas Tuegel **20110729154249 Ignore-this: 40a2e69e5cedfb37ca21228b5e1fef75 ] hash: 0000000862-40ea460d582526ef9272bee26dd45fe8bfc7758f33ecbdc9e03d810f855bd997 [Removed 'optionStringDescription' from OptionType. Thomas Tuegel **20110729154812 Ignore-this: 8632369a1123daf0fa35821efb147bce ] hash: 0000000237-69ef6b3ca09998896dfb25984ddb5fac23b21c5f54e6250ba994444983ded4ef [Changed detailed test exported type to [Test]. Thomas Tuegel **20110901182606 Ignore-this: 3407d72362f3cc7c864ac1f9811c08ae ] hash: 0000002045-98b2c348aa19d74b2679c2126d4eae4c1d070d56c886b559bbcd2aa045e869ef [Clean D.S.Test for unused symbols. Thomas Tuegel **20110906211611 Ignore-this: e8d186a7a7b24dfcde152b93f312882 The unused declarations were all related to replaying test suites with logged options, but the command-line option for this feature has been disabled for some time. Changing the detailed test suite type to expect "tests :: IO [Test]" instead of "tests :: IO Test" made the old method of replaying options clumsy. Since it was already disabled, I chose to remove it, rather than rewrite it again. ] hash: 0000002628-59ba6607f8d4561c6eee0a0e434497c0095a9044db1c4d934d6607a6b8b2edfe [Removed Options from Finished. Thomas Tuegel **20110906215557 Ignore-this: 64e3b26e9ebbf57bf8c824387de16ff4 ] hash: 0000001226-61c301ca0d647ddef333b11b870514dedb5a3657b012149e47b1f60d5bc19130 [Improved documentation for 'concurrently' field of Test. Thomas Tuegel **20110906215600 Ignore-this: e3a00672a542cf0a50e1c0cbf032e6ba ] hash: 0000000978-47826a3ddefb381014a985408bd81184ff90eb7c1c30b74bb6bfa1d93646e573 [Added 'testGroup' to D.S.TestSuite. Thomas Tuegel **20110906233632 Ignore-this: 5b52fe97c70c743d6baecdbd355625c9 ] hash: 0000000452-c1ff887003db7587e93af9d6ae9bfd8dd1142ee70e194b230f3175cc84933ba4 [Updated user manual for new detailed interface. Thomas Tuegel **20110906234931 Ignore-this: fb81a637aa1814320239a35d0cd2db33 ] hash: 0000001819-0eb59f67f8755e83bef16b1f6f771dffc74782522c7fe1db96dbda9cdcdf0612