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

Add TLAPS and TLA+ Toolbox #38589

Merged
merged 2 commits into from Apr 17, 2018
Merged

Add TLAPS and TLA+ Toolbox #38589

merged 2 commits into from Apr 17, 2018

Conversation

badmutex
Copy link
Contributor

@badmutex badmutex commented Apr 8, 2018

Motivation for this change

This attempts to address #18640.

Testing:

  • tlaplusToolbox: I've been using this without unexpected issues (pdf generation needs pdflatex in the PATH).
  • tlaps: Both tlapm and zenon run and produce their usage information.
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Terminal=false
Name=TLA Toolbox
Categories=Application;Development;
StartupWMClass=TLA+ Toolbox
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ooh that's useful. I'll do that. Thanks for the pointer!

'';
homepage = https://tla.msr-inria.inria.fr/tlaps/content/Home.html;
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.unix;
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure, sounds fun :)

'';
# http://lamport.azurewebsites.net/tla/license.html
license = with lib.licenses; [ mit ];
platforms = stdenv.lib.platforms.linux;
Copy link
Member

Choose a reason for hiding this comment

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

And this.

, makeWrapper
, stdenv
, ocaml, gawk, isabelle, cvc3, perl, wget, which
, ...
Copy link
Member

Choose a reason for hiding this comment

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

... should be removed.

@@ -0,0 +1,80 @@
{ lib, fetchzip, makeWrapper, makeDesktopItem, stdenv, jre, swt, gtk, libXtst, glib
, ... }:
Copy link
Member

Choose a reason for hiding this comment

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

also here.


chmod +x $out/bin/tla-toolbox

wrapProgram "$out/bin/tla-toolbox" \
Copy link
Member

@Mic92 Mic92 Apr 10, 2018

Choose a reason for hiding this comment

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

if you use makeWrapper, you don't need the echo above. It also has a --run parameter for the cd command and --add-flags for arguments.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for pointing that out!
Adapted to use makeWrapper.

@Mic92 Mic92 merged commit 5dc7a70 into NixOS:master Apr 17, 2018
@badmutex badmutex deleted the tlatools branch April 17, 2018 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants