CI: update nix & nixpkgs

jasmin-lang · Jun 5, 2023 · 60cde06 · 60cde06
1 parent c9cd01c
commit 60cde06
Show file tree

Hide file tree

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

diff --git a/default.nix b/default.nix
@@ -60,6 +60,8 @@ stdenv.mkDerivation {
          menhir (oP.menhirLib or null) zarith camlidl apron yojson ]))
     ++ optionals devTools (with oP; [ merlin ocaml-lsp ])
     ++ optionals ecDeps [ easycrypt easycrypt.runtest alt-ergo z3.out ]
-    ++ optionals opamDeps [ rsync git pkg-config perl ppl mpfr opam ]
+    # Apron as packaged in opam is broken with gnumake ≥ 4.4
+    # Bringing gnumake 4.2 in scope works around this issue
+    ++ optionals opamDeps [ gnumake42 rsync git pkg-config perl ppl mpfr opam ]
     ;
 }
diff --git a/scripts/nixpkgs.nix b/scripts/nixpkgs.nix
@@ -1,4 +1,4 @@
 import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/67f26c1cfc5d5783628231e776a81c1ade623e0b.tar.gz";
-  sha256 = "sha256:1spvf68a2yjxd13x7q1n3nppnmp5vf0m1gl9lp3n58bcs3frcnb3";
+  url = "https://github.com/NixOS/nixpkgs/archive/3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d.tar.gz";
+  sha256 = "sha256:0npyj597wwrp7xyqwrkds537vs9i5gazhmaxv8wc8z0sjr1450fb";
 })