Merge remote-tracking branch 'upstream/master' into stdenv-updates

This commit is contained in:
Rickard Nilsson 2013-01-20 16:53:21 +01:00
commit 1886d1db6a
41 changed files with 537 additions and 127 deletions

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";

View file

@ -21,8 +21,8 @@ assert stdenv.system == "x86_64-linux";
let
version = "1.4.0";
sha256 = "93933d95cce5956ed99342fa342d01ce2bde8d2e4339afb97f23e0c0ec98875e";
version = "1.4.21";
sha256 = "94073842f4a81feee80bca590e1df73fc3cab47ba879407ceba2de48f30d84e2";
# relative location where the dropbox libraries are stored
appdir = "opt/dropbox";

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 ];

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];

View file

@ -38,8 +38,8 @@ rec {
name = "lazarus-${version}";
meta = {
description = "Lazarus graphical IDE for FreePascal language";
homepage = http://www.lazarus.freepascal.org ;
homepage = http://www.lazarus.freepascal.org;
maintainers = [args.lib.maintainers.raskin];
platforms = args.lib.platforms.linux;
#platforms = args.lib.platforms.linux;
};
}

View file

@ -48,13 +48,12 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "Opa is a concise and elegant language for writing distributed web applications. Both client and server sides.";
description = "A concise and elegant language for writing distributed web applications";
longDescription = ''
Opa is a new generation of web development platform that lets you write distributed
web applications using a single technology. Among the the many features of Opa are these:
Opa is concise, simple, concurrent, dynamically distributed, and secure.
Opa is a new generation of web development platform that lets you write distributed
web applications using a single technology. Among the the many features of Opa are these:
Opa is concise, simple, concurrent, dynamically distributed, and secure.
'';
homepage = http://opalang.org/;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.kkallio ];

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 = [

View file

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

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 ];

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hs-bibutils";
version = "4.15";
sha256 = "1h2vqi6ymhx9wpfv5qzvq4fhc4iand93shsncp8nszk64acmz9z9";
version = "4.16";
sha256 = "0501fqv0xlwdmpg65s3rr0fns6gqq15x2zq2a8915n3dvipfkixb";
buildDepends = [ syb ];
meta = {
homepage = "http://gorgias.mine.nu/repos/hs-bibutils/";

View file

@ -1,21 +1,23 @@
{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
, conduit, cookie, cprngAes, dataDefault, deepseq, failure
, httpTypes, liftedBase, monadControl, mtl, network, regexCompat
, resourcet, socks, text, time, tls, tlsExtra, transformers
, transformersBase, utf8String, void, zlibConduit
, filepath, httpTypes, liftedBase, mimeTypes, monadControl, mtl
, network, random, regexCompat, resourcet, socks, text, time, tls
, tlsExtra, transformers, transformersBase, utf8String, void
, zlibConduit
}:
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.8.6.3";
sha256 = "0ykwfii3qcj77ai0jafgbf5017mckz51gmbk3m8kwm1z6dalb27r";
version = "1.8.7";
sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie
cprngAes dataDefault deepseq failure httpTypes liftedBase
monadControl mtl network regexCompat resourcet socks text time tls
tlsExtra transformers transformersBase utf8String void zlibConduit
cprngAes dataDefault deepseq failure filepath httpTypes liftedBase
mimeTypes monadControl mtl network random regexCompat resourcet
socks text time tls tlsExtra transformers transformersBase
utf8String void zlibConduit
];
meta = {
homepage = "http://www.yesodweb.com/book/http-conduit";

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";

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";
sha256 = "11zvyzn16zckgs1zzhl415y14nziw16zhgghg31a459d1ww7c3dg";
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 = {

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "smallcheck";
version = "0.6.1";
sha256 = "1p2bsc08lcyzmqdjc5qsr60dr03kvc8xw7kk4lbi9cnn9s9w90vb";
version = "0.6.2";
sha256 = "0yz7an3k71ia7sgs8xpkh37xz9ipsnbf13680185cij8llq8zbyr";
buildDepends = [ dlist ];
meta = {
homepage = "https://github.com/feuerbach/smallcheck";

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 = [

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 = [

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, popt }:
{ stdenv, fetchurl, popt, libiconv }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "libnatspec-0.2.6";
src = fetchurl {
@ -16,4 +16,8 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
NIX_CFLAGS_COMPILE = "-I${libiconv}/include";
NIX_CFLAGS_LINK = "-L${libiconv}/lib -liconv";
})

View file

@ -49,6 +49,6 @@ rec {
maintainers = [
a.lib.maintainers.raskin
];
platforms = a.lib.platforms.linux ;
#platforms = a.lib.platforms.linux ;
};
}

View file

@ -16,7 +16,8 @@ let
deleteKeychain = "security delete-keychain $keychainName";
in
stdenv.mkDerivation {
inherit name src;
name = stdenv.lib.replaceChars [" "] [""] name;
inherit src;
buildInputs = [] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
@ -27,9 +28,9 @@ stdenv.mkDerivation {
${if target == "android" then
if release then
"${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out"
''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out''
else
"${titaniumsdk}/mobilesdk/*/*/android/builder.py build ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}"
''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}''
else if target == "iphone" then
if iosDistribute then ''
@ -52,7 +53,7 @@ stdenv.mkDerivation {
cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
fi
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName"
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName"
# Remove our generated keychain
@ -80,7 +81,7 @@ stdenv.mkDerivation {
cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
fi
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName"
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName"
# Remove our generated keychain
@ -95,7 +96,7 @@ stdenv.mkDerivation {
cp -av * $out
cd $out
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} ${name}
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}"
''
else throw "Target: ${target} is not supported!"}

View file

@ -40,6 +40,8 @@
, preInstall ? ""
, postInstall ? ""
, meta ? {}
, ... } @ attrs:
# Keep extra attributes from ATTR, e.g., `patchPhase', etc.
@ -48,6 +50,12 @@ python.stdenv.mkDerivation (attrs // {
name = namePrefix + name;
# default values for maintainers and platforms
meta = {
maintainers = python.meta.maintainers;
platforms = python.meta.platforms;
} // meta;
# checkPhase after installPhase to run tests on installed packages
phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase";

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 = [

View file

@ -2,11 +2,11 @@
, mesa, openal}:
stdenv.mkDerivation {
name = "minecraft-1.3.1";
name = "minecraft-1.4.7";
src = fetchurl {
url = "https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft.jar";
sha256 = "0j8a889w174vwgcxl4yqgp2kbqqha3x505fn7izz38srlx59gnwj";
sha256 = "92db974aa759a3f17f3cd61550fa5010e335c57dd813dad9e39b9cc013420a49";
};
phases = "installPhase";

View file

@ -36,6 +36,6 @@ stdenv.mkDerivation {
homepage = http://www.naev.org;
license = "GPLv3+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
#platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = http://torcs.sourceforge.net/;
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
#platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
description = "Squad-based tactical strategy game in the tradition of X-Com";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
#platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -82,6 +82,6 @@ stdenv.mkDerivation rec {
homepage = http://www.urbanterror.net;
license = [ "unfree-redistributable" ];
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
platforms = with stdenv.lib.platforms; linux;
#platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -64,8 +64,7 @@ rec {
raskin
jcumming
];
platforms = with a.lib.platforms;
linux;
#platforms = a.lib.platforms.linux;
license = a.lib.licenses.gpl2Plus;
};
passthru = {

View file

@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
patchelf
unzip
];
inherit kernel glibc /* glibc only used for setting interpreter */;
LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
[ "${xorg.libXrandr}/lib"
"${xorg.libXrender}/lib"
@ -58,11 +58,11 @@ stdenv.mkDerivation rec {
inherit mesa; # only required to build examples
meta = {
description = "ati drivers";
description = "ATI drivers";
homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx;
license = "unfree";
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = [ "x86_64-linux" ];
#platforms = [ "x86_64-linux" ];
};
# moved assertions here because the name is evaluated when the NixOS manual is generated

View file

@ -33,6 +33,7 @@ stdenv.mkDerivation {
'';
passthru = { inherit patch; };
meta = {
description = "Another Unionfs implementation for Linux (third generation)";
homepage = http://aufs.sourceforge.net/;

View file

@ -230,7 +230,7 @@ in
import ./generic.nix (
rec {
version = "3.0.58";
version = "3.0.59";
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 = "10ahi60ass970vjlhnzcf0y5fk3g7ck1a1lnwzy0kkywp6nb2c10";
sha256 = "0w0l0vsky921j6wvhydl8ggzwkwkhr0lk2lkd7lshhmv9c6bdg86";
};
config = configWithPlatform stdenv.platform;

View file

@ -237,7 +237,7 @@ in
import ./generic.nix (
rec {
version = "3.2.36";
version = "3.2.37";
testing = false;
modDirVersion = version;
@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0jyla0mjh1jjk84jywyvd7n6ax27xarkllfjf991rqj32zinlnzn";
sha256 = "1h8lx0gvb1q962lghjpixa6q89k4yrgvpiw8hplb3w2jicqs4948";
};
config = configWithPlatform stdenv.platform;

View file

@ -239,7 +239,7 @@ in
import ./generic.nix (
rec {
version = "3.4.25";
version = "3.4.26";
testing = false;
preConfigure = ''
@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0jlnrjxyyfw2f87mr9y8c4337yfbnrj5jp3vhm33dwy7i3vdpfs6";
sha256 = "1zmv1g90fgqrabc0qb5ip551mh12ps1zin3hbygysc89j684rbk1";
};
config = configWithPlatform stdenv.platform;

View file

@ -245,7 +245,7 @@ in
import ./generic.nix (
rec {
version = "3.7.2";
version = "3.7.3";
testing = false;
preConfigure = ''
@ -254,7 +254,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "09s1z2z15xnnqm2syr76l7s3s14zzsalifnnfmry52ibizllzh04";
sha256 = "05421g78kx01ia0pq3d3y3gkrzqb5grfhhy7vy1ixlq8a23kc6b7";
};
config = configWithPlatform stdenv.platform;

View file

@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "spl-0.6.0-rc13-${kernel.version}";
src = fetchurl {
url = http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz;
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc13.tar.gz;
sha256 = "1frbifj1yd7pznlhsqsiksip5amx4ljvasg8h80haaxk0yvvkr9b";
};

View file

@ -11,23 +11,15 @@ stdenv.mkDerivation rec {
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.in
'';
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;
};

View file

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "zfs-0.6.0-rc13-${kernel.version}";
src = fetchurl {
url = http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz;
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc13.tar.gz;
sha256 = "1kpx7sa49ir93kmlrjwjzd6v4kzmda4j9cf6bv2p4s3yrmiz3cjv";
};

View file

@ -1,39 +1,85 @@
{ stdenv, fetchurl, pkgconfig, glib, alsaSupport ? true, alsaLib
, flacSupport ? true, flac, vorbisSupport ? true, libvorbis
, madSupport ? true, libmad, id3tagSupport ? true, libid3tag
, mikmodSupport ? true, libmikmod, cueSupport ? true, libcue
{ stdenv, fetchurl, pkgconfig, glib, systemd
, alsaSupport ? true, alsaLib
, flacSupport ? true, flac
, vorbisSupport ? true, libvorbis
, madSupport ? true, libmad
, id3tagSupport ? true, libid3tag
, mikmodSupport ? true, libmikmod
, shoutSupport ? true, libshout
, sqliteSupport ? true, sqlite
, curlSupport ? true, curl
, soupSupport ? true, libsoup
, audiofileSupport ? true, audiofile
, bzip2Support ? true, bzip2
, ffadoSupport ? true, ffado
, ffmpegSupport ? true, ffmpeg
, fluidsynthSupport ? true, fluidsynth
, zipSupport ? true, zziplib
, samplerateSupport ? true, libsamplerate
, mmsSupport ? true, libmms
, mpg123Support ? true, mpg123
, aacSupport ? true, faad2
}:
let
opt = stdenv.lib.optional;
in
stdenv.mkDerivation rec {
name = "mpd-0.16.8";
mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
in stdenv.mkDerivation rec {
name = "mpd-0.17.3";
src = fetchurl {
url = "mirror://sourceforge/musicpd/${name}.tar.bz2";
sha256 = "35183ae4a706391f5d739e4378b74f516952adda09a260fecfd531a58b0fff17";
sha256 = "1iilimlyhw22lpbqiab4qprznxg9c4d68fkrr9jww765b4c7x1ip";
};
buildInputs = [ pkgconfig glib ]
buildInputs = [ pkgconfig glib systemd ]
++ opt alsaSupport alsaLib
++ opt flacSupport flac
++ opt vorbisSupport libvorbis
++ opt madSupport libmad
++ opt id3tagSupport libid3tag
++ opt mikmodSupport libmikmod
++ opt cueSupport libcue
++ opt shoutSupport libshout;
++ opt shoutSupport libshout
++ opt sqliteSupport sqlite
++ opt curlSupport curl
++ opt soupSupport libsoup
++ opt bzip2Support bzip2
++ opt audiofileSupport audiofile
++ opt ffadoSupport ffado
++ opt ffmpegSupport ffmpeg
++ opt fluidsynthSupport fluidsynth
++ opt samplerateSupport libsamplerate
++ opt mmsSupport libmms
++ opt mpg123Support mpg123
++ opt aacSupport faad2
++ opt zipSupport zziplib;
configureFlags = ''
${if alsaSupport then "--enable-alsa" else "--disable-alsa"}
${if flacSupport then "--enable-flac" else "--disable-flac"}
${if vorbisSupport then "--enable-vorbis" else "--disable-vorbis"}
${if madSupport then "--enable-mad" else "--disable-mad"}
${if mikmodSupport then "--enable-mikmod" else "--disable-mikmod"}
${if id3tagSupport then "--enable-id3" else "--disable-id3"}
${if cueSupport then "--enable-cue" else "--disable-cue"}
${if shoutSupport then "--enable-shout" else "--disable-shout"}
'';
configureFlags = [
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
(mkFlag alsaSupport "alsa")
(mkFlag flacSupport "flac")
(mkFlag vorbisSupport "vorbis")
(mkFlag vorbisSupport "vorbis-encoder")
(mkFlag madSupport "mad")
(mkFlag mikmodSupport "mikmod")
(mkFlag id3tagSupport "id3")
(mkFlag shoutSupport "shout")
(mkFlag sqliteSupport "sqlite")
(mkFlag curlSupport "curl")
(mkFlag soupSupport "soup")
(mkFlag audiofileSupport "audiofile")
(mkFlag bzip2Support "bzip2")
(mkFlag ffadoSupport "ffado")
(mkFlag ffmpegSupport "ffmpeg")
(mkFlag fluidsynthSupport "fluidsynth")
(mkFlag zipSupport "zzip")
(mkFlag samplerateSupport "lsr")
(mkFlag mmsSupport "mms")
(mkFlag mpg123Support "mpg123")
(mkFlag aacSupport "aac")
];
NIX_LDFLAGS = ''
${if shoutSupport then "-lshout" else ""}

View file

@ -10,7 +10,7 @@ let
lib = import ../../lib;
disallowUnfree = builtins.getEnv "HYDRA_DISALLOW_UNFREE" == "1";
allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";
stdenvGenerator = setupScript: rec {
@ -41,7 +41,7 @@ let
# Add a utility function to produce derivations that use this
# stdenv and its shell.
mkDerivation = attrs:
if disallowUnfree && attrs.meta.license or "" == "unfree" then
if !allowUnfree && attrs.meta.license or "" == "unfree" then
throw "package ${attrs.name} has an unfree license, refusing to evaluate"
else
(derivation (

View file

@ -3953,13 +3953,13 @@ rec {
};
TestWarn = buildPerlPackage rec {
name = "Test-Warn-0.23";
name = "Test-Warn-0.24";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
sha256 = "1733s39s4pm0hsshvvjsv1vbri09l4g0g7yyg64y65yqcyanfdf0";
sha256 = "12r1mcwrm6cgc3ppgawwv265vmrighj4bl6xc5c41f4c2l6bdxml";
};
propagatedBuildInputs = [TestSimple TestException ArrayCompare TreeDAGNode];
buildInputs = [TestPod];
propagatedBuildInputs = [ TestSimple TestException ArrayCompare TreeDAGNode ];
buildInputs = [ TestPod ];
};
TestWWWMechanize = buildPerlPackage rec {

View file

@ -352,6 +352,22 @@ let pythonPackages = python.modules // rec {
# });
buildout = buildPythonPackage rec {
name = "buildout-${version}";
version = "1.7.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zc.buildout/zc.${name}.tar.gz";
md5 = "4e3b521600e475c56a0a66459a5fc7bb";
};
meta = {
homepage = http://www.buildout.org/;
description = "A software build and configuration system";
};
};
carrot = buildPythonPackage rec {
name = "carrot-0.10.7";
@ -486,6 +502,18 @@ let pythonPackages = python.modules // rec {
};
};
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 {
@ -604,6 +632,29 @@ let pythonPackages = python.modules // rec {
});
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";
@ -1255,6 +1306,23 @@ let pythonPackages = python.modules // rec {
};
};
manuel = buildPythonPackage rec {
name = "manuel-${version}";
version = "1.6.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz";
md5 = "53d6a6905301a20f6095e41d11968fff";
};
propagatedBuildInputs = [ six zope_testing ];
meta = {
description = "A documentation builder";
homepage = http://pypi.python.org/pypi/manuel;
license = "ZPL";
};
};
markdown = buildPythonPackage rec {
version = "2.0.3";
@ -1368,6 +1436,26 @@ let pythonPackages = python.modules // rec {
};
mrbob = buildPythonPackage rec {
name = "mrbob-${version}";
version = "0.1a6";
src = fetchurl {
url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip";
md5 = "361c8ac7a31953ab94a95cf34d9a0b2b";
};
buildInputs = [ pkgs.unzip ];
propagatedBuildInputs = [ argparse jinja2 ];
meta = {
homepage = https://github.com/iElectric/mr.bob.git;
description = "A tool to generate code skeletons from templates";
};
};
mutagen = buildPythonPackage (rec {
name = "mutagen-1.20";
@ -1516,6 +1604,32 @@ let pythonPackages = python.modules // rec {
buildInputs = [ coverage ];
};
nose2 = 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 = 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";
};
buildInputs = [ covCore nose2 ];
};
notify = pkgs.stdenv.mkDerivation (rec {
name = "python-notify-0.1.1";
@ -1524,7 +1638,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 .";
@ -1838,6 +1952,21 @@ let pythonPackages = python.modules // rec {
};
psutil = buildPythonPackage rec {
name = "psutil-0.6.1";
src = fetchurl {
url = "http://psutil.googlecode.com/files/${name}.tar.gz";
sha256 = "0vqarv63jqzghr4fi1fqdbvg847fq2gqdj8dzc3x59f9b36a8rfn";
};
meta = {
description = "Process and system utilization information interface for python";
homepage = http://code.google.com/p/psutil/;
};
};
psycopg2 = buildPythonPackage rec {
name = "psycopg2-2.0.13";
@ -2759,7 +2888,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";
@ -2859,6 +2988,24 @@ let pythonPackages = python.modules // rec {
});
subunit = buildPythonPackage rec {
name = "subunit-${version}";
version = "0.0.9";
src = fetchurl {
url = "https://launchpad.net/subunit/trunk/0.0.9/+download/python-${name}.tar.gz";
sha256 = "0g3bk8lfd52zjzg43h47h2kckchm3xyv1gcr85nca2i50rcrpj56";
};
propagatedBuildInputs = [ testtools ];
meta = {
description = "A streaming protocol for test results";
homepage = https://launchpad.net/subunit;
license = pkgs.lib.licenses.asl20;
};
};
# XXX: ValueError: ZIP does not support timestamps before 1980
# svneverever = buildPythonPackage rec {
# name = "svneverever-778489a8";
@ -2920,6 +3067,23 @@ let pythonPackages = python.modules // rec {
};
testtools = buildPythonPackage rec {
name = "testtools-${version}";
version = "0.9.24";
src = fetchurl {
url = "https://launchpad.net/testtools/0.9/0.9.24/+download/${name}.tar.gz";
sha256 = "0mgkvd7c1aw34nlnz2nmll5k01aqhixxiikbs2nfyk3xfa4221x7";
};
meta = {
description = "A set of extensions to the Python standard library's unit testing framework";
homepage = http://pypi.python.org/pypi/testtools;
license = pkgs.lib.licenses.mit;
};
};
trac = buildPythonPackage {
name = "trac-0.12.2";
@ -2942,6 +3106,44 @@ let pythonPackages = python.modules // rec {
};
};
transaction = buildPythonPackage rec {
name = "transaction-${version}";
version = "1.4.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz";
md5 = "b7c2ff135939f605a8c54e1c13cd5d66";
};
propagatedBuildInputs = [ zopeInterface ];
meta = {
description = "Transaction management";
homepage = http://pypi.python.org/pypi/transaction;
license = "ZPL";
};
};
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";
@ -3260,6 +3462,62 @@ let pythonPackages = python.modules // rec {
};
});
zconfig = buildPythonPackage rec {
name = "zconfig-${version}";
version = "2.9.3";
src = fetchurl {
url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-${version}.tar.gz";
md5 = "2c5f73c216140a705be3d9c44b988722";
};
propagatedBuildInputs = [ zope_testrunner ];
meta = {
description = "Structured Configuration Library";
homepage = http://pypi.python.org/pypi/ZConfig;
license = "ZPL";
};
};
zc_lockfile = buildPythonPackage rec {
name = "zc_lockfile-${version}";
version = "1.0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-${version}.tar.gz";
md5 = "f099d4cf2583a0c7bea0146a44dc4d59";
};
meta = {
description = "Inter-process locks";
homepage = http://www.python.org/pypi/zc.lockfile;
license = "ZPL";
};
};
zdaemon = buildPythonPackage rec {
name = "zdaemon-${version}";
version = "3.0.5";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz";
md5 = "975f770544bb4352c5cf32fec22e63c9";
};
propagatedBuildInputs = [ zconfig ];
meta = {
description = "A daemon process control library and tools for Unix-based systems";
homepage = http://pypi.python.org/pypi/zdaemon;
license = "ZPL";
};
};
zfec = buildPythonPackage (rec {
name = "zfec-1.4.7";
@ -3289,6 +3547,102 @@ let pythonPackages = python.modules // rec {
};
});
zodb3 = buildPythonPackage rec {
name = "zodb3-${version}";
version = "3.10.5";
src = fetchurl {
url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-${version}.tar.gz";
md5 = "6f180c6897a1820948fee2a6290503cd";
};
propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zopeInterface zope_event ];
meta = {
description = "An object-oriented database for Python";
homepage = http://pypi.python.org/pypi/ZODB3;
license = "ZPL";
};
};
zope_event = buildPythonPackage rec {
name = "zope_event-${version}";
version = "4.0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-${version}.tar.gz";
md5 = "e08dd299d428d77a1cfcbfe841b81872";
};
meta = {
description = "An event publishing system";
homepage = http://pypi.python.org/pypi/zope.event;
license = "ZPL";
};
};
zope_exceptions = buildPythonPackage rec {
name = "zopeexceptions-${version}";
version = "4.0.5";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-${version}.tar.gz";
md5 = "c95569fcb444ae541777de7ae5297492";
};
propagatedBuildInputs = [ zopeInterface ];
meta = {
description = "Exception interfaces and implementations";
homepage = http://pypi.python.org/pypi/zope.exceptions;
license = "ZPL";
};
};
zope_testing = buildPythonPackage rec {
name = "zope_testing-${version}";
version = "4.1.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-${version}.tar.gz";
md5 = "2e3829841090d6adff718b8b73c87b6b";
};
propagatedBuildInputs = [ zopeInterface zope_exceptions ];
meta = {
description = "Zope testing helpers";
homepage = http://pypi.python.org/pypi/zope.testing;
license = "ZPL";
};
};
zope_testrunner = buildPythonPackage rec {
name = "zope_testrunner-${version}";
version = "4.0.4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.testrunner/zope.testrunner-${version}.zip";
md5 = "cd648fc865a79aa0950e73342836dd4c";
};
buildInputs = [ pkgs.unzip ];
propagatedBuildInputs = [ subunit zopeInterface zope_exceptions zope_testing ];
meta = {
description = "A flexible test runner with layer support";
homepage = http://pypi.python.org/pypi/zope.testrunner;
license = "ZPL";
};
};
zopeInterface = buildPythonPackage {
name = "zope-interface-3.6.1";
src = fetchurl {

View file

@ -1,7 +1,11 @@
rec {
allPackages = import ./all-packages.nix;
pkgs = allPackages {};
# Ensure that we don't build packages marked as unfree.
allPackages = args: import ./all-packages.nix (args // {
config.allowUnfree = false;
});
pkgs = allPackages { };
/* !!! Hack: poor man's memoisation function. Necessary for prevent
Nixpkgs from being evaluated again and again for every