Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: input-output-hk/haskell.nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: circuithub/haskell.nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 11 files changed
  • 4 contributors

Commits on Feb 7, 2020

  1. Add test.

    @cdepillabout
    cdepillabout committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    5f9bdc5 View commit details
    Browse the repository at this point in the history

  2. wip

    @cdepillabout
    cdepillabout committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    f7dc472 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2020

  1. Merge branch 'master' into support-cabal-doctest

    @angerman
    angerman authored Feb 18, 2020
    Configuration menu
    Copy the full SHA
    a1f6eaf View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2020

  1. Merge branch 'master' into support-cabal-doctest

    @hamishmack
    hamishmack committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    c7ba0f9 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2020

  1. Merge master into support-cabal-doctest

    @hamishmack
    hamishmack committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    1d8a687 View commit details
    Browse the repository at this point in the history

  2. Fix merge regression

    @hamishmack
    hamishmack committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    473c375 View commit details
    Browse the repository at this point in the history

  3. Combine drv, drv.source and drv.dist for doctest

    @hamishmack
    hamishmack committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    c659d88 View commit details
    Browse the repository at this point in the history

  4. Skip cabal-doctests test when cross compiling

    @hamishmack
    hamishmack committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    fa9597f View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Add the --no-magic flag to the .cabal file for the cabal-doctests test. 

    This appears to be necessary on OSX.

The --no-magic flag stops the doctest executable from expanding path
arguments, trying to locate the package db, etc.

This shouldn't be necessary with cabal-doctest, since all the
necessary options to pass to doctest are computed when running the Setup.hs
script.

See
#427 (comment).
    @cdepillabout
    cdepillabout committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    1d6dd9c View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. Merge remote-tracking branch 'origin/master' into support-cabal-doctest

    @hamishmack
    hamishmack committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    c3e883c View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. Merge branch 'master' into support-cabal-doctest

    @angerman
    angerman authored May 1, 2020
    Configuration menu
    Copy the full SHA
    9caf1cd View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2021

  1. Merge master into support-cabal-doctest 

    # Conflicts:
#	builder/comp-builder.nix
#	lib/check.nix
#	lib/default.nix
#	test/default.nix
    @hamishmack
    hamishmack committed Jan 14, 2021
    Configuration menu
    Copy the full SHA
    cb20a5a View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2021

  1. Fix cabal-doctest support

    @hamishmack
    hamishmack committed Jan 15, 2021
    Configuration menu
    Copy the full SHA
    1b2eae0 View commit details
    Browse the repository at this point in the history

  2. Skip cabal-doctest test plan cross compiling

    @hamishmack
    hamishmack committed Jan 15, 2021
    Configuration menu
    Copy the full SHA
    69ba0c1 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

  1. Merge remote-tracking branch 'origin/master' into support-cabal-doctest

    @hamishmack
    hamishmack committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    da71b82 View commit details
    Browse the repository at this point in the history

  2. More fixes for cabal-doctest

    @hamishmack
    hamishmack committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    cc58520 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into support-cabal-doctest

    @hamishmack
    hamishmack committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    506e63a View commit details
    Browse the repository at this point in the history

  4. Skip cabal-doctest tests when cross compiling

    @hamishmack
    hamishmack committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    37c662a View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2021

  1. Merge branch 'master' of https://github.com/input-output-hk/haskell.nix

    @ocharles
    ocharles committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    f32ba7e View commit details
    Browse the repository at this point in the history
Loading