summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--slides.md19
1 files changed, 12 insertions, 7 deletions
diff --git a/slides.md b/slides.md
index 9d8774b..1f09fe0 100644
--- a/slides.md
+++ b/slides.md
@@ -191,13 +191,17 @@ of the "package function".
191 191
192```nix 192```nix
193{ 193{
194 int = 1; 194 int = 1;
195 boolean = true; 195 boolean = true;
196 string = "hello ${world}!"; 196 string = "hello ${world}!";
197 "attribute set" = { a = 1; b = 2; }; 197 multilineString = ''
198 list = [ 1 2 "hello" ]; 198 hello
199 function = a: builtins.toString a; 199 initial indentation is removed!
200 "function w/ named parameters" = { a, b, c ? "default"}: a; 200 '';
201 "attribute set" = { a = 1; b = 2; };
202 list = [ 1 2 "hello" ];
203 function = a: builtins.toString a;
204 "function w/ named parameters" = { a, b, c ? "default"}: a;
201} 205}
202``` 206```
203 207
@@ -927,6 +931,7 @@ $ nix build -f default.nix \
927- [ ] Add intro? about problems that I had in Buildroot (non-determinism, no 931- [ ] Add intro? about problems that I had in Buildroot (non-determinism, no
928 auto-recompile) 932 auto-recompile)
929- [ ] Talk about nix-shell 933- [ ] Talk about nix-shell
934- [ ] Talk about nix-shell scripts
930- [ ] Talk about nixops 935- [ ] Talk about nixops
931- [ ] Talk about choosing generation at boot 936- [ ] Talk about choosing generation at boot
932- [ ] Have a functional programming intro 937- [ ] Have a functional programming intro