diff --git a/nix/frama-c.nix b/nix/frama-c.nix index 34d0802ce288a8f63d33b0a58d16a5fca606b806..2348e83bdc91d0ae3ea337ea18b76507d5fcc0e2 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 9ad873a8e05ef05ba66ea97621c0d6c8e89e241e..1b45e6fe5ee33442541b8994991ae7a254df61ac 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 7611438ae2e8127ecdfeb51b0aaefddf7b9dceb4..6b35a03b912472dd8f093b79d505c88ece8e6a59 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": {