Merge pull request #139 from siraben/flake

Add Nix flake

.github/workflows/build.yml

@@ -6,27 +6,25 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Check out code base
+      - name: 'Checkout codebase'
         if: github.event_name == 'push'
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v2.4.0
         with:
           fetch-depth: 0
 
-      - name: Check out code base
+      - name: 'Checkout codebase'
         if: github.event_name == 'pull_request'
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v2.4.0
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - uses: cachix/install-nix-action@v12
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - run: NIXPKGS_ALLOW_UNFREE=1 nix-build
-      - name: "Copy book"
-        run: "cp result/share/book.pdf ."
-      - name: "Upload artifact to GitHub"
-        uses: actions/upload-artifact@v2
+      - uses: cachix/install-nix-action@v14
+      - run: NIXPKGS_ALLOW_UNFREE=1 nix --experimental-features 'nix-command flakes' build -L --impure
+      - name: 'Copy book'
+        run: cp result/share/book.pdf .
+      - name: 'Upload artifact to GitHub'
+        uses: actions/upload-artifact@v2.2.4
         with:
           name: book.pdf
           path: book.pdf

.gitignore

@@ -21,4 +21,4 @@
 **/#*#
 tex/gitrev
 .DS_Store
-
+result

README.md

@@ -1,11 +1,20 @@
 # This is the "Mathematical Components" book.
 [![build](https://github.com/math-comp/mcb/actions/workflows/build.yml/badge.svg)](https://github.com/math-comp/mcb/actions/workflows/build.yml)
 
-To build the book using Nix, run `nix-build`.  Alternatively you may
-fetch the latest artifact produced by the CI for the master branch
+## Building
+To build the book using Nix, run
+```ShellSession
+# without flakes, check out the repo first
+$ NIXPKGS_ALLOW_UNFREE=1 nix-build
+# with flakes
+$ NIXPKGS_ALLOW_UNFREE=1 nix build github:math-comp/mcb --impure
+```
+
+Alternatively you may fetch the latest artifact produced by the CI for
+the master branch
 [here](https://github.com/math-comp/mcb/actions?query=branch%3Amaster).
 
-The `tex/` directory contains the sources.  TexLive 2014 is
+The `tex/` directory contains the sources.  TexLive 2014, 2021 is
 known to work.
 
 The `coq/` directory contains snippets corresponding to the chapters

default.nix

@@ -1,30 +1,9 @@
-with import <nixpkgs> {};
-
-stdenv.mkDerivation rec {
-  name = "math-comp-book";
-  version = "master";
-  src = ./.;
-
-  nativeBuildInputs = [ git texlive.combined.scheme-full ];
-
-  buildPhase = ''
-    cd tex
-    make
-    biber main
-    make
-    make
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share
-    cp book.pdf $out/share
-  '';
-
-  meta = with lib; {
-    description = "Mathematical components book";
-    homepage = "https://github.com/math-comp/mcb";
-    license = lib.licenses.cc-by-nc-40;
-    maintainers = with maintainers; [ siraben ];
-    platforms = platforms.all;
-  };
-}
+(import (
+  let
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  in fetchTarball {
+    url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+    sha256 = lock.nodes.flake-compat.locked.narHash; }
+) {
+  src =  ./.;
+}).defaultNix

flake.nix

@@ -0,0 +1,46 @@
+{
+  description = "Mathematical Components (the book)";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    utils.url = "github:numtide/flake-utils";
+    flake-compat = {
+      url = "github:edolstra/flake-compat";
+      flake = false;
+    };
+  };
+
+  outputs = { self, nixpkgs, utils, ... }:
+    utils.lib.eachDefaultSystem (system:
+      with import nixpkgs { inherit system; }; {
+        defaultPackage = stdenv.mkDerivation {
+          name = "math-comp-book";
+          version = "master";
+          src = ./.;
+
+          nativeBuildInputs = [ git texlive.combined.scheme-full ];
+
+          buildPhase = ''
+            cd tex
+            make
+            biber main
+            make
+            make
+          '';
+
+          installPhase = ''
+            mkdir -p $out/share
+            cp book.pdf $out/share
+          '';
+
+          meta = with lib; {
+            description = "Mathematical components book";
+            homepage = "https://github.com/math-comp/mcb";
+            license = lib.licenses.cc-by-nc-40;
+            maintainers = with maintainers; [ siraben ];
+            platforms = platforms.all;
+          };
+        };
+      }
+    );
+}
+