diff options
Diffstat (limited to 'pkgs/applications/science')
5 files changed, 41 insertions, 9 deletions
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 02723530ba10..5903edd337df 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { longDescription = '' Gravit is a gravity simulator which runs under Linux, Windows and - Mac OS X. It uses Newtonian physics using the Barnes-Hut N-body + macOS. It uses Newtonian physics using the Barnes-Hut N-body algorithm. Although the main goal of Gravit is to be as accurate as possible, it also creates beautiful looking gravity patterns. It records the history of each particle so it can animate and diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix new file mode 100644 index 000000000000..b98af36604a3 --- /dev/null +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, gtk2, pkgconfig }: + +with stdenv.lib; + +stdenv.mkDerivation { + name = "gwyddion"; + version = "2.48"; + src = fetchurl { + url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz"; + sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx"; + }; + buildInputs = [ gtk2 pkgconfig ]; + meta = { + homepage = http://gwyddion.net/; + + description = "Scanning probe microscopy data visualization and analysis"; + + longDescription = '' + A modular program for SPM (scanning probe microscopy) data + visualization and analysis. Primarily it is intended for the + analysis of height fields obtained by scanning probe microscopy + techniques (AFM, MFM, STM, SNOM/NSOM) and it supports a lot of + SPM data formats. However, it can be used for general height + field and (greyscale) image processing, for instance for the + analysis of profilometry data or thickness maps from imaging + spectrophotometry. + ''; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index f93856e90e11..9620140dde4b 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,7 @@ , ocamlPackages, ncurses , buildIde ? true , csdp ? null -, version ? "8.6" +, version ? "8.6.1" }: let @@ -18,9 +18,10 @@ let "8.5pl2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"; "8.5pl3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh"; "8.6" = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f"; + "8.6.1" = "17cg2c40y9lskkiqfhngavp8yw3shpqgkpihh30xx0rlhn9amy1j"; }."${version}"; coq-version = builtins.substring 0 3 version; - camlp5 = ocamlPackages.camlp5_transitional; + camlp5 = ocamlPackages.camlp5_strict; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" @@ -132,7 +133,7 @@ self = stdenv.mkDerivation { homepage = http://coq.inria.fr; license = licenses.lgpl21; branch = coq-version; - maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; + maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ]; platforms = platforms.unix; }; }; in self diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 0ec7f93d26f5..c8e20c7260c9 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yices-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=${name}-src.tar.gz&accept=I+Agree"; name = "${name}-src.tar.gz"; - sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c"; + sha256 = "18mjnwg0pwc0fx4f99l7hxsi10mb5skkzk0k1m3xv5kx3qfnghs0"; }; patchPhase = ''patchShebangs tests/regress/check.sh''; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # only installing the libyices.so.2.5.1 file. installPhase = '' make install LDCONFIG=true - (cd $out/lib && ln -s -f libyices.so.2.5.1 libyices.so.2.5) + (cd $out/lib && ln -s -f libyices.so.2.5.2 libyices.so.2.5) ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 0ba1212567f4..8a84ed78b781 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -4,7 +4,7 @@ tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false let name = "maxima"; - version = "5.39.0"; + version = "5.40.0"; searchPath = stdenv.lib.makeBinPath @@ -15,7 +15,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1cvignn5y6qzrby6qb885yc8zdcdqdr1d50vcvc3gapw2f0gk3zm"; + sha256 = "15pp35ayglv723bjbqc60gcdv2bm54s6pywsm4i4cwbjsf64dzkl"; }; buildInputs = stdenv.lib.filter (x: x != null) |