Merge pull request #82 from tweag/mk/use-new-buildkite-setup

Use the new buildkite setup for CI

Author: aherrmann

.buildkite/pipeline.yml

@@ -0,0 +1,5 @@
+steps:
+  - label: Build and test
+    command: |
+      nix-build -A capability --no-out-link
+    timeout: 100

.circleci/config.yml

@@ -1,5 +1,7 @@
 # capability: effects, extensionally
 
+[![Build status](https://badge.buildkite.com/a44574059e13fc443caa437226af5ae5e67b6a5ae012534712.svg?branch=master)](https://buildkite.com/tweag-1/capability)
+
 A capability is a type class that says explicitly which effects
 a function is allowed to use. The [`mtl`][mtl] works like this too.
 But unlike the `mtl`, this library decouples effects from their
@@ -136,17 +138,6 @@ These patches are defined in
 A development environment with all patched dependencies in scope is defined in
 [`shell.nix`](shell.nix).
 
-### Cachix Nix Cache
-
-A Nix cache for this package's dependencies is provided via [cachix][cachix].
-If you have [cachix][cachix] installed, then you can activate it by executing
-
-```
-$ cachix use tweag
-```
-
-[cachix]: https://cachix.org/
-
 ### Build
 
 The build instructions assume that you have [Nix][nix] installed.

LICENSE renamed to LICENSE.md

@@ -2,7 +2,7 @@ name: capability
 version: 0.2.0.0
 homepage: https://github.com/tweag/capability
 license: BSD3
-license-file: LICENSE
+license-file: LICENSE.md
 maintainer: [email protected]
 copyright: 2018 EURL Tweag
 category: Control
@@ -29,6 +29,11 @@ flag hspec-jenkins
     This package allows JUnit formatted test reporting for CI.
   default: False
 
+flag dev
+  description: Turn on development settings.
+  manual: True
+  default: False
+
 library
   exposed-modules:
     Capability
@@ -70,7 +75,13 @@ library
     , transformers >= 0.5.5 && < 0.6
     , unliftio >= 0.2 && < 0.3
     , unliftio-core >= 0.1 && < 0.2
-  ghc-options: -Wall
+  if flag(dev)
+    ghc-options: -Wall -Werror -Wcompat
+                 -Wincomplete-record-updates
+                 -Wincomplete-uni-patterns
+                 -Wnoncanonical-monad-instances
+  else
+    ghc-options: -Wall
   hs-source-dirs: src
   default-language: Haskell2010
 
@@ -100,6 +111,12 @@ test-suite examples
     , unliftio >= 0.2 && < 0.3
   if flag(hspec-jenkins)
     build-depends: hspec-jenkins
-  ghc-options: -Wall
+  if flag(dev)
+    ghc-options: -Wall -Werror -Wcompat
+                 -Wincomplete-record-updates
+                 -Wincomplete-uni-patterns
+                 -Wnoncanonical-monad-instances
+  else
+    ghc-options: -Wall
   hs-source-dirs: examples
   default-language: Haskell2010

README.md

@@ -0,0 +1,29 @@
+{ pkgs ? (import ./nix/nixpkgs) }:
+
+let
+  compiler = "ghc865";
+  source = pkgs.lib.sourceByRegex ./. [
+    "^.*\.md$"
+    "^capability\.cabal$"
+    "^examples.*$"
+    "^src.*$"
+  ];
+  haskellPackages = pkgs.haskell.packages.${compiler}.override {
+    overrides = capabilityOverlay;
+  };
+  capabilityOverlay = self: super: {
+    "capability" = pkgs.haskell.lib.enableCabalFlag
+      (super.callCabal2nix "capability" source { }) "dev";
+  };
+in {
+  capability = haskellPackages.capability;
+  shell = haskellPackages.shellFor {
+    packages = ps: [
+      ps.capability
+    ];
+    buildInputs = [
+      haskellPackages.cabal-install
+      haskellPackages.ghcid
+    ];
+  };
+}

capability.cabal

@@ -1,9 +1,9 @@
 let
-  spec = builtins.fromJSON (builtins.readFile ./src.json);
-  src = {
-    url = "https://github.com/${spec.owner}/${spec.repo}/archive/${spec.rev}.tar.gz";
-    inherit (spec) sha256;
+  rev = "19.09";
+  sha256 = "0mhqhq21y5vrr1f30qd2bvydv4bbbslvyzclhw0kdxmkgg3z4c92";
+  nixpkgs = builtins.fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
+    inherit sha256;
   };
-
-in 
-  builtins.fetchTarball src
+  pkgs = import nixpkgs { config.allowUnfree = true; };
+in pkgs

default.nix

@@ -1,14 +1,3 @@
-with (import ./nix {});
+{ pkgs ? (import ./nix/nixpkgs) }:
 
-{ ghc ? "ghc861"  # One of ghc843, ghc861.
-, haskellPackages ? haskell.packages.${ghc}
-}:
-
-mkShell {
-  inputsFrom = [
-    haskellPackages.capability.env
-  ];
-  nativeBuildInputs = [
-    cabal-install
-  ];
-}
+(import ./default.nix { inherit pkgs; }).shell