From 0e83e7ea03ccc3f97325211c1fb60f8c04c67225 Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Mon, 1 Oct 2018 07:26:45 +0000
Subject: [default.nix] Update the reference to nixpkgs; make it the default

---
 default.nix | 4 ++--
 shell.nix   | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/default.nix b/default.nix
index 29c0c68174..6b24a8853c 100644
--- a/default.nix
+++ b/default.nix
@@ -23,8 +23,8 @@
 
 { pkgs ?
     (import (fetchTarball {
-      url = "https://github.com/NixOS/nixpkgs/archive/52a1179b6c20e923beddde1dd1e0034aa19176d2.tar.gz";
-      sha256 = "040xrsgnip6gqljfyy1ad0l7q41h659h5hqbcn96bzhdiakcr4yc";
+      url = "https://github.com/NixOS/nixpkgs/archive/4c95508641fe780efe41885366e03339b95d04fb.tar.gz";
+      sha256 = "1wjspwhzdb6d1kz4khd9l0fivxdk2nq3qvj93pql235sb7909ygx";
     }) {})
 , ocamlPackages ? pkgs.ocaml-ng.ocamlPackages_4_06
 , buildIde ? true
diff --git a/shell.nix b/shell.nix
index 3201c50501..75ac952bd6 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,3 @@
-# Some developers don't want a pinned nix-shell by default.
-# If you want to use the pin nix-shell or a more sophisticated set of arguments:
+# If you want to use a more sophisticated set of arguments:
 # $ nix-shell default.nix --arg shell true
-import ./default.nix { pkgs = import <nixpkgs> {}; shell = true; }
+import ./default.nix { shell = true; }
-- 
cgit v1.2.3


From 0a01590462678d8374f11ddc60d68a569fa3df9c Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Mon, 1 Oct 2018 07:26:52 +0000
Subject: [default.nix] Add odoc to the documentation build-inputs

---
 default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.nix b/default.nix
index 6b24a8853c..1faaafae03 100644
--- a/default.nix
+++ b/default.nix
@@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
       (ps: [ ps.sphinx ps.sphinx_rtd_theme ps.pexpect ps.beautifulsoup4
              ps.antlr4-python3-runtime ps.sphinxcontrib-bibtex ]))
     antlr4
+    ocamlPackages.odoc
   ]
   ++ optionals doInstallCheck (
     # Test-suite dependencies
-- 
cgit v1.2.3