diff options
author | Malte Brandy <malte.brandy@maralorn.de> | 2020-10-11 14:50:04 +0200 |
---|---|---|
committer | Malte Brandy <malte.brandy@maralorn.de> | 2020-10-11 16:18:20 +0200 |
commit | 24c9b05ac53e422f1af81a156f1fd58499eb27fb (patch) | |
tree | ac825f550d7eca44ed4e488fdfeccafa9e92c8a4 | |
parent | 937c2597d941788cc282d3c2945e760cd3476610 (diff) | |
download | nixpkgs-24c9b05ac53e422f1af81a156f1fd58499eb27fb.tar nixpkgs-24c9b05ac53e422f1af81a156f1fd58499eb27fb.tar.gz nixpkgs-24c9b05ac53e422f1af81a156f1fd58499eb27fb.tar.bz2 nixpkgs-24c9b05ac53e422f1af81a156f1fd58499eb27fb.tar.lz nixpkgs-24c9b05ac53e422f1af81a156f1fd58499eb27fb.tar.xz nixpkgs-24c9b05ac53e422f1af81a156f1fd58499eb27fb.tar.zst nixpkgs-24c9b05ac53e422f1af81a156f1fd58499eb27fb.zip |
haskellPackages.neuron: Fix build
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c85245255cd..559e2879fa6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1376,15 +1376,11 @@ self: super: { # https://github.com/jgm/commonmark-hs/issues/55 commonmark-extensions = dontCheck super.commonmark-extensions; - # Apply version-bump patch that is not contained in released version yet. - # Upstream PR: https://github.com/srid/neuron/pull/304 - neuron = appendPatch super.neuron (pkgs.fetchpatch { - url= "https://github.com/srid/neuron/commit/9ddcb7e9d63b8266d1372ef7c14c13b6b5277990.patch"; - sha256 = "01f9v3jnl05fnpd624wv3a0j5prcbnf62ysa16fbc0vabw19zv1b"; - excludes = [ "commonmark-hs/github.json" ]; - stripLen = 2; - extraPrefix = ""; - }); + + # 2020-10-11: reflex-dom-pandoc and neuron require skylighting >= 9, which we + # can‘t support, because there is no pandoc release compatible with this. + reflex-dom-pandoc = doJailbreak super.reflex-dom-pandoc; + neuron = doJailbreak super.neuron; # Testsuite trying to run `which haskeline-examples-Test` haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0; |