diff options
| -rw-r--r-- | default.nix | 13 | ||||
| -rw-r--r-- | presentations/bootstrapping-2018/README.md | 5 | ||||
| -rw-r--r-- | presentations/bootstrapping-2018/default.nix | 15 | ||||
| -rw-r--r-- | presentations/bootstrapping-2018/presentation.pdf | bin | 0 -> 527371 bytes | |||
| -rw-r--r-- | third_party/default.nix | 6 |
5 files changed, 27 insertions, 12 deletions
diff --git a/default.nix b/default.nix index f638b8f2b0b6..b38a12aaa7a1 100644 --- a/default.nix +++ b/default.nix @@ -29,12 +29,13 @@ let readTree' = import ./read-tree.nix; localPkgs = readTree: { - fun = readTree ./fun; - nix = readTree ./nix; - ops = readTree ./ops; - third_party = readTree ./third_party; - tools = readTree ./tools; - web = readTree ./web; + fun = readTree ./fun; + nix = readTree ./nix; + ops = readTree ./ops; + presentations = readTree ./presentations; + third_party = readTree ./third_party; + tools = readTree ./tools; + web = readTree ./web; }; in fix(self: { config = config self; diff --git a/presentations/bootstrapping-2018/README.md b/presentations/bootstrapping-2018/README.md new file mode 100644 index 000000000000..e9573ae3f2e1 --- /dev/null +++ b/presentations/bootstrapping-2018/README.md @@ -0,0 +1,5 @@ +These are the slides for a talk I gave at the Norwegian Unix User Group on +2018-03-13. + +There is more information and a recording on the [event +page](https://www.nuug.no/aktiviteter/20180313-reproduible-compiler/). diff --git a/presentations/bootstrapping-2018/default.nix b/presentations/bootstrapping-2018/default.nix index c4ac8a472a78..28296d8bf3ba 100644 --- a/presentations/bootstrapping-2018/default.nix +++ b/presentations/bootstrapping-2018/default.nix @@ -1,8 +1,10 @@ # This derivation builds the LaTeX presentation. -{ pkgs ? import <nixpkgs> {} }: +{ pkgs, ... }: -with pkgs; let tex = texlive.combine { +with pkgs.third_party; + +let tex = texlive.combine { inherit (texlive) beamer beamertheme-metropolis @@ -13,14 +15,14 @@ with pkgs; let tex = texlive.combine { lualibs luaotfload luatex - luatex-def minted ms pgfopts - scheme-basic; + scheme-basic + translator; }; in stdenv.mkDerivation { - name = "nuug-reproducible-slides.pdf"; + name = "nuug-bootstrapping-slides"; src = ./.; FONTCONFIG_FILE = makeFontsConf { @@ -42,6 +44,7 @@ in stdenv.mkDerivation { ''; installPhase = '' - cp presentation.pdf $out + mkdir -p $out + cp presentation.pdf $out/ ''; } diff --git a/presentations/bootstrapping-2018/presentation.pdf b/presentations/bootstrapping-2018/presentation.pdf new file mode 100644 index 000000000000..7f435fe5b539 --- /dev/null +++ b/presentations/bootstrapping-2018/presentation.pdf Binary files differdiff --git a/third_party/default.nix b/third_party/default.nix index 94954f960436..f7bd07031e82 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -36,6 +36,9 @@ let emacsPackagesNgGen fetchFromGitHub fetchurl + fira + fira-code + fira-mono git glibc gnutar @@ -49,6 +52,8 @@ let lib lispPackages llvmPackages + luatex + makeFontsConf makeWrapper mdbook mime-types @@ -76,6 +81,7 @@ let systemd tdlib terraform_0_12 + texlive thttpd tree writeShellScriptBin |