Skip to content
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.

Sign up for GitHub

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

Jump to bottom

'gpl' cabal flag to switch between HsYAML and aeson-yaml #1417

Merged
merged 16 commits into from
Oct 15, 2019
Merged

'gpl' cabal flag to switch between HsYAML and aeson-yaml #1417

merged 16 commits into from
Oct 15, 2019

Commits on Oct 13, 2019

  1. WIP gpl flag to switch between HsYAML and aeson-yaml

    @patrickmn
    patrickmn committed Oct 13, 2019
    Configuration menu
    Copy the full SHA
    bc8a98d View commit details
    Browse the repository at this point in the history

  2. Make gpl flag manual

    @patrickmn
    patrickmn committed Oct 13, 2019
    Configuration menu
    Copy the full SHA
    c3d6f1a View commit details
    Browse the repository at this point in the history

  3. add aeson-yaml to stack.yaml

    @patrickmn
    patrickmn committed Oct 13, 2019
    Configuration menu
    Copy the full SHA
    bdf066b View commit details
    Browse the repository at this point in the history

  4. restore submodule commit

    @patrickmn
    patrickmn committed Oct 13, 2019
    Configuration menu
    Copy the full SHA
    15a1757 View commit details
    Browse the repository at this point in the history

  5. Add and use a GPL CPP flag

    @patrickmn
    patrickmn committed Oct 13, 2019
    Configuration menu
    Copy the full SHA
    8550421 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2019

  1. Fix Nix CI to enable the -fgpl flag

    @Gabriella439
    Gabriella439 committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    b96d747 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from dhall-lang/patrickmn-master 

    Fix Nix CI to enable the `-fgpl` flag
    @patrickmn
    patrickmn committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    c377e67 View commit details
    Browse the repository at this point in the history

  3. Use aeson-yaml's encodeQuoted if quoted is True

    @patrickmn
    patrickmn committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    4d1b853 View commit details
    Browse the repository at this point in the history

  4. Merge master

    @patrickmn
    patrickmn committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    285405c View commit details
    Browse the repository at this point in the history

  5. Remove local aeson-yaml package

    @patrickmn
    patrickmn committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    613540e View commit details
    Browse the repository at this point in the history

  6. Use aeson-yaml >= 1.0.1.0

    @patrickmn
    patrickmn committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    61e5090 View commit details
    Browse the repository at this point in the history

  7. Only import Data.ByteString.Lazy when using aeson-yaml, and update st… 

    …ack.yaml
    @patrickmn
    patrickmn committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    c3b8efb View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into master

    @patrickmn
    patrickmn committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    b5ca809 View commit details
    Browse the repository at this point in the history

  9. Add '--flag dhall-json:gpl' to travis stack build

    @patrickmn
    patrickmn committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    5bec643 View commit details
    Browse the repository at this point in the history

  10. dummy commit to re-trigger CI 1/2

    @patrickmn
    patrickmn committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    996d90c View commit details
    Browse the repository at this point in the history

  11. dummy commit to re-trigger CI 2/2

    @patrickmn
    patrickmn committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    fcd557d View commit details
    Browse the repository at this point in the history