From b5a09712d103efe75718541e454429eb57eeca7e Mon Sep 17 00:00:00 2001 From: mseri Date: Tue, 19 Jan 2016 15:04:49 +0000 Subject: [PATCH 1/4] Update resolver to 4.2 This uses ghc 7.10.3 and works much better on osx --- stack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index 2af92ac..e217d4b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-2.22 +resolver: lts-4.2 packages: - '.' extra-deps: [] From 10853fac216dfd4186d2b6f6c1acbf246ba2f536 Mon Sep 17 00:00:00 2001 From: mseri Date: Tue, 19 Jan 2016 15:06:35 +0000 Subject: [PATCH 2/4] relax bounds on base This is necessary for compatibility with the stack resolver 4.2 --- write-you-a-haskell.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/write-you-a-haskell.cabal b/write-you-a-haskell.cabal index 4e9f295..e05d712 100644 --- a/write-you-a-haskell.cabal +++ b/write-you-a-haskell.cabal @@ -11,7 +11,7 @@ cabal-version: >=1.10 executable write-you-a-haskell main-is: Main.hs build-depends: - base >= 4.7 && <4.8, + base >= 4.7 && <4.9, pretty >= 1.1 && <1.2, containers >= 0.5 && <0.6, transformers >= 0.3 && <0.5, From 75783751570bc73bb5848b2874b40241211fe6f3 Mon Sep 17 00:00:00 2001 From: mseri Date: Tue, 19 Jan 2016 16:09:55 +0000 Subject: [PATCH 3/4] Fix typo and explicit epub support --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 62e6c95..c104ead 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ is done by the ``write-you-a-haskell.cabal`` and ``stack.yaml`` files. $ stack exec make ``` -To make the generate the pdf, the LaTeX packages must be installed on the +To generate the pdf, the LaTeX packages must be installed on the system. ```bash @@ -81,6 +81,13 @@ $ sudo tlmgr install zapfding $ stack exec make pdf ``` +Generation of the epub is also supported. + +```bash +$ stack exec make epub +``` + + **Cabal** ```bash From cf1a1b2b9d3f63f0b76ab2b210df19719604f415 Mon Sep 17 00:00:00 2001 From: mseri Date: Tue, 19 Jan 2016 16:12:09 +0000 Subject: [PATCH 4/4] Wrong image path --- 026_llvm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/026_llvm.md b/026_llvm.md index 40c53b9..3ba4873 100644 --- a/026_llvm.md +++ b/026_llvm.md @@ -750,7 +750,7 @@ ModRM = 0xc3 **Scale Index Base** - + Scale is the factor by which index is multipled before being added to base to specify the address of the operand. Scale can have value of 1, 2, 4, or