summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorRickard Nilsson <rickynils@gmail.com>2013-01-20 16:53:21 +0100
committerRickard Nilsson <rickynils@gmail.com>2013-01-20 16:53:21 +0100
commit1886d1db6a962578bd802e820a1279b4aed3333a (patch)
tree4b938608821b25f0b972c80a837b8f8f35becc1f /pkgs/applications/science
parentd1c548cdd728961350f6ee4a65d597df3b1ebe61 (diff)
parente185691ced86fc517a2daea762d7d11e525c6ae8 (diff)
downloadnixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar
nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.gz
nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.bz2
nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.lz
nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.xz
nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.zst
nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.zip
Merge remote-tracking branch 'upstream/master' into stdenv-updates
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/astronomy/stellarium/default.nix4
-rw-r--r--pkgs/applications/science/math/maxima/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index e890ee58307c..541340df6299 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
 
 let
-  name = "stellarium-0.11.4";
+  name = "stellarium-0.11.4a";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "8ad5e9878eb36c2c27f4754dcfc69279123e0eae02cc388074e3cf9b23746535";
+    sha256 = "0gs3lf2061chgcyx22xbnn6b284nsnj8xal7jyjzj57s8yk4n619";
   };
 
   buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 18d145b6dde2..d644a1633cbb 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.28.0";
+  version = "5.29.1";
 
   searchPath =
     stdenv.lib.makeSearchPath "bin"
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
-    sha256 = "d73e925f0116ba361bf4390c80e24d4fa763f647cc1fc4cc06bbf40ceb3facda";
+    sha256 = "1p94l28adcn0826nah460r9pz71h7wd5klsg885sl2gzds75bn74";
   };
 
   buildInputs = [sbcl texinfo perl makeWrapper];