diff options
| author | Vincent Laporte | 2020-01-15 10:00:30 +0100 |
|---|---|---|
| committer | Vincent Laporte | 2020-01-15 10:01:18 +0100 |
| commit | e69931170d2b460c30be1f54bb94043c0c001272 (patch) | |
| tree | 994958a060e8dabd9f66f9b9e6954560b6332b4a | |
| parent | c072c6d11a1ed5712e84d3e8da5172c3d162a2d4 (diff) | |
[Nix] Update reference to nixpkgs
This brings dune at version 2.1.2
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | dev/nixpkgs.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/default.nix b/default.nix index cfadca54d2..3f9d0d56e9 100644 --- a/default.nix +++ b/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { buildInputs = [ hostname python3 time # coq-makefile timing tools - dune ] ++ (with ocamlPackages; [ ocaml findlib num ]) ++ optionals buildIde [ @@ -67,6 +66,7 @@ stdenv.mkDerivation rec { [ jq curl gitFull gnupg ] # Dependencies of the merging script ++ (with ocamlPackages; [ merlin ocp-indent ocp-index utop ocamlformat ]) # Dev tools ++ [ graphviz ] # Useful for STM debugging + ++ [ dune_2 ] # Maybe the next build system ); src = diff --git a/dev/nixpkgs.nix b/dev/nixpkgs.nix index 677377f868..54baaee1fe 100644 --- a/dev/nixpkgs.nix +++ b/dev/nixpkgs.nix @@ -1,4 +1,4 @@ import (fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/f4ad230f90ef312695adc26f256036203e9c70af.tar.gz"; - sha256 = "0cdd275dz3q51sknn7s087js81zvaj5riz8f29id6j6chnyikzjq"; + url = "https://github.com/NixOS/nixpkgs/archive/8da81465c19fca393a3b17004c743e4d82a98e4f.tar.gz"; + sha256 = "1f3s27nrssfk413pszjhbs70wpap43bbjx2pf4zq5x2c1kd72l6y"; }) |