diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c0f0f0526cbf..833d85d2ddd3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -904,6 +904,63 @@ 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 = + assert super.csound-expression-typed.version == "0.2.7"; + overrideCabal (drv: { + src = csound_src_git + "/csound-expression-typed"; + editedCabalFile = null; + }) super.csound-expression-typed; + + csound-expression-dynamic = + assert super.csound-expression-dynamic.version == "0.3.9"; + overrideCabal (drv: { + src = csound_src_git + "/csound-expression-dynamic"; + editedCabalFile = null; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + self.base64-bytestring self.cereal self.cereal-text + self.cryptohash-sha256 self.pretty-show self.safe + self.unordered-containers self.vector self.wl-pprint-text + ]; + }) super.csound-expression-dynamic; + + csound-expression = + assert super.csound-expression.version == "5.4.3"; + overrideCabal (drv: { + src = csound_src_git + "/csound-expression"; + editedCabalFile = null; + }) super.csound-expression; + + csound-expression-opcodes = + assert super.csound-expression-opcodes.version == "0.0.5.1"; + overrideCabal (drv: { + src = csound_src_git + "/csound-expression-opcodes"; + editedCabalFile = null; + }) super.csound-expression-opcodes; + + csound-sampler = + assert super.csound-sampler.version == "0.0.10.1"; + overrideCabal (drv: { + 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: { # We cannot easily byte-compile these files, unfortunately, because they diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 290b3f6bc736..27db7e3c351d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1001,7 +1001,6 @@ broken-packages: - cryptsy-api # failure in job https://hydra.nixos.org/build/233195814 at 2023-09-02 - csa # failure in job https://hydra.nixos.org/build/233233907 at 2023-09-02 - cse-ghc-plugin # failure in job https://hydra.nixos.org/build/233251963 at 2023-09-02 - - csound-expression-dynamic # failure in job https://hydra.nixos.org/build/233225568 at 2023-09-02 - CSPM-Frontend # failure in job https://hydra.nixos.org/build/233219295 at 2023-09-02 - cspretty # failure in job https://hydra.nixos.org/build/233246796 at 2023-09-02 - css-easings # failure in job https://hydra.nixos.org/build/233203513 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 87df614acb81..e4ab07de038e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1005,12 +1005,6 @@ dont-distribute-packages: - cryptonite-cd - crystalfontz - csg - - csound-catalog - - csound-controllers - - csound-expression - - csound-expression-opcodes - - csound-expression-typed - - csound-sampler - cspmchecker - csv-enumerator - ctpl @@ -3877,7 +3871,6 @@ dont-distribute-packages: - techlab - telegram-bot - telegram-raw-api - - temporal-csound - ten-lens - ten-unordered-containers - tensorflow-opgen diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d67256774b40..acd673beb812 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -77372,7 +77372,6 @@ self: { ]; description = "a gallery of Csound instruments"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-controllers" = callPackage @@ -77384,7 +77383,6 @@ self: { libraryHaskellDepends = [ base csound-expression ]; testHaskellDepends = [ base csound-expression ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-expression" = callPackage @@ -77406,7 +77404,6 @@ self: { ]; description = "library to make electronic music"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-expression-dynamic" = callPackage @@ -77426,8 +77423,6 @@ self: { ]; description = "dynamic core for csound-expression library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "csound-expression-opcodes" = callPackage @@ -77445,7 +77440,6 @@ self: { ]; description = "opcodes for the library csound-expression"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-expression-typed" = callPackage @@ -77468,7 +77462,6 @@ self: { ]; description = "typed core for the library csound-expression"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-sampler" = callPackage @@ -77482,7 +77475,6 @@ self: { libraryHaskellDepends = [ base csound-expression transformers ]; description = "A musical sampler based on Csound"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csp" = callPackage @@ -295736,7 +295728,6 @@ self: { ]; description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "temporal-media" = callPackage