diff options
| author | Peter Simons <simons@cryp.to> | 2019-03-25 13:57:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 13:57:12 +0100 |
| commit | 3e113f5f7a5bf2857a6afdf63d592245bfb7397a (patch) | |
| tree | 23a3c2e4e4269c932dd7149b715e03f7863a7722 | |
| parent | 83cb84ebc3c84a4f3192edee58541bffc592f04c (diff) | |
| parent | 32ec718b57ac9844be9d1131a6a1c9b63da408fb (diff) | |
| download | nixpkgs-3e113f5f7a5bf2857a6afdf63d592245bfb7397a.tar nixpkgs-3e113f5f7a5bf2857a6afdf63d592245bfb7397a.tar.gz nixpkgs-3e113f5f7a5bf2857a6afdf63d592245bfb7397a.tar.bz2 nixpkgs-3e113f5f7a5bf2857a6afdf63d592245bfb7397a.tar.lz nixpkgs-3e113f5f7a5bf2857a6afdf63d592245bfb7397a.tar.xz nixpkgs-3e113f5f7a5bf2857a6afdf63d592245bfb7397a.tar.zst nixpkgs-3e113f5f7a5bf2857a6afdf63d592245bfb7397a.zip | |
Merge pull request #58199 from rnhmjoj/superbuffer
haskellPackages.superbuffer: fix build
3 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 245714822cc..c439d2cca00 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1218,6 +1218,14 @@ self: super: { })]; }); + # Remove unecessary constraint: + # https://github.com/agrafix/superbuffer/pull/2 + superbuffer = overrideCabal super.superbuffer (drv: { + postPatch = '' + sed -i 's#QuickCheck < 2.10#QuickCheck < 2.13#' superbuffer.cabal + ''; + }); + # Use latest pandoc despite what LTS says. # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309. pandoc = doDistribute super.pandoc_2_7_1; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ff9934cd632..ce6fdfbe6ac 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8871,7 +8871,6 @@ broken-packages: - sunroof-server - super-user-spark - superbubbles - - superbuffer - supercollider-ht - supercollider-midi - superconstraints diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d49a17c0c49..5ade7f900ef 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -215026,7 +215026,6 @@ self: { description = "Efficiently build a bytestring from smaller chunks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "supercollider-ht" = callPackage |