diff --git a/nix/default.nix b/nix/default.nix index b1b2d1c36..373f8f0ab 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -10,6 +10,8 @@ import sources.nixpkgs { dolmen = self.callPackage ./dolmen.nix { }; dolmen_type = self.callPackage ./dolmen_type.nix { }; dolmen_loop = self.callPackage ./dolmen_loop.nix { }; + dolmen_model = self.callPackage ./dolmen_model.nix { }; + dolmen_bin = self.callPackage ./dolmen_bin.nix { }; landmarks = self.callPackage ./landmarks.nix { }; landmarks-ppx = self.callPackage ./landmarks-ppx.nix { }; zarith_stubs_js = self.callPackage ./zarith_stubs_js.nix { }; diff --git a/nix/dolmen_bin.nix b/nix/dolmen_bin.nix new file mode 100644 index 000000000..3b62f8414 --- /dev/null +++ b/nix/dolmen_bin.nix @@ -0,0 +1,27 @@ +{ buildDunePackage, + dolmen, + dolmen_type, + dolmen_loop, + dolmen_model, + fmt, + cmdliner +}: + +buildDunePackage { + pname = "dolmen_bin"; + inherit (dolmen) version src strictDeps; + + minimalOCamlVersion = "4.08"; + duneVersion = "3"; + + propagatedBuildInputs = [ + dolmen + dolmen_type + dolmen_loop + dolmen_model + fmt + cmdliner + ]; + + meta = dolmen.meta; +} diff --git a/nix/dolmen_model.nix b/nix/dolmen_model.nix new file mode 100644 index 000000000..74538a28c --- /dev/null +++ b/nix/dolmen_model.nix @@ -0,0 +1,23 @@ +{ buildDunePackage, + dolmen, + dolmen_loop, + zarith, + farith +}: + +buildDunePackage { + pname = "dolmen_model"; + inherit (dolmen) version src strictDeps; + + minimalOCamlVersion = "4.08"; + duneVersion = "3"; + + propagatedBuildInputs = [ + dolmen + dolmen_loop + zarith + farith + ]; + + meta = dolmen.meta; +} diff --git a/nix/sources.json b/nix/sources.json index 5774217e2..f3d521f70 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "Gbury", "repo": "dolmen", - "rev": "3c77a22b2aac2eb85aca76f198797d40ca3ec4a3", - "sha256": "0qsl5f0mh4azmqvq99l24cna8brvw00x9703wyd98gm0pbmsc3pm", + "rev": "6c96de76c291c8159d5f954bfd19924e1e7d4530", + "sha256": "0krq5gcifxw5zljn9ljq78g673224vmln77fsavm50yns12g0s30", "type": "tarball", - "url": "https://github.com/Gbury/dolmen/archive/3c77a22b2aac2eb85aca76f198797d40ca3ec4a3.tar.gz", + "url": "https://github.com/Gbury/dolmen/archive/6c96de76c291c8159d5f954bfd19924e1e7d4530.tar.gz", "url_template": "https://github.com///archive/.tar.gz", "version": "0.10" }, @@ -26,16 +26,17 @@ "version": "dev" }, "nixpkgs": { - "branch": "nixos-25.05", + "branch": "nixos-25.11", "description": "Nix Packages collection", "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "36ab78dab7da2e4e27911007033713bab534187b", - "sha256": "072rx8y4bravd9163brjicqsb1i11f0n9v4bhikzbvc7wpb7kdds", + "rev": "fa56d7d6de78f5a7f997b0ea2bc6efd5868ad9e8", + "sha256": "0d8xd2rk1phikz7icawxkbdsg8yc5c71hs5aln0kg9hj73f50kaz", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/36ab78dab7da2e4e27911007033713bab534187b.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fa56d7d6de78f5a7f997b0ea2bc6efd5868ad9e8.tar.gz", + "url_template": "https://github.com///archive/.tar.gz", + "version": "25.11" }, "ocplib-simplex": { "branch": "v0.5.1", diff --git a/shell.nix b/shell.nix index 2347877c5..e6bf80bed 100644 --- a/shell.nix +++ b/shell.nix @@ -26,7 +26,6 @@ pkgs.mkShell { bos dolmen_loop camlzip - psmt2-frontend stdlib-shims menhir dune-build-info @@ -43,5 +42,6 @@ pkgs.mkShell { landmarks-ppx qcheck utop + dolmen_bin ]; }