summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-05-19 13:16:11 +0200
committerPeter Simons <simons@cryp.to>2015-05-19 13:16:11 +0200
commit51412f96c0b9a953559d7c8593cfeaf8588dbd86 (patch)
tree7bdc8302c552958337ef1da3208a49e169cd3b86
parent557c1401afee15975a4b7f896a7a98171570d259 (diff)
parent0e2472ac86ba17cdb8b8f937d985dc191100f86e (diff)
downloadnixpkgs-51412f96c0b9a953559d7c8593cfeaf8588dbd86.tar
nixpkgs-51412f96c0b9a953559d7c8593cfeaf8588dbd86.tar.gz
nixpkgs-51412f96c0b9a953559d7c8593cfeaf8588dbd86.tar.bz2
nixpkgs-51412f96c0b9a953559d7c8593cfeaf8588dbd86.tar.lz
nixpkgs-51412f96c0b9a953559d7c8593cfeaf8588dbd86.tar.xz
nixpkgs-51412f96c0b9a953559d7c8593cfeaf8588dbd86.tar.zst
nixpkgs-51412f96c0b9a953559d7c8593cfeaf8588dbd86.zip
Merge pull request #7886 from joelmo/numpy
numpy and matplotlib updates
-rw-r--r--pkgs/development/python-modules/matplotlib/default.nix4
-rw-r--r--pkgs/top-level/python-packages.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index d22c8cf3231..15716f20422 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -10,11 +10,11 @@ assert enableGhostscript -> ghostscript != null;
 assert enableGtk2 -> pygtk != null;
 
 buildPythonPackage rec {
-  name = "matplotlib-1.4.2";
+  name = "matplotlib-1.4.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/matplotlib/${name}.tar.gz";
-    sha256 = "0m6v9nwdldlwk22gcd339zg6mny5m301fxgks7z8sb8m9wawg8qp";
+    sha256 = "1dn05cvd0g984lzhh72wa0z93psgwshbbg93fkab6slx5m3l95av";
   };
   
   XDG_RUNTIME_DIR = "/tmp";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 47ec86b41ad..dd96c9234ce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7728,11 +7728,11 @@ let
   };
 
   numpy = buildPythonPackage ( rec {
-    name = "numpy-1.8.2";
+    name = "numpy-1.9.2";
 
     src = pkgs.fetchurl {
       url = "mirror://sourceforge/numpy/${name}.tar.gz";
-      sha256 = "1gcxlk3mf43pzpxvbw8kcfg173g4105j9szsfc1kxwablail6myf";
+      sha256 = "0apgmsk9jlaphb2dp1zaxqzdxkf69h1y3iw2d1pcnkj31cmmypij";
     };
 
     disabled = isPyPy;  # WIP