Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7fedc7e46b14
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 04002e2b7186
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 7, 2018

  1. tamarin-prover: 1.3.1 -> 1.4.0 

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed May 7, 2018
    Copy the full SHA
    04002e2 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/applications/science/logic/tamarin-prover/default.nix
10 changes: 5 additions & 5 deletions pkgs/applications/science/logic/tamarin-prover/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
}:

let
version = "1.3.1";
version = "1.4.0";
src = fetchFromGitHub {
owner = "tamarin-prover";
repo = "tamarin-prover";
rev = "ab8a155452e9e9c57ccb4bbe1b94d7677ea5ce21";
sha256 = "02ycxxkcpc0dzybaq63viciydq1ik8wiv2blk8mvnz3ssxw3sjik";
rev = "7ced07a69f8e93178f9a95797479277a736ae572";
sha256 = "02pyw22h90228g6qybjpdvpcm9d5lh96f5qwmy2hv2bylz05z3nn";
};

# tamarin has its own dependencies, but they're kept inside the repo,
@@ -80,7 +80,7 @@ mkDerivation (common "tamarin-prover" src // {
wrapProgram $out/bin/tamarin-prover \
--prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]}
# so that the package can be used as a vim plugin to install syntax coloration
install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim
install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim
install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim
'';

@@ -89,7 +89,7 @@ mkDerivation (common "tamarin-prover" src // {
executableHaskellDepends = (with haskellPackages; [
base binary binary-orphans blaze-builder blaze-html bytestring
cmdargs conduit containers monad-control deepseq directory fclabels file-embed
filepath gitrev http-types HUnit lifted-base mtl parsec process
filepath gitrev http-types HUnit lifted-base mtl monad-unlift parsec process
resourcet safe shakespeare tamarin-prover-term
template-haskell text threads time wai warp yesod-core yesod-static
]) ++ [ tamarin-prover-utils