CI: update nixpkgs

jasmin-lang · Dec 16, 2024 · dfd334f · dfd334f
1 parent 3c40d1d
commit dfd334f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 - test
 - deploy
 
-image: nixos/nix:2.18.2
+image: nixos/nix:2.24.10
 
 variables:
   NIX_PATH: nixpkgs=channel:nixpkgs-unstable

diff --git a/default.nix b/default.nix
@@ -19,9 +19,10 @@ let coqPackages =
   if coqMaster then
     pkgs.coqPackages.overrideScope (self: super: {
       coq = super.coq.override { version = "master"; };
+      stdlib = super.stdlib.override { version = "master"; };
       coq-elpi = callPackage scripts/coq-elpi.nix {
         version = "master";
-        inherit (self) lib mkCoqDerivation coq;
+        inherit (self) lib mkCoqDerivation coq stdlib;
       };
       hierarchy-builder = super.hierarchy-builder.override { version = "master"; };
     })
@@ -66,7 +67,7 @@ stdenv.mkDerivation {
          batteries
          menhir (oP.menhirLib or null) zarith camlidl apron yojson ]))
     ++ optionals devTools (with oP; [ merlin ocaml-lsp ])
-    ++ optionals ecDeps [ easycrypt alt-ergo z3.out ]
+    ++ optionals ecDeps [ easycrypt alt-ergo.bin z3.out ]
     ++ optionals opamDeps [ rsync git pkg-config perl ppl mpfr opam ]
     ;
 

diff --git a/scripts/coq-elpi.nix b/scripts/coq-elpi.nix
@@ -1,10 +1,4 @@
-{ lib, mkCoqDerivation, coq, version }:
-
-let elpi =
-  coq.ocamlPackages.elpi.override {
-    version = "v1.20.0";
-  }
-; in
+{ lib, mkCoqDerivation, coq, version, stdlib }:
 
 mkCoqDerivation {
   pname = "elpi";
@@ -14,7 +8,7 @@ mkCoqDerivation {
 
   mlPlugin = true;
   useDune = true;
-  propagatedBuildInputs = [ elpi ]
-  ++ (with coq.ocamlPackages; [ findlib ppx_optcomp ]);
+  propagatedBuildInputs = [ stdlib ]
+  ++ (with coq.ocamlPackages; [ elpi findlib ppx_optcomp ]);
 
 }
diff --git a/scripts/nixpkgs.nix b/scripts/nixpkgs.nix
@@ -1,4 +1,4 @@
 import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/759537f06e6999e141588ff1c9be7f3a5c060106.tar.gz";
-  sha256 = "sha256:1an5d5a68ip1bk0l7375jwlrnmg1q9iaxjwymi11z76k4kqch0r9";
+  url = "https://github.com/NixOS/nixpkgs/archive/ea82ecb28089583a19be2a9eeca0f1a8f44eacea.tar.gz";
+  sha256 = "sha256:099fdnqrrsnm8xadzxdvdydi5x1r897mhgvfm1sfj269h4g1ymvp";
 })