diff options
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/biology/bppsuite/default.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/science/chemistry/marvin/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/logic/cryptominisat/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/logic/proverif/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/logic/sad/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/logic/sad/patch.patch (renamed from pkgs/applications/science/logic/sad/patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/science/math/palp/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/physics/xflr5/default.nix | 23 |
8 files changed, 52 insertions, 8 deletions
diff --git a/pkgs/applications/science/biology/bppsuite/default.nix b/pkgs/applications/science/biology/bppsuite/default.nix new file mode 100644 index 000000000000..564a38708bcd --- /dev/null +++ b/pkgs/applications/science/biology/bppsuite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake, bpp-core, bpp-seq, bpp-phyl, bpp-popgen }: + +stdenv.mkDerivation rec { + pname = "bppsuite"; + + inherit (bpp-core) version; + + src = fetchFromGitHub { + owner = "BioPP"; + repo = pname; + rev = "v${version}"; + sha256 = "1wdwcgczqbc3m116vakvi0129wm3acln3cfc7ivqnalwvi6lrpds"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ bpp-core bpp-seq bpp-phyl bpp-popgen ]; + + meta = bpp-core.meta // { + changelog = "https://github.com/BioPP/bppsuite/blob/master/ChangeLog"; + }; +} diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 9512a288d80c..1a22544c270a 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.10.0"; + version = "20.12.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "042ndlns48pa6mn6wyrp4q9c1v0a2vzcnhw5l766zdnxdjyv0acx"; + sha256 = "1imfr56nbq2mbcyapwa8xmcmj5rjhbjz9r438387s73kd1avd6yl"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 8c1b3bd03694..591b04ab062b 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - sha256 = "0ny5ln8fc0irprs04qw01c9mppps8q27lkx01a549zazwhj4b5rm"; + sha256 = "16lydnbd4rxfyabvvw7l4hbbby3yprcqqzrydd3n8rjbxibi4xyf"; }; buildInputs = [ python3 boost ]; diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix index 931ad2fc4f39..6a9367b30aa0 100644 --- a/pkgs/applications/science/logic/proverif/default.nix +++ b/pkgs/applications/science/logic/proverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "proverif"; - version = "2.00"; + version = "2.01"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz"; - sha256 = "0vjphj85ch9q39vc7sd6n4vxy5bplp017vlshk989yhfwb00r37y"; + sha256 = "01wp5431c77z0aaa99h8bnm5yhr6jslpqc8iyg0a7gxfqnb19gxi"; }; buildInputs = with ocamlPackages; [ ocaml findlib lablgtk ]; diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index f9b82b5d733b..f1066abf6931 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; buildInputs = [ haskell.compiler.ghc844 spass ]; patches = [ - ./patch + ./patch.patch # Since the LTS 12.0 update, <> is an operator in Prelude, colliding with # the <> operator with a different meaning defined by this package ./monoid.patch diff --git a/pkgs/applications/science/logic/sad/patch b/pkgs/applications/science/logic/sad/patch.patch index a5b1d6177083..a5b1d6177083 100644 --- a/pkgs/applications/science/logic/sad/patch +++ b/pkgs/applications/science/logic/sad/patch.patch diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index c0100422c64a..c383438002f4 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz"; - sha256 = "0pv3rmgk8xc8z98w173f1jxc1cd67cdl8mjjgmgp3mcvifcfsrjl"; + sha256 = "00jpm73fw9jjq58z6rysr1mwv489j6rpfqqlhm9ab0dln4kyhh05"; }; hardeningDisable = [ diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix new file mode 100644 index 000000000000..85838b04cbf1 --- /dev/null +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchurl, wrapQtAppsHook, qmake }: + +stdenv.mkDerivation rec { + pname = "xflr5"; + version = "6.47"; + + src = fetchurl { + url = "mirror://sourceforge/xflr5/${pname}_v${version}_src.tar.gz"; + sha256 = "02x3r9iv3ndwxa65mxn9m5dlhcrnjiq7cffi6rmb456gs3v3dnav"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + meta = with stdenv.lib; { + description = "An analysis tool for airfoils, wings and planes"; + homepage = https://sourceforge.net/projects/xflr5/; + license = licenses.gpl3; + maintainers = [ maintainers.esclear ]; + platforms = platforms.linux; + }; +} \ No newline at end of file |