Skip to content

Commit

Permalink
Fix nix build for Tidal 2.0 (include hosc 0.20). Update nixpkgs input.
Browse files Browse the repository at this point in the history
This resolves the nix build issue encountered at
tidalcycles#1022, mentioned in
tidalcycles#1022 (comment).

Namely, as Tidal 2.0 requires `hosc` `0.20` but nixpkgs currently only
provides `0.19.1`, we temporarily include `hosc` `0.20` directly from
its source.

This commit also updates the nixpkgs pin to the latest version while
we're at it.
  • Loading branch information
mitchmindtree authored and matthewkaney committed Nov 30, 2023
1 parent 6ffb9c4 commit 8e55a88
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 6 deletions.
48 changes: 42 additions & 6 deletions flake.lock

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
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

0 comments on commit 8e55a88

Please sign in to comment.