alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'master' of https://github.com/Krofek/nixpkgs

Browse source
This commit is contained in:
Krofek 2013-09-14 00:28:27 +02:00
parent da21a852c3 afdc44df8d
commit 51f63b1d03
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/freetds/default.nix
View file

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "freetds-0.91";
src = fetchurl {
url = ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-stable.tgz;
url = ftp://ftp.astron.com/pub/freetds/stable/freetds-stable.tgz;
sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba";
};

4
pkgs/development/tools/misc/avrdude/default.nix
View file

@ -3,11 +3,11 @@
let edf = composableDerivation.edf; in
composableDerivation.composableDerivation {} rec {
name="avrdude-5.10";
name="avrdude-5.11";
src = fetchurl {
url = "mirror://savannah/avrdude/${name}.tar.gz";
sha256 = "0pmy73777x8p7f2aj2w2q1dnk1bvhd1cm7hcs1s9hsdqsmiinl41";
sha256 = "1mwmslqysak25a3x61pj97wygqgk79s5qpp50xzay6yb1zrz85v3";
};
configureFlags = [ "--disable-dependency-tracking" ];

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

@ -3793,14 +3793,16 @@ pythonPackages = modules // import ./python-packages-generated.nix {
};
};
pip = buildPythonPackage {
name = "pip-1.2.1";
pip = buildPythonPackage rec {
version = "1.4.1";
name = "pip-${version}";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz";
md5 = "db8a6d8a4564d3dc7f337ebed67b1a85";
url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz";
sha256 = "0knhj3c1nqqzxgqin8l0gzy6nzsbcxinyr0cbp1j99hi8xahcyjf";
};
buildInputs = [ mock scripttest virtualenv nose ];
# ValueError: Working directory tests not found, or not a directory
# see https://github.com/pypa/pip/issues/92
doCheck = false;
};