From bd54a9047d7d36463aa3ccfd29d28b848a67dc4d Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 5 Apr 2023 14:39:55 +0800 Subject: [PATCH] tamarin-prover: Allow compiling with maude-3.3 --- .../science/logic/tamarin-prover/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 50824ab3c0c2..8e883374066d 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -1,4 +1,4 @@ -{ haskellPackages, mkDerivation, fetchFromGitHub, lib, stdenv +{ haskellPackages, mkDerivation, fetchFromGitHub, fetchpatch, lib, stdenv # the following are non-haskell dependencies , makeWrapper, which, maude, graphviz, glibcLocales }: @@ -67,6 +67,14 @@ mkDerivation (common "tamarin-prover" src // { isLibrary = false; isExecutable = true; + patches = [ + # Backport of https://github.com/tamarin-prover/tamarin-prover/pull/536 to 1.6.1 + (fetchpatch { + url = "https://github.com/tamarin-prover/tamarin-prover/commit/95fbace0c5cbea57b5f320f6bb4d0387a4beab8d.patch"; + sha256 = "sha256-Wjf7C208kcskEN1op//HQZnhoZopKQS42JvE8kV5NhI="; + }) + ]; + # strip out unneeded deps manually doHaddock = false; enableSharedExecutables = false;