mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

* Update darcsver and mock.

Browse source 
svn path=/nixpkgs/branches/modular-python/; revision=26681
This commit is contained in:
Eelco Dolstra 2011-04-04 14:38:53 +00:00
parent 66a2615eea
commit 9c16728cd4
2 changed files with 13 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/top-level/all-packages.nix
View file

@ -6698,8 +6698,7 @@ let
tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs { tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {
inherit (pythonPackages) twisted foolscap simplejson nevow zfec inherit (pythonPackages) twisted foolscap simplejson nevow zfec
pycryptopp pysqlite darcsver setuptoolsTrial setuptoolsDarcs pycryptopp pysqlite darcsver setuptoolsTrial setuptoolsDarcs
numpy pyasn1; numpy pyasn1 mock;
mock = pythonPackages.mock060;
}; };
tailor = builderDefsPackage (import ../applications/version-management/tailor) { tailor = builderDefsPackage (import ../applications/version-management/tailor) {

47
pkgs/top-level/python-packages.nix
View file

@ -256,18 +256,23 @@ python.modules // rec {
}); });
darcsver = buildPythonPackage (rec { darcsver = buildPythonPackage (rec {
name = "darcsver-1.5.1"; name = "darcsver-1.7.2";
src = fetchurl { src = fetchurl {
url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz"; url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz";
sha256 = "e643d607f27e4b8cc96565432ff1abdc2af5e9061c70798e2f33e78c07b66b3a"; md5 = "94ca7e8c9ea0f69c0f3fc6f9fc88f65a";
}; };
buildInputs = [ mock ];
# Note: We don't actually need to provide Darcs as a build input. # Note: We don't actually need to provide Darcs as a build input.
# Darcsver will DTRT when Darcs isn't available. See news.gmane.org # Darcsver will DTRT when Darcs isn't available. See news.gmane.org
# http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3200 for a # http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3200 for a
# discussion. # discussion.
# Gives "ValueError: Empty module name" with no clue as to why.
doCheck = false;
meta = { meta = {
description = "Darcsver, generate a version number from Darcs history"; description = "Darcsver, generate a version number from Darcs history";
@ -679,25 +684,16 @@ python.modules // rec {
}; };
}); });
mock = buildPythonPackage (rec { mock = buildPythonPackage (rec {
name = "mock-0.1.0"; name = "mock-0.7.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/python-mock/pythonmock-0.1.0.zip"; url = "http://pypi.python.org/packages/source/m/mock/${name}.tar.gz";
sha256 = "0r17f8sjq6pjlfh2sq2x80bd5r6y9sb3n5l05x5sf25iaba7sg9z"; md5 = "be029f8c963c55250a452c400e10cf42";
}; };
buildInputs = [ pkgs.unzip ]; buildInputs = [ unittest2 ];
phases = "unpackPhase";
unpackPhase =
'' mkdir "${name}"
unzip "$src"
ensureDir "$out/lib/${python.libPrefix}/site-packages"
cp -v mock.py "$out/lib/${python.libPrefix}/site-packages"
'';
meta = { meta = {
description = "Mock objects for Python"; description = "Mock objects for Python";
@ -708,25 +704,6 @@ python.modules // rec {
}; };
}); });
mock060 = pkgs.lowPrio (buildPythonPackage (rec {
# TODO: This appears to be an unofficially hacked version of 'mock'
# from above. This could probably replace the previous
# package, but I don't have time to test that right now.
name = "mock-0.6.0";
src = fetchurl {
url = "http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/${name}.tar.bz2";
sha256 = "1vwxzr2sjyl3x5jqgz9swpmp6cyhmwmab65akysfglf6acmn3czf";
};
doCheck = false; # Package doesn't have any tests.
meta = {
description = "Mock objects for Python, provided by tahoe-lafs.org";
homepage = "http://python-mock.sourceforge.net/";
license = "mBSD";
};
}));
mox = buildPythonPackage rec { mox = buildPythonPackage rec {
name = "mox-0.5.3"; name = "mox-0.5.3";