From ccb2d83980f3a871cf603ff00234020dd1d38add Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 6 Feb 2017 22:41:01 +0100 Subject: [PATCH] boogie: fix basename issues; promote to package --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/dotnet-packages.nix | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d38479b26d56..299e4d1b8461 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17007,6 +17007,8 @@ with pkgs; aspino = callPackage ../applications/science/logic/aspino {}; + boogie = dotnetPackages.Boogie; + coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { make = pkgs.gnumake3; inherit (ocamlPackages_3_12_1) ocaml findlib; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index c3d8b861c767..0e53e820a39d 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -221,8 +221,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # SOURCE PACKAGES Boogie = buildDotnetPackage rec { - baseName = "Boogie-unstable"; + baseName = "Boogie"; version = "2017-01-03"; + name = "${baseName}-unstable-${version}"; src = fetchFromGitHub { owner = "boogie-org"; @@ -238,8 +239,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "Binaries/*" ]; postInstall = '' - mkdir -pv "$out/lib/dotnet/Boogie" - ln -sv "${pkgs.z3}/bin/z3" "$out/lib/dotnet/Boogie/z3.exe" + mkdir -pv "$out/lib/dotnet/${baseName}" + ln -sv "${pkgs.z3}/bin/z3" "$out/lib/dotnet/${baseName}/z3.exe" ''; meta = with stdenv.lib; {