Merge pull request #9 from reflex-frp/aa/reflex-0.9

Update for reflex-0.9

Author: ali-abrar

.github/workflows/haskell.yml

@@ -6,18 +6,19 @@ jobs:
   build:
     strategy:
       matrix:
-        ghc: ['8.6.5', '8.8.4', '8.10.2']
+        ghc: ['8.6.5', '8.8.4', '8.10.7']
         os: ['ubuntu-latest', 'macos-latest']
     runs-on: ${{ matrix.os }}
 
     name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-haskell@v1
+    - uses: actions/checkout@v3
+    - uses: haskell/actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
+        cabal-version: '3.10.1.0'
     - name: Cache
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       env:
         cache-name: cache-cabal
       with:
@@ -30,12 +31,12 @@ jobs:
           ${{ runner.os }}
 
     - name: Install dependencies
-      run: |
-        cabal update
-        cabal build --only-dependencies --enable-tests --enable-benchmarks
+      run: cabal build --only-dependencies --enable-tests --enable-benchmarks
     - name: Build
       run: cabal build --enable-tests --enable-benchmarks all
     - name: Run tests
-      run: cabal test all
-    - name: Build Docs
+      run: cabal test --enable-tests all
+    - if: matrix.ghc != '8.4.4'
+      # docs aren't built on ghc 8.4.4 because some dependency docs don't build on older GHCs
+      name: Build Docs
       run: cabal haddock

ChangeLog.md

@@ -1,5 +1,10 @@
 # Revision history for reflex-fsnotify
 
+## 0.3.0.0
+
+* Require fsnotify >= 0.4, which has a breaking API change
+* Support reflex-0.9
+
 ## 0.2.1.3
 
 Support GHC 8.10

README.md

@@ -1,5 +1,5 @@
 # reflex-fsnotify
 
-[![Haskell](https://img.shields.io/badge/language-Haskell-orange.svg)](https://haskell.org) [![Hackage](https://img.shields.io/hackage/v/reflex-fsnotify.svg)](https://hackage.haskell.org/package/reflex-fsnotify) [![Hackage CI](https://matrix.hackage.haskell.org/api/v2/packages/reflex-fsnotify/badge)](https://matrix.hackage.haskell.org/#/package/reflex-fsnotify) [![Travis CI](https://api.travis-ci.org/reflex-frp/reflex-fsnotify.svg?branch=develop)](https://travis-ci.org/reflex-frp/reflex-fsnotify) [![BSD3 License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://github.com/reflex-frp/reflex-fsnotify/blob/master/LICENSE)
+[![Haskell](https://img.shields.io/badge/language-Haskell-orange.svg)](https://haskell.org) [![Hackage](https://img.shields.io/hackage/v/reflex-fsnotify.svg)](https://hackage.haskell.org/package/reflex-fsnotify) [![BSD3 License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://github.com/reflex-frp/reflex-fsnotify/blob/master/LICENSE)
 
 Watch files and directories for changes using a functional-reactive interface!

reflex-fsnotify.cabal

@@ -1,6 +1,6 @@
 cabal-version: >=1.10
 name: reflex-fsnotify
-version: 0.2.1.3
+version: 0.3.0.0
 synopsis: Reflex FRP interface for watching files
 description:
   Watch files and directories for changes using a functional-reactive interface!
@@ -16,16 +16,16 @@ category: System, FRP
 build-type: Simple
 extra-source-files: ChangeLog.md
                     README.md
-tested-with: GHC ==8.10.2 || ==8.8.4 || ==8.6.5
+tested-with: GHC ==8.10.7 || ==8.8.4 || ==8.6.5
 
 library
   exposed-modules: Reflex.FSNotify
-  build-depends: base >=4.10 && <4.15
+  build-depends: base >=4.10 && <4.19
                , containers >= 0.6 && < 0.7
                , directory >= 1.3 && < 1.4
                , filepath >= 1.4 && < 1.5
-               , fsnotify >= 0.3 && < 0.4
-               , reflex >= 0.5 && < 0.9
+               , fsnotify >= 0.4 && < 0.5
+               , reflex >= 0.5 && < 1
   hs-source-dirs: src
   default-language: Haskell2010
   ghc-options: -Wall

reflex-platform/default.nix

@@ -1,7 +1,2 @@
 # DO NOT HAND-EDIT THIS FILE
-import ((import <nixpkgs> {}).fetchFromGitHub (
-  let json = builtins.fromJSON (builtins.readFile ./github.json);
-  in { inherit (json) owner repo rev sha256;
-       private = json.private or false;
-     }
-))
+import (import ./thunk.nix)

reflex-platform/github.json

@@ -1,7 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-platform",
-  "branch": "aa-vty",
-  "rev": "17ff24efff2e6272a2f8df5021e229d9a20d4ac5",
-  "sha256": "0vgqxid9dldi5gvlhmiijikq58vaxz7w254ggj91935qd5x70wb9"
+  "branch": "release/1.0.1.0",
+  "private": false,
+  "rev": "50099ce2bca93ef69cea615ec72152b4a7648de4",
+  "sha256": "1ldzf3qznpysf4drkrvj7ysmdvrv6ddprnniylvcxccpp0f4krb7"
 }

reflex-platform/thunk.nix

@@ -0,0 +1,12 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json

release.nix

@@ -1,5 +1,10 @@
-{ p ? import ./reflex-platform {}
+{ p ? import ./reflex-platform { __useNewerCompiler = true; }
 }:
 let
   inherit (p.nixpkgs) lib;
-in p.ghc.callCabal2nix "reflex-fsnotify" ./. {}
+  ghc = p.ghc.override {
+    overrides = self: super: {
+      fsnotify = p.nixpkgs.haskell.lib.dontCheck (self.callHackage "fsnotify" "0.4.1.0" {});
+    };
+  };
+in ghc.callCabal2nix "reflex-fsnotify" ./. {}