diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/applications/science | |
parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
download | nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.zip |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/applications/science')
5 files changed, 8 insertions, 51 deletions
diff --git a/pkgs/applications/science/electronics/qucs/tr1-complex.patch b/pkgs/applications/science/electronics/qucs/tr1-complex.patch deleted file mode 100644 index 0be7ae00eb95..000000000000 --- a/pkgs/applications/science/electronics/qucs/tr1-complex.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- qucs-core/configure.orig 2011-07-03 07:34:09.069218113 -0500 -+++ qucs-core/configure 2011-07-03 07:34:46.618990497 -0500 -@@ -5884,7 +5884,6 @@ - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include <tr1/complex> - using namespace std; - using namespace std::tr1; - int diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix index df888cf5c793..104fb02fc450 100644 --- a/pkgs/applications/science/logic/coq/8.5.nix +++ b/pkgs/applications/science/logic/coq/8.5.nix @@ -6,7 +6,7 @@ {stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: let - version = "8.5rc1"; + version = "8.5"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -23,8 +23,8 @@ stdenv.mkDerivation { inherit ocaml camlp5; src = fetchurl { - url = https://coq.inria.fr/distrib/V8.5rc1/files/coq-8.5rc1.tar.gz; - sha256 = "0n8mb7di9iwg8dgy1xmivf2ajx8kqkrj9mafc32vicn2lbg16q2r"; + url = https://coq.inria.fr/distrib/V8.5/files/coq-8.5.tar.gz; + sha256 = "0gdfm6k5q1f8sz1xr9ijdkkvwqsb7v8prj21gmwv0z0yp6w2zac9"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; diff --git a/pkgs/applications/science/logic/isabelle/settings.patch b/pkgs/applications/science/logic/isabelle/settings.patch deleted file mode 100644 index bf509a4bac46..000000000000 --- a/pkgs/applications/science/logic/isabelle/settings.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nuar Isabelle2011/etc/settings Isabelle2011-fix/etc/settings ---- Isabelle2011/etc/settings 2011-01-30 13:02:18.000000000 +0100 -+++ Isabelle2011-fix/etc/settings 2011-05-14 22:56:04.000000000 +0200 -@@ -17,13 +17,7 @@ - - # Poly/ML 5.x (automated settings) - ML_PLATFORM="$ISABELLE_PLATFORM" --ML_HOME="$(choosefrom \ -- "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \ -- "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \ -- "/usr/local/polyml/$ML_PLATFORM" \ -- "/usr/share/polyml/$ML_PLATFORM" \ -- "/opt/polyml/$ML_PLATFORM" \ -- "")" -+ML_HOME=@ML_HOME@ - ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version") - ML_OPTIONS="-H 200" - ML_SOURCES="$ML_HOME/../src" -@@ -175,13 +169,7 @@ - ### - - # Proof General home, look in a variety of places --PROOFGENERAL_HOME="$(choosefrom \ -- "$ISABELLE_HOME/contrib/ProofGeneral" \ -- "$ISABELLE_HOME/../ProofGeneral" \ -- "/usr/local/ProofGeneral" \ -- "/usr/share/ProofGeneral" \ -- "/opt/ProofGeneral" \ -- "")" -+PROOFGENERAL_HOME=@PROOFGENERAL_HOME@ - - PROOFGENERAL_OPTIONS="" - #PROOFGENERAL_OPTIONS="-m no_brackets -m no_type_brackets" diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix index 308ca79eab28..772d755b233e 100644 --- a/pkgs/applications/science/logic/metis-prover/default.nix +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metis-prover-${version}"; - version = "2.3.20160101"; + version = "2.3.20160102"; src = fetchurl { url = "http://www.gilith.com/software/metis/metis.tar.gz"; - sha256 = "0wkh506ggwmfacwl19n84n1xi6ak4xhrc96d9pdkpk8zdwh5w58l"; + sha256 = "13csr90i9lsxdyzxqiwgi98pa7phfl28drjcv4qdjhzi71wcdc66"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index fb3fb959ae63..43ce46b8e7a0 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "z3-${version}"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "Z3Prover"; repo = "z3"; - rev = "7f6ef0b6c0813f2e9e8f993d45722c0e5b99e152"; - sha256 = "1xllvq9fcj4cz34biq2a9dn2sj33bdgrzyzkj26hqw70wkzv1kzx"; + rev = "z3-${version}"; + sha256 = "1ix100r1h00iph1bk5qx5963gpqaxmmx42r2vb5zglynchjif07c"; }; buildInputs = [ python ]; |