Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build fixes for Tidal 1.9 #1052

Merged
merged 4 commits into from
Dec 2, 2023
Merged

Build fixes for Tidal 1.9 #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e55a88
Fix nix build for Tidal 2.0 (include hosc 0.20). Update nixpkgs input.
mitchmindtree Jun 28, 2023
f878aad
Fix tidal-listener build options, and add it to the stack build too.
Jun 23, 2023
3179c11
Bump action versions in workflows for nix-build and build-listener-wi…
Jun 23, 2023
aab0ff2
Don't build dynamic libraries for tidal-listener on Windows.
Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/listener-build-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./
Expand All @@ -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 }}
48 changes: 42 additions & 6 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down
1 change: 1 addition & 0 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ resolver: lts-20.5
packages:
- '.'
- 'tidal-parse'
- 'tidal-listener'
- 'tidal-link'

extra-deps:
Expand Down
6 changes: 4 additions & 2 deletions tidal-listener/tidal-listener.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Loading