diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7d3aa8cc1f4012a27a3dcf462dac727c1814e0a8..09111c609592cca0361ae720466dcb47afc445a0 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 71c63321ddb00e482b9c079ba7b677cda6128ce0..25ea43d3cc95f2f14a64e382abe31018a400df5f 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 Binary files /dev/null and b/res/cc.png differ diff --git a/src/00-introduction.md b/src/00-introduction.md index 9f0d505c0050702b8429ff3fc3cd286c9fd18d80..1cfe4ccd42cf5dd6cab66b711ad832d331c3c2d2 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 3c89d507ac2cdddf1df49ac6bf588265984e561e..9288368a450dfaa29ac6c2cf9da42814d0f94850 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 d4e8a27cfc591c737741b57e919274685107ea05..795ab7ab8ede5b6132ee24ac37b44e92d27e9dd3 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?