diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science/logic')
5 files changed, 38 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix b/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix index 66ba807c8dd8..5c15b8a17241 100644 --- a/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cryptoverif"; - version = "2.07"; + version = "2.08pl1"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - hash = "sha256-GXXql4+JZ396BM6W2I3kN0u59xos7UCAtzR0IjMIETY="; + hash = "sha256-rmORSZuhds9W2WpNgYf4AJM2jgEUPoJit4G64qLqj5w="; }; /* Fix up the frontend to load the 'default' cryptoverif library diff --git a/nixpkgs/pkgs/applications/science/logic/elan/default.nix b/nixpkgs/pkgs/applications/science/logic/elan/default.nix index b0df275085e6..6a899eec4dc8 100644 --- a/nixpkgs/pkgs/applications/science/logic/elan/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/elan/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-VrCEwAoWKhb1qfJUv3OreTzuKEVQADwZpEQIVEhjwHA="; + hash = "sha256-IC/xb4tZer2cbwIusdCwXxJS3K7kN/XFoU4mxKW4dVc="; }; - cargoHash = "sha256-SMKFSu5C5mc3U266hEa6RB3GH5te3jIrUZAzj3YNa2E="; + cargoHash = "sha256-F80iiXb0UpV+N9q7Msef6/Uzas1DGjMKPWuOKrk8tqU="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix b/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix index a3c324d0dbb8..ad3af12429a2 100644 --- a/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix +++ b/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clingo"; - version = "5.6.2"; + version = "5.7.1"; src = fetchFromGitHub { owner = "potassco"; repo = "clingo"; rev = "v${version}"; - sha256 = "sha256-2vOscD5jengY3z9gHoY9y9y6RLfdzUj7BNKLyppNRac="; + sha256 = "sha256-S0JAfMwg49aryKABbC/2oLCEkndVpMVcFE6X0vkbtNc="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/science/logic/stp/default.nix b/nixpkgs/pkgs/applications/science/logic/stp/default.nix index 42926a870816..fb41ea07f5a1 100644 --- a/nixpkgs/pkgs/applications/science/logic/stp/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/stp/default.nix @@ -11,6 +11,20 @@ stdenv.mkDerivation rec { rev = version; sha256 = "1yg2v4wmswh1sigk47drwsxyayr472mf4i47lqmlcgn9hhbx1q87"; }; + patches = [ + # Fix missing type declaration + # due to undeterminisitic compilation + # of circularly dependent headers + ./stdint.patch + ]; + + postPatch = '' + # Upstream fix for gcc-13 support: + # https://github.com/stp/stp/pull/462 + # Can't apply it as is as patch context changed in ither patches. + # TODO: remove me on 2.4 release + sed -e '1i #include <cstdint>' -i include/stp/AST/ASTNode.h + ''; buildInputs = [ boost zlib minisat cryptominisat python3 ]; nativeBuildInputs = [ cmake bison flex perl ]; @@ -26,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple Theorem Prover"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ McSinyx ]; platforms = platforms.linux; license = licenses.mit; }; diff --git a/nixpkgs/pkgs/applications/science/logic/stp/stdint.patch b/nixpkgs/pkgs/applications/science/logic/stp/stdint.patch new file mode 100644 index 000000000000..6595d5561731 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/logic/stp/stdint.patch @@ -0,0 +1,16 @@ +diff --git a/include/stp/AST/ASTNode.h b/include/stp/AST/ASTNode.h +index 91acd726182c..0a17db23ffbf 100644 +--- a/include/stp/AST/ASTNode.h ++++ b/include/stp/AST/ASTNode.h +@@ -24,9 +24,10 @@ THE SOFTWARE. + #ifndef ASTNODE_H + #define ASTNODE_H + ++#include "stp/AST/ASTInternal.h" + #include "stp/AST/NodeFactory/HashingNodeFactory.h" ++#include "stp/AST/UsefulDefs.h" + #include "stp/Util/Attributes.h" +-#include "ASTInternal.h" + #include "stp/Globals/Globals.h" + + namespace stp |