diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
commit | 0518ccf5af90017df31c445f52badaff45b6b7cd (patch) | |
tree | f60c912ecd598722d76947f6bd5230955210eb66 /pkgs/applications/science/math | |
parent | c96407720010658b44dcd2a8801b05879105b9ff (diff) | |
parent | 782a12e450a58b815cd702c65da75855124d1572 (diff) | |
download | nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.gz nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.bz2 nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.lz nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.xz nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.zst nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.zip |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/wxmaxima/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 75448b6965c..06eceea65c9 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "13.04.2"; + version = "14.09.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxMaxima-${version}.tar.gz"; - sha256 = "1sylvr0kfdzxxc3qsb0c6ff3lg0bzm1ib5xh78wjgzykbnvjsd99"; + url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxmaxima-${version}.tar.gz"; + sha256 = "1wqiw9dgjc9vg94dqk4kif8xs7nlmn34xj3v4zm13fh1jihraksq"; }; buildInputs = [wxGTK maxima makeWrapper]; |