From c0513b3024b3af9da5afa619acc912bc6a11316b Mon Sep 17 00:00:00 2001 From: mrkkrp Date: Wed, 28 Aug 2019 14:15:35 +0200 Subject: [PATCH] Use GHC 8.6.5 --- .circleci/config.yml | 6 +++--- README.md | 2 +- default.nix | 2 +- nix/nixpkgs/default.nix | 4 ++-- ormolu.cabal | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 908987e..6a3cc6c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 jobs: - build_ghc864: + build: docker: - image: nixos/nix:2.1.3 steps: @@ -14,7 +14,7 @@ jobs: - run: name: Setup Cachix command: | - nix-env -f nix/nixpkgs/ -iA cachix + nix-env -iA cachix -f https://cachix.org/api/v1/install USER=dummy cachix use tweag - run: name: Build environment @@ -40,5 +40,5 @@ workflows: version: 2 build: jobs: - - build_ghc864: + - build: context: org-global diff --git a/README.md b/README.md index 7a3feeb..191971b 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Alternatively, `stack` could be used with a `stack.yaml` file as follows. ```console $ cat stack.yaml -resolver: lts-13.19 +resolver: lts-14.3 packages: - '.' diff --git a/default.nix b/default.nix index 15cd46e..a387d32 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,7 @@ { pkgs ? (import ./nix/nixpkgs) }: let - ormoluCompiler = "ghc864"; + ormoluCompiler = "ghc865"; source = pkgs.lib.sourceByRegex ./.[ "^.*\.md$" "^app.*$" diff --git a/nix/nixpkgs/default.nix b/nix/nixpkgs/default.nix index c682e2a..d352fbc 100644 --- a/nix/nixpkgs/default.nix +++ b/nix/nixpkgs/default.nix @@ -1,6 +1,6 @@ let - rev = "454eea84a757ca5f733c4ec0f234eba2281c74eb"; - sha256 = "1k9jbix4w43brqlfmvwy218pf5fbmzsnc08shaww9qfdl1rdlaxy"; + rev = "3f4144c30a6351dd79b177328ec4dea03e2ce45f"; + sha256 = "1qg5n60n3fr6cypihnrjw451fadps5pysj5p0vvfb320mpfvlbjb"; nixpkgs = builtins.fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz"; inherit sha256; diff --git a/ormolu.cabal b/ormolu.cabal index 50d5ae8..8044ffa 100644 --- a/ormolu.cabal +++ b/ormolu.cabal @@ -1,7 +1,7 @@ name: ormolu version: 0.0.1.0 cabal-version: 1.18 -tested-with: GHC==8.6.4 +tested-with: GHC==8.6.5 license: BSD3 license-file: LICENSE.md maintainer: Mark Karpov @@ -69,8 +69,8 @@ library , containers >= 0.5 && < 0.7 , dlist >= 0.8 && < 0.9 , exceptions >= 0.6 && < 0.11 - , ghc >= 8.4.3 - , ghc-boot-th >= 8.4.3 + , ghc == 8.6.5 + , ghc-boot-th == 8.6.5 , ghc-paths >= 0.1 && < 0.2 , mtl >= 2.0 && < 3.0 , syb >= 0.7 && < 0.8 @@ -149,7 +149,7 @@ executable ormolu main-is: Main.hs hs-source-dirs: app build-depends: base >= 4.12 && < 5.0 - , ghc >= 8.4.3 + , ghc == 8.6.5 , gitrev >= 1.3 && < 1.4 , optparse-applicative >= 0.14 && < 0.15 , ormolu