diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-09-13 21:44:45 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-13 21:48:29 +0200 |
| commit | d957b4bd78335b845eb5d405be40fa36951b5bea (patch) | |
| tree | f4e9b5320d1c83c020024e3c31d95c964d351fbd /pkgs/applications/science | |
| parent | 6a63d1e1e107c0a7c8fe77cdc2bf62155ca88d25 (diff) | |
| download | nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.tar nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.tar.gz nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.tar.bz2 nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.tar.lz nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.tar.xz nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.tar.zst nixlib-d957b4bd78335b845eb5d405be40fa36951b5bea.zip | |
Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/logic/coq/HEAD.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index ed922b3aedbe..1be95a17eede 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -3,7 +3,7 @@ {stdenv, fetchgit, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: let - version = "8.5pre-c70d5b2"; + version = "8.5pre-fbbb86b"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; idePath = if buildIde then '' @@ -16,8 +16,8 @@ stdenv.mkDerivation { src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "c70d5b27ad5872c74e20b6c997383fb4462a68dc"; - sha256 = "02wks2aivgjcf4h3ss9rn683vyawz8gl8rbysdq7awxh062316l2"; + rev = "f7c6b864a509a4cca11cac5fbd5d37efc"; + sha256 = "0v84pjxx361afkipgwkc4d2wmn7v1c5n2y8d264kc26i58cgrrf4"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index edba65146a66..7bdfa2026e15 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.1.0"; + name = "R-3.1.1"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "1qjzbw341bvi1h4jwbvdkvq8j0z9l3m85mpgrlfw0n2cz2806s4a"; + sha256 = "06bs5jk2bgib2wvd76yq9kf1vyim2j344midxkqyhk216ig4sp6f"; }; buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt |