cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

tamarin-prover: allow maude 3.1.1

Browse source 
See https://github.com/tamarin-prover/tamarin-prover/pull/544.

Added tamarin-prover to passthru.tests of maude to prevent future
regressions of this kind.
This commit is contained in:
sternenseemann 2023-05-10 15:07:36 +02:00
parent 5b55bccfe2
commit dd6a74bdbe
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/applications/science/logic/tamarin-prover/default.nix
View file

@ -68,10 +68,23 @@ mkDerivation (common "tamarin-prover" src // {
isExecutable = true;
patches = [
# Backport of https://github.com/tamarin-prover/tamarin-prover/pull/536 to 1.6.1
# Backport unreleased patch allowing maude 3.2.1
(fetchpatch {
url = "https://github.com/tamarin-prover/tamarin-prover/commit/95fbace0c5cbea57b5f320f6bb4d0387a4beab8d.patch";
sha256 = "sha256-Wjf7C208kcskEN1op//HQZnhoZopKQS42JvE8kV5NhI=";
name = "tamarin-prover-allow-maude-3.2.1.patch";
url = "https://github.com/tamarin-prover/tamarin-prover/commit/bfcf56909479e154a203f0eeefa767f4d91b600d.patch";
sha256 = "1zjqzyxwnfp7z3h3li8jrxn9732dx6lyq9q3w2dsphmxbzrs64dg";
})
# Backport unreleased patch allowing maude 3.2.2
(fetchpatch {
name = "tamarin-prover-allow-maude-3.2.2.patch";
url = "https://github.com/tamarin-prover/tamarin-prover/commit/df1aa9fc4fcc72b6cf0bed0f71844efe3d8ad238.patch";
sha256 = "1bkwvyyz5d660jjh08z8wq9c3l40s0rxd2nsbn20xnl2nynyvqpy";
})
# Backport proposed patch allowing maude 3.3 and 3.3.1
(fetchpatch {
name = "tamarin-prover-allow-maude-3.3.patch";
url = "https://github.com/tamarin-prover/tamarin-prover/pull/544/commits/d0313b1a1bac7c92130773f7ccdd890f8aec286d.patch";
sha256 = "1jhlz8vp9a3aahyhj24yjcv4l1389y9kg878yfnq0rkkgvk0m681";
})
];

7
pkgs/development/interpreters/maude/default.nix
View file

@ -1,5 +1,7 @@
{ lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla
, libsigsegv, gmpxx, cln, yices
# passthru.tests
, tamarin-prover
}:
let
@ -46,6 +48,11 @@ stdenv.mkDerivation {
for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
'';
passthru.tests = {
# tamarin-prover only supports specific versions of maude explicitly
inherit tamarin-prover;
};
enableParallelBuilding = true;
meta = {