Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tamarin-prover: 1.4.1 → 1.6.0 #100148

Merged
merged 2 commits into from Oct 13, 2020
Merged

tamarin-prover: 1.4.1 → 1.6.0 #100148

merged 2 commits into from Oct 13, 2020

Conversation

vbgl
Copy link
Contributor

@vbgl vbgl commented Oct 10, 2020 •
edited

Motivation for this change

This is currently broken.

Fixes #69292

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc maintainer @thoughtpolice

symphorien
symphorien approved these changes Oct 10, 2020
View reviewed changes
Copy link
Member

@symphorien symphorien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opened a few proof I have lying around to check that it works.

@thoughtpolice
Copy link
Member

thoughtpolice commented Oct 10, 2020 •
edited

@vbgl Thanks for this, I owe you one! We actually don't need the sapic-native.patch anymore from my understanding, because SAPIC support is provided directly by the new tamarin-prover-sapic package (which you've correctly added) which is a port of the ocaml code; the only reason the old patch needed to be updated is because the old code path hasn't been thrown away yet. If you could remove that (and the corresponding stuff to build/install the ocaml code) I think this is otherwise ready!

@vbgl
Copy link
Contributor Author

vbgl commented Oct 12, 2020

Thanks for the review. I’ve thus removed the instructions to patch & build the sapic plugin.

@thoughtpolice
Copy link
Member

Thanks! Feel free to merge at your own leisure.

@thoughtpolice thoughtpolice mentioned this pull request Oct 12, 2020
Closed
@vbgl vbgl merged commit 33b7529 into NixOS:master Oct 13, 2020
@vbgl vbgl deleted the tamarin-1.6.0 branch October 13, 2020 08:16
vbgl added a commit that referenced this pull request Oct 13, 2020
@vbgl
tamarin-prover: 1.4.1 → 1.6.0 (#100148)
63470cc 
(cherry picked from commit 33b7529)
@vbgl
Copy link
Contributor Author

vbgl commented Oct 13, 2020

Merged into 20.09 as 63470cc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thoughtpolice thoughtpolice thoughtpolice approved these changes

@symphorien symphorien symphorien approved these changes

Assignees
No one assigned
Labels
8.has: package (update) 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

tamarin-prover doesn't compile: No instance for (Bin.Binary ZonedTime)
3 participants
@vbgl @thoughtpolice @symphorien