From 30b8a6c5ef046eaa3ed4a531eece0d81a46fe162 Mon Sep 17 00:00:00 2001
From: Allan Blanchard <allan.blanchard@cea.fr>
Date: Fri, 22 Apr 2022 14:59:54 +0200
Subject: [PATCH] [nix] Update + remove dune hack
---
nix/frama-c.nix | 4 ++--
nix/pkgs.nix | 37 -------------------------------------
nix/sources.json | 6 +++---
3 files changed, 5 insertions(+), 42 deletions(-)
diff --git a/nix/frama-c.nix b/nix/frama-c.nix
index 34d0802ce28..2348e83bdc9 100644
--- a/nix/frama-c.nix
+++ b/nix/frama-c.nix
@@ -14,7 +14,7 @@
, apron
, camlzip
, dune_3
-, dune-site-3
+, dune-site
, gcc9
, graphviz
, lablgtk3
@@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation rec {
apron
camlzip
dune_3
- dune-site-3
+ dune-site
findlib
gcc9
graphviz
diff --git a/nix/pkgs.nix b/nix/pkgs.nix
index 9ad873a8e05..1b45e6fe5ee 100644
--- a/nix/pkgs.nix
+++ b/nix/pkgs.nix
@@ -8,43 +8,6 @@ let
ocp-indent = oself.callPackage ./ocp-indent.nix {};
psmt2-frontend = oself.callPackage ./psmt2-frontend.nix {};
why3 = oself.callPackage ./why3.nix {};
- # Nix + Dune 3
- dune-build-3 =
- osuper.buildDunePackage.override {
- dune_2 = oself.dune_3;
- };
- dune-ordering-3 =
- oself.callPackage ./dune-ordering.nix {
- dune_2 = oself.dune_3;
- buildDunePackage = oself.dune-build-3;
- };
- dune-dyn-3 =
- oself.callPackage ./dune-dyn.nix {
- dune_2 = oself.dune_3;
- buildDunePackage = oself.dune-build-3;
- dune-ordering = oself.dune-ordering-3;
- };
- dune-stdune-3 =
- oself.callPackage ./dune-stdune.nix {
- dune_2 = oself.dune_3;
- buildDunePackage = oself.dune-build-3;
- dune-ordering = oself.dune-ordering-3;
- dune-dyn = oself.dune-dyn-3;
- };
- dune-private-libs-3 =
- oself.callPackage ./dune-private-libs.nix {
- dune_2 = oself.dune_3;
- buildDunePackage = oself.dune-build-3;
- dune-ordering = oself.dune-ordering-3;
- dune-stdune = oself.dune-stdune-3;
- dune-dyn = oself.dune-dyn-3;
- };
- dune-site-3 =
- osuper.dune-site.override {
- dune_2 = oself.dune_3;
- buildDunePackage = oself.dune-build-3;
- dune-private-libs = oself.dune-private-libs-3;
- };
# Builds
frama-c = oself.callPackage ./frama-c.nix {};
lint = oself.callPackage ./lint.nix {};
diff --git a/nix/sources.json b/nix/sources.json
index 7611438ae2e..6b35a03b912 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -29,10 +29,10 @@
"homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58",
- "sha256": "01j7nhxbb2kjw38yk4hkjkkbmz50g3br7fgvad6b1cjpdvfsllds",
+ "rev": "bc4b9eef3ce3d5a90d8693e8367c9cbfc9fc1e13",
+ "sha256": "0mrpsl0554fzk04asz0nmyxf6ny1syd9qzrh37vz85bpq8wi21dx",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58.tar.gz",
+ "url": "https://github.com/NixOS/nixpkgs/archive/bc4b9eef3ce3d5a90d8693e8367c9cbfc9fc1e13.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"why3": {
--
GitLab