cheat-sheet updates

Makefile

@@ -1,14 +1,14 @@
 emacs ?= emacs
 
-sheets: colemak.pdf qwerty.pdf
+sheets: colemak.pdf qwerty.pdf qwertz.pdf workman.pdf
 
 %.pdf: cheat-sheet.hs %.hs
 	cp $*.hs Layout.hs
-	nix-shell --run "cabal build"
-	nix-shell --run "dist/build/boonCS/boonCS $*" # generate the size of boxes
-	nix-shell latex.nix --run "xelatex $*.tex"
-	nix-shell --run "dist/build/boonCS/boonCS $*" # generate the diagram according to the above sizes
-	nix-shell latex.nix --run "xelatex $*.tex"
+	cabal new-build
+	nix-shell --run "cabal new-exec boonCS $*" # generate the size of boxes
+	xelatex $*.tex
+	nix-shell --run "cabal new-exec boonCS $*" # generate the diagrams according to the above sizes
+	xelatex $*.tex
 
 test:
 	$(emacs) -batch --script boon-test.el

boon.cabal

@@ -1,22 +1,23 @@
+Cabal-Version:  2.4
 name:           boon
 version:        1.0
 category:       Development
 synopsis:       A generator of nix files
 description:
   Soon to appear.
-license:        GPL
 license-file:   LICENSE
 author:         Jean-Philippe Bernardy
 maintainer:     jeanphilippe.bernardy@gmail.com
-Cabal-Version:  >= 1.20
-tested-with:    GHC==8.0.1
+tested-with:    GHC==8.6.4
 build-type:     Simple
 
 executable boonCS
+  build-tool-depends: marxup:marxup
   default-language: Haskell2010
   build-depends: base
   build-depends: lens
   build-depends: gasp
   build-depends: marxup
   build-depends: lp-diagrams
+  build-depends: typography-geometry >= 1.0.1
   main-is: cheat-sheet.hs

cheat-sheet.hs

@@ -64,7 +64,7 @@ argColor a = case a of
   Char -> "red"
   SearchObject -> "orange"
   Prefix -> "yellow"
-  TextRegion -> "blue"
+  TextRegion -> "cyan"
   Bin _ _ -> "purple"
   _ -> "white"
 

shell.nix

@@ -1,15 +1,72 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc801" }: 
-with (import <nixpkgs> {}).pkgs;
-let hp = haskell.packages.${compiler}.override{
-    overrides = self: super: {
-      lp-diagrams = self.callPackage ./lp-diagrams.nix {};
-      marxup = self.callPackage ./marxup.nix {};
-      };};
-    locpkg = hp.callPackage ./default.nix { }; 
-in stdenv.mkDerivation {
-    name = locpkg.name;
-    buildInputs = locpkg.buildInputs ++ [ z3 ];
-    shellHook = ''
-      export LANG=en_US.UTF-8
-      '';
-     }
+with import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-19.03.tar.gz) {};
+let hp = haskellPackages.override{
+      overrides = self: super: {
+        lp-diagrams = self.callPackage ./lp-diagrams.nix {};
+        marxup = self.callPackage ./marxup.nix {};
+      };};  
+    ghc = hp.ghcWithPackages (ps: with ps; ([ base gasp lens lp-diagrams lp-diagrams-svg ]));
+    myTexLive =  texlive.combine {
+      inherit (texlive)
+      make4ht # html conversion 
+      tex4ht  # html conversion
+      hyphenat # don't hyphenate
+      dvipng # org-mode preview needs this
+      arabtex
+      ebgaramond # font
+      #fonts
+      tex-gyre
+      tex-gyre-math
+      collection-fontsrecommended
+      comment
+      dejavu
+      doublestroke # usepackage dsfont
+      inconsolata
+      latexmk
+      libertine
+      libertinus
+      # collection-fontutils
+      biblatex
+      capt-of
+      cm-super
+      # dvipng # org-mode preview wants this; but broken
+      mathdesign # jlm requirement
+      enumitem
+      fancyhdr
+      filehook
+      hyperref
+      lastpage
+      lazylist # for lhs2tex
+      lm
+      lm-math
+      logreq
+      marvosym
+      multirow
+      newunicodechar
+      newtx # newtxmath
+      pgfplots
+      polytable # for lhs2tex
+      scheme-small
+      soul
+      stmaryrd
+      titlesec # change the environment of sections, etc. in convenient way
+      titling # tweaking title
+      fontaxes
+      threeparttable
+      todonotes
+      ucharcat
+      unicode-math
+      varwidth
+      wasy
+      wasysym
+      wrapfig
+      xargs
+      xstring;
+    };
+in pkgs.stdenv.mkDerivation {
+  name = "my-env-0";
+  buildInputs = [ z3 myTexLive ];
+  shellHook = ''
+ export LANG=en_US.UTF-8
+'';
+}
+