From eb00b4aa84d32f987a44538028a749386050210b Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Fri, 13 Dec 2019 18:00:30 +0100
Subject: Add ocamlformat dependency to Nix file

---
 default.nix     | 2 +-
 dev/nixpkgs.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/default.nix b/default.nix
index 6a7a98aa5e..ee4a6046ea 100644
--- a/default.nix
+++ b/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   )
   ++ optionals shell (
     [ jq curl gitFull gnupg ] # Dependencies of the merging script
-    ++ (with ocamlPackages; [ merlin ocp-indent ocp-index utop ]) # Dev tools
+    ++ (with ocamlPackages; [ merlin ocp-indent ocp-index utop ocamlformat ]) # Dev tools
     ++ [ graphviz ] # Useful for STM debugging
   );
 
diff --git a/dev/nixpkgs.nix b/dev/nixpkgs.nix
index e7a0ba4f6c..677377f868 100644
--- a/dev/nixpkgs.nix
+++ b/dev/nixpkgs.nix
@@ -1,4 +1,4 @@
 import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/4cd2cb43fb3a87f48c1e10bb65aee99d8f24cb9d.tar.gz";
-  sha256 = "1d6rmq67kdg5gmk94wx2774qw89nvbhy6g1f2lms3c9ph37hways";
+  url = "https://github.com/NixOS/nixpkgs/archive/f4ad230f90ef312695adc26f256036203e9c70af.tar.gz";
+  sha256 = "0cdd275dz3q51sknn7s087js81zvaj5riz8f29id6j6chnyikzjq";
 })
-- 
cgit v1.2.3