From 69883695948ae5177ea0e9659ef52eafaa749aa1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 23 May 2024 16:10:41 +0200 Subject: [PATCH 1/2] Update nixpkgs --- shell.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell.nix b/shell.nix index 46cb5752..25a9c8cd 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,7 @@ { pkgs ? import (fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd.tar.gz"; - sha256 = "sha256:0yz78sahc3mzv38bah8chl2y9cmwsmp9r2p7xv4ny6rcvl1f94cf"; + url = "https://github.com/NixOS/nixpkgs/archive/46397778ef1f73414b03ed553a3368f0e7e33c2f.tar.gz"; + sha256 = "sha256:1kl124v7ny2ar49s5498vx2jl3g8dwaqqvkdaqbjalhn9npl6dlv"; }) {} , full ? true }: From 159218b3bf67390087dbaf88025c0538d079add8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 23 May 2024 16:17:05 +0200 Subject: [PATCH 2/2] Update EasyCrypt --- shell.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shell.nix b/shell.nix index 25a9c8cd..7f98f533 100644 --- a/shell.nix +++ b/shell.nix @@ -15,17 +15,18 @@ let ideSupport = false; coqPackages = { coq = null; flocq = null; }; }; - ecVersion = "a8274feb63b62d281db350cd6dd8940c69aca835"; - ec = (easycrypt.overrideAttrs (_: { + ecVersion = "0df85113c4a399990f3f8ed93db5047a8844f8a9"; + ec = (easycrypt.overrideAttrs (o: { src = fetchFromGitHub { owner = "EasyCrypt"; repo = "easycrypt"; rev = ecVersion; - hash = "sha256-Rbs3alnnnDPbKrAqPq1pj/kedHWC+PvPFES4d+V8EAk="; + hash = "sha256-+3qI/Z9EpQXe75yHfkqt/N0Uwb+iN8ziTYg4Z4yBaSk="; }; postPatch = '' substituteInPlace dune-project --replace '(name easycrypt)' '(name easycrypt)(version ${ecVersion})' ''; + buildInputs = o.buildInputs ++ [ oc.dune-site ]; })).override { ocamlPackages = oc; why3 = why;