From ea64d739af16952883abce536958ac4877698277 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Fri, 17 Sep 2021 18:21:19 +0100
Subject: Fix compilation with new CompCert version

---
 default.nix | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 8308389..1121469 100644
--- a/default.nix
+++ b/default.nix
@@ -1,35 +1,15 @@
-with import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/269fc4ddb896c1c5994eb4bb8c750ec18cb3db82.tar.gz") {};
+with import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/8dd8bd8be74879f9f7919b16a4cb5ab2a75f18e5.tar.gz") {};
 let
-  ncoq = coq_8_12;
-  ncoqPackages = coqPackages_8_12;
-  bbv = ncoqPackages.callPackage
-    ( { coq, stdenv, fetchFromGitHub }:
-      stdenv.mkDerivation {
-        name = "coq${coq.coq-version}-bbv";
-
-        src = fetchFromGitHub {
-          owner = "mit-plv";
-          repo = "bbv";
-          rev = "5099237c52d2910f79a1a3ca9ae4dfa80129bf86";
-          sha256 = "0qnha333h7dc8105prdxvmkgy6l8swvyf6kz9v5s5dk4dvr5nra8";
-        };
-
-        buildInputs = with coq.ocamlPackages; [ ocaml camlp5 ];
-        propagatedBuildInputs = [ coq ];
-        enableParallelBuilding = true;
-
-        installPhase = ''
-          make -f Makefile.coq.all install COQLIB='$(out)/lib/coq/${coq.coq-version}/'
-        '';
-      } ) { };
+  ncoq = coq_8_13;
+  ncoqPackages = coqPackages_8_13;
 in
 stdenv.mkDerivation {
   name = "vericert";
   src = ./.;
 
   buildInputs = [ ncoq dune_2 gcc
-                  ocaml ocamlPackages.findlib ocamlPackages.menhir
-                  ocamlPackages.ocamlgraph
+                  ncoq.ocaml ncoq.ocamlPackages.findlib ncoq.ocamlPackages.menhir
+                  ncoq.ocamlPackages.ocamlgraph
                 ];
 
   enableParallelBuilding = true;
-- 
cgit