diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2022-05-29 15:05:27 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-06-05 15:44:28 +0200 |
| commit | 1b95daa381fa4a0963217a5d386433c20008208a (patch) | |
| tree | 83487fa8172d079acdd5d2b6f6ba806dd7001ba3 /pkgs/applications/science/logic | |
| parent | 0a91054a94cf4abab1048134cc8066d2a7db4ede (diff) | |
| download | nixpkgs-1b95daa381fa4a0963217a5d386433c20008208a.tar nixpkgs-1b95daa381fa4a0963217a5d386433c20008208a.tar.gz nixpkgs-1b95daa381fa4a0963217a5d386433c20008208a.tar.bz2 nixpkgs-1b95daa381fa4a0963217a5d386433c20008208a.tar.lz nixpkgs-1b95daa381fa4a0963217a5d386433c20008208a.tar.xz nixpkgs-1b95daa381fa4a0963217a5d386433c20008208a.tar.zst nixpkgs-1b95daa381fa4a0963217a5d386433c20008208a.zip | |
alt-ergo: ensure compatibility with Menhir ≥ 20211215
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/alt-ergo/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 0767c58bdea..553f133c7f7 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, which, ocamlPackages }: +{ fetchFromGitHub, fetchpatch, lib, which, ocamlPackages }: let pname = "alt-ergo"; @@ -10,13 +10,11 @@ let rev = version; sha256 = "0hglj1p0753w2isds01h90knraxa42d2jghr35dpwf9g8a1sm9d3"; }; - - useDune2 = true; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src useDune2; + inherit version src; configureFlags = [ pname ]; nativeBuildInputs = [ which ]; buildInputs = with ocamlPackages; [ dune-configurator ]; @@ -25,7 +23,7 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src useDune2; + inherit version src; configureFlags = [ pname ]; nativeBuildInputs = [ which ocamlPackages.menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); @@ -33,7 +31,13 @@ let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage { - inherit pname version src useDune2; + inherit pname version src; + + # Ensure compatibility with Menhir ≥ 20211215 + patches = fetchpatch { + url = "https://github.com/OCamlPro/alt-ergo/commit/0f9c45af352657c3aec32fca63d11d44f5126df8.patch"; + sha256 = "sha256:0zaj3xbk2s8k8jl0id3nrhdfq9mv0n378cbawwx3sziiizq7djbg"; + }; configureFlags = [ pname ]; |