From 23ca27d27e6136e272bd15219f4c5422bf8a0541 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 11 Jun 2019 20:20:04 +0200 Subject: [PATCH] Update stackage GHC to 8.4.4 (#1322) * Update stack.yaml to lts-12.26 (GHC 8.4.4) with simplified nix config (On GHC 8.6.5, profiled build was exiting with: -- While building package postgrest-5.2.0 using: /home/circleci/.stack/setup-exe-cache/x86_64-linux/Cabal-simple_mPHDZzAJ_2.4.0.1_ghc-8.6.5 --builddir=.stack-work/dist/x86_64-linux/Cabal-2.4.0.1 build lib:postgrest exe:postgrest --ghc-options " -ddump-hi -ddump-to-file -fdiagnostics-color=always" Process exited with code: ExitFailure (-9) (THIS MAY INDICATE OUT OF MEMORY) Exited with code 1) * stack.yaml: Add postgresql to nix packages --- shell.nix | 19 ------------------- stack.yaml | 21 ++++++++------------- 2 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 shell.nix diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 582ac8db2..000000000 --- a/shell.nix +++ /dev/null @@ -1,19 +0,0 @@ -with import (builtins.fetchGit { - url = https://github.com/NixOS/nixpkgs-channels; - ref = "nixos-17.09"; - rev = "14f9ee66e63077539252f8b4550049381a082518"; -}) {}; -# alternatively you can add 17.09 to your channels with: -# -# nix-channel --add https://nixos.org/channels/nixos-17.09 nixos-17.09 -# nix-channel --update -# -# and then remove the above and uncomment this line. -#with (import {}); - -haskell.lib.buildStackProject { - name = "postgrest"; - # nixos-17.09 has ghc 8.0.2 by default - # this is the one used by stack lts-9.6 - buildInputs = [ ghc postgresql zlib pcre ]; -} diff --git a/stack.yaml b/stack.yaml index 36dcad27e..d094fbda8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,17 +1,12 @@ -resolver: lts-9.6 +# stack.yaml is used for circle-ci tests. Profiling build fails on circleci +# with GHC 8.6, so we build with 8.4 for now. + +resolver: lts-12.26 extra-deps: - - Ranged-sets-0.3.0 - - protolude-0.2.2 - - hasql-1.3 - - hasql-pool-0.5 - - hasql-transaction-0.7 - - text-builder-0.5.1.1 - - jose-0.7.0.0 - - postgresql-libpq-0.9.4.1 - - http-types-0.12.3 - - wai-middleware-static-0.8.2 - - configurator-pg-0.1.0.1 +- Ranged-sets-0.4.0 +- configurator-pg-0.1.0.3 +- http-types-0.12.3 ghc-options: postgrest: -O2 -Werror -Wall -fwarn-identities -fno-warn-redundant-constraints nix: - shell-file: shell.nix + packages: [pcre, pkgconfig, postgresql, zlib]