Merge branch '1.9-dev' into split-osc-code

.github/workflows/listener-build-windows.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Haskell
-        uses: haskell/actions/setup@v1
+        uses: haskell/actions/setup@v2
         id: setup-haskell-cabal
         with:
           ghc-version: ${{ matrix.ghc }}

.github/workflows/nix.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
-      - uses: cachix/install-nix-action@v16
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - run: nix fmt -- --check ./
@@ -36,7 +36,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/[email protected]
-      - uses: cachix/install-nix-action@v16
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - run: nix build --print-build-logs --no-update-lock-file .#${{ matrix.package }}

flake.nix

@@ -23,6 +23,14 @@
   inputs = {
     utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    # Temporarily add `hosc` at the latest v0.20 commit
+    # (nixpkgs currently only has 0.19.1).
+    # See this comment for details:
+    # https://github.com/tidalcycles/Tidal/pull/1022#issuecomment-1610978403
+    hosc = {
+      url = "github:rd--/hosc?rev=e77aa67cd0b99a32498fef246a687ba443c9b4be";
+      flake = false;
+    };
   };
 
   outputs = inputs: let
@@ -38,6 +46,7 @@
 
     mkPackages = pkgs: let
       project = pkgs.haskellPackages.extend (pkgs.haskell.lib.compose.packageSourceOverrides {
+        hosc = inputs.hosc; # Remove once `hosc` is at 0.20 in nixpkgs.
         tidal = ./.;
         tidal-link = ./tidal-link;
         tidal-listener = ./tidal-listener;

stack.yaml

@@ -3,6 +3,7 @@ resolver: lts-20.5
 packages:
   - '.'
   - 'tidal-parse'
+  - 'tidal-listener'
   - 'tidal-link'
 
 extra-deps:

tidal-listener/tidal-listener.cabal

@@ -33,8 +33,9 @@ library
   default-language:    Haskell2010
   ghc-options: -threaded
                -Wall
-               -dynamic
                -- see: https://github.com/haskell-hint/hint/issues/156
+  if !os(windows)
+    ghc-options:           -dynamic-too
 
 
 executable tidal-listener
@@ -46,5 +47,6 @@ executable tidal-listener
   default-language:    Haskell2010
   ghc-options: -threaded
                -Wall
-               -dynamic
                -- see: https://github.com/haskell-hint/hint/issues/156
+  if !os(windows)
+    ghc-options:           -dynamic-too

tidal.cabal

@@ -116,7 +116,7 @@ benchmark bench-speed
                  Tidal.Inputs
   build-depends:
                 base == 4.*
-              , criterion
+              , criterion >= 1.6.3.0
               , tidal
   ghc-options: -Wall