public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
This commit is contained in:
Yury G. Kudryashov
2012-02-10 10:24:30 +00:00
parent 232da3a29d e9974606a5
commit 5144a19987
63 changed files with 589 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/python-packages.nix
View File

@@ -759,10 +759,10 @@ let pythonPackages = python.modules // rec {
matplotlib = buildPythonPackage ( rec {
name = "matplotlib-1.0.1";
name = "matplotlib-1.1.0";
src = fetchurl {
url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz";
sha256 = "1xksjix227n9hm6jnhlwkdf1yf1zgz18665cisqk8grv6xvn7g43";
sha256 = "be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7";
};
doCheck = false;