From 04ca98c467ffb110cecca2db8c003d60948e9bf0 Mon Sep 17 00:00:00 2001
From: Allan Blanchard <allan.blanchard@cea.fr>
Date: Wed, 9 Mar 2022 14:04:41 +0100
Subject: [PATCH] [ci] Migrate to Dune 3
---
nix/frama-c.nix | 2 +-
nix/sources.json | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/nix/frama-c.nix b/nix/frama-c.nix
index 4f3a9c28193..f08d99e7e70 100644
--- a/nix/frama-c.nix
+++ b/nix/frama-c.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = with ocamlPackages; [
apron
camlzip
- dune_2
+ dune_3
dune-site
findlib
graphviz
diff --git a/nix/sources.json b/nix/sources.json
index 7a2b7113653..660c236a9c0 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -29,10 +29,10 @@
"homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2",
- "sha256": "0dcxc4yc2y5z08pmkmjws4ir0r2cbc5mha2a48bn0bk7nxc6wx8g",
+ "rev": "18bd82edcc752d6a0e6cce1401ba0c81353a03ca",
+ "sha256": "0wcc8y7c055hlx20m8x0ap6kqalfrfiw2addvlnvxlw69299rci0",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/48d63e924a2666baf37f4f14a18f19347fbd54a2.tar.gz",
+ "url": "https://github.com/NixOS/nixpkgs/archive/18bd82edcc752d6a0e6cce1401ba0c81353a03ca.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"why3": {
--
GitLab