diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e08c05ac0177..4d284d843639 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -774,7 +774,9 @@ self: super: { diagrams-braille = doJailbreak super.diagrams-braille; # https://github.com/timbod7/haskell-chart/pull/231#issuecomment-953745932 - Chart-diagrams = doJailbreak super.Chart-diagrams; + Chart-diagrams = doJailbreak (super.Chart-diagrams.override { + SVGFonts = super.SVGFonts_1_7_0_1; + }); # https://github.com/xu-hao/namespace/issues/1 namespace = doJailbreak super.namespace; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 520d985c1bc3..f449454b87c2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -127,6 +127,7 @@ extra-packages: - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - 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 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ce5cfb83fe33..278987d6769b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17883,6 +17883,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "SVGFonts_1_7_0_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg + , bytestring, cereal, cereal-vector, containers, data-default-class + , diagrams-core, diagrams-lib, directory, parsec, split, text + , vector, xml + }: + mkDerivation { + pname = "SVGFonts"; + version = "1.7.0.1"; + sha256 = "06vnpkkr19s9b1wjp7l2w29vr7fsghcrffd2knlxvdhjacrfpc9h"; + revision = "2"; + editedCabalFile = "0q731cyrqq1csbid9nxh2bj6rf8yss017lz9j9zk22bw3bymzb0s"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base blaze-markup blaze-svg bytestring cereal + cereal-vector containers data-default-class diagrams-core + diagrams-lib directory parsec split text vector xml + ]; + description = "Fonts from the SVG-Font format"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "SVGFonts" = callPackage ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg , bytestring, cereal, cereal-vector, containers, data-default-class