Update default.nix filedev/full-nix-build

3 files changed, 4 insertions, 15 deletions

diff --git a/_CoqProject b/_CoqProject
index 43b3ecc..e522e73 100644
--- a/_CoqProject
+++ b/_CoqProject
@@ -2,5 +2,3 @@
 -R src/extraction vericert.extraction
 -R src/hls vericert.hls
 -R src vericert
-
--R /nix/store/66l13gkqf431c0lm3x1lcn7zvfqxz6sq-coq8.14-compcert-dev-lib/lib/coq/8.14/user-contrib/compcert/flocq Flocq
diff --git a/default.nix b/default.nix
index 841a140..95f83cf 100644
--- a/default.nix
+++ b/default.nix
@@ -14,11 +14,11 @@ let
         src = fetchFromGitHub {
           owner = "ymherklotz";
           repo = "CompCert";
-          rev = "4f467596f8674f5f4fbf84a793cb8fcfc35a44a2";
-          sha256 = "0m435pscfdb4irjxhzazzpl8jv63piwl4rb3nnpdirs9dg7msl2j";
+          rev = "4fa0349a2f5477a78b249ac0e762a5d32e0722d7";
+          sha256 = "Rqw9xvqyT43IfhNpuCN3guUb+62bhPOA/O8Frg3Poxc=";
         };
 
-        buildInputs = with ocamlPackages; [ ocaml findlib menhir menhirLib gcc ] ++ [ coq ];
+        buildInputs = with ocamlPackages; [ ocaml findlib gcc menhir menhirLib ] ++ [ coq ];
         propagatedBuildInputs = [ flocq ];
 
         enableParallelBuilding = true;
@@ -55,9 +55,8 @@ ncoqPackages.mkCoqDerivation {
   defaultVersion = "3.10";
 
   buildInputs = with ncoq.ocamlPackages; [ ncoq dune_2 gcc
-                                           ncoq.ocaml findlib menhir
+                                           ncoq.ocaml findlib
                                            ocamlgraph merlin
-                                           menhirLib
                                            ncompcert
                                          ];
 
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index a80b1be..0000000
--- a/shell.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-with import <nixpkgs> {};
-
-mkShell {
-  buildInputs = (import ./.).buildInputs ++ [ ocamlPackages.ocp-indent
-                                              ocamlPackages.merlin ocamlPackages.utop
-                                              # (import ./.)
-                                            ];
-}