From 7bdf79423065ceb4c8ebcb3f416beeeca2fa69c2 Mon Sep 17 00:00:00 2001
From: Nicolas Lenz <nicolas@eisfunke.com>
Date: Sat, 9 Jul 2022 01:29:51 +0200
Subject: [PATCH] Updates
---
.vscode/tasks.json | 32 +++++++++++------------
metadata.yaml | 8 ++++++
res/cc.png | Bin 0 -> 1515 bytes
src/00-introduction.md | 2 --
src/01-basic-usage.md | 28 +++++++++++---------
src/02-what-is-functional-programming.md | 2 +-
6 files changed, 41 insertions(+), 31 deletions(-)
create mode 100644 res/cc.png
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 7d3aa8c..09111c6 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,17 +1,17 @@
{
- // See https://go.microsoft.com/fwlink/?LinkId=733558
- // for the documentation about the tasks.json format
- "version": "2.0.0",
- "tasks": [
- {
- "label": "Make",
- "type": "shell",
- "command": "make",
- "problemMatcher": [],
- "group": {
- "kind": "build",
- "isDefault": true
- }
- }
- ]
-}
\ No newline at end of file
+ // See https://go.microsoft.com/fwlink/?LinkId=733558
+ // for the documentation about the tasks.json format
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "label": "make",
+ "type": "shell",
+ "command": "make -f template/makefile",
+ "problemMatcher": [],
+ "group": {
+ "kind": "build",
+ "isDefault": true
+ }
+ }
+ ]
+}
diff --git a/metadata.yaml b/metadata.yaml
index 71c6332..25ea43d 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -3,3 +3,11 @@ subtitle: An introductory Workshop
author: Nicolas Lenz
institute: "[eisfunke.com](https://www.eisfunke.com)"
logo: res/logo-haskell.png
+disclaimer: |
+ {height=31px} \
+
+ This work is freely available under a \
+ **[Creative Commons Attribution-ShareAlike 4.0 (CC BY-SA 4.0)](https://creativecommons.org/licenses/by-sa/4.0/)** \
+ license.
+
+ The source code of these slides can be found at <https://git.eisfunke.com/lab/fupro>.
diff --git a/res/cc.png b/res/cc.png
new file mode 100644
index 0000000000000000000000000000000000000000..12229ac202d01f8007642172ca4aa00905aa52ad
GIT binary patch
literal 1515
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
Xz=eOOH=Jf*U|{fc^>bP0l+XkKUSS9W
literal 0
HcmV?d00001
diff --git a/src/00-introduction.md b/src/00-introduction.md
index 9f0d505..1cfe4cc 100644
--- a/src/00-introduction.md
+++ b/src/00-introduction.md
@@ -22,8 +22,6 @@ Nicolas Lenz
**My GitLab instance** (with some Haskell stuff): \
[git.eisfunke.com](https://git.eisfunke.com)
-You can find the source code of these slides at <https://git.eisfunke.com/lab/fupro>.
-
## Interaction & Questions
Interaction is important. Don't hesitate to ask questions!
diff --git a/src/01-basic-usage.md b/src/01-basic-usage.md
index 3c89d50..9288368 100644
--- a/src/01-basic-usage.md
+++ b/src/01-basic-usage.md
@@ -1,10 +1,22 @@
# Basic Usage
-## Installation
+## What you need
-- Recommended: Install the [Haskell Platform](https://www.haskell.org/platform/)
-- Includes everything you need to start with Haskell
-- Just installing the GHC alone is enough for this workshop
+- a **code editor**. I recommend VSCodium/Visual Studio Code with the Haskell extension (`haskell.haskell`)
+- **GHC**, the Haskell compiler, including **GHCi**, the interactive Haskell shell
+ - on Linux, install it using your package manager. The package is probably named `ghc` or similar. \
+ Alternatively, use ghcup: <https://www.haskell.org/ghcup/>
+ - on Windows, install using Chocolatey: <https://www.haskell.org/downloads/>.
+ - on macOS, install using ghcup: <https://www.haskell.org/ghcup/>
+- **Stack**, the Haskell project, package and build tool. It can also run a GHCi using `stack ghci` if you couldn't install GHC directly
+ - on Linux, install it using your package manager
+ - alternatively and for other OS's: <https://docs.haskellstack.org/en/stable/install_and_upgrade/>
+
+## What you need
+
+### Most important:
+
+You can start a somewhat current GHCi (version 8 or newer should be fine)
## GHCI
@@ -29,11 +41,3 @@
Haskell can of course also be compiled into executable programs with `ghc`, but that comes later.
For now we'll use only the GHCi. It's great for trying out stuff.
-
-## Stack
-
-Just so you know: for projects, you'd want to use Stack.
-
-https://docs.haskellstack.org/en/stable/README/
-
-All-in-one build tool & "package manager"
diff --git a/src/02-what-is-functional-programming.md b/src/02-what-is-functional-programming.md
index d4e8a27..795ab7a 100644
--- a/src/02-what-is-functional-programming.md
+++ b/src/02-what-is-functional-programming.md
@@ -26,4 +26,4 @@ x = 2
x = 4
```
-Will *this* work?
\ No newline at end of file
+Will *this* work?
--
GitLab