Permalink
Commits on Nov 12, 2016
  1. DNS.hs: enable DoAndIfThenElse LANGUAGE extension

    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
    trofi committed Nov 12, 2016
  2. Setup.hs: enable NoMonoLocalBinds

    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
    trofi committed Nov 12, 2016
  3. Add missing ForeignFunctionInterface LANGAUGE pragma

    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
    trofi committed Nov 12, 2016
  4. disable MonoLocalBinds as it conflicts with GADTs set outside

    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
    trofi committed Apr 9, 2016
  5. 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.
    kolmodin committed with trofi Dec 26, 2010
  6. 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.
    trofi committed with trofi Jul 10, 2011
Commits on Nov 11, 2016
  1. Merge pull request #4099 from juhp/patch-3

    fix comment typo of security
    23Skidoo committed on GitHub Nov 11, 2016
  2. fix comment typo of security

    juhp committed on GitHub Nov 11, 2016
Commits on Nov 9, 2016
  1. Change internal representation of UnitId to use ShortText

    UnitId was already opaque but missed the ShortText treatment;
    this allows for simple re-casting from ComponentIds (which are
    internally ShortTexts as well)
    hvr committed Nov 9, 2016
  2. Merge pull request #4096 from byorgey/master

    D.C.Compat.Process.readProcessWithExitCode: also catch permission errors
    byorgey committed on GitHub Nov 9, 2016
  3. Merge pull request #4091 from hvr/pr/nowrap

    Implement +nowrap verbosity flag to suppress log-msg line-wrapping
    23Skidoo committed on GitHub Nov 9, 2016
Commits on Nov 8, 2016
  1. Implement +nowrap verbosity flag to suppress log-msg line-wrapping

    Unfortunately, propagating the `Verbosity` to the `topHandler`
    proves to be more complicated.
    
    This is mostly a problem for `die` invocations which are translated
    into user-error exceptions (which in turn then cause callstacks
    to be printed; are we abusing `die`?)
    hvr committed Nov 8, 2016
Commits on Nov 7, 2016
  1. Merge pull request #4086 from ezyang/pr/T4081

    Improve error output when package fails to build.
    BardurArantsson committed on GitHub Nov 7, 2016
