diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d805343e7471..e76cd13a9a94 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1644,14 +1644,19 @@ self: super: { # 2022-03-16 upstream is not updating bounds: https://github.com/srid/rib/issues/169 rib-core = doJailbreak (super.rib-core.override { relude = doJailbreak super.relude_0_7_0_0; }); - neuron = overrideCabal { + neuron = assert super.neuron.version == "1.0.0.0"; overrideCabal { # neuron is soon to be deprecated # Fixing another ghc 9.0 bug here postPatch = '' sed -i 's/asks routeConfigRouteLink/asks (\\x -> routeConfigRouteLink x)/' src/lib/Neuron/Web/Route.hs ''; } - (doJailbreak (super.neuron.override { relude = doJailbreak super.relude_0_7_0_0; })); + (doJailbreak (super.neuron.override { + clay = dontCheck self.clay_0_13_3; + relude = doJailbreak self.relude_0_7_0_0; + })); + + reflex-dom-pandoc = super.reflex-dom-pandoc.override { clay = dontCheck self.clay_0_13_3; }; # 2022-03-16: Pull request for ghc 9 compat: https://github.com/reflex-frp/reflex/pull/467 reflex = appendPatch (pkgs.fetchpatch { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f449454b87c2..e30d9fe4dd9e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -128,6 +128,7 @@ extra-packages: - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6 - SVGFonts < 1.8 # 2022-03-19: Needed for Chart-diagrams 1.9.3 + - clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ef5f267f7c4e..72eb29e1cf2d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -57152,6 +57152,20 @@ self: { broken = true; }) {}; + "clay_0_13_3" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, mtl, text }: + mkDerivation { + pname = "clay"; + version = "0.13.3"; + sha256 = "192lsbyj6azjs2ygpx4i47fyr8zfmvwcas8mia07ndqglk2c9csx"; + libraryHaskellDepends = [ base mtl text ]; + testHaskellDepends = [ base hspec hspec-discover mtl text ]; + testToolDepends = [ hspec-discover ]; + description = "CSS preprocessor as embedded Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "clay" = callPackage ({ mkDerivation, base, hspec, hspec-discover, mtl, text }: mkDerivation {