Merge branch 'upstream-master' into stdenv-updates

This commit is contained in:
Shea Levy 2013-02-19 10:09:39 -05:00
commit aacca1902c
15 changed files with 345 additions and 35 deletions

View File

@ -0,0 +1,26 @@
{ clangStdenv, fetchgit, llvm, clangUnwrapped }:
clangStdenv.mkDerivation {
name = "emacs-clang-complete-async-20130218";
src = fetchgit {
url = "git://github.com/Golevka/emacs-clang-complete-async.git";
rev = "f01488971ec8b5752780d130fb84de0c16a46f31";
sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf";
};
buildInputs = [ llvm clangUnwrapped ];
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/emacs/site-lisp
install -m 755 clang-complete $out/bin
install -m 644 auto-complete-clang-async.el $out/share/emacs/site-lisp
'';
meta = {
homepage = "https://github.com/Golevka/emacs-clang-complete-async";
description = "An emacs plugin to complete C and C++ code using libclang";
license = "GPLv3+";
};
}

View File

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "notmuch-0.14";
name = "notmuch-0.15";
src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
sha256 = "095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753";
sha256 = "07bi87jxfh761b4fvcwf4svlksd7jlznnzhnsp983gdldkabg60q";
};
buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
description = "Notmuch -- The mail indexer";
longDescription = "";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ];
platforms = stdenv.lib.platforms.gnu;
};
}

View File

@ -77,7 +77,8 @@ stdenv.mkDerivation (
if [ -z "${toString doCoverageAnalysis}" ]; then
for i in $outputs; do
if [ "$i" = out ]; then j=none; else j="$i"; fi
echo "nix-build $j ''${!i}" >> $out/nix-support/hydra-build-products
mkdir -p ''${!i}/nix-support
echo "nix-build $j ''${!i}" >> ''${!i}/nix-support/hydra-build-products
done
fi
'';

View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "snappy-1.1.0";
src = fetchurl {
url = "http://snappy.googlecode.com/files/${name}.tar.gz";
sha256 = "0q31cx3zkw0apx1fy8z3xlh2lvivssvykqn0vxsgm4xvi32jpa0z";
};
# -DNDEBUG for speed
preConfigure = ''
configureFlagsArray=("CXXFLAGS=-DNDEBUG -O2")
'';
doCheck = true;
meta = {
homepage = http://code.google.com/p/snappy/;
license = "BSD";
description = "Compression/decompression library for very high speeds";
};
}

View File

