lol

tamarin-prover: allow maude 3.1.1

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.

+23 -3
+16 -3
pkgs/applications/science/logic/tamarin-prover/default.nix
··· 68 68 isExecutable = true; 69 69 70 70 patches = [ 71 - # Backport of https://github.com/tamarin-prover/tamarin-prover/pull/536 to 1.6.1 71 + # Backport unreleased patch allowing maude 3.2.1 72 + (fetchpatch { 73 + name = "tamarin-prover-allow-maude-3.2.1.patch"; 74 + url = "https://github.com/tamarin-prover/tamarin-prover/commit/bfcf56909479e154a203f0eeefa767f4d91b600d.patch"; 75 + sha256 = "1zjqzyxwnfp7z3h3li8jrxn9732dx6lyq9q3w2dsphmxbzrs64dg"; 76 + }) 77 + # Backport unreleased patch allowing maude 3.2.2 78 + (fetchpatch { 79 + name = "tamarin-prover-allow-maude-3.2.2.patch"; 80 + url = "https://github.com/tamarin-prover/tamarin-prover/commit/df1aa9fc4fcc72b6cf0bed0f71844efe3d8ad238.patch"; 81 + sha256 = "1bkwvyyz5d660jjh08z8wq9c3l40s0rxd2nsbn20xnl2nynyvqpy"; 82 + }) 83 + # Backport proposed patch allowing maude 3.3 and 3.3.1 72 84 (fetchpatch { 73 - url = "https://github.com/tamarin-prover/tamarin-prover/commit/95fbace0c5cbea57b5f320f6bb4d0387a4beab8d.patch"; 74 - sha256 = "sha256-Wjf7C208kcskEN1op//HQZnhoZopKQS42JvE8kV5NhI="; 85 + name = "tamarin-prover-allow-maude-3.3.patch"; 86 + url = "https://github.com/tamarin-prover/tamarin-prover/pull/544/commits/d0313b1a1bac7c92130773f7ccdd890f8aec286d.patch"; 87 + sha256 = "1jhlz8vp9a3aahyhj24yjcv4l1389y9kg878yfnq0rkkgvk0m681"; 75 88 }) 76 89 ]; 77 90
+7
pkgs/development/interpreters/maude/default.nix
··· 1 1 { lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla 2 2 , libsigsegv, gmpxx, cln, yices 3 + # passthru.tests 4 + , tamarin-prover 3 5 }: 4 6 5 7 let ··· 45 47 postInstall = '' 46 48 for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done 47 49 ''; 50 + 51 + passthru.tests = { 52 + # tamarin-prover only supports specific versions of maude explicitly 53 + inherit tamarin-prover; 54 + }; 48 55 49 56 enableParallelBuilding = true; 50 57