Unverified Commit ead74f0c authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

vampire: 5.0.0 -> 5.0.1 (#481619)

parents a425ddc3 28b2a1e0

pkgs/by-name/is/isabelle/package.nix

+12 −2
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ let 


  # Isabelle uses a branch of vampire that is not in the normal release line

  # that adds support for higher order goals

  vampire' = (vampire.override { stdenv = gcc14Stdenv; }).overrideAttrs (_: {

  vampireStdenv = if stdenv.hostPlatform.isLinux then gcc14Stdenv else stdenv;

  vampire' = (vampire.override { stdenv = vampireStdenv; }).overrideAttrs (_: {

    pname = "vampire-for-isabelle";

    version = "4.8";
@@ -61,7 +62,16 @@ let 
      hash = "sha256-CmppaGa4M9tkE1b25cY1LSPFygJy5yV4kpHKbPqvcVE=";

    };



    cmakeFlags = [ (lib.cmakeFeature "CMAKE_BUILD_HOL" "On") ];

    patches = [ ./vampire-add-install-directive.patch ];



    postInstall = ''

      mv $out/bin/vampire_rel $out/bin/vampire

    '';



    cmakeFlags = [

      (lib.cmakeFeature "CMAKE_BUILD_HOL" "On")

      (lib.cmakeFeature "CMAKE_DISABLE_FIND_PACKAGE_Z3" "On")

    ];

  });



  sha1 = stdenv.mkDerivation {

pkgs/by-name/is/isabelle/vampire-add-install-directive.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -997,6 +997,8 @@ set_target_properties(vampire PROPERTIES

   )

 configure_file(version.cpp.in version.cpp)

 

+install(TARGETS vampire)

+

 if(CMAKE_BUILD_TYPE STREQUAL Release AND IPO)

   message(STATUS "compiling Vampire with IPO: this might take a while")

   set_property(TARGET obj PROPERTY INTERPROCEDURAL_OPTIMIZATION true)

pkgs/by-name/va/vampire/package.nix

+2 −16
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "vampire";

  version = "5.0.0";

  version = "5.0.1";



  src = fetchFromGitHub {

    owner = "vprover";

    repo = "vampire";

    tag = "v${finalAttrs.version}";

    hash = "sha256-jRzVh1KirWi9GpOkzSGoIBUExDN1rV0b3AGwa6gWb3I=";

    hash = "sha256-Ka9HmicIf7b5VN9nbiCW604ZZrGpJuP57RPTzOnwJbU=";

    fetchSubmodules = true;

  };
@@ -42,20 +42,6 @@ stdenv.mkDerivation (finalAttrs: { 
    rm -rf z3

  '';



  installPhase = ''

    runHook preInstall



    # some versions place the binary at ./ while others at bin/

    if test -n "$(find . -maxdepth 1 -name 'vampire*' -print -quit)"

    then

      install -m0755 -D vampire* $out/bin/vampire

    else

      install -m0755 -D bin/vampire* $out/bin/vampire

    fi



    runHook postInstall

  '';



  meta = {

    homepage = "https://vprover.github.io/";

    description = "Vampire Theorem Prover";