diff options
Diffstat (limited to 'pkgs/applications/science')
6 files changed, 44 insertions, 16 deletions
diff --git a/pkgs/applications/science/electronics/fparser/default.nix b/pkgs/applications/science/electronics/fparser/default.nix new file mode 100644 index 0000000000000..55e40ca2b00bd --- /dev/null +++ b/pkgs/applications/science/electronics/fparser/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "fparser"; + version = "unstable-2015-09-25"; + + src = fetchFromGitHub { + owner = "thliebig"; + repo = "fparser"; + rev = "a59e1f51e32096bfe2a0a2640d5dffc7ae6ba37b"; + sha256 = "0wayml1mlyi922gp6am3fsidhzsilziksdn5kbnpcln01h8555ad"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "C++ Library for Evaluating Mathematical Functions"; + homepage = "https://github.com/thliebig/fparser"; + license = licenses.lgpl3; + maintainers = with maintainers; [ matthuszagh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index ad931c23d53c4..e396f1c4a91a1 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,12 +2,11 @@ let pname = "alt-ergo"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${pname}-${version}.tar.gz"; - name = "${pname}-${version}.tar.gz"; - sha256 = "124n836alqm13245hcnxixzc6a15rip919shfflvxqnl617mkmhg"; + url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-${version}/alt-ergo-${version}.tar.gz"; + sha256 = "130hisjzkaslygipdaaqib92spzx9rapsd45dbh5ssczjn5qnhb9"; }; preConfigure = "patchShebangs ./configure"; @@ -20,7 +19,7 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; inherit version src preConfigure nativeBuildInputs; configureFlags = pname; - propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex zarith ]; + propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index cfd645a3c7321..594f596b5ef75 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.7.2"; + version = "3.8.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0d9lz0mbxyaaykkvk2p8w2hcif9cx0ksihgh7qhxf417bz6msgc1"; + sha256 = "0frs2vhxlzdliyydb462c1886dn585zd7yp7hdxzsri2v6gdh89g"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix index c833b22e49b66..ee50a2d850401 100644 --- a/pkgs/applications/science/logic/poly/default.nix +++ b/pkgs/applications/science/logic/poly/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "libpoly"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "libpoly"; - rev = "v${version}"; - sha256 = "0i5ar4lhs88glk0rvkmag656ii434i6i1q5dspx6d0kyg78fii64"; + # they've pushed to the release branch, use explicit tag + rev = "refs/tags/v${version}"; + sha256 = "1n3gijksnl2ybznq4lkwm2428f82423sxq18gnb2g1kiwqlzdaa3"; }; nativeBuildInputs = [ cmake ]; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp python ]; meta = with stdenv.lib; { - homepage = https://github.com/SRI-CSL/libpoly; + homepage = "https://github.com/SRI-CSL/libpoly"; description = "C library for manipulating polynomials"; license = licenses.lgpl3; platforms = platforms.all; diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index e9fd21b46d8aa..4912b82d158fe 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -4,10 +4,12 @@ , doSymlink ? true # symlink the executables to the default location (without dimension postfix) }: +let + dim = toString dimensions; +in stdenv.mkDerivation rec { + pname = "palp"; version = "2.1"; - dim = toString dimensions; - name = "palp-${dim}d-${version}"; src = fetchurl { url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz"; @@ -75,7 +77,7 @@ stdenv.mkDerivation rec { algorithms work in any dimension and our key routine for vertex and facet enumeration compares well with existing packages. ''; - homepage = http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html; + homepage = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"; # Just a link on the website pointing to gpl -- now gplv3. When the last # version was released that pointed to gplv2 however, so thats probably # the right license. diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index c23debdd7a454..e393111590a85 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.8.0"; + version = "3.8.0a"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "0nsg6dzg5r7rzqr671nvrf1c50rjwpz7bxv5f20i4s7agizgv840"; + sha256 = "0bjd61bbc5b2i09kz3ss01c0xmxrhmiv5wpbhhplkp3yhw2qrf3m"; }; patchPhase = '' |