Commits on Nov 6, 2016
  1. Merge pull request #4089 from ezyang/pr/parsec-data-word-import

    Fix redundant import warning from Parsec.
    phadej committed on GitHub Nov 6, 2016
  2. Merge pull request #4083 from hvr/pr/plan-json-pkgid

    Add more fields to plan.json schema
    
    [skip ci] to reuse ci-status from PR
    hvr committed on GitHub Nov 6, 2016
  3. Fix redundant import warning from Parsec.

    Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
    ezyang committed Nov 6, 2016
  4. Add more fields to plan.json schema

    This adds the following new fields:
    
     - `.compiler-id`
     - `.os`
     - `.arch`
     - `.install-plan[].pkg-name`
     - `.install-plan[].pkg-version`
     - `.install-plan[].pkg-src-sha256`
    
    Having separate "pkg-{name,version}" fields is desirable because the "id"-field
    is actually a UnitId which is supposed to be an opaque id which may not
    always be easily convertible into a PackageId via string operations.
    
    The "pkg-src-sha256" is generally useful to uniquely identify a
    source-tarball (when the package-id is not exact enough).
    
    Finally, the compiler-id/os/arch information is needed to determine the
    values of the respective impl()/os()/arch() predicates used in
    conditionals in .cabal files.
    
    Here's an example demonstrating the new fields:
    
        {
          "cabal-version": "1.25.0.0",
          "cabal-lib-version": "1.25.0.0",
          "compiler-id": "ghc-8.0.1",
          "os": "linux",
          "arch": "x86_64",
          "install-plan": [
    	{
    	  "type": "configured",
    	  "id": "StateVar-1.1.0.4-048d5d25d5813f17f152f9e766fe3ea0ef6f5317439aa115f3fc24e53a0e3c17",
    	  "pkg-name": "StateVar",
    	  "pkg-version": "1.1.0.4",
    	  "flags": {},
    	  "style": "global",
    	  "pkg-src-sha256": "7ad68decb5c9a76f83c95ece5fa13d1b053e4fb1079bd2d3538f6b05014dffb7",
    	  "depends": [
    	    "base-4.9.0.0",
    	    "stm-2.4.4.1-2c7789312d2396a91db173e1ae8cf3a9af3dd18de42bb1021c4978fbab49c191",
    	    "transformers-0.5.2.0"
    	  ],
    	  "exe-depends": [],
    	  "component-name": "lib"
    	},
            {
              "type": "pre-existing",
              "id": "rts",
              "pkg-name": "rts",
              "pkg-version": "1.0",
              "depends": []
            },
    	{
    	  "type": "configured",
    	  "id": "hackage-matrix-builder3-0.3-inplace-matrix-lib",
    	  "pkg-name": "hackage-matrix-builder3",
    	  "pkg-version": "0.3",
    	  "component-name": "lib:matrix-lib"
    	  ...
    	}
    	...
        }
    hvr committed Nov 4, 2016
  5. Improve error output when package fails to build.

    New error message is:
    
    cabal: Failed to build p-1.0 (which is required by exe:e4 from p-1.0, exe:e3
    from p-1.0 and others).
    
    Fixes #4081.
    
    TODO: Use these utility functions in other appropriate places.
    
    Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
    ezyang committed Nov 5, 2016
Commits on Nov 5, 2016
  1. Add fingerprint of Generic representation when serializing.

    The idea is we can use Rep to get a full, structural representation
    of a type, and the fingerprint it using Typeable.  This gives
    us a very concise way of fingerprinting our Binary representation.
    
    This patch is not completely correct; the fingerprint needs
    to be overridable when someone writes a custom Binary instance.
    But this should be "good enough" in practice; we're not using
    these fingerprints to check anything security critical.
    
    TODO: Not sure if I have tagged all the call-sites which could
    profit from this.
    
    Fixes #4059.
    
    Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
    ezyang committed with ezyang Nov 2, 2016
  2. Add some missing Typeable instances.

    Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
    ezyang committed with ezyang Nov 5, 2016
Commits on Nov 4, 2016
  1. Merge pull request #4082 from phadej/no-lambda-case

    No LambdaCase, resolve #4079
    23Skidoo committed on GitHub Nov 4, 2016
  2. No LambdaCase, resolve #4079

    phadej committed Nov 4, 2016
Commits on Nov 3, 2016
  1. Formatting.

    Before:
    
        cabal new-build               Build the package in the current
      directory or all packages in the project
        cabal new-build pkgname       Build the package named pkgname in the
      project
        cabal new-build cname       Build the component named cname in the
      project
        cabal new-build pkgname:cname       Build the component named cname
      in the package pkgname
    
    After:
    
        cabal new-build               Build the package in the current
      directory or all packages in the project
        cabal new-build pkgname       Build the package named pkgname in the
      project
        cabal new-build cname         Build the component named cname in the
      project
        cabal new-build pkgname:cname Build the component named cname in the
      package pkgname
    23Skidoo committed Nov 3, 2016
  2. Merge pull request #4077 from 23Skidoo/new-configure-more-correct-pla…

    …n-subset
    
    new-configure: Select the same plan subset as new-build.
    23Skidoo committed on GitHub Nov 3, 2016
  3. Merge pull request #4076 from ezyang/pr/sanityCheckHookedBuildInfo-fixup

    Fix missing line pointed out by @abooij.
    23Skidoo committed on GitHub Nov 3, 2016
Commits on Nov 2, 2016
  1. Fix missing line pointed out by @abooij.

    Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
    ezyang committed Nov 2, 2016
  2. new-configure: Select the same plan subset as new-build.

    Before:
    
    $ cabal new-configure
    Resolving dependencies...
    In order, the following would be built (use -v for more details):
     - Crypto-4.2.5.1 (exe:SymmetricTest) (requires build)
     - Crypto-4.2.5.1 (exe:WordListTest) (requires build)
     - Crypto-4.2.5.1 (exe:SHA1Test) (requires build)
     - Crypto-4.2.5.1 (exe:QuickTest) (requires build)
     - Crypto-4.2.5.1 (exe:RSATest) (requires build)
     - Crypto-4.2.5.1 (exe:HMACTest) (requires build)
     - HaXml-1.25.3 (exe:Xtract) (requires build)
     - HaXml-1.25.3 (exe:Validate) (requires build)
     - HaXml-1.25.3 (exe:MkOneOf) (requires build)
     - HaXml-1.25.3 (exe:CanonicaliseLazy) (requires build)
     - HaXml-1.25.3 (exe:Canonicalise) (requires build)
     - HaXml-1.25.3 (exe:XsdToHaskell) (requires build)
     - HaXml-1.25.3 (exe:DtdToHaskell) (requires build)
     - HaXml-1.25.3 (exe:FpMLToHaskell) (requires build)
     - aeson-pretty-0.8.1 (exe:aeson-pretty) (requires build)
     - cpphs-1.20.2 (exe:cpphs) (requires build)
     - hS3-0.5.9 (exe:hs3) (requires build)
     - yaml-0.8.18 (exe:json2yaml) (requires build)
     - yaml-0.8.18 (exe:yaml2json) (requires build)
    
    $ cabal new-build
    Resolving dependencies...
    Up to date
    
    After:
    
    $ cabal new-configure
    Resolving dependencies...
    Up to date
    
    $ cabal new-build
    Resolving dependencies...
    Up to date
    23Skidoo committed Nov 2, 2016
  3. Whitespace.

    23Skidoo committed Nov 2, 2016
  4. Merge pull request #4067 from Ericson2314/dep-types

    Make more dependency types
    Ericson2314 committed on GitHub Nov 2, 2016
  5. Merge pull request #4072 from abooij/pr4065-fixup

    Deduplicate version checks in cabal-testsuite
    abooij committed on GitHub Nov 2, 2016
Commits on Nov 1, 2016
  1. Make more dependency types, and PkgconfigName

        Plain `Dependency` should strictly refer to a Haskell Package, usually the
        library component of that package.
    Ericson2314 committed with Ericson2314 Nov 1, 2016