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

Merge remote-tracking branch 'origin/master' into systemd

Browse source
This commit is contained in:
Eelco Dolstra 2013-01-21 13:01:00 +01:00
parent bcc0c1dc59 c6b874be2f
commit 331e7ac221
25 changed files with 241 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/browsers/chromium/sources.nix
View file

@ -1,14 +1,14 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "25.0.1364.29";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.29.tar.bz2";
sha256 = "0da3in98b65rb9wkj9jxb3n07d5k7s1xpqwpvk1jz9jbp0hw7ijp";
version = "25.0.1364.36";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2";
sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s";
};
beta = {
version = "24.0.1312.52";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2";
sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk";
version = "25.0.1364.36";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2";
sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s";
};
stable = {
version = "24.0.1312.52";

8
pkgs/applications/networking/dropbox/default.nix
View file

@ -42,7 +42,7 @@ let
exec = "dropbox";
comment = "Online directories";
desktopName = "Dropbox";
genericName = "Online storage";
genericName = "Online storage";
categories = "Application;Internet;";
};
@ -65,7 +65,7 @@ in stdenv.mkDerivation {
installPhase = ''
ensureDir "$out/${appdir}"
cp -r .dropbox-dist/* "$out/${appdir}/"
cp -r ".dropbox-dist/"* "$out/${appdir}/"
ensureDir "$out/bin"
ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
@ -78,13 +78,13 @@ in stdenv.mkDerivation {
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
ensureDir "$out/share/applications"
cp ${desktopItem}/share/applications/* $out/share/applications
cp "${desktopItem}/share/applications/"* $out/share/applications
'';
buildInputs = [ patchelf ];
meta = {
homepage = "http://www.dropbox.com";
description = "Online stored folders (daemon version)";
homepage = http://www.dropbox.com;
};
}

4
pkgs/applications/science/astronomy/stellarium/default.nix
View file

@ -1,14 +1,14 @@
{stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
let
name = "stellarium-0.11.4";
name = "stellarium-0.11.4a";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/stellarium/${name}.tar.gz";
sha256 = "8ad5e9878eb36c2c27f4754dcfc69279123e0eae02cc388074e3cf9b23746535";
sha256 = "0gs3lf2061chgcyx22xbnn6b284nsnj8xal7jyjzj57s8yk4n619";
};
buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];

4
pkgs/applications/science/math/maxima/default.nix
View file

@ -2,7 +2,7 @@
let
name = "maxima";
version = "5.28.0";
version = "5.29.1";
searchPath =
stdenv.lib.makeSearchPath "bin"
@ -13,7 +13,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
sha256 = "d73e925f0116ba361bf4390c80e24d4fa763f647cc1fc4cc06bbf40ceb3facda";
sha256 = "1p94l28adcn0826nah460r9pz71h7wd5klsg885sl2gzds75bn74";
};
buildInputs = [sbcl texinfo perl makeWrapper];

22
pkgs/development/compilers/mit-scheme/default.nix
View file

@ -1,8 +1,12 @@
{ fetchurl, stdenv, gnum4, texinfo, texLive, automake }:
{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }:
let
version = "9.1.1";
bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
arch = if stdenv.isi686 then "-i386"
else if stdenv.isx86_64 then "-x86-64"
else "";
in
stdenv.mkDerivation {
name = "mit-scheme-${version}";
@ -25,6 +29,11 @@ stdenv.mkDerivation {
sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j";
};
configurePhase =
'' (cd src && ./configure)
(cd doc && ./configure)
'';
buildPhase =
'' cd src
${if bootstrapFromC
@ -42,11 +51,16 @@ stdenv.mkDerivation {
'';
installPhase =
'' make install -C src
make install -C doc
'' make prefix=$out install -C src
make prefix=$out install -C doc
'';
buildNativeInputs = [ gnum4 texinfo texLive automake ];
fixupPhase =
'' wrapProgram $out/bin/mit-scheme${arch} --set MITSCHEME_LIBRARY_PATH \
$out/lib/mit-scheme${arch}
'';
buildNativeInputs = [ makeWrapper gnum4 texinfo texLive automake ];
# XXX: The `check' target doesn't exist.
doCheck = false;

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

@ -40,7 +40,7 @@ stdenv.mkDerivation (rec {
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = (!stdenv.isFreeBSD);
doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
meta = {
description = "The GNU Transport Layer Security Library";

10
pkgs/development/libraries/haskell/JuicyPixels/default.nix
View file

@ -1,17 +1,17 @@
{ cabal, cereal, deepseq, mtl, primitive, transformers, vector
{ cabal, binary, deepseq, mtl, primitive, transformers, vector
, zlib
}:
cabal.mkDerivation (self: {
pname = "JuicyPixels";
version = "2.0.2";
sha256 = "14nqifdsdhzlfq29waqlwspyy37gp174vw368ph772zp9b0ngyff";
version = "3.0";
sha256 = "1qhhhnfs12r67nf07bx58n8a2v6wikan8cqs1wnjnaad8yk2spsg";
buildDepends = [
cereal deepseq mtl primitive transformers vector zlib
binary deepseq mtl primitive transformers vector zlib
];
meta = {
homepage = "https://github.com/Twinside/Juicy.Pixels";
description = "Picture loading/serialization (in png, jpeg, bitmap and gif)";
description = "Picture loading/serialization (in png, jpeg, bitmap, radiance and gif)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

4
pkgs/development/libraries/haskell/certificate/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "certificate";
version = "1.3.3";
sha256 = "043xj3xd6cfnbg9hw2f8agckww3fasvraa72jw84zqc7l2gq0rq2";
version = "1.3.5";
sha256 = "17g2alyib89y2k8jjg4b6jskz0ndpr92yi8hzra7vw7ygfi5mi4j";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/hakyll/default.nix
View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "4.0.0.0";
sha256 = "165r9x158nnnwzd1cxymskkxvfhxsnpam8bi3gjy8bql8arsibzr";
version = "4.1.2.0";
sha256 = "1kbilad4ry8lyfcygajaphkgragmq5js349mjmh1bjn04rhjm54c";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/highlighting-kate/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
version = "0.5.3.4";
sha256 = "1xm9dr71qna1w65vzaf63hbchpvshfjvvs5038sy04x2ddwdix77";
version = "0.5.3.5";
sha256 = "0m76h33igw77ndllgzkqgmygi7krc5vfjvizidsgris0zd1g2yv3";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];

4
pkgs/development/libraries/haskell/mongoDB/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "mongoDB";
version = "1.3.1";
sha256 = "1qvsb993n5gmchym4zz2pv68mdyir439cfindqdqlvjwam0jf4l5";
version = "1.3.2";
sha256 = "0gv0i2z6f797ibjfp16ax2aiqa66sclxjy8sabrwydwcyr96xb4y";
buildDepends = [
binary bson cryptohash liftedBase monadControl mtl network parsec
random randomShuffle text transformersBase

4
pkgs/development/libraries/haskell/pandoc-types/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "pandoc-types";
version = "1.9.1";
sha256 = "1174nkaig0g71n3kqrhgqn7xmr9rni3l3dh1xpypc0ksjm0ym21i";
version = "1.10";
sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6";
buildDepends = [ syb ];
meta = {
homepage = "http://johnmacfarlane.net/pandoc";

14
pkgs/development/libraries/haskell/pandoc/default.nix
View file

@ -1,20 +1,20 @@
{ cabal, base64Bytestring, blazeHtml, blazeMarkup, citeprocHs
, extensibleExceptions, filepath, highlightingKate, HTTP, json, mtl
, network, pandocTypes, parsec, random, syb, tagsoup, temporary
, texmath, time, utf8String, xml, zipArchive, zlib
, dataDefault, extensibleExceptions, filepath, highlightingKate
, HTTP, json, mtl, network, pandocTypes, parsec, random, syb
, tagsoup, temporary, texmath, text, time, xml, zipArchive, zlib
}:
cabal.mkDerivation (self: {
pname = "pandoc";
version = "1.9.4.5";
sha256 = "05k8i537756m07xlb6kgshpfxa4sp2jxidb1c8m72ilpai13r6fb";
version = "1.10.0.4";
sha256 = "1zwjwzxgip3zhbs7v7i981f5ch1rrd8i04cmn1gkfxnapbxx6z26";
isLibrary = true;
isExecutable = true;
buildDepends = [
base64Bytestring blazeHtml blazeMarkup citeprocHs
base64Bytestring blazeHtml blazeMarkup citeprocHs dataDefault
extensibleExceptions filepath highlightingKate HTTP json mtl
network pandocTypes parsec random syb tagsoup temporary texmath
time utf8String xml zipArchive zlib
text time xml zipArchive zlib
];
configureFlags = "-fblaze_html_0_5";
meta = {

4
pkgs/development/libraries/haskell/tls-extra/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "tls-extra";
version = "0.6.0";
sha256 = "11cf91cgbyp4xzbr3n9h20rvbb6756r9dk74r5w158f3xmlgk5nx";
version = "0.6.1";
sha256 = "0gc3dz3s188jk6q2lai56y4ckxh62s9gm04d7jznr6jzpx2i4fan";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/yst/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "yst";
version = "0.3.0.1";
sha256 = "17jp9vdbpp82wzsj8rhp5nh6fbmgm2xrclfnb7jl4gjwls7xggrv";
version = "0.3.1";
sha256 = "1ax3j21b4ac9x4vvvfgnhz0sczd7l7ia6mcxnqhbc3166sn91vig";
isLibrary = false;
isExecutable = true;
buildDepends = [

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

@ -11,7 +11,7 @@ stdenv.mkDerivation (rec {
buildInputs = [ gnum4 ];
propagatedBuildInputs = [ gmp ];
doCheck = (stdenv.system != "i686-cygwin");
doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin);
enableParallelBuilding = true;

10
pkgs/development/python-modules/generic/default.nix
View file

@ -40,6 +40,8 @@
, preInstall ? ""
, postInstall ? ""
, meta ? {}
, ... } @ attrs:
# Keep extra attributes from ATTR, e.g., `patchPhase', etc.
@ -48,6 +50,14 @@ python.stdenv.mkDerivation (attrs // {
name = namePrefix + name;
# default to python's platforms and add maintainer(s) to every
# package
meta = {
platforms = python.meta.platforms;
} // meta // {
maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow ];
};
# checkPhase after installPhase to run tests on installed packages
phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase";

2
pkgs/development/python-modules/offline-distutils/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation {
unpackPhase = "true";
installPhase = ''
dst="$out/lib/${python.libPrefix}"
dst="$out/lib/${python.libPrefix}/site-packages"
ensureDir $dst/distutils
ln -s ${python}/lib/${python.libPrefix}/distutils/* $dst/distutils/
cat <<EOF > $dst/distutils/distutils.cfg

4
pkgs/development/tools/haskell/hlint/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
version = "1.8.40";
sha256 = "18w4dhxv7c1y4x1agdjq99ss5i77jnm8p9vg3jp9gvhk2arhcl0x";
version = "1.8.41";
sha256 = "0b585i5v81jh1j2r70x74ykabc5hcd5sbww4kspl3s5i3jwkp16q";
isLibrary = true;
isExecutable = true;
buildDepends = [

6
pkgs/os-specific/linux/mcelog/default.nix
View file

@ -25,9 +25,13 @@ in stdenv.mkDerivation {
makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc";
preInstall = ''
ensureDir $out/share/doc
'';
meta = {
description = "Tool to display logged machine check exceptions";
homepage = http://mcelog.org/;
license = stdenv.lib.licenses.gpl2;
};
}
}

20
pkgs/os-specific/linux/v4l-utils/default.nix
View file

@ -4,30 +4,22 @@
assert withQt4 -> qt4 != null;
stdenv.mkDerivation rec {
name = "v4l-utils-0.8.8";
name = "v4l-utils-0.9.3";
src = fetchurl {
url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
sha256 = "0zx8f1npsl6g5vjah1gwydg1j5azl74kr83ifbjhshgmnvscd92z";
sha256 = "0gaag38x47wlvmp4j60wgf9ma1rxzfyg7i12zxxxi4m3cpcb0bah";
};
buildInputs = [ libjpeg which ] ++ stdenv.lib.optional withQt4 qt4;
buildInputs = [ which ];
propagatedBuildInputs = [ libjpeg ] ++ stdenv.lib.optional withQt4 qt4;
# The keytable wants to touch /etc files and udev scripts in /lib.
# I skip it.
patchPhase = ''
sed -i s/keytable// utils/Makefile
'';
installPhase = ''
make PREFIX=$out install
'';
preConfigure = ''configureFlags="--with-udevdir=$out/lib/udev"'';
meta = {
homepage = http://linuxtv.org/projects.php;
description = "V4L utils and libv4l, that provides common image formats regardless of the v4l device";
# (The libs are of LGPLv2.1+, some other pieces are GPL)
license = "free";
license = "free"; # The libs are of LGPLv2.1+, some other pieces are GPL.
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};

30
pkgs/tools/networking/tinc/default.nix Normal file
View file

@ -0,0 +1,30 @@
{stdenv, fetchurl, lzo, openssl, zlib}:
stdenv.mkDerivation rec {
version = "1.0.19";
name = "tinc-${version}";
src = fetchurl {
url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
sha256 = "183nxj23d05vc3pxwbb692lr048wr81wnv0avzlkdm4r6c3bp7jh";
};
buildInputs = [ lzo openssl zlib ];
configureFlags = ''
--localstatedir=/var
--sysconfdir=/etc
'';
meta = {
description = "VPN daemon with full mesh routing";
longDescription = ''
tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and
encryption to create a secure private network between hosts on the
Internet. It features full mesh routing, as well as encryption,
authentication, compression and ethernet bridging.
'';
homepage="http://www.tinc-vpn.org/";
license = stdenv.lib.licenses.gpl2Plus;
};
}

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

@ -1587,6 +1587,8 @@ let
guile = guile_1_8;
};
tinc = callPackage ../tools/networking/tinc { };
tmux = callPackage ../tools/misc/tmux { };
tor = callPackage ../tools/security/tor { };

11
pkgs/top-level/perl-packages.nix
View file

@ -1737,10 +1737,10 @@ rec {
};
EncodeLocale = buildPerlPackage rec {
name = "Encode-Locale-1.02";
name = "Encode-Locale-1.03";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Encode/${name}.tar.gz";
sha256 = "0h2kim6mg236s749wlg35lhv1zdkrkr0bm65spkg005cn0mbmi90";
sha256 = "0m9d1vdphlyzybgmdanipwd9ndfvyjgk3hzw250r299jjgh3fqzp";
};
};
@ -1878,10 +1878,10 @@ rec {
};
FileListing = buildPerlPackage rec {
name = "File-Listing-6.03";
name = "File-Listing-6.04";
src = fetchurl {
url = "mirror://cpan/modules/by-module/File/${name}.tar.gz";
sha256 = "154hp49pcngsqrwi1pbw3fx82v7vql4dc9wh7qfj37vmy8sn1s93";
sha256 = "1xcwjlnxaiwwpn41a5yi6nz95ywh3szq5chdxiwj36kqsvy5000y";
};
propagatedBuildInputs = [ HTTPDate ];
};
@ -2404,6 +2404,7 @@ rec {
description = "IO Interface to compressed data files/buffers";
license = "perl5";
};
doCheck = !stdenv.isDarwin;
};
IODigest = buildPerlPackage {
@ -3591,7 +3592,7 @@ rec {
url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz";
sha256 = "4ab927b6756366fa4cef2b54088645849f32fc7e0cd8de0a50001bbf62946fd8";
};
propagatedBuildInputs = [ NetOpenIDCommon JSON ];
propagatedBuildInputs = [ NetOpenIDCommon JSON LWP ];
};
PackageDeprecationManager = buildPerlPackage {

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

@ -1,6 +1,12 @@
{ pkgs, python }:
let pythonPackages = python.modules // rec {
let
isPy26 = python.majorVersion == "2.6";
isPy27 = python.majorVersion == "2.7";
optional = pkgs.lib.optional;
optionals = pkgs.lib.optionals;
pythonPackages = python.modules // rec {
inherit python;
inherit (pkgs) fetchurl fetchsvn fetchgit stdenv;
@ -108,7 +114,6 @@ let pythonPackages = python.modules // rec {
homepage = https://github.com/teythoon/afew;
description = "afew is an initial tagging script for notmuch mail.";
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
};
@ -137,7 +142,6 @@ let pythonPackages = python.modules // rec {
homepage = https://github.com/pazz/alot;
description = "Terminal MUA using notmuch mail";
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
};
@ -461,7 +465,6 @@ let pythonPackages = python.modules // rec {
description = "Simple, lightweight, and easily extensible STOMP message broker";
homepage = http://code.google.com/p/coilmq/;
license = pkgs.lib.licenses.asl20;
platforms = python.meta.platforms;
};
});
@ -481,16 +484,15 @@ let pythonPackages = python.modules // rec {
homepage = http://pypi.python.org/pypi/configobj;
license = pkgs.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
});
coverage = buildPythonPackage rec {
name = "coverage-3.5.3";
name = "coverage-3.6";
src = fetchurl {
url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz";
md5 = "5f1f523940c473faa8a9f6ca29f78efc";
md5 = "67d4e393f4c6a5ffc18605409d2aa1ac";
};
meta = {
@ -498,10 +500,21 @@ let pythonPackages = python.modules // rec {
homepage = http://nedbatchelder.com/code/coverage/;
license = pkgs.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = python.meta.platforms;
};
};
covCore = buildPythonPackage rec {
name = "cov-core-1.7";
src = fetchurl {
url = "http://pypi.python.org/packages/source/c/cov-core/cov-core-1.7.tar.gz";
md5 = "59c1e22e636633e10120beacbf45b28c";
};
meta = {
description = "plugin core for use by pytest-cov, nose-cov and nose2-cov";
};
propagatedBuildInputs = [ coverage ];
};
cssselect = buildPythonPackage rec {
name = "cssselect-0.7.1";
src = fetchurl {
@ -615,11 +628,33 @@ let pythonPackages = python.modules // rec {
description = "Easily download, build, install, upgrade, and uninstall Python packages";
homepage = http://packages.python.org/distribute;
license = "PSF or ZPL";
platforms = python.meta.platforms;
};
});
distutils2 = buildPythonPackage rec {
name = "distutils2-${version}";
version = "1.0a4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/D/Distutils2/Distutils2-${version}.tar.gz";
md5 = "52bc9dffb394970c27e02853ae3a3241";
};
patchPhase = ''
sed -e "s#html.entities#htmlentitydefs#g" -i distutils2/pypi/simple.py
'';
doCheck = false;
meta = {
description = "A Python Packaging Library";
homepage = http://pypi.python.org/pypi/Distutils2;
license = "PSF";
};
};
distutils_extra = buildPythonPackage rec {
name = "distutils-extra-2.26";
@ -840,7 +875,6 @@ let pythonPackages = python.modules // rec {
homepage = http://pypi.python.org/pypi/flake8;
license = pkgs.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
});
@ -904,7 +938,6 @@ let pythonPackages = python.modules // rec {
license = "MIT";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.meta.platforms;
};
});
@ -961,14 +994,12 @@ let pythonPackages = python.modules // rec {
sha256 = "0bhiyx41kilvy04cgjbvjy2r4b6l7zz31fbrg3l6lvnqm26nihb0";
};
buildInputs = [ pkgs.setuptools ] ++
(if python.majorVersion == "2.6" then [ argparse ] else []);
buildInputs = [ pkgs.setuptools ] ++ (optional isPy26 argparse);
meta = {
description = "automatically generated zsh completion function for Python's option parser modules";
license = "BSD";
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = python.meta.platforms;
};
};
@ -1062,10 +1093,17 @@ let pythonPackages = python.modules // rec {
description = "A comprehensive HTTP client library";
license = pkgs.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
};
importlib = if isPy26 then (buildPythonPackage {
name = "importlib-1.0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz";
md5 = "4aa23397da8bd7c7426864e88e4db7e1";
};
doCheck = false;
}) else null;
iptools = buildPythonPackage rec {
version = "0.4.0";
@ -1101,6 +1139,15 @@ let pythonPackages = python.modules // rec {
};
};
ipdb = buildPythonPackage {
name = "ipdb-0.7";
src = fetchurl {
url = "http://pypi.python.org/packages/source/i/ipdb/ipdb-0.7.tar.gz";
md5 = "d879f9b2b0f26e0e999809585dcaec61";
};
propagatedBuildInputs = [ ipython ];
};
jedi = buildPythonPackage (rec {
name = "jedi-0.5b5";
@ -1114,7 +1161,6 @@ let pythonPackages = python.modules // rec {
description = "An autocompletion tool for Python that can be used for text editors.";
license = pkgs.lib.licenses.lgpl3Plus;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
});
@ -1410,7 +1456,7 @@ let pythonPackages = python.modules // rec {
md5 = "361c8ac7a31953ab94a95cf34d9a0b2b";
};
buildInputs = [ pkgs.unzip ];
buildInputs = [ pkgs.unzip six ] ++ (optionals isPy26 [ importlib ordereddict ]);
propagatedBuildInputs = [ argparse jinja2 ];
@ -1569,6 +1615,32 @@ let pythonPackages = python.modules // rec {
buildInputs = [ coverage ];
};
nose2 = if isPy26 then null else (buildPythonPackage rec {
name = "nose2-0.4.5";
src = fetchurl {
url = "http://pypi.python.org/packages/source/n/nose2/${name}.tar.gz";
md5 = "d7e51c848227488e3cc0424faf5511cd";
};
meta = {
description = "nose2 is the next generation of nicer testing for Python";
};
propagatedBuildInputs = [ six ];
# AttributeError: 'module' object has no attribute 'collector'
doCheck = false;
});
nose2Cov = if isPy26 then null else (buildPythonPackage rec {
name = "nose2-cov-1.0a4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/n/nose2-cov/nose2-cov-1.0a4.tar.gz";
md5 = "6442f03e2ea732b0e38eb5b00fbe0b31";
};
meta = {
description = "nose2 plugin for coverage reporting, including subprocesses and multiprocessing";
};
propagatedBuildInputs = [ covCore nose2 ];
});
notify = pkgs.stdenv.mkDerivation (rec {
name = "python-notify-0.1.1";
@ -1577,7 +1649,7 @@ let pythonPackages = python.modules // rec {
sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx";
};
buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ];
buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pygobject pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ];
postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";
@ -1605,7 +1677,6 @@ let pythonPackages = python.modules // rec {
description = "A Python wrapper around notmuch";
homepage = http://notmuchmail.org/;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
};
@ -1682,6 +1753,15 @@ let pythonPackages = python.modules // rec {
# };
# });
ordereddict = if isPy26 then (buildPythonPackage {
name = "ordereddict-1.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz";
md5 = "a0ed854ee442051b249bfad0f638bbec";
};
doCheck = false;
}) else null;
ply = buildPythonPackage (rec {
name = "ply-3.2";
@ -1712,7 +1792,6 @@ let pythonPackages = python.modules // rec {
license = "revised-BSD";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.meta.platforms;
};
});
@ -1743,8 +1822,6 @@ let pythonPackages = python.modules // rec {
tunnel -- this is how sftp works, for example. it is written
entirely in python (no C or platform-dependent code) and is released
under the GNU LGPL (lesser GPL). '';
platforms = python.meta.platforms;
};
};
@ -1838,7 +1915,6 @@ let pythonPackages = python.modules // rec {
'';
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = python.meta.platforms;
};
};
@ -2123,7 +2199,6 @@ let pythonPackages = python.modules // rec {
description = "A Python wrapper for the GPGME library.";
license = pkgs.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
};
@ -2356,7 +2431,6 @@ let pythonPackages = python.modules // rec {
license = "revised BSD";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.meta.platforms;
};
});
@ -2827,7 +2901,7 @@ let pythonPackages = python.modules // rec {
# error: invalid command 'test'
doCheck = false;
propagatedBuildInputs = [ pkgs.xlibs.libX11 pkgs.pythonDBus pkgs.pygobject ];
propagatedBuildInputs = [ pkgs.xlibs.libX11 pkgs.pythonDBus pygobject ];
meta = {
description = "High-level, platform independent Skype API wrapper for Python";
@ -2922,7 +2996,6 @@ let pythonPackages = python.modules // rec {
description = "Lightweight and extensible STOMP messaging client";
homepage = http://bitbucket.org/hozn/stompclient;
license = pkgs.lib.licenses.asl20;
platforms = python.meta.platforms;
};
});
@ -3065,6 +3138,24 @@ let pythonPackages = python.modules // rec {
};
eggdeps = buildPythonPackage rec {
name = "eggdeps-${version}";
version = "0.4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/t/tl.eggdeps/tl.${name}.tar.gz";
md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7";
};
propagatedBuildInputs = [ zopeInterface zope_testing ];
meta = {
description = "A tool which computes a dependency graph between active Python eggs";
homepage = http://thomas-lotze.de/en/software/eggdeps/;
license = "ZPL";
};
};
turses = buildPythonPackage (rec {
name = "turses-0.2.9";
@ -3073,9 +3164,7 @@ let pythonPackages = python.modules // rec {
sha256 = "c0f32fa31e2c5fa42f5cc19f3dba4e73f0438bf36bf756ba137f2423c0ac4637";
};
propagatedBuildInputs = [ oauth2 urwid tweepy ] ++
(if python.majorVersion == "2.6" then [ argparse ]
else []);
propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse;
#buildInputs = [ tox ];
# needs tox
@ -3136,7 +3225,6 @@ let pythonPackages = python.modules // rec {
license = "MIT";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.meta.platforms;
};
};
@ -3194,7 +3282,6 @@ let pythonPackages = python.modules // rec {
homepage = http://excess.org/urwid;
license = pkgs.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
});
@ -3614,7 +3701,6 @@ let pythonPackages = python.modules // rec {
homepage = http://liw.fi/cliapp/;
description = "Python framework for Unix command line programs.";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3635,7 +3721,6 @@ let pythonPackages = python.modules // rec {
homepage = http://liw.fi/tracing/;
description = "Python debug logging helper.";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3656,7 +3741,6 @@ let pythonPackages = python.modules // rec {
homepage = http://liw.fi/ttystatus/;
description = "Progress and status updates on terminals for Python.";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3679,7 +3763,6 @@ let pythonPackages = python.modules // rec {
homepage = http://liw.fi/larch/;
description = "Python B-tree library.";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3699,7 +3782,6 @@ let pythonPackages = python.modules // rec {
homepage = http://graphite.wikidot.com/;
description = "Fixed size round-robin style database";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3722,7 +3804,6 @@ let pythonPackages = python.modules // rec {
homepage = http://graphite.wikidot.com/;
description = "Backend data caching and persistence daemon for Graphite";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3741,7 +3822,6 @@ let pythonPackages = python.modules // rec {
homepage = https://launchpad.net/txamqp;
description = "Library for communicating with AMQP peers and brokers using Twisted";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3763,7 +3843,6 @@ let pythonPackages = python.modules // rec {
homepage = http://graphite.wikidot.com/;
description = "Enterprise scalable realtime graphing";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};