finish and attempt to fix CI builds

schonfinkel · Apr 26, 2024 · 8ac3a41 · 8ac3a41
1 parent 72f821d
commit 8ac3a41
Show file tree

Hide file tree

Showing 5 changed files with 126 additions and 50 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,6 +26,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          lfs: 'true'
 
       - name: Install Nix
         uses: cachix/install-nix-action@v17
@@ -39,4 +41,10 @@ jobs:
 
       - name: Build PDF
         run: |
-          nix develop .#ci --impure -c make
+          nix build -L ".#document"  
+
+      - name: Upload PDF
+        uses: actions/upload-artifact@v4
+        with:
+          name: slide
+          path: result/slide.pdf
diff --git a/README.md b/README.md
@@ -1,11 +1,29 @@
 # undb-presentation
 
+[![built with nix](https://builtwithnix.org/badge.svg)](https://builtwithnix.org)
+
 Being some beamer-based presentation done at a local event.
 
-# Building
+## Development
+
+To dive into a local development shell you should run:
+
+```shell
+nix develop --impure
+```
 
-## Nix
+## Build
 
 ```shell
 nix develop .#ci --impure -c make
 ```
+or
+```shell
+nix build -L ".#document"  
+```
+
+## TODO
+
+- [x] Setup Nix devenv
+- [x] Make local nix builds work
+- [] Make CI nix builds work
diff --git a/flake.nix b/flake.nix
@@ -22,40 +22,63 @@
         inherit system;
         config.allowUnfree = true;
       });
