CI: update nixpkgs

.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
 - test
 - deploy
 
-image: nixos/nix:2.24.11
+image: nixos/nix:2.24.12
 
 variables:
   NIX_PATH: nixpkgs=channel:nixpkgs-unstable

default.nix

@@ -33,7 +33,10 @@ let mathcomp-word = callPackage scripts/mathcomp-word.nix { inherit coqPackages;
 
 let easycrypt = callPackage scripts/easycrypt.nix {
   inherit ecRef;
-  why3 = pkgs.why3.override { ideSupport = false; };
+  why3 = pkgs.why3.override {
+    ideSupport = false;
+    coqPackages = { coq = null; flocq = null; };
+  };
 }; in
 
 let inherit (coqPackages.coq) ocamlPackages; in

scripts/easycrypt.nix

@@ -10,25 +10,13 @@
 , fetchurl
 }:
 
-let why3_1_8 = (why3.override {
-  ideSupport = false;
-  coqPackages = { coq = null; flocq = null; };
-  }).overrideAttrs (o: {
-  name = "why3-1.8.0";
-  version = "1.8.0";
-  src = fetchurl {
-    url = "https://why3.gitlabpages.inria.fr/releases/why3-1.8.0.tar.gz";
-    hash = "sha256-gDe4OI0AuoYmJSCg/SMRQYcgelX/SM28ClQfKhnw88E=";
-  };
-}); in
-
 with {
 
   "dev" = {
     version = "main";
     rev = "????";
     src = builtins.fetchTarball "https://api.github.com/repos/easycrypt/easycrypt/tarball/main";
-    local_why3 = why3_1_8;
+    local_why3 = why3.override { version = "1.8.0"; };
   };
 
   "release" = rec {
@@ -46,7 +34,7 @@ with {
         hash = "sha256-DpCpDzoFW/BZu5doJwM/4iSbkZ085qESUZAdqxRVK3U=";
       };
     };
-    local_why3 = why3;
+    local_why3 = why3.override { version = "1.7.2"; };
   };
 
 }."${ecRef}";

scripts/nixpkgs.nix

@@ -1,4 +1,4 @@
 import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/ae584d90cbd0396a422289ee3efb1f1c9d141dc3.tar.gz";
-  sha256 = "sha256:0vq0jwz512xdbp86m5q93q4190ds5ibwmq28lapb6qa8k8ya0mbv";
+  url = "https://github.com/NixOS/nixpkgs/archive/768e0defd5cf2c93df46fecf53a53811b111af72.tar.gz";
+  sha256 = "sha256:1xbwvplfxgs5b7p0mhb7q59xaaks8if47gznbh4jq34p9z04ll7d";
 })