diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science/logic')
5 files changed, 27 insertions, 30 deletions
diff --git a/nixpkgs/pkgs/applications/science/logic/cedille/default.nix b/nixpkgs/pkgs/applications/science/logic/cedille/default.nix index e27173651913..4cef49788c04 100644 --- a/nixpkgs/pkgs/applications/science/logic/cedille/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/cedille/default.nix @@ -1,8 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch -, texinfo , alex , happy , Agda @@ -19,11 +17,11 @@ stdenv.mkDerivation rec { owner = "cedille"; repo = "cedille"; rev = "v${version}"; - sha256 = "17j7an5bharc8q1pj06615zmflipjdd0clf67cnfdhsmqwzf6l9r"; + sha256 = "16pc72wz6kclq9yv2r8hx85mkp0s125h12snrhcjxkbl41xx2ynb"; fetchSubmodules = true; }; - nativeBuildInputs = [ texinfo alex happy ]; + nativeBuildInputs = [ alex happy ]; buildInputs = [ Agda (ghcWithPackages (ps: [ps.ieee])) ]; LANG = "en_US.UTF-8"; @@ -31,26 +29,10 @@ stdenv.mkDerivation rec { lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; - patches = [ - # texinfo direntry fix. See: https://github.com/cedille/cedille/pull/86 - (fetchpatch { - url = "https://github.com/cedille/cedille/commit/c058f42179a635c7b6179772c30f0eba4ac53724.patch"; - sha256 = "02qd86k5bdrygjzh2k0j0q5qk4nk2vwnsz7nvlssvysbvsmiba7x"; - }) - ]; - postPatch = '' patchShebangs create-libraries.sh - patchShebangs docs/src/compile-docs.sh - ''; - - # We regenerate the info file in order to fix the direntry - preBuild = '' - rm -f docs/info/cedille-info-main.info ''; - buildFlags = [ "all" "cedille-docs" ]; - installPhase = '' install -Dm755 -t $out/bin/ cedille install -Dm755 -t $out/bin/ core/cedille-core diff --git a/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/nixpkgs/pkgs/applications/science/logic/coq/default.nix index 0a4e1dddcae3..774fbadd4fd3 100644 --- a/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -8,6 +8,7 @@ { stdenv, fetchFromGitHub, writeText, pkgconfig , ocamlPackages, ncurses , buildIde ? true +, glib, gnome3, wrapGAppsHook , csdp ? null , version }: @@ -26,9 +27,15 @@ let "8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk"; "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; + "8.10+beta1" = "19wf39i0ap2vakglgdlqxpjd3l1h5w7dp460w8y7nc1y06b2153h"; }."${version}"; - coq-version = builtins.substring 0 3 version; - ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; + coq-version = + let inherit (builtins) concatStringsSep head map; in + let inherit (stdenv.lib) take splitString; in + concatStringsSep "." (take 2 (map head (map (splitString "pl") (splitString "." version)))); + versionAtLeast = stdenv.lib.versionAtLeast coq-version; + ideFlags = stdenv.lib.optionalString (buildIde && !versionAtLeast "8.10") + "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" @@ -96,7 +103,10 @@ self = stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 num ]) - ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk; + ++ stdenv.lib.optionals buildIde + (if versionAtLeast "8.10" + then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] + else [ ocamlPackages.lablgtk ]); postPatch = '' UNAME=$(type -tp uname) @@ -117,7 +127,9 @@ self = stdenv.mkDerivation { addEnvHooks "$targetOffset" addCoqPath ''; - preConfigure = '' + preConfigure = if versionAtLeast "8.10" then '' + patchShebangs dev/tools/ + '' else '' configureFlagsArray=( ${ideFlags} ) diff --git a/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix index f58c820d22b6..8ba77159693e 100644 --- a/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, yosys, python3 }: +{ stdenv, fetchFromGitHub, yosys, bash, python3 }: stdenv.mkDerivation rec { name = "symbiyosys-${version}"; @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/sby \ --replace "##yosys-sys-path##" \ "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]" + substituteInPlace $out/share/yosys/python3/sby_core.py \ + --replace "/bin/bash" \ + "${bash}/bin/bash" ''; meta = { description = "Tooling for Yosys-based verification flows"; diff --git a/nixpkgs/pkgs/applications/science/logic/tptp/default.nix b/nixpkgs/pkgs/applications/science/logic/tptp/default.nix index 24971b500d3f..7f68a8e647e9 100644 --- a/nixpkgs/pkgs/applications/science/logic/tptp/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/tptp/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz" - "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}.tgz" + "http://tptp.cs.miami.edu/TPTP/Distribution/TPTP-v${version}.tgz" + "http://tptp.cs.miami.edu/TPTP/Archive/TPTP-v${version}.tgz" ]; sha256 = "0yq8452b6mym4yscy46pshg0z2my8xi74b5bp2qlxd5bjwcrg6rl"; }; diff --git a/nixpkgs/pkgs/applications/science/logic/vampire/default.nix b/nixpkgs/pkgs/applications/science/logic/vampire/default.nix index 8ad70531d543..08ab243fb96a 100644 --- a/nixpkgs/pkgs/applications/science/logic/vampire/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/vampire/default.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { owner = "vprover"; repo = "vampire"; rev = version; - sha256 = "0d1klprlgqrcn8r5ywgvsahr4qz96ayl67ry5jks946v0k94m1k1"; - fetchSubmodules = true; - leaveDotGit = true; + sha256 = "03dqjxr3cwz4h6sn9074kc6b6wjz12kpsvsi0mq2w0j5l9f8d80y"; + #fetchSubmodules = true; + #leaveDotGit = true; }; nativeBuildInputs = [ git ]; |