tamarin-prover: 1.6.1 -> 1.8.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>

+31 -22
+31 -22
pkgs/applications/science/logic/tamarin-prover/default.nix
··· 4 4 }: 5 5 6 6 let 7 - version = "1.6.1"; 7 + version = "1.8.0"; 8 8 src = fetchFromGitHub { 9 9 owner = "tamarin-prover"; 10 10 repo = "tamarin-prover"; 11 11 rev = version; 12 - sha256 = "sha256:0cz1v7k4d0im749ag632nc34n91b51b0pq4z05rzw1p59a5lza92"; 12 + sha256 = "sha256-ujnaUdbjqajmkphOS4Fs4QBCRGX4JZkQ2p1X2jripww="; 13 13 }; 14 14 15 15 # tamarin has its own dependencies, but they're kept inside the repo, ··· 51 51 doHaddock = false; # broken 52 52 libraryHaskellDepends = (with haskellPackages; [ 53 53 aeson aeson-pretty parallel uniplate 54 + regex-pcre-builtin regex-posix split 54 55 ]) ++ [ tamarin-prover-utils tamarin-prover-term ]; 55 56 }); 56 57 ··· 62 63 ]) ++ [ tamarin-prover-theory ]; 63 64 }); 64 65 66 + tamarin-prover-accountability = mkDerivation (common "tamarin-prover-accountability" (src + "/lib/accountability") // { 67 + postPatch = "cp --remove-destination ${src}/LICENSE ."; 68 + doHaddock = false; # broken 69 + libraryHaskellDepends = (with haskellPackages; [ 70 + raw-strings-qq 71 + ]) ++ [ 72 + tamarin-prover-utils 73 + tamarin-prover-term 74 + tamarin-prover-theory 75 + ]; 76 + }); 77 + 78 + tamarin-prover-export = mkDerivation (common "tamarin-prover-export" (src + "/lib/export") // { 79 + postPatch = "cp --remove-destination ${src}/LICENSE ."; 80 + doHaddock = false; # broken 81 + libraryHaskellDepends = (with haskellPackages; [ 82 + HStringTemplate 83 + ]) ++ [ 84 + tamarin-prover-utils 85 + tamarin-prover-term 86 + tamarin-prover-theory 87 + tamarin-prover-sapic 88 + ]; 89 + }); 90 + 65 91 in 66 92 mkDerivation (common "tamarin-prover" src // { 67 93 isLibrary = false; 68 94 isExecutable = true; 69 95 70 - patches = [ 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 84 - (fetchpatch { 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"; 88 - }) 89 - ]; 96 + patches = [ ]; 90 97 91 98 # strip out unneeded deps manually 92 99 doHaddock = false; ··· 118 125 resourcet shakespeare threads wai warp yesod-core yesod-static 119 126 ]) ++ [ tamarin-prover-utils 120 127 tamarin-prover-sapic 128 + tamarin-prover-accountability 129 + tamarin-prover-export 121 130 tamarin-prover-term 122 131 tamarin-prover-theory 123 132 ];