From 47d4004a52e309e8b854bd0d32bd8d6cb594b17d Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Tue, 28 Nov 2023 19:01:54 +0100 Subject: [PATCH 1/6] haskellPackages.csound-expression-dynamic: unbreak --- .../haskell-modules/configuration-common.nix | 18 ++++++++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../transitive-broken.yaml | 7 ------- .../haskell-modules/hackage-packages.nix | 9 --------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 61c2e51b7939..20ac9ef841af 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -14,6 +14,12 @@ 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; @@ -918,6 +924,18 @@ self: super: { ''; }) super.structured-haskell-mode; + 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; + # 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 206f39758090..6422a98d80d8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -997,7 +997,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 136aed746efb..283a68046fa8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1008,12 +1008,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 @@ -3866,7 +3860,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 f46ce422cc7f..1e7ddd520216 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -77042,7 +77042,6 @@ self: { ]; description = "a gallery of Csound instruments"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-controllers" = callPackage @@ -77054,7 +77053,6 @@ self: { libraryHaskellDepends = [ base csound-expression ]; testHaskellDepends = [ base csound-expression ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-expression" = callPackage @@ -77076,7 +77074,6 @@ self: { ]; description = "library to make electronic music"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-expression-dynamic" = callPackage @@ -77096,8 +77093,6 @@ self: { ]; description = "dynamic core for csound-expression library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "csound-expression-opcodes" = callPackage @@ -77115,7 +77110,6 @@ self: { ]; description = "opcodes for the library csound-expression"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-expression-typed" = callPackage @@ -77138,7 +77132,6 @@ self: { ]; description = "typed core for the library csound-expression"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-sampler" = callPackage @@ -77152,7 +77145,6 @@ self: { libraryHaskellDepends = [ base csound-expression transformers ]; description = "A musical sampler based on Csound"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csp" = callPackage @@ -294393,7 +294385,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 From 90a4a1d26521cb317744233d2e6f2112754c68f2 Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Sun, 3 Dec 2023 15:19:56 +0100 Subject: [PATCH 2/6] haskellPackages.csound-expression: unbreak on recent GHC --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 20ac9ef841af..7a121ac82b01 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -936,6 +936,13 @@ self: super: { ]; }) 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; + # Make elisp files available at a location where people expect it. hindent = (overrideCabal (drv: { # We cannot easily byte-compile these files, unfortunately, because they From 80c649c662a2010689a241737269bac06815fcd2 Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Sun, 3 Dec 2023 18:50:12 +0100 Subject: [PATCH 3/6] haskellPackages.csound-expression-opcodes: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7a121ac82b01..b610cf1ab77f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -943,6 +943,13 @@ self: super: { 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; + # Make elisp files available at a location where people expect it. hindent = (overrideCabal (drv: { # We cannot easily byte-compile these files, unfortunately, because they From 98426afa72315eff6c46dc998a764e8d56e3694b Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Sun, 3 Dec 2023 21:33:50 +0100 Subject: [PATCH 4/6] haskellPackages.csound-expression-typed: unbreak --- .../development/haskell-modules/configuration-common.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b610cf1ab77f..c67f33c89114 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -924,6 +924,15 @@ self: super: { ''; }) super.structured-haskell-mode; + # 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: { From a56afd860cac7a59d5261581410e109a3c67604b Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Sun, 3 Dec 2023 22:46:01 +0100 Subject: [PATCH 5/6] haskellPackages.csound-sampler: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c67f33c89114..0d49c7f1256d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -959,6 +959,13 @@ self: super: { 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; + # Make elisp files available at a location where people expect it. hindent = (overrideCabal (drv: { # We cannot easily byte-compile these files, unfortunately, because they From 272fa4a1c04e1bb052abb40fe224704508d2c1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 6 Dec 2023 11:41:15 +0100 Subject: [PATCH 6/6] haskellPackages: refactor csound overrides --- .../haskell-modules/configuration-common.nix | 95 ++++++++++--------- 1 file changed, 52 insertions(+), 43 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0d49c7f1256d..56d30f78ddae 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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,47 +918,62 @@ self: super: { ''; }) super.structured-haskell-mode; - # 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; + 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-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 = + 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-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-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: {