+
+      mkPkgs = system: nixpkgsFor."${system}";
+
+      mkEnv = pkgs: pkgs.texlive.combine {
+        inherit (pkgs.texlive)
+        beamer
+        beamertheme-metropolis
+        caption
+        collection-basic
+        collection-fontsextra
+        collection-fontsrecommended
+        collection-langenglish
+        collection-langportuguese
+        collection-latexextra
+        hyphen-portuguese
+        latexmk
+        paracol
+        pdfx
+        pgfopts
+        ragged2e
+        scheme-basic
+        unicode-math
+        xetex
+        xkeyval;
+      };
     in
     {
-      devShells = forAllSystems (system:
+      packages = forAllSystems (system:
         let
-          pkgs = nixpkgsFor."${system}";
-          texenv = pkgs.texlive.combine {
-            inherit (pkgs.texlive)
-            booktabs
-            beamer
-            beamertheme-metropolis
-            caption
-            collection-basic
-            collection-fontsextra
-            collection-fontsrecommended
-            collection-langenglish
-            collection-langportuguese
-            collection-latexextra
-            collection-mathscience
-            ctex
-            etoolbox
-            fancyvrb
-            fira
-            fontaxes
-            hyphen-portuguese
-            latexmk
-            paracol
-            pdfx
-            pgfopts
-            ragged2e
-            scheme-basic
-            unicode-math
-            xetex
-            xkeyval;
+          pkgs = mkPkgs system;
+          texenv = mkEnv pkgs;
+        in
+        {
+          document = pkgs.stdenvNoCC.mkDerivation rec {
+            name = "document";
+            src = self;
+            buildInputs = with pkgs; [ bash coreutils gnumake texenv ];
+            phases = ["unpackPhase" "buildPhase" "installPhase"];
+            buildPhase = ''
+              export PATH="${pkgs.lib.makeBinPath buildInputs}"
+              export XDG_CACHE_HOME="$(mktemp -d)"
+              make
+            '';
+            installPhase = ''
+              mkdir -p $out
+              cp slide.pdf $out/
+            '';
           };
+        }
+      );
+
+      defaultPackage = forAllSystems (system: self.packages.${system}.document);
+
+      devShells = forAllSystems (system:
+        let
+          pkgs = mkPkgs system;
+          texenv = mkEnv pkgs;
         in
         {
           # To be run with:

diff --git a/images/bob_taylor.jpeg b/images/bob_taylor.jpeg
diff --git a/main.tex b/main.tex
@@ -105,10 +105,45 @@
         % Column 1
         \begin{column}{0.5\textwidth}
             \begin{itemize}[<+->]
-                \item<2-> Computador pessoal
+                \item<2-> Mouse e teclado
+                \item<3-> Janelas
+                \item<4-> Linkagem dinâmica
+                \item<5-> Editores de Texto
+                \item<5-> Hypertexto
+                \item<5-> Hypermedia
+                \item<6-> Edição colaborativa de texto em tempo real
+                \item<6-> Video conferência
+                \item<7-> $\ldots$
+            \end{itemize}
+        \end{column}
+        % Column 2
+        \begin{column}{0.5\textwidth}
+            \begin{figure}
+            \centering
+                \includegraphics<1>[width=0.8\textwidth]{tmoad00.jpg}
+                \includegraphics<2>[width=0.8\textwidth]{tmoad01.jpg}
+                \includegraphics<3-4>[width=0.8\textwidth]{tmoad02.jpg}
+                \includegraphics<5>[width=\textwidth]{tmoad03.png}
+                \includegraphics<6>[width=\textwidth]{tmoad04.jpeg}
+                \includegraphics<7>[width=\textwidth]{tmoad05.png}
+                \caption{\href{https://www.youtube.com/watch?v=yJDv-zdhzMY}{Douglas Engelbart - The Mother of all Demos (1968)}}
+            \end{figure}
+        \end{column}
+    \end{columns}
+  \end{frame}
+
+  %-------------------------------------
+  \begin{frame}{Xerox Parc}
+    \begin{columns}
+        % Column 1
+        \begin{column}{0.5\textwidth}
+            \begin{itemize}[<+->]
+                \item<2-> Computador pessoal (Xerox Alto)
+                \item<2-> Dynabook (Laptop/Tablet)
                 \item<3-> GUIs
                 \item<4-> Smalltalk (OOP)
                 \item<5-> Ethernet
+                \item<5-> Email
                 \item<6-> Impressora a laser
                 \item<7-> Computação distribuída
                 \item<7-> $\ldots$
@@ -125,33 +160,22 @@
     \end{columns}
   \end{frame}
 
+  %-------------------------------------
   \begin{frame}{Xerox Parc}
     \begin{columns}
         % Column 1
         \begin{column}{0.5\textwidth}
             \begin{itemize}[<+->]
-                \item<2-> Mouse e teclado
-                \item<3-> Janelas
-                \item<4-> Linkagem dinâmica
-                \item<5-> Editores de Texto
-                \item<5-> Hypertexto
-                \item<5-> Hypermedia
-                \item<6-> Edição colaborativa de texto em tempo real
-                \item<6-> Video conferência
-                \item<7-> $\ldots$
+                \item<2-> Como diretor do escritório de Técnicas de Processamento de Informações da ARPA, Taylor financiou o experimento de Engelbart.
+                \item<3-> Taylor então contratou o pioneiro em redes Larry Roberts para supervisionar o projeto ARPAnet, um ancestral importante da Internet.
             \end{itemize}
         \end{column}
         % Column 2
         \begin{column}{0.5\textwidth}
             \begin{figure}
             \centering
-                \includegraphics<1>[width=0.8\textwidth]{tmoad00.jpg}
-                \includegraphics<2>[width=0.8\textwidth]{tmoad01.jpg}
-                \includegraphics<3-4>[width=0.8\textwidth]{tmoad02.jpg}
-                \includegraphics<5>[width=\textwidth]{tmoad03.png}
-                \includegraphics<6>[width=\textwidth]{tmoad04.jpeg}
-                \includegraphics<7>[width=\textwidth]{tmoad05.png}
-                \caption{\href{https://www.youtube.com/watch?v=yJDv-zdhzMY}{Douglas Engelbart - The Mother of all Demos (1968)}}
+                \includegraphics[width=0.7\textwidth]{bob_taylor.jpeg}
+                \caption{Robert "Bob" \, Taylor}
             \end{figure}
         \end{column}
     \end{columns}