From 0d818adfdf3322ab152641e4298f8bcad04bbc73 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Wed, 17 Jan 2024 11:42:29 +0100 Subject: elmPackages.elm: fix compilation with stackage LTS 22.4 --- pkgs/development/compilers/elm/default.nix | 4 ++++ .../compilers/elm/packages/ansi-wl-pprint.nix | 17 +++++++++++++++++ pkgs/development/compilers/elm/update.sh | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 pkgs/development/compilers/elm/packages/ansi-wl-pprint.nix diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 9ae361ddf442..44e1459af84d 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -36,6 +36,10 @@ let }; in elmPkgs // { inherit elmPkgs; + + ansi-wl-pprint = overrideCabal (drv: { + jailbreak = true; + }) (self.callPackage ./packages/ansi-wl-pprint.nix {}); }; }; diff --git a/pkgs/development/compilers/elm/packages/ansi-wl-pprint.nix b/pkgs/development/compilers/elm/packages/ansi-wl-pprint.nix new file mode 100644 index 000000000000..392ca5ab31b1 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/ansi-wl-pprint.nix @@ -0,0 +1,17 @@ +{ mkDerivation, ansi-terminal, base, fetchgit, lib }: +mkDerivation { + pname = "ansi-wl-pprint"; + version = "0.6.8.1"; + src = fetchgit { + url = "https://github.com/ekmett/ansi-wl-pprint"; + sha256 = "00pgxgkramz6y1bgdlm00rsh6gd6mdaqllh6riax2rc2sa35kip4"; + rev = "d16e2f6896d76b87b72af7220c2e93ba15c53280"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base ]; + homepage = "http://github.com/ekmett/ansi-wl-pprint"; + description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; + license = lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/elm/update.sh b/pkgs/development/compilers/elm/update.sh index ecd24de46f67..4de11bd8ff5d 100755 --- a/pkgs/development/compilers/elm/update.sh +++ b/pkgs/development/compilers/elm/update.sh @@ -1,6 +1,8 @@ #!/usr/bin/env nix-shell #!nix-shell -p cabal2nix elm2nix -i bash ../../.. +cabal2nix https://github.com/ekmett/ansi-wl-pprint --revision d16e2f6896d76b87b72af7220c2e93ba15c53280 > packages/ansi-wl-pprint.nix + # We're building binaries from commit that npm installer is using since # November 1st release called 0.19.1-6 in npm registry. # These binaries are built with newer ghc version and also support Aarch64 for Linux and Darwin. -- cgit v1.2.3