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: NixOS/cabal2nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4da78502b73c
Choose a base ref
...
head repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 941229b6b488
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 13, 2018

  1. Update ghc versions to use for CI tests.

    @peti
    peti committed Nov 13, 2018
    Copy the full SHA
    941229b View commit details
Showing with 7 additions and 7 deletions.
  1. +6 −6 .travis.yml
  2. +1 −1 cabal2nix.cabal
12 changes: 6 additions & 6 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -28,12 +28,12 @@ before_cache:

matrix:
include:
- compiler: "ghc-8.6.1"
- compiler: "ghc-8.6.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
- compiler: "ghc-8.4.3"
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.2], sources: [hvr-ghc]}}
- compiler: "ghc-8.4.4"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}}
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}

before_install:
- HC=${CC}
@@ -60,7 +60,7 @@ install:
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
- (cd /tmp && echo '' | cabal new-repl -w ${HC} --build-dep fail)
- if [ $HCNUMVER -ge 80000 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin doctest --constraint='doctest ==0.16.*'; fi
- if [ $HCNUMVER -eq 80403 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin hlint --constraint='hlint ==2.1.*'; fi
- if [ $HCNUMVER -eq 80602 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin hlint --constraint='hlint ==2.1.*'; fi
- "printf 'packages: \".\"\\n' > cabal.project"
- touch cabal.project.local
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- cabal2nix | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
@@ -99,7 +99,7 @@ script:
- if [ $HCNUMVER -ge 80000 ]; then (cd cabal2nix-* && doctest -i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen -XMonadFailDesugaring src); fi

# hlint
- if [ $HCNUMVER -eq 80403 ]; then (cd cabal2nix-* && hlint -XMonadFailDesugaring src); fi
- if [ $HCNUMVER -eq 80602 ]; then (cd cabal2nix-* && hlint -XMonadFailDesugaring src); fi

# cabal check
- (cd cabal2nix-* && cabal check)
2 changes: 1 addition & 1 deletion cabal2nix.cabal
View file
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ author: Peter Simons,
Александр Цамутали
maintainer: Peter Simons <simons@cryp.to>
stability: stable
tested-with: GHC == 8.4.3, GHC == 8.6.1
tested-with: GHC == 8.4.4, GHC == 8.6.2
category: Distribution, Nix
homepage: https://github.com/nixos/cabal2nix#readme
bug-reports: https://github.com/nixos/cabal2nix/issues