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

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

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

Copy link
Contributor

@symphorien symphorien left a comment

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

@thoughtpolice
Copy link
Member

@thoughtpolice thoughtpolice commented Oct 10, 2020

@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 added 2 commits Oct 10, 2020
@vbgl vbgl force-pushed the vbgl:tamarin-1.6.0 branch from abdd77a to 02d3b4f Oct 11, 2020
@vbgl
Copy link
Contributor Author

@vbgl 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

@thoughtpolice thoughtpolice commented Oct 12, 2020

Thanks! Feel free to merge at your own leisure.

@vbgl vbgl merged commit 33b7529 into NixOS:master Oct 13, 2020
19 of 20 checks passed
19 of 20 checks passed
tests tests
Details
action
Details
tamarin-prover, tamarin-prover.passthru.tests on x86_64-darwin
Details
tamarin-prover, tamarin-prover.passthru.tests on aarch64-linux Failure
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02d3b4f"; rev="02d3b4fb77ec9950e008b3fbb41156ce3976066f"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02d3b4f"; rev="02d3b4fb77ec9950e008b3fbb41156ce3976066f"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02d3b4f"; rev="02d3b4fb77ec9950e008b3fbb41156ce3976066f"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02d3b4f"; rev="02d3b4fb77ec9950e008b3fbb41156ce3976066f"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02d3b4f"; rev="02d3b4fb77ec9950e008b3fbb41156ce3976066f"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02d3b4f"; rev="02d3b4fb77ec9950e008b3fbb41156ce3976066f"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02d3b4f"; rev="02d3b4fb77ec9950e008b3fbb41156ce3976066f"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tamarin-prover, tamarin-prover.passthru.tests on x86_64-linux Success
Details
@vbgl vbgl deleted the vbgl:tamarin-1.6.0 branch Oct 13, 2020
vbgl added a commit that referenced this pull request Oct 13, 2020
(cherry picked from commit 33b7529)
@vbgl
Copy link
Contributor Author

@vbgl 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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants
You can’t perform that action at this time.