Unverified Commit 272fa4a1 authored by Naïm Favier's avatar Naïm Favier
Browse files

haskellPackages: refactor csound overrides

parent a56afd86

pkgs/development/haskell-modules/configuration-common.nix

+56 −47
Original line number Diff line number Diff line
@@ -14,12 +14,6 @@ 
let

  inherit (pkgs) fetchpatch fetchpatch2 lib;

  inherit (lib) throwIfNot versionOlder versions;

  csound_src_git = pkgs.fetchFromGitHub {

    owner = "spell-music";

    repo = "csound-expression";

    rev = "345df2c91c9831dd895f58951990165598504814";

    hash = "sha256-6qPiKsZwZpqB2kmckKDKyQPTcWPIaVwi+EYs74tRod0=";

  };

in



with haskellLib;
@@ -924,6 +918,14 @@ self: super: { 
    '';

  }) super.structured-haskell-mode;



  inherit (let

    csound_src_git = pkgs.fetchFromGitHub {

      owner = "spell-music";

      repo = "csound-expression";

      rev = "345df2c91c9831dd895f58951990165598504814";

      hash = "sha256-6qPiKsZwZpqB2kmckKDKyQPTcWPIaVwi+EYs74tRod0=";

    };

  in {

    # Compilation on recent GHC is fixed on git, but not yet on hackage

    # https://github.com/spell-music/csound-expression/pull/68

    csound-expression-typed =
@@ -965,6 +967,13 @@ self: super: { 
        src = csound_src_git + "/csound-sampler";

        editedCabalFile = null;

      }) super.csound-sampler;

  })

    csound-expression-typed

    csound-expression-dynamic

    csound-expression

    csound-expression-opcodes

    csound-sampler

    ;



  # Make elisp files available at a location where people expect it.

  hindent = (overrideCabal (drv: {