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

Commits on Mar 6, 2019

  1. cabal2nix.cabal: tentatively bump the version number to 3.0.0

    @peti
    peti committed Mar 6, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jluttine Jaakko Luttinen
    GPG key ID: 7B1CE13152E6B964
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ca1a56c View commit details

  2. travis-ci: run CI builds with ghc-8.6.4

    @peti
    peti committed Mar 6, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jluttine Jaakko Luttinen
    GPG key ID: 7B1CE13152E6B964
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    06144c3 View commit details
Showing with 5 additions and 5 deletions.
  1. +3 −3 .travis.yml
  2. +2 −2 cabal2nix.cabal
6 changes: 3 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.2
# version: 0.3
#
language: c
dist: xenial
@@ -30,8 +30,8 @@ before_cache:

matrix:
include:
- compiler: "ghc-8.6.3"
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}
- compiler: "ghc-8.6.4"
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.4], sources: [hvr-ghc]}}

before_install:
- HC=/opt/ghc/bin/${CC}
4 changes: 2 additions & 2 deletions cabal2nix.cabal
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cabal2nix
version: 2.14.2
version: 3.0.0
synopsis: Convert Cabal files into Nix build instructions.
description:
Convert Cabal files into Nix build instructions. Users of Nix can install the latest
@@ -74,7 +74,7 @@ author: Peter Simons,
Александр Цамутали
maintainer: Peter Simons <simons@cryp.to>
stability: stable
tested-with: GHC == 8.6.3
tested-with: GHC == 8.6.4
category: Distribution, Nix
homepage: https://github.com/nixos/cabal2nix#readme
bug-reports: https://github.com/nixos/cabal2nix/issues