diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:35:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:46:20 +0100 |
| commit | 0a58b512cb696b2482cbac4fd3a20b43ae31c1bc (patch) | |
| tree | 7ae35a255ac57b66696c3db743f6ed9a4dab7431 /pkgs/applications/science | |
| parent | 284833649192072959a335367374fc0a6ec667df (diff) | |
| parent | 9c1d3bfa9f7d7b95eb20d0f729e3b3c9d7abcd4b (diff) | |
| download | nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.gz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.bz2 nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.lz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.xz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.zst nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.zip | |
Merge master into stdenv-updates
Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/logic/hol_light/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/science/math/maxima/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index d6c1c0c18781..54c7174bde7f 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { - name = "hol_light-20130324"; + name = "hol_light-20140112"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "157"; - sha256 = "0d0pbnkw2gb11dn30ggfl91lhdxv86kd1fyiqn170w08n0gi805f"; + rev = "179"; + sha256 = "1j402s7142fj09bjijrkargwx03fvbdwmn0hgzzmi6s4p1y7gww0"; }; buildInputs = [ ocaml findlib camlp5 ]; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 2c85a1c97d17..684ac321900f 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.31.3"; + version = "5.32.1"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1g959569plywqaxxp488ylblgkirqg24arwa93dplfxi4h7fc4km"; + sha256 = "0krxha1jckgw5s52bjasf7bnkcnq81qyi2k1bcglgqzfp79b44gw"; }; buildInputs = [sbcl texinfo perl makeWrapper]; |