public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tla-toolbox: 1.7.0 -> 1.7.1

Browse Source 
* updates package version
* fixes #114741
* fixes TLC model check call
This commit is contained in:
mucaho 2021-03-11 11:35:25 +01:00 committed by tomberek
parent 769859fa95
commit ddf1821112
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/science/logic/tlaplus/toolbox.nix
View File

@ -1,11 +1,8 @@
{ lib, fetchzip, makeWrapper, makeDesktopItem, stdenv { lib, fetchzip, makeWrapper, makeDesktopItem, stdenv
, gtk, libXtst, glib, zlib , gtk3, libXtst, glib, zlib
}: }:
let let
version = "1.7.0";
arch = "x86_64";
desktopItem = makeDesktopItem rec { desktopItem = makeDesktopItem rec {
name = "TLA+Toolbox"; name = "TLA+Toolbox";
exec = "tla-toolbox"; exec = "tla-toolbox";
@ -20,12 +17,12 @@ let
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation rec {
pname = "tla-toolbox"; pname = "tla-toolbox";
inherit version; version = "1.7.1";
src = fetchzip { src = fetchzip {
url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.x86_64.zip";
sha256 = "0v15wscawair5bghr5ixb4i062kmh9by1m0hnz2r1sawlqyafz02"; sha256 = "02a2y2mkfab5cczw8g604m61h4xr0apir49zbd1aq6mmgcgngw80";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -33,6 +30,8 @@ in stdenv.mkDerivation {
phases = [ "installPhase" ]; phases = [ "installPhase" ];
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p "$out/bin" mkdir -p "$out/bin"
cp -r "$src" "$out/toolbox" cp -r "$src" "$out/toolbox"
chmod -R +w "$out/toolbox" chmod -R +w "$out/toolbox"
@ -43,12 +42,17 @@ in stdenv.mkDerivation {
patchelf \ patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath "${lib.makeLibraryPath [ zlib ]}:$(patchelf --print-rpath $(find "$out/toolbox" -name java))" \
"$(find "$out/toolbox" -name java)" "$(find "$out/toolbox" -name java)"
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$(find "$out/toolbox" -name jspawnhelper)"
makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \
--run "set -x; cd $out/toolbox" \ --run "set -x; cd $out/toolbox" \
--add-flags "-data ~/.tla-toolbox" \ --add-flags "-data ~/.tla-toolbox" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk libXtst glib zlib ]}" --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}"
echo -e "\nCreating TLA Toolbox icons..." echo -e "\nCreating TLA Toolbox icons..."
pushd "$src" pushd "$src"
@ -63,6 +67,8 @@ in stdenv.mkDerivation {
echo -e "\nCreating TLA Toolbox desktop entry..." echo -e "\nCreating TLA Toolbox desktop entry..."
cp -r "${desktopItem}/share/applications"* "$out/share/applications" cp -r "${desktopItem}/share/applications"* "$out/share/applications"
runHook postInstall
''; '';
meta = { meta = {
@ -75,7 +81,7 @@ in stdenv.mkDerivation {
''; '';
# http://lamport.azurewebsites.net/tla/license.html # http://lamport.azurewebsites.net/tla/license.html
license = with lib.licenses; [ mit ]; license = with lib.licenses; [ mit ];
platforms = lib.platforms.linux; platforms = [ "x86_64-linux" ];
maintainers = [ ]; maintainers = [ ];
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -28493,7 +28493,7 @@ in
tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {
inherit (ocaml-ng.ocamlPackages_4_05) ocaml; inherit (ocaml-ng.ocamlPackages_4_05) ocaml;
}; };
tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {gtk = gtk2;}; tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {};
aiger = callPackage ../applications/science/logic/aiger {}; aiger = callPackage ../applications/science/logic/aiger {};