diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-05 15:00:44 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-05 15:00:44 +0100 |
commit | 52404a868ddc6665da66f54dab5f102908843784 (patch) | |
tree | da856ff0f583e67a7a209d8d75826f796df5a3bb /pkgs/applications/science/math | |
parent | c0e2aceef46033e43ab8b4f6aa0b36b25ba35f3d (diff) | |
parent | 8e02bde1a8ea913ecaa4801898057968412efa01 (diff) | |
download | nixpkgs-52404a868ddc6665da66f54dab5f102908843784.tar nixpkgs-52404a868ddc6665da66f54dab5f102908843784.tar.gz nixpkgs-52404a868ddc6665da66f54dab5f102908843784.tar.bz2 nixpkgs-52404a868ddc6665da66f54dab5f102908843784.tar.lz nixpkgs-52404a868ddc6665da66f54dab5f102908843784.tar.xz nixpkgs-52404a868ddc6665da66f54dab5f102908843784.tar.zst nixpkgs-52404a868ddc6665da66f54dab5f102908843784.zip |
Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272 TODO: port e22889064f82be3 Conflicts: nixos/tests/gnome3_10.nix (auto-solved) pkgs/applications/video/aegisub/default.nix pkgs/development/libraries/boost/1.55.nix
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/sage/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index ced8b6f95bb..a27a93dd2c6 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "sage-6.1.1"; src = fetchurl { - url = "http://mirrors.xmission.com/sage/src/sage-6.1.1.tar.gz"; + url = "mirror://sagemath/${name}.tar.gz"; sha256 = "0kbzs0l9q7y34jv3f8rd1c2mrjsjkdgaw6mfdwjlpg9g4gghmq5y"; }; @@ -23,9 +23,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.scilab.org/; - description = "Scientific software package for numerical computations (Matlab lookalike)"; - # see http://www.scilab.org/legal - license = "SciLab"; + homepage = "http://www.sagemath.org"; + description = "A free open source mathematics software system"; + license = stdenv.lib.licenses.gpl2Plus; }; } |