Merge pull request #56 from cofree-coffee/feature/version-bumps

Updates matrix-client to 0.1.4.2 and ghc to 924. Removes brittany.

.github/workflows/cabal.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         cabal: ["3.4"]
-        ghc: ["8.10.7"]
+        ghc: ["8.10.7", "9.0.2", "9.2.4"]
 
     env:
       CONFIG: "--project-file=cabal.project"
@@ -61,4 +61,4 @@ jobs:
 #        run: cabal test $CONFIG
 #
 #      - run: cabal haddock $CONFIG
-#      - run: cabal sdist
+#      - run: cabal sdist

.gitignore

@@ -4,3 +4,5 @@
 /dist-newstyle/
 .pre-commit-config.yaml
 /hie.yaml
+/.direnv/
+/.envrc.local

cabal.project

@@ -3,5 +3,5 @@ packages: *
 source-repository-package
   type: git
   location: https://github.com/softwarefactory-project/matrix-client-haskell.git
-  tag: f8610d8956bd146105292bb75821ca078d01b5ff
+  tag: 0.1.4.2
   subdir: matrix-client

flake.nix

@@ -3,7 +3,7 @@
   description = "Cofree.Coffee Matrix Bot";
 
   inputs = {
-    nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11;
+    nixpkgs.url = github:NixOS/nixpkgs/nixos-22.05;
 
     flake-utils = {
       url = github:numtide/flake-utils;
@@ -15,7 +15,7 @@
 
   outputs = { self, nixpkgs, flake-utils, pre-commit-hooks }:
     let
-      ghcVersion = "8107";
+      ghcVersion = "924";
       compiler = "ghc${ghcVersion}";
       # default systems compatible with pre-commit-hooks.nix
       # https://github.com/cachix/pre-commit-hooks.nix/pull/122
@@ -40,23 +40,8 @@
         hsPkgs = evalPkgs.haskell.packages.${compiler}.override {
           overrides = hfinal: hprev: {
             cofree-bot = hfinal.callCabal2nix "cofree-bot" ./. { };
-
-            # command to reproduce:
-            # cabal2nix https://github.com/softwarefactory-project/matrix-client-haskell --subpath matrix-client --revision f8610d8956bd146105292bb75821ca078d01b5ff > .nix/deps/matrix-client.nix
-            matrix-client = hfinal.callPackage ./nix/deps/matrix-client.nix { };
           };
         };
-
-        brittany-config = pkgs.writeTextFile {
-          name = "brittany-config";
-          text = builtins.readFile ./brittany.yaml;
-        };
-
-        scripts = import ./nix/scripts.nix {
-          inherit brittany-config;
-          s = pkgs.writeShellScriptBin;
-          brittany = pkgs.haskellPackages.brittany;
-        };
       in
       rec {
 
@@ -65,14 +50,13 @@
         devShell = pkgs.mkShell {
           inherit (self.checks.${system}.pre-commit-check) shellHook;
           buildInputs = with pkgs; [
-            haskellPackages.brittany
-            (haskell-language-server.override { supportedGhcVersions = [ ghcVersion ]; })
+            cabal2nix
             cabal-install
-            ghc
             ghcid
-            cabal2nix
+            haskell.compiler.${compiler}
+            haskell.packages.${compiler}.haskell-language-server
             zlib
-          ] ++ (builtins.attrValues scripts);
+          ];
         };
 
         packages = flake-utils.lib.flattenTree {
@@ -88,13 +72,6 @@
             src = ./.;
             hooks = {
               nixpkgs-fmt.enable = true;
-              brittany = {
-                name = "brittany";
-                entry = "${hsPkgs.brittany}/bin/brittany --write-mode=inplace --config-file=${brittany-config}";
-                files = "\\.l?hs$";
-                language = "system";
-                pass_filenames = false;
-              };
               cabal-fmt.enable = true;
             };
           };

stack.yaml

@@ -1,11 +1,11 @@
-resolver: lts-18.16
+resolver: lts-20.1
 
 packages:
 - .
 
 extra-deps:
 - git: https://github.com/cofree-coffee/matrix-client-haskell.git
-  commit: f8610d8956bd146105292bb75821ca078d01b5ff
+  commit: 0.1.4.2
   subdirs:
     - matrix-client