on master help sign in
Use GHC 8.6.5
commitc0513b3024b3af9da5afa619acc912bc6a11316b authormrkkrp <mark.karpov@tweag.io> dateWed 28 Aug 2019, 14:15 (7 years ago) parente138b56
5 files changed+11−11
.circleci/config.yml+3−3 README.md+1−1 default.nix+1−1 nix/nixpkgs/default.nix+2−2 ormolu.cabal+4−4
.circleci/config.yml+3−3
@@ -1,7 +1,7 @@
11version: 2
22
33jobs:
4− build_ghc864:
4+ build:
55 docker:
66 - image: nixos/nix:2.1.3
77 steps:
@@ -14,7 +14,7 @@ jobs:
1414 - run:
1515 name: Setup Cachix
1616 command: |
17− nix-env -f nix/nixpkgs/ -iA cachix
17+ nix-env -iA cachix -f https://cachix.org/api/v1/install
1818 USER=dummy cachix use tweag
1919 - run:
2020 name: Build environment
@@ -40,5 +40,5 @@ workflows:
4040 version: 2
4141 build:
4242 jobs:
43− - build_ghc864:
43+ - build:
4444 context: org-global
README.md+1−1
@@ -42,7 +42,7 @@ Alternatively, `stack` could be used with a `stack.yaml` file as follows.
4242
4343```console
4444$ cat stack.yaml
45−resolver: lts-13.19
45+resolver: lts-14.3
4646packages:
4747- '.'
4848
default.nix+1−1
@@ -1,7 +1,7 @@
11{ pkgs ? (import ./nix/nixpkgs) }:
22
33let
4− ormoluCompiler = "ghc864";
4+ ormoluCompiler = "ghc865";
55 source = pkgs.lib.sourceByRegex ./.[
66 "^.*\.md$"
77 "^app.*$"
nix/nixpkgs/default.nix+2−2
@@ -1,6 +1,6 @@
11let
2− rev = "454eea84a757ca5f733c4ec0f234eba2281c74eb";
3− sha256 = "1k9jbix4w43brqlfmvwy218pf5fbmzsnc08shaww9qfdl1rdlaxy";
2+ rev = "3f4144c30a6351dd79b177328ec4dea03e2ce45f";
3+ sha256 = "1qg5n60n3fr6cypihnrjw451fadps5pysj5p0vvfb320mpfvlbjb";
44 nixpkgs = builtins.fetchTarball {
55 url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
66 inherit sha256;
ormolu.cabal+4−4
@@ -1,7 +1,7 @@
11name: ormolu
22version: 0.0.1.0
33cabal-version: 1.18
4−tested-with: GHC==8.6.4
4+tested-with: GHC==8.6.5
55license: BSD3
66license-file: LICENSE.md
77maintainer: Mark Karpov <mark.karpov@tweag.io>
@@ -69,8 +69,8 @@ library
6969 , containers >= 0.5 && < 0.7
7070 , dlist >= 0.8 && < 0.9
7171 , exceptions >= 0.6 && < 0.11
72− , ghc >= 8.4.3
73− , ghc-boot-th >= 8.4.3
72+ , ghc == 8.6.5
73+ , ghc-boot-th == 8.6.5
7474 , ghc-paths >= 0.1 && < 0.2
7575 , mtl >= 2.0 && < 3.0
7676 , syb >= 0.7 && < 0.8
@@ -149,7 +149,7 @@ executable ormolu
149149 main-is: Main.hs
150150 hs-source-dirs: app
151151 build-depends: base >= 4.12 && < 5.0
152− , ghc >= 8.4.3
152+ , ghc == 8.6.5
153153 , gitrev >= 1.3 && < 1.4
154154 , optparse-applicative >= 0.14 && < 0.15
155155 , ormolu