Rework Nix Build

Author: yurrriq

.gitignore

@@ -192,4 +192,4 @@ src/auto/
 
 
 ## Nix
-/result*
+/result*

.travis.yml

@@ -1,3 +1 @@
 language: nix
-# FIXME: Why does pandoc fail in nix-build?
-script: nix-shell --pure --run make

Makefile

@@ -7,7 +7,7 @@ PDF    ?= sf-idris-2018.pdf
 .PHONY: pdf site
 
 
-all: check pdf site
+all: pdf site
 
 
 build:
@@ -20,7 +20,8 @@ check:
 
 pdf:
 	$(MAKE) -C src
-	mv src/all.pdf docs/pdf/${PDF}
+	mkdir -p ${PREFIX}/pdf
+	mv src/all.pdf ${PREFIX}/pdf/${PDF}
 
 
 clean-all: clean clean-docs
@@ -32,17 +33,13 @@ clean:
 
 clean-docs:
 	$(MAKE) -C src clean
-	@$(RM) docs/index.html >/dev/null
+	@$(RM) ${PREFIX}/index.html >/dev/null
 
 
-site: docs/index.html
+site: ${PREFIX}/index.html
 
 
-docs/index.html: README.md CONTRIBUTING.md
+${PREFIX}/index.html: README.md CONTRIBUTING.md
 	pandoc -f gfm -t gfm -A CONTRIBUTING.md $< | \
 		pandoc -M title='Software Foundations in Idris' \
 			-f gfm -t html -s -o $@
-
-
-install:
-	install -m644 -Dt "${PREFIX}" docs/pdf/${PDF}

VERSION

@@ -1 +1 @@
-0.0.2.0
+0.0.2.1

default.nix

@@ -9,23 +9,45 @@ let
 
   fromJSONFile = f: builtins.fromJSON (builtins.readFile f);
 
+  genMeta = { ghc, stdenv, ...}: with stdenv.lib; {
+    description = "Software Foundations in Idris";
+    homepage = https://idris-hackers.github.io/software-foundations;
+    license = licenses.mit;
+    maintainers = with maintainers; [ yurrriq ];
+    inherit (ghc.meta) platforms;
+  };
+
 in
 
 { nixpkgs ? fetchTarballFromGitHub (fromJSONFile ./nixpkgs-src.json) }:
 
 with import nixpkgs {
   overlays = [
     (self: super: {
-      ghc-with-pandoc = super.haskellPackages.ghcWithPackages (ps: with ps; [
-        pandoc
-      ]);
-
+      idrisPackages = super.idrisPackages // {
+        software_foundations = with super.idrisPackages; build-idris-package {
+          name = "software_foundations";
+          version = builtins.readFile ./VERSION;
+          src = ./.;
+          idrisDeps = [ pruviloj ];
+          meta = genMeta super;
+        };
+      };
+    })
+    (self: super: {
       idris = with super.idrisPackages; with-packages [
         base
         prelude
         pruviloj
+        software_foundations
       ];
 
+      pandoc = super.haskellPackages.ghcWithPackages (ps: with ps; [
+        pandoc
+      ]);
+
+      inherit (super.pythonPackages) pygments;
+
       xelatex = super.texlive.combine {
         inherit (super.texlive) scheme-small
           amsmath
@@ -53,34 +75,34 @@ with import nixpkgs {
   ];
 };
 
+
 stdenv.mkDerivation rec {
-  name = "software-foundations-${version}-env";
+  name = "sf-idris-${version}";
   version = builtins.readFile ./VERSION;
   src = ./.;
 
-  FONTCONFIG_FILE = makeFontsConf {
-    fontDirectories = [
-      iosevka
-    ];
-  };
+  FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ iosevka ]; };
 
-  buildInputs = [
-    ghc-with-pandoc
-    idris
-    python3Packages.pygments
+  patchPhase = lib.optionalString (! lib.inNixShell) ''
+    patchShebangs src/pandoc-minted.hs
+  '';
+
+  nativeBuildInputs = [
+    pandoc
+    pygments
     xelatex
     which
   ];
 
- installFlags = [
-    "PREFIX=$(out)"
+  buildInputs = [
+    idris
   ];
 
-  meta = with stdenv.lib; {
-    description = "Software Foundations in Idris";
-    homepage = https://idris-hackers.github.io/software-foundations;
-    license = licenses.mit;
-    maintainers = with maintainers; [ yurrriq ];
-    inherit (ghc.meta) platforms;
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  dontInstall = true;
+
+  meta = (genMeta pkgs) // {
+    platforms = lib.platforms.linux;
   };
 }

software_foundations.ipkg

@@ -14,7 +14,7 @@ modules    = Basics
            , ImpCEvalFun
 
 brief      = "Software Foundations in Idris"
-version    = 0.0.2.0
+version    = 0.0.2.1
 readme     = README.md
 -- NOTE: For license information see the file LICENSE.
 

src/Makefile

@@ -5,9 +5,11 @@ PANDOC ?= pandoc
 
 
 PANDOC_FLAGS := \
-	--filter pandoc-minted.hs --pdf-engine=xelatex \
-	-f markdown+lhs+tex_math_single_backslash -t latex+lhs \
-	--top-level-division=chapter
+	--filter=pandoc-minted.hs \
+	--pdf-engine=xelatex \
+	--top-level-division=chapter \
+	-f markdown+lhs+tex_math_single_backslash \
+	-t latex+lhs
 
 
 LIDR_FILES := Preface.lidr \