Skip to content

Commit

Permalink
Merge pull request #1098 from ahihi/flake-update-nixpkgs
Browse files Browse the repository at this point in the history
flake.nix: update nixpkgs and remove temporary hosc input
  • Loading branch information
yaxu authored Dec 13, 2024
2 parents 2270d9e + b379799 commit 2127647
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 30 deletions.
24 changes: 3 additions & 21 deletions flake.lock

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

9 changes: 0 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@
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 @@ -46,7 +38,6 @@

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 2127647

Please sign in to comment.