@ -1,4 +1,4 @@
{ cabal, mtl }:
{ cabal, mtl, fetchurl }:
cabal.mkDerivation (self: {
pname = "BNFC";
@ -7,6 +7,8 @@ cabal.mkDerivation (self: {
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl ];
patches = [ (fetchurl { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "103l04ylzswgxrmpv5zy6dd0jyr96z21mdkpgk1z4prvn8wjl624"; }) ];
patchFlags = "-p2";
meta = {
homepage = "http://bnfc.digitalgrammars.com/";
description = "A compiler front-end generator";

View File

@ -0,0 +1,36 @@
{ stdenv, fetchurl, ncurses, perl }:
stdenv.mkDerivation rec {
name = "texinfo-5.0";
src = fetchurl {
url = "mirror://gnu/texinfo/${name}.tar.xz";
sha256 = "1p34f68h9ggfj6ckgj0p62qlj7pmz3ha3vc91kh4hr44pnwm1pla";
};
buildInputs = [ ncurses perl ];
doCheck = true;
meta = {
homepage = "http://www.gnu.org/software/texinfo/";
description = "GNU Texinfo, the GNU documentation system";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
Texinfo is the official documentation format of the GNU project.
It was invented by Richard Stallman and Bob Chassell many years
ago, loosely based on Brian Reid's Scribe and other formatting
languages of the time. It is used by many non-GNU projects as
well.
Texinfo uses a single source file to produce output in a number
of formats, both online and printed (dvi, html, info, pdf, xml,
etc.). This means that instead of writing different documents
for online information and another for a printed manual, you
need write only one document. And when the work is revised, you
need revise only that one document. The Texinfo system is
well-integrated with GNU Emacs.
'';
};
}

View File

@ -230,7 +230,7 @@ in
import ./generic.nix (
rec {
version = "3.0.64";
version = "3.0.65";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@ -238,7 +238,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0vya753ayxzjk7ymnw5i2rwcpxp8lss7xf1gl7fzakn6kz780nky";
sha256 = "1vmk0bmg0djwbh9scrhpyljan01ygkwn4q0j1ydn8snag7sn4x8y";
};
config = configWithPlatform stdenv.platform;

View File

@ -244,7 +244,7 @@ in
import ./generic.nix (
rec {
version = "3.4.31";
version = "3.4.32";
testing = false;
preConfigure = ''
@ -253,7 +253,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "1148f77iab0p5j61v42a4jka4ndwnjpd6lkqhwiqs61lmv3m7j2r";
sha256 = "0z218ibz36lpdyjjch94jx12fcghj376x3fkmgxmwdjaz7zngn4i";
};
config = configWithPlatform stdenv.platform;

View File

@ -250,7 +250,7 @@ in
import ./generic.nix (
rec {
version = "3.7.8";
version = "3.7.9";
testing = false;
preConfigure = ''
@ -259,7 +259,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0phn7a6sfc89n3p6irk349jcxfaa5fi04in9h4wsm25klgw16vxa";
sha256 = "1d9834flw0jyfn0lq1l0ahp8v12p227qn6z39v1pk53dap1zl0v1";
};
config = configWithPlatform stdenv.platform;

View File

@ -6,8 +6,8 @@
let
hpnSrc = fetchurl {
url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v12.diff.gz;
sha256 = "0h1h45vic4zks5bc5mvkc50rlgy2c219vn3rmpmalgm5hws9qjbl";
url = http://nixos.org/tarballs/openssh-6.1p1-hpn13v14.diff.gz;
sha256 = "14das6lim6fxxnx887ssw76ywsbvx3s4q3n43afgh5rgvs4xmnnq";
};
in
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
gunzip -c ${hpnSrc} | patch -p1
export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
'';
patches = [ ./locale_archive.patch ];
buildInputs = [ zlib openssl libedit pkgconfig pam ];

View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus,
wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, iproute,
wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute,
locale ? "C" }:
# Wicd has a ncurses interface that we do not build because it depends
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in

View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "aespipe-${version}";
version = "v2.4c";
src = fetchurl {
url = "mirror://sourceforge/loop-aes/aespipe/${name}.tar.bz2";
sha256 = "0pl49jnjczjvfxwm9lw576qsjm1lxh8gc4g776l904cixaz90096";
};
meta = {
description = "AES encrypting or decrypting pipe";
homepage = http://loop-aes.sourceforge.net/aespipe.README;
license = "GPL";
maintainers = stdenv.lib.maintainers.goibniu;
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -378,6 +378,8 @@ let
aefs = callPackage ../tools/filesystems/aefs { };
aespipe = callPackage ../tools/security/aespipe { };
aircrackng = callPackage ../tools/networking/aircrack-ng { };
analog = callPackage ../tools/admin/analog {};
@ -3286,9 +3288,10 @@ let
swftools = callPackage ../tools/video/swftools { };
texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { };
texinfo = callPackage ../development/tools/misc/texinfo { };
texinfo5 = callPackage ../development/tools/misc/texinfo/5.0.nix { };
texinfo = texinfo413;
texi2html = callPackage ../development/tools/misc/texi2html { };
@ -4869,6 +4872,8 @@ let
# optional
};
snappy = callPackage ../development/libraries/snappy { };
sofia_sip = callPackage ../development/libraries/sofia-sip { };
soprano = callPackage ../development/libraries/soprano { };
@ -6779,6 +6784,8 @@ let
jabber = callPackage ../applications/editors/emacs-modes/jabber { };
emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { };
emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { };
emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { };

View File

@ -119,13 +119,13 @@ pythonPackages = python.modules // rec {
alot = buildPythonPackage rec {
rev = "6b5f1a8bf68eecf4364f97c71ec177cf715c081e";
rev = "c765ebd6041a845a800cc9fd30705102ae2d040f";
name = "alot-0.3.3_${rev}";
src = fetchurl {
url = "https://github.com/pazz/alot/tarball/${rev}";
name = "${name}.tar.bz";
sha256 = "1l6b5gy0z549p54p2va1q7pxyiwb6ghqfy6gdm3kg1np9hw59rl4";
sha256 = "0yyp3nz5n1zfwf0l4rkkphq5l6prd988b57ighnmi2samzqa9yv4";
};
# error: invalid command 'test'
@ -275,12 +275,35 @@ pythonPackages = python.modules // rec {
propagatedBuildInputs = [ logilab_common ];
};
beautifulsoup = buildPythonPackage (rec {
name = "beautifulsoup-3.0.8";
beets = buildPythonPackage rec {
name = "beets-1.0.0";
src = fetchurl {
url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz";
sha256 = "1gasiy5lwbhsxw27g36d88n36xbj52434klisvqhljgckd4xqcy7";
url = "http://pypi.python.org/packages/source/b/beets/${name}.tar.gz";
md5 = "88ad09a93aa0d69ce813205cf23b2a6c";
};
# tests depend on $HOME setting
configurePhase = "export HOME=$TMPDIR";
propagatedBuildInputs = [ pyyaml unidecode mutagen munkres musicbrainzngs python.modules.sqlite3 python.modules.readline ];
meta = {
homepage = http://beets.radbox.org;
description = "Music tagger and library organizer";
license = pkgs.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
};
beautifulsoup = buildPythonPackage (rec {
name = "beautifulsoup-3.2.1";
src = fetchurl {
url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
};
# error: invalid command 'test'
@ -288,13 +311,30 @@ pythonPackages = python.modules // rec {
meta = {
homepage = http://www.crummy.com/software/BeautifulSoup/;
license = "bsd";
description = "Undemanding HTML/XML parser";
};
});
beautifulsoup4 = buildPythonPackage (rec {
name = "beautifulsoup4-4.1.3";
src = fetchurl {
url = "http://pypi.python.org/packages/source/b/beautifulsoup4/${name}.tar.gz";
md5 = "c012adc06217b8532c446d181cc56586";
};
# invalid command 'test'
doCheck = false;
meta = {
homepage = http://crummy.com/software/BeautifulSoup/bs4/;
description = "HTML and XML parser";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
# euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work.
boto_1_9 = buildPythonPackage (rec {
name = "boto-1.9b";
@ -402,7 +442,7 @@ pythonPackages = python.modules // rec {
# It makes buildout useful in a nix profile, but this alters the default functionality
patchPhase = ''
sed -i "s/return (stdlib, site_paths)/return (stdlib, sys.path)/g" src/zc/buildout/easy_install.py
'';
'';
meta = {
homepage = http://www.buildout.org/;
@ -963,6 +1003,23 @@ pythonPackages = python.modules // rec {
};
feedparser = buildPythonPackage (rec {
name = "feedparser-5.1.3";
src = fetchurl {
url = "http://pypi.python.org/packages/source/f/feedparser/${name}.tar.gz";
md5 = "f2253de78085a1d5738f626fcc1d8f71";
};
meta = {
homepage = http://code.google.com/p/feedparser/;
description = "Universal feed parser";
license = stdenv.lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
flake8 = buildPythonPackage (rec {
name = "flake8-1.7.0";
@ -1003,6 +1060,26 @@ pythonPackages = python.modules // rec {
};
flexget = buildPythonPackage (rec {
name = "FlexGet-1.0.3353";
src = fetchurl {
url = "http://download.flexget.com/archive/${name}.tar.gz";
md5 = "cffc4e51b5c5efddb339d265524e46b8";
};
buildInputs = [ nose ];
propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar ];
meta = {
homepage = http://flexget.com/;
description = "Multipurpose automation tool for content like torrents, ...";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
flup = buildPythonPackage (rec {
name = "flup-1.0.2";
@ -1199,6 +1276,21 @@ pythonPackages = python.modules // rec {
};
};
html5lib = buildPythonPackage (rec {
name = "html5lib-0.95";
src = fetchurl {
url = "http://pypi.python.org/packages/source/h/html5lib/${name}.tar.gz";
md5 = "fe607f9917d81763e842f818f23464ee";
};
meta = {
homepage = http://code.google.com/p/html5lib/;
description = "HTML parser based on WHAT-WG HTML5 specification";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
httplib2 = buildPythonPackage rec {
name = "httplib2-0.7.7";
@ -1624,6 +1716,43 @@ pythonPackages = python.modules // rec {
};
munkres = buildPythonPackage rec {
name = "munkres-1.0.5.4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/m/munkres/${name}.tar.gz";
md5 = "cb9d114fb523428bab4742e88bc83696";
};
# error: invalid command 'test'
doCheck = false;
meta = {
homepage = http://bmc.github.com/munkres/;
description = "Munkres algorithm for the Assignment Problem";
license = pkgs.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
};
musicbrainzngs = buildPythonPackage rec {
name = "musicbrainzngs-0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/m/musicbrainzngs/${name}.tar.gz";
md5 = "bc32aa1cf121f29c3ca1c06e9668865f";
};
meta = {
homepage = http://alastair/python-musicbrainz-ngs;
description = "Python bindings for musicbrainz NGS webservice";
license = pkgs.lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
};
mutagen = buildPythonPackage (rec {
name = "mutagen-1.20";
@ -2452,6 +2581,56 @@ pythonPackages = python.modules // rec {
};
};
pyrss2gen = buildPythonPackage (rec {
name = "PyRSS2Gen-1.0.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/P/PyRSS2Gen/${name}.tar.gz";
md5 = "eae2bc6412c5679c287ecc1a59588f75";
};
meta = {
homepage = http://www.dalkescientific.om/Python/PyRSS2Gen.html;
description = "Library for generating RSS 2.0 feeds";
license = stdenv.lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
pynzb = buildPythonPackage (rec {
name = "pynzb-0.1.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pynzb/${name}.tar.gz";
md5 = "63c74a36348ac28aa99732dcb8be8c59";
};
meta = {
homepage = http://github.com/ericflo/pynzb;
description = "Unified API for parsing NZB files";
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
progressbar = buildPythonPackage (rec {
name = "progressbar-2.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/progressbar/${name}.tar.gz";
md5 = "8ea4e2c17a8ec9e7d153767c5f2a7b28";
};
# invalid command 'test'
doCheck = false;
meta = {
homepage = http://code.google.com/p/python-progressbar/;
description = "Text progressbar library for python";
license = stdenv.lib.licenses.lgpl3Plus;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
ldap = buildPythonPackage rec {
name = "python-ldap-2.4.3";
@ -3173,11 +3352,11 @@ pythonPackages = python.modules // rec {
sqlalchemy = buildPythonPackage {
name = "sqlalchemy-0.6.6";
name = "sqlalchemy-0.7.9";
src = fetchurl {
url = mirror://sourceforge/sqlalchemy/0.6.6/SQLAlchemy-0.6.6.tar.gz;
sha256 = "0inj9b66pi447cw500mqn7d09dij20ic3k5bnyhj6rpdl2l83a0l";
url = mirror://sourceforge/sqlalchemy/0.7.9/SQLAlchemy-0.7.9.tar.gz;
md5 = "c4852d586d95a59fbc9358f4467875d5";
};
buildInputs = [ nose ];
@ -3394,11 +3573,11 @@ pythonPackages = python.modules // rec {
turses = buildPythonPackage (rec {
name = "turses-0.2.11";
name = "turses-0.2.12";
src = fetchurl {
url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";
sha256 = "0zd0fjb5rr5if8wp6kmi29wrkj7ypp4vz00xxb0if1kjrakczlvm";
sha256 = "016fw2ch1gy3rrlfjsdpd6y11mkrbjw4h84h7954k2vhc84l1gm0";
};
propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse;
@ -3417,11 +3596,11 @@ pythonPackages = python.modules // rec {
});
tweepy = buildPythonPackage (rec {
name = "tweepy-1.13";
name = "tweepy-2.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz";
sha256 = "1gaki8qvzi72jaj5xls51lc6fgs1xnm9c6jgpirwklpdn7y8wyy5";
sha256 = "1b95xcw11b5871gd4br78hxbvcq8y9f0i0sqga85dgg9hnmvdcx0";
};
meta = {
@ -4119,7 +4298,7 @@ pythonPackages = python.modules // rec {
url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
md5 = "e7e581af8193551831560a736a53cf58";
};
propagatedBuildInputs = [ zope_event zope_interface zope_testing ];
# ignore circular dependency on zope_location
@ -4389,6 +4568,23 @@ pythonPackages = python.modules // rec {
};
};
unidecode = buildPythonPackage rec {
name = "Unidecode-0.04.12";
src = fetchurl {
url = "http://pypi.python.org/packages/source/U/Unidecode/${name}.tar.gz";
md5 = "351dc98f4512bdd2e93f7a6c498730eb";
};
meta = {
homepage = http://pypi.python.org/pypi/Unidecode/;
description = "ASCII transliterations of Unicode text";
license = pkgs.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
};
txamqp = buildPythonPackage rec {
name = "txamqp-${version}";
version = "0.3";