diff --git a/maintainers/scripts/generate-cpan-package b/maintainers/scripts/generate-cpan-package new file mode 100755 index 00000000000..f091625b6ce --- /dev/null +++ b/maintainers/scripts/generate-cpan-package @@ -0,0 +1,122 @@ +#! /bin/sh -e + +export PERL5LIB=/nix/var/nix/profiles/per-user/eelco/cpan-generator/lib/perl5/site_perl + +name="$1" +[ -n "$name" ] || { echo "no name"; exit 1; } + +cpan -D "$name" > cpan-info + +url="$(echo $(cat cpan-info | sed '6!d'))" +[ -n "$url" ] || { echo "no URL"; exit 1; } +url="mirror://cpan/authors/id/$url" +echo "URL = $url" >&2 + +version=$(cat cpan-info | grep 'CPAN: ' | awk '{ print $2 }') +echo "VERSION = $version" + +declare -a xs=($(PRINT_PATH=1 nix-prefetch-url "$url")) +hash=${xs[0]} +path=${xs[1]} +echo "HASH = $hash" >&2 + +namedash="$(echo $name | sed s/::/-/g)-$version" + +attr=$(echo $name | sed s/:://g) + +rm -rf cpan_tmp +mkdir cpan_tmp +tar xf "$path" -C cpan_tmp + +shopt -s nullglob +meta=$(echo cpan_tmp/*/META.json) +if [ -z "$meta" ]; then + yaml=$(echo cpan_tmp/*/META.yml) + [ -n "$yaml" ] || { echo "no meta file"; exit 1; } + meta=$(echo $yaml | sed s/\.yml$/.json/) + perl -e ' + use YAML; + use JSON; + local $/; + $x = YAML::Load(<>); + print encode_json $x; + ' < $yaml > $meta +fi + +description="$(json abstract < $meta | perl -e '$x = <>; print uc(substr($x, 0, 1)), substr($x, 1);')" +homepage="$(json resources.homepage < $meta)" +if [ -z "$homepage" ]; then + #homepage="$(json meta-spec.url < $meta)" + true +fi + +license="$(json license < $meta | json -a 2> /dev/null || true)" +if [ -z "$license" ]; then + license="$(json -a license < $meta)" +fi +license="$(echo $license | sed s/perl_5/perl5/)" + +f() { + local type="$1" + perl -e ' + use JSON; + local $/; + $x = decode_json <>; + if (defined $x->{prereqs}) { + $x2 = $x->{prereqs}->{'$type'}->{requires}; + } elsif ("'$type'" eq "runtime") { + $x2 = $x->{requires}; + } elsif ("'$type'" eq "configure") { + $x2 = $x->{configure_requires}; + } elsif ("'$type'" eq "build") { + $x2 = $x->{build_requires}; + } + foreach my $y (keys %{$x2}) { + next if $y eq "perl"; + eval "use $y;"; + if (!$@) { + print STDERR "skipping Perl-builtin module $y\n"; + next; + } + print $y, "\n"; + }; + ' < $meta | sed s/:://g +} + +confdeps=$(f configure) +builddeps=$(f build) +testdeps=$(f test) +runtimedeps=$(f runtime) + +buildInputs=$(echo $(for i in $confdeps $builddeps $testdeps; do echo $i; done | sort | uniq)) +propagatedBuildInputs=$(echo $(for i in $runtimedeps; do echo $i; done | sort | uniq)) + +echo "===" >&2 + +cat <&2; if sha256="$(sha_lookup "$version")"; diff --git a/pkgs/applications/networking/browsers/firefox/13.0.nix b/pkgs/applications/networking/browsers/firefox/13.0.nix index fbbf3275ad1..1717a476e9c 100644 --- a/pkgs/applications/networking/browsers/firefox/13.0.nix +++ b/pkgs/applications/networking/browsers/firefox/13.0.nix @@ -21,8 +21,8 @@ rec { src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "3752f13f26a51dd2e42d2805a707a842e6f8d1b1"; + url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha256 = "1qwvs3rdmrnkjnjvhi3vh4mjdpxr43zcm7llc6z5qws9n9yx15n1"; }; commonConfigureFlags = diff --git a/pkgs/applications/networking/browsers/firefox/18.0.nix b/pkgs/applications/networking/browsers/firefox/18.0.nix index 66acae13084..f9258792a2e 100644 --- a/pkgs/applications/networking/browsers/firefox/18.0.nix +++ b/pkgs/applications/networking/browsers/firefox/18.0.nix @@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "18.0.1"; + firefoxVersion = "18.0.2"; - xulVersion = "18.0.1"; # this attribute is used by other packages + xulVersion = "18.0.2"; # this attribute is used by other packages src = fetchurl { @@ -27,7 +27,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "26415396233450a4e66bb0e0a73a258e1cb174ef"; + sha1 = "fe5810d61edf6f4dc8bc477a08f9483b955f747b"; }; commonConfigureFlags = diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 7e2bfb692a3..47f99a1d555 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -44,9 +44,9 @@ let throw "no x86_64 debugging version available" else rec { # -> http://labs.adobe.com/downloads/flashplayer10.html - version = "11.2.202.251"; - url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_x86_64.tar.gz"; - sha256 = "0nkwpqp8ilv21rlmr4jv8abdnfmz292y3w1qlx6r67qf926nfrz2"; + version = "11.2.202.262"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; + sha256 = "1bfr7ajpqkah4kshhqkmi2c15mm962absrq9ks7gfsfaircp387j"; } else if stdenv.system == "i686-linux" then if debug then { @@ -55,9 +55,9 @@ let url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk"; } else rec { - version = "11.2.202.251"; - url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_i386.tar.gz"; - sha256 = "0nph42s1bspf88m1qqrvc93kkxkrvq3lfs5iq4l5dflwzs32jdm3"; + version = "11.2.202.262"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; + sha256 = "0fhslr46apa6qfzdhagmjb8vbl741ryh6j14qy2271nl2q687jsx"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 811847920c5..365fd1e2613 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -45,6 +45,8 @@ in stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; + # Use the following to determine the current upstream version: + # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p' version = "3.10.2.0"; src = diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 6063024c216..1bdc41d1fb5 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -3,12 +3,12 @@ , pango, pkgconfig, scrollkeeper, zlib }: -stdenv.mkDerivation { - name = "gnumeric-1.11.3"; +stdenv.mkDerivation rec { + name = "gnumeric-1.12.0"; src = fetchurl { - url = mirror://gnome/sources/gnumeric/1.11/gnumeric-1.11.3.tar.xz; - sha256 = "1hblcbba4qzlby094dih6ncclgf2n5ac59lqg9dykpz8ad3hxw72"; + url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; + sha256 = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111"; }; configureFlags = "--disable-component"; diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix index c1cd4b42a02..ca71ceeca66 100644 --- a/pkgs/applications/office/ledger/2.6.3.nix +++ b/pkgs/applications/office/ledger/2.6.3.nix @@ -1,40 +1,24 @@ -# Patchelf fails to hard-code the library paths to ledger's -# libamounts.so and libledger-2.6.3 shared objects: -# -# $ ldd ~/.nix-profile/bin/ledger -# linux-vdso.so.1 => (0x00007fff513ff000) -# libamounts.so.0 => not found -# libledger-2.6.3.so => not found -# libstdc++.so.6 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libstdc++.so.6 (0x00007f1f0feee000) -# libpcre.so.0 => /nix/store/kfhy189arpj3wrfzpgw8p9ac4g4hfgca-pcre-8.10/lib/libpcre.so.0 (0x00007f1f0fcd3000) -# libgmp.so.3 => /nix/store/ji6py9m9w2ray1bmpkmgig9llj1i2ggf-gmp-4.3.2/lib/libgmp.so.3 (0x00007f1f0fa7f000) -# libm.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libm.so.6 (0x00007f1f0f7fd000) -# libgcc_s.so.1 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libgcc_s.so.1 (0x00007f1f0f5e8000) -# libc.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6 (0x00007f1f0f27d000) -# /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2 (0x00007f1f101ef000) -# -# Fortunately, libtools builds the program with proper paths hard-coded -# alread, so we don't need patchelf. Phew! +{ stdenv, fetchurl, emacs, gmp, pcre, expat }: -{stdenv, fetchurl, emacs, gmp, pcre, expat}: - -let +stdenv.mkDerivation rec { name = "ledger-2.6.3"; -in -stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "https://github.com/downloads/jwiegley/ledger/${name}.tar.gz"; + url = "https://github.com/downloads/ledger/ledger/${name}.tar.gz"; sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k"; }; buildInputs = [ emacs gmp pcre expat ]; configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; - dontPatchELF = true; + doCheck = true; + # Patchelf breaks the hard-coded rpath to ledger's libamounts.0.so and + # libledger-2.6.3.so. Fortunately, libtool chooses proper rpaths to + # begin with, so we can just disable patchelf to avoid the issue. + dontPatchELF = true; + meta = { homepage = "http://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/libreoffice/default.nix similarity index 100% rename from pkgs/applications/office/openoffice/libreoffice.nix rename to pkgs/applications/office/libreoffice/default.nix diff --git a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh similarity index 100% rename from pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh rename to pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh diff --git a/pkgs/applications/office/openoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix similarity index 100% rename from pkgs/applications/office/openoffice/libreoffice-srcs.nix rename to pkgs/applications/office/libreoffice/libreoffice-srcs.nix diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh deleted file mode 100644 index 2c6e04e049b..00000000000 --- a/pkgs/applications/office/openoffice/builder.sh +++ /dev/null @@ -1,105 +0,0 @@ -source $stdenv/setup - -export nodep=TRUE -export NO_HIDS=TRUE - -export PATH=$icu/sbin:$PATH - -postUnpack() { - tar xvjf $src_system -} - -preConfigure() { - ./configure --help - - for i in sysui/desktop/share/makefile.mk; do - substituteInPlace $i --replace /bin/bash $shell - done - - SRCDIR= - - sed -e '/CURL_NO_OLDIES/d' -i ucb/source/ucp/ftp/makefile.mk -} - -postConfigure() { - for i in LinuxX86*Env.Set; do - substituteInPlace $i --replace /usr /no-such-path - done - substituteInPlace solenv/inc/libs.mk \ - --replace /usr/lib/libjpeg.so $libjpeg/lib/libjpeg.so \ - --replace /usr/lib64/libjpeg.so $libjpeg/lib/libjpeg.so -} - -buildPhase() { - source LinuxX86*Env.Set.sh - ./bootstrap - # bootstrap defines the alias 'build', that mostly runs this perl script: - (cd instsetoo_native; perl ../solenv/bin/build.pl --all) # wait a few hours... add -P4 for quadcores -} - -wrapSOffice() { - local fn=$1 - local arg=$2 - - # !!! should use makeWrapper for this. - - cat > $out/bin/$fn <> $appl - done - - # Copy icons so that the menu items in KDE and GNOME will look much nicer - (cd $SRC_ROOT/sysui/desktop/icons - install -v -d $out/share/icons/{hicolor,locolor} -m 755 - cp -rv hicolor/*x* $out/share/icons/hicolor - cp -rv locolor/*x* $out/share/icons/locolor - ) - - # The desktop files expect a openoffice.org3 executable in the PATH, which is a symlink to soffice - ln -s $out/bin/soffice $out/bin/openoffice.org3 -} - -genericBuild - diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix deleted file mode 100644 index 5bc5cbf8c9b..00000000000 --- a/pkgs/applications/office/openoffice/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip -, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd -, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups -, libXinerama, openssl, gperf, cppunit, GConf, ORBit2 -}: - -let version = "3.2.1"; in - -stdenv.mkDerivation rec { - name = "openoffice.org-${version}"; - builder = ./builder.sh; - - downloadRoot = "http://openoffice.mirrorbrain.org/files/stable"; - versionDirs = true; - - src = fetchurl { - url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2"; - sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i"; - }; - - patches = [ ./oo.patch ./root-required.patch ./xlib.patch ]; - - postPatch = - /* Compiling with GCC 4.5 fails: - - Compiling: cppu/source/AffineBridge/AffineBridge.cxx - [...] - ../../inc/uno/lbnames.h:67:2: error: #error "Supported gcc majors are 2 , 3 and 4 <= 4.4. Unsupported gcc major version." - - However, we can't compile with GCC 4.4 because then we'd end up with - two different versions of libstdc++ (because the deps are compiled - with 4.5), which isn't supported (link time error.) - - Thus, force compilation with 4.5 and hope for the best. */ - '' sed -i "cppu/inc/uno/lbnames.h" \ - -e 's/#[[:blank:]]*error "Supported.*$//g' - ''; - - src_system = fetchurl { - url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2"; - sha256 = "0giy3sza64ij19w7b06rxcrkrb5kq2fvkz486vh3mv08s8xa8zfc"; - }; - - preConfigure = '' - PATH=$PATH:${icu}/sbin - ''; - - configureFlags = " - --with-package-format=native - --disable-epm - --disable-fontooo - --disable-gnome-vfs - --disable-gnome-vfs - --disable-mathmldtd - --disable-mozilla - --disable-odk - --disable-pasf - --with-cairo - --with-system-libs - --with-system-python - --with-system-boost - --with-system-db - --with-jdk-home=${jdk} - --with-ant-home=${ant} - --without-afms - --without-dict - --without-fonts - --without-myspell-dicts - --without-nas - --without-ppds - --without-system-agg - --without-system-beanshell - --without-system-hsqldb - --without-system-xalan - --without-system-xerces - --without-system-xml-apis - --without-system-xt - --without-system-jars - --without-system-hunspell - --without-system-altlinuxhyph - --without-system-lpsolve - --without-system-graphite - "; - - LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib"; - - buildInputs = [ - pam python tcsh libxslt perl ArchiveZip CompressZlib zlib - libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl - libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack - getopt file jdk cairo which icu boost libXext libX11 libXtst libXi - cups libXinerama openssl gperf GConf ORBit2 - ]; - - inherit icu fontconfig libjpeg jdk cups; - - meta = { - description = "OpenOffice.org is a multiplatform and multilingual office suite"; - homepage = http://www.openoffice.org/; - license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - }; -} diff --git a/pkgs/applications/office/openoffice/oo.patch b/pkgs/applications/office/openoffice/oo.patch deleted file mode 100644 index e759fcdc2d4..00000000000 --- a/pkgs/applications/office/openoffice/oo.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk -index 74c64bf..fbf8d21 100644 ---- a/libtextcat/makefile.mk -+++ b/libtextcat/makefile.mk -@@ -57,7 +57,7 @@ ADDITIONAL_FILES= \ - #CONFIGURE_DIR=$(BUILD_DIR) - - #relative to CONFIGURE_DIR --CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" -+CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" --prefix=$(TMPDIR) - CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) - - BUILD_ACTION=make -diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk -index 0d92de9..aae3b4f 100644 ---- a/redland/raptor/makefile.mk -+++ b/redland/raptor/makefile.mk -@@ -130,7 +130,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config - CONFIGURE_DIR= - CONFIGURE_ACTION=.$/configure - # do not enable grddl parser (#i93768#) --CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) - BUILD_ACTION=$(GNUMAKE) - BUILD_FLAGS+= -j$(EXTMAXPROCESS) - BUILD_DIR=$(CONFIGURE_DIR) -diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk -index fba6460..fc70419 100644 ---- a/redland/rasqal/makefile.mk -+++ b/redland/rasqal/makefile.mk -@@ -126,7 +126,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config - - CONFIGURE_DIR= - CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" --CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) - BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) - BUILD_FLAGS+= -j$(EXTMAXPROCESS) - BUILD_DIR=$(CONFIGURE_DIR) -diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk -index 710d7d6..dd60f0d 100644 ---- a/redland/redland/makefile.mk -+++ b/redland/redland/makefile.mk -@@ -132,7 +132,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config - - CONFIGURE_DIR= - CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" --CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) - BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) - BUILD_FLAGS+= -j$(EXTMAXPROCESS) - BUILD_DIR=$(CONFIGURE_DIR) -diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch -index 37b7964..e6fd962 100644 ---- a/hunspell/hunspell-1.2.8.patch -+++ b/hunspell/hunspell-1.2.8.patch -@@ -619,3 +619,15 @@ - p++; - } - if (i > 0 && buf[i - 1] == '\n') { -+diff --git a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh -+index 90080f6..f069517 100755 -+--- a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh -++++ b/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh -+--- misc/hunspell-1.2.8/tests/test.sh Sep 4 01:25:35 2007 -++++ misc/build/hunspell-1.2.8/tests/test.sh Jun 18 11:53:11 2008 -+@@ -1,4 +1,4 @@ -+-#!/bin/bash -++#!/bin/sh -+ export LC_ALL="C" -+ -+ function check_valgrind_log () { diff --git a/pkgs/applications/office/openoffice/root-required.patch b/pkgs/applications/office/openoffice/root-required.patch deleted file mode 100644 index b93fd22b4ab..00000000000 --- a/pkgs/applications/office/openoffice/root-required.patch +++ /dev/null @@ -1,25 +0,0 @@ -As nix chroot environment does not have the 'root' as owner, we have to disable -the "owner=root" tar parameters when doing these tar files. -They are built at openoffice build time. -diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk -index 3342aca..49679b1 100644 ---- a/sysui/desktop/slackware/makefile.mk -+++ b/sysui/desktop/slackware/makefile.mk -@@ -100,7 +100,7 @@ $(MISC)/$(TARGET)/usr/share/applications/ : - - $(MISC)/$(TARGET)/empty.tar : - @$(MKDIRHIER) $(@:d)/empty -- @tar -C $(MISC)/$(TARGET)/empty --owner=root --group=root --same-owner -cf $@ . -+ @tar -C $(MISC)/$(TARGET)/empty -cf $@ . - - - # --- packaging --------------------------------------------------- -@@ -112,7 +112,7 @@ $(MENUFILES) : $(MISC)/$(TARGET)/empty.tar - -$(RM) -r $(MISC)$/$(@:b) - dmake $(MISC)$/$(@:b)$/usr/share/applications $(MISC)$/$(@:b)$/install$/slack-desc $(MISC)$/$(@:b)$/install$/doinst.sh - @$(COPY) $(MISC)/$(TARGET)$/empty.tar $@.tmp -- @tar -C $(MISC)/$(@:b) --owner=root --group=root --same-owner --exclude application.flag -rf $@.tmp install usr opt -+ @tar -C $(MISC)/$(@:b) --exclude application.flag -rf $@.tmp install usr opt - @gzip < $@.tmp > $@ - @$(RM) $@.tmp - $(RM) -r $(MISC)$/$(@:b) diff --git a/pkgs/applications/office/openoffice/xlib.patch b/pkgs/applications/office/openoffice/xlib.patch deleted file mode 100644 index d5f0ff9aa20..00000000000 --- a/pkgs/applications/office/openoffice/xlib.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.freedesktop.org/show_bug.cgi?id=31322 - -diff -rc OOO320_m19-orig//vcl/unx/inc/dtint.hxx OOO320_m19//vcl/unx/inc/dtint.hxx -*** OOO320_m19-orig//vcl/unx/inc/dtint.hxx 2010-05-26 20:34:28.000000000 +0200 ---- OOO320_m19//vcl/unx/inc/dtint.hxx 2011-02-15 17:04:32.134813676 +0100 -*************** -*** 36,42 **** - class SalDisplay; - class AllSettings; - -! #ifndef _XLIB_H_ - // forwards from X - struct Display; - struct XEvent; ---- 36,42 ---- - class SalDisplay; - class AllSettings; - -! #if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_) - // forwards from X - struct Display; - struct XEvent; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index e62751cde9d..3ba9e7eb49f 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { - name = "hol_light-20121213"; + name = "hol_light-20130124"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "153"; - sha256 = "1n4da5k3jya8mf7dgif8cl5sr2dqf6vl21fw1fcdna215v2x1rc0"; + rev = "155"; + sha256 = "057223kcv7y2vcnyzvrygvdafn6mb7ycr1m5rj3fsrwz0yl8dqnr"; }; buildInputs = [ ocaml findlib camlp5 ]; diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index 8ac93af8c46..86f9be93f68 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -1,18 +1,18 @@ { cabal, curl, extensibleExceptions, filepath, hashedStorage , haskeline, html, HTTP, mmap, mtl, network, parsec, random -, regexCompat, tar, terminfo, text, vector, zlib +, regexCompat, tar, terminfo, text, utf8String, vector, zlib }: cabal.mkDerivation (self: { pname = "darcs"; - version = "2.8.3"; - sha256 = "0nbg45i5sgbsc488siqirgysy3z912xghqbwm5hcsl37j910hxch"; + version = "2.8.4"; + sha256 = "164zclgib9ql4rqykpdhhk2bad0m5v0k0iwzsj0z7nax5nxlvarz"; isLibrary = true; isExecutable = true; buildDepends = [ extensibleExceptions filepath hashedStorage haskeline html HTTP - mmap mtl network parsec random regexCompat tar terminfo text vector - zlib + mmap mtl network parsec random regexCompat tar terminfo text + utf8String vector zlib ]; extraLibraries = [ curl ]; postInstall = '' diff --git a/pkgs/applications/video/RealPlayer/builder.sh b/pkgs/applications/video/RealPlayer/builder.sh deleted file mode 100644 index 9929634921c..00000000000 --- a/pkgs/applications/video/RealPlayer/builder.sh +++ /dev/null @@ -1,20 +0,0 @@ -source $stdenv/setup -source $makeWrapper - -mkdir -p $out/real - -skip=143273 # Look for "BZh91" in the executable. - -(dd bs=1 count=$skip of=/dev/null && dd) < $src | (cd $out/real && tar xvfj -) - -rm -rf $out/real/Bin $out/real/postinst - -patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $out/real/realplay.bin - -mkdir -p $out/bin -makeWrapper "$out/real/realplay.bin" "$out/bin/realplay" \ - --set HELIX_LIBS "$out/real" \ - --suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)" - -#echo "$libstdcpp5/lib" > $out/real/mozilla/extra-library-path # !!! must be updated, use patchelf --rpath -echo "$out/bin" > $out/real/mozilla/extra-bin-path diff --git a/pkgs/applications/video/RealPlayer/default.nix b/pkgs/applications/video/RealPlayer/default.nix deleted file mode 100644 index 968846f1dcb..00000000000 --- a/pkgs/applications/video/RealPlayer/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl, libstdcpp5, glib, pango, atk, gtk, libX11, makeWrapper}: - -# Note that RealPlayer 10 need libstdc++.so.5, i.e., GCC 3.3, not 3.4. - -assert stdenv.system == "i686-linux"; - -(stdenv.mkDerivation { - name = "RealPlayer-10.0.8.805-GOLD"; - - builder = ./builder.sh; - src = fetchurl { - url = http://software-dl.real.com/25ae61d70a6855a52c14/unix/RealPlayer10GOLD.bin; - md5 = "d28b31261059231a3e93c7466f8153e6"; - }; - - inherit libstdcpp5 makeWrapper; - libPath = [libstdcpp5 glib pango atk gtk libX11]; - -}) // {mozillaPlugin = "/real/mozilla";} diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index b518e9c7456..8109477aa64 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "kdenlive-${version}"; - version = "0.9.2"; + version = "0.9.4"; src = fetchurl { - url = "mirror://kde/stable/kdenlive/0.9.2/src/${name}.tar.bz2"; - sha256 = "1h240s0c10z8sgvwmrfzam33qlx7j2a5b12lw1mk02ihs9hl43j1"; + url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2"; + sha256 = "1l3axf3y83gdfr6yc1lmy296h09gypkpqsc01w7pprg0y19rrfif"; }; buildInputs = diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix new file mode 100644 index 00000000000..52b5b9f7bd4 --- /dev/null +++ b/pkgs/applications/video/mplayer2/default.nix @@ -0,0 +1,132 @@ +{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, yasm, freefont_ttf, ffmpeg, libass +, python3, docutils, which +, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null +, xineramaSupport ? true, libXinerama ? null +, xvSupport ? true, libXv ? null +, alsaSupport ? true, alsaLib ? null +, screenSaverSupport ? true, libXScrnSaver ? null +, vdpauSupport ? true, libvdpau ? null +, dvdnavSupport ? true, libdvdnav ? null +, bluraySupport ? true, libbluray ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, jackaudioSupport ? false, jackaudio ? null +, pulseSupport ? true, pulseaudio ? null +# For screenshots +, libpngSupport ? true, libpng ? null +, useUnfreeCodecs ? false +}: + +assert x11Support -> (libX11 != null && libXext != null && mesa != null); +assert xineramaSupport -> (libXinerama != null && x11Support); +assert xvSupport -> (libXv != null && x11Support); +assert alsaSupport -> alsaLib != null; +assert screenSaverSupport -> libXScrnSaver != null; +assert vdpauSupport -> libvdpau != null; +assert dvdnavSupport -> libdvdnav != null; +assert bluraySupport -> libbluray != null; +assert speexSupport -> speex != null; +assert theoraSupport -> libtheora != null; +assert jackaudioSupport -> jackaudio != null; +assert pulseSupport -> pulseaudio != null; +assert libpngSupport -> libpng != null; + +let + + codecs_src = + let + dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/; + in + if stdenv.system == "i686-linux" then fetchurl { + url = "${dir}/essential-20071007.tar.bz2"; + sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic"; + } else if stdenv.system == "x86_64-linux" then fetchurl { + url = "${dir}/essential-amd64-20071007.tar.bz2"; + sha256 = "13xf5b92w1ra5hw00ck151lypbmnylrnznq9hhb0sj36z5wz290x"; + } else if stdenv.system == "powerpc-linux" then fetchurl { + url = "${dir}/essential-ppc-20071007.tar.bz2"; + sha256 = "18mlj8dp4wnz42xbhdk1jlz2ygra6fbln9wyrcyvynxh96g1871z"; + } else null; + + codecs = if codecs_src != null then stdenv.mkDerivation { + name = "MPlayer-codecs-essential-20071007"; + + src = codecs_src; + + installPhase = '' + mkdir $out + cp -prv * $out + ''; + + meta.license = "unfree"; + } else null; + +in + +stdenv.mkDerivation rec { + name = "mplayer2-20130130"; + + src = fetchgit { + url = "git://git.mplayer2.org/mplayer2.git"; + rev = "d3c580156c0b8777ff082426ebd61bb7ffe0c225"; + sha256 = "1akf2mb2zklz609ks555vjvcs1gw8nwg5kbb9jwra8c4v1dfyhys"; + }; + + prePatch = '' + sed -i /^_install_strip/d configure + ''; + + buildInputs = with stdenv.lib; + [ freetype pkgconfig ffmpeg libass docutils which ] + ++ optionals x11Support [ libX11 libXext mesa ] + ++ optional alsaSupport alsaLib + ++ optional xvSupport libXv + ++ optional theoraSupport libtheora + ++ optional xineramaSupport libXinerama + ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] + ++ optional bluraySupport libbluray + ++ optional jackaudioSupport jackaudio + ++ optional pulseSupport pulseaudio + ++ optional screenSaverSupport libXScrnSaver + ++ optional vdpauSupport libvdpau + ++ optional speexSupport speex + ++ optional libpngSupport libpng + ; + + buildNativeInputs = [ yasm python3 ]; + + postConfigure = '' + patchShebangs TOOLS + ''; + + configureFlags = with stdenv.lib; + '' + ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} + ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} + ${optionalString dvdnavSupport "--extra-ldflags=-ldvdread"} + ${if xvSupport then "--enable-xv" else "--disable-xv"} + ${if x11Support then "--enable-x11 --enable-gl --extra-cflags=-I{libx11}/include" + else "--disable-x11 --disable-gl"} + --disable-xvid + --disable-ossaudio + ''; + + NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; + + enableParallelBuilding = true; + + # Provide a reasonable standard font. Maybe we should symlink here. + postInstall = + '' + mkdir -p $out/share/mplayer + cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf + ''; + + meta = { + description = "A movie player that supports many video formats (MPlayer fork)"; + homepage = "http://mplayer2.org"; + license = "GPLv3+"; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/qemu/0.15.nix b/pkgs/applications/virtualization/qemu/0.15.nix deleted file mode 100644 index f75b2129243..00000000000 --- a/pkgs/applications/virtualization/qemu/0.15.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }: - -stdenv.mkDerivation rec { - name = "qemu-0.15.1"; - - src = fetchurl { - url = "http://wiki.qemu.org/download/${name}.tar.gz"; - sha256 = "1fmm7l7hm0vsmahp41pgvbl62hh833k802brn6hg8kcfkd6v21bp"; - }; - - buildInputs = [ python zlib pkgconfig glib SDL ncurses ]; - - meta = { - description = "QEmu processor emulator"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/virtualization/qemu/1.0.nix b/pkgs/applications/virtualization/qemu/1.0.nix deleted file mode 100644 index daa0b74ee32..00000000000 --- a/pkgs/applications/virtualization/qemu/1.0.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }: - -stdenv.mkDerivation rec { - name = "qemu-1.0.1"; - - src = fetchurl { - url = "http://wiki.qemu.org/download/${name}.tar.gz"; - sha256 = "0y43v5ls3j7iqczfswxkksiqww77nllydncygih7ylc20zhh528r"; - }; - - buildInputs = [ python zlib pkgconfig glib SDL ncurses ]; - - meta = { - description = "QEmu processor emulator"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix new file mode 100644 index 00000000000..fabe3fed47d --- /dev/null +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }: + +stdenv.mkDerivation rec { + name = "qemu-1.3.1"; + + src = fetchurl { + url = "http://wiki.qemu.org/download/${name}.tar.bz2"; + sha256 = "1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip"; + }; + + buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ]; + + enableParallelBuilding = true; + + meta = { + description = "QEmu processor emulator"; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [ viric shlevy ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 2bb2adaa00a..26b16375e65 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { distutils_extra simplejson readline glance cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that # libxml2Python is a dependency of libvirt.py. - libvirt libxml2Python + libvirt libxml2Python urlgrabber ]; buildInputs = @@ -31,8 +31,9 @@ stdenv.mkDerivation rec { buildPhase = "python setup.py build"; installPhase = - '' + '' python setup.py install --prefix="$out"; + wrapPythonPrograms ''; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f699119c5f0..ea98d1ce7a9 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -121,7 +121,7 @@ in stdenv.mkDerivation { --base-dir "$libexec/ExtensionPacks" \ --cert-dir "$libexec/ExtPackCertificates" \ --name "Oracle VM VirtualBox Extension Pack" \ - --tarball "${extensionPack}" + --tarball "${extensionPack}" \ --sha-256 "${extensionPack.outputHash}" ''} diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index a15755205ee..0b8b71db7e9 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -9,6 +9,10 @@ cabal.mkDerivation (self: { buildDepends = [ extensibleExceptions filepath mtl utf8String X11 ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/ + ''; meta = { homepage = "http://xmonad.org"; description = "A tiling window manager"; diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 808bf9f7cde..177b1e016a6 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -6,7 +6,7 @@ source $mirrorsFile # Curl flags to handle redirects, not use EPSV, handle cookies for # servers to need them during redirects, and work on SSL without a # certificate (this isn't a security problem because we check the -# cryptographic hash of the output anyway). +# cryptographic hash of the output anyway). curl="curl \ --location --max-redirs 20 \ --retry 3 @@ -29,20 +29,6 @@ tryDownload() { finish() { - # On old versions of Nix, verify the hash of the output. On newer - # versions, Nix verifies the hash itself. - if test "$NIX_OUTPUT_CHECKED" != "1"; then - if test "$outputHashAlgo" != "md5"; then - echo "hashes other than md5 are unsupported in Nix <= 0.7, upgrade to Nix 0.8" - exit 1 - fi - actual=$(md5sum -b "$out" | cut -c1-32) - if test "$actual" != "$id"; then - echo "hash is $actual, expected $id" - exit 1 - fi - fi - stopNest exit 0 } @@ -52,10 +38,11 @@ tryHashedMirrors() { if test -n "$NIX_HASHED_MIRRORS"; then hashedMirrors="$NIX_HASHED_MIRRORS" fi - + for mirror in $hashedMirrors; do url="$mirror/$outputHashAlgo/$outputHash" - if $curl --fail --silent --show-error --head "$url" \ + if $curl --retry 0 --connect-timeout "${NIX_CONNECT_TIMEOUT:-15}" \ + --fail --silent --show-error --head "$url" \ --write-out "%{http_code}" --output /dev/null > code 2> log; then tryDownload "$url" if test -n "$success"; then finish; fi diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index cc59dd7fab1..09816d9ba8e 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -1,4 +1,4 @@ -{stdenv, curl}: # Note that `curl' may be `null', in case of the native stdenv. +{ stdenv, curl }: # Note that `curl' may be `null', in case of the native stdenv. let @@ -17,10 +17,7 @@ let # Names of the master sites that are mirrored (i.e., "sourceforge", # "gnu", etc.). - sites = - if builtins ? attrNames - then builtins.attrNames mirrors - else [] /* backwards compatibility */; + sites = builtins.attrNames mirrors; impureEnvVars = [ # We borrow these environment variables from the caller to allow @@ -35,10 +32,14 @@ let # This variable allows the user to override hashedMirrors from the # command-line. "NIX_HASHED_MIRRORS" + + # This variable allows overriding the timeout for connecting to + # the hashed mirrors. + "NIX_CONNECT_TIMEOUT" ] ++ (map (site: "NIX_MIRRORS_${site}") sites); in - + { # URL to fetch. url ? "" @@ -79,9 +80,9 @@ stdenv.mkDerivation { if showURLs then "urls" else if name != "" then name else baseNameOf (toString (builtins.head urls_)); - + builder = ./builder.sh; - + buildInputs = [curl]; urls = urls_; @@ -90,9 +91,6 @@ stdenv.mkDerivation { # (http://nixos.org/tarballs) over the original URLs. preferHashedMirrors = true; - # Compatibility with Nix <= 0.7. - id = md5; - # New-style output content requirements. outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 336563ae285..a107e652291 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -46,17 +46,17 @@ stdenv.mkDerivation ( header "Copying build directory to $KEEPBUILDDIR" mkdir -p $KEEPBUILDDIR cp -R $TMPDIR/* $KEEPBUILDDIR - stopNest + stopNest fi fi ''; } - // args // + // args // { name = name + (if src ? version then "-" + src.version else ""); - + postHook = '' . ${./functions.sh} origSrc=$src @@ -75,7 +75,10 @@ stdenv.mkDerivation ( echo "$system" > $out/nix-support/system if [ -z "${toString doCoverageAnalysis}" ]; then - echo "nix-build none $out" >> $out/nix-support/hydra-build-products + 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 + done fi ''; diff --git a/pkgs/desktops/e17/default.nix b/pkgs/desktops/e17/default.nix index 6822c641913..f241f3ff0a6 100644 --- a/pkgs/desktops/e17/default.nix +++ b/pkgs/desktops/e17/default.nix @@ -10,6 +10,8 @@ rec { ecore = callPackage ./ecore { }; + eio = callPackage ./eio { }; + embryo = callPackage ./embryo { }; edje = callPackage ./edje { lua = pkgs.lua5; }; @@ -20,6 +22,12 @@ rec { eeze = callPackage ./eeze { }; + emotion = callPackage ./emotion { }; + + ethumb = callPackage ./ethumb { }; + + elementary = callPackage ./elementary { }; + #### WINDOW MANAGER diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix index 1b3ba2c7256..44eaf2328ec 100644 --- a/pkgs/desktops/e17/e_dbus/default.nix +++ b/pkgs/desktops/e17/e_dbus/default.nix @@ -2,10 +2,10 @@ , dbus_libs }: stdenv.mkDerivation rec { name = "e_dbus-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1kky76v7yydsjihgi1hbwpyqhdmbxmxj2dw4p7kiqbl67dmsjhxg"; + sha256 = "16ckrpzzw5x1cs0fwqkk8431al55xil5magihkp9l3s77g0qd26q"; }; buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ]; propagatedBuildInputs = [ dbus_libs ]; @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { --disable-edbus-test-client --disable-edbus-notify-send --disable-edbus-notify-test + --disable-edbus-async-test ''; meta = { description = "Enlightenment's D-Bus wrapping and glue layer library"; diff --git a/pkgs/desktops/e17/ecore/default.nix b/pkgs/desktops/e17/ecore/default.nix index 47e9e05fd65..4a3eef4ec49 100644 --- a/pkgs/desktops/e17/ecore/default.nix +++ b/pkgs/desktops/e17/ecore/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }: +{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext, libXrender +, libXcomposite, libXfixes, libXdamage }: stdenv.mkDerivation rec { name = "ecore-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1fq3prr2i9n14jppfpns3dg1mkk3iy0ijv2d47pm4krymd7l4hs4"; + sha256 = "08ljda6p0zj1h5sq3l0js6mihw8cr6ydynn42dnka36vachvmfjb"; }; buildInputs = [ pkgconfig eina evas ]; - propagatedBuildInputs = [ libX11 libXext ]; + propagatedBuildInputs = [ libX11 libXext libXcomposite libXrender libXfixes + libXdamage + ]; meta = { description = "Enlightenment's core mainloop, display abstraction and utility library"; longDescription = '' diff --git a/pkgs/desktops/e17/edje/default.nix b/pkgs/desktops/e17/edje/default.nix index b48794e147e..62758b2094e 100644 --- a/pkgs/desktops/e17/edje/default.nix +++ b/pkgs/desktops/e17/edje/default.nix @@ -2,12 +2,16 @@ , ecore, embryo }: stdenv.mkDerivation rec { name = "edje-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "15vh0plb9gb75q0lgbqv4kjz0pyhbfxk39x3inzn87ih567z73xx"; + sha256 = "1hsyj46bk94yd9ymf9425pf4ygy36h5gdkg9fhf8qds8cnn2kcy7"; }; buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ]; + patchPhase = '' + substituteInPlace src/bin/edje_cc_out.c --replace '%s/embryo_cc' '${embryo}/bin/embryo_cc' + substituteInPlace src/bin/edje_cc_out.c --replace 'eina_prefix_bin_get(pfx),' "" + ''; meta = { description = "Enlightenment's abstract GUI layout and animation object library"; longDescription = '' diff --git a/pkgs/desktops/e17/eet/default.nix b/pkgs/desktops/e17/eet/default.nix index 6ac119161c5..079d07187ff 100644 --- a/pkgs/desktops/e17/eet/default.nix +++ b/pkgs/desktops/e17/eet/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }: stdenv.mkDerivation rec { name = "eet-${version}"; - version = "1.6.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1cq6i9g020mi5mr069jykx1fvihd18k1y4x49skmhzfh7dv10dfp"; + sha256 = "0ys2579v45f9x2n47shq0k63g0sdbj1ndhh72dvfajihsgjwd767"; }; buildInputs = [ pkgconfig eina zlib libjpeg ]; meta = { diff --git a/pkgs/desktops/e17/eeze/default.nix b/pkgs/desktops/e17/eeze/default.nix index 4931dbf6203..162fbcf1aef 100644 --- a/pkgs/desktops/e17/eeze/default.nix +++ b/pkgs/desktops/e17/eeze/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, ecore, udev }: stdenv.mkDerivation rec { name = "eeze-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1v0n6bn3g04bjq0cxp6ixw7hb4kjbqpvywpvgik960xkn4pva76p"; + sha256 = "0274fs4cxgw6420yyz9frrc8zhj0qqyvwczzslq3kih3sx1nikxr"; }; buildInputs = [ pkgconfig eina ecore ]; propagatedBuildInputs = [ udev ]; diff --git a/pkgs/desktops/e17/efreet/default.nix b/pkgs/desktops/e17/efreet/default.nix index 960a8694b86..dfe755db597 100644 --- a/pkgs/desktops/e17/efreet/default.nix +++ b/pkgs/desktops/e17/efreet/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, eet, ecore }: stdenv.mkDerivation rec { name = "efreet-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1nydy3ahdq7q6b0xxaj79a8kd4b4xy3hzf1fdh117c9pwp4fxhl0"; + sha256 = "1yw7qjddqcnsz1vb693pa57v9wydvzfy198dc23mz46qfqx08nlg"; }; buildInputs = [ pkgconfig eina eet ecore ]; meta = { diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix index 51b938790ec..77d4829a841 100644 --- a/pkgs/desktops/e17/eina/default.nix +++ b/pkgs/desktops/e17/eina/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { name = "eina-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1vchzb34hd9z8ghh75ch7sdf90gmzzpxryk3yq8hjcdxd0zjx9yj"; + sha256 = "0kd4116njrbag9h459cmfpg07c4ag04z3yrsg513lpi27amch27w"; }; meta = { description = "Enlightenment's core data structure library"; diff --git a/pkgs/desktops/e17/eio/default.nix b/pkgs/desktops/e17/eio/default.nix new file mode 100644 index 00000000000..b56422fd774 --- /dev/null +++ b/pkgs/desktops/e17/eio/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, eet, eina, ecore }: +stdenv.mkDerivation rec { + name = "eio-${version}"; + version = "1.7.5"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1bsam5q364kc4xwfv7pql6686gj0byhk42zwjqx9ajf70l23kss6"; + }; + buildInputs = [ pkgconfig eet eina ecore ]; + meta = { + description = "A library that integrates with EFL to provide efficient filesystem IO"; + longDescription = '' + Eio integrates with EFL (Ecore, Eina) to provide efficient filesystem Input/Output. + It use the best techniques to achieve such purpose, like using at-variants, splice, + properly handling errors and doing it in an asynchronous fashion by means of worker + threads. It is also ported to Windows, so multi-platform. + + Whenever you need to list a directory, copy, move or delete files, Eio will do that + task better than you'd achieve with naive implementations, and it is easy to use. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/elementary/default.nix b/pkgs/desktops/e17/elementary/default.nix new file mode 100644 index 00000000000..b0240d986de --- /dev/null +++ b/pkgs/desktops/e17/elementary/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje }: +stdenv.mkDerivation rec { + name = "elementary-${version}"; + version = "1.7.5"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "08cb4x9639xyrb8d4vzvhl6v385qjfswl717sicm7iimh5zlm2l9"; + }; + buildInputs = [ pkgconfig eina eet evas ecore edje ]; + meta = { + description = "Enlightenment's core data structure library"; + longDescription = '' + Enlightenment's Eina is a core data structure and common utility + library. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix index f09bc6b2ded..29f157545db 100644 --- a/pkgs/desktops/e17/embryo/default.nix +++ b/pkgs/desktops/e17/embryo/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina }: stdenv.mkDerivation rec { name = "embryo-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0hcjlf0rljz4zs1y5l4h0gn2gyqb1h4msfsaps8flaym4mxrvvd9"; + sha256 = "104fsa179w2dfg00sfnap7c3b4ixcps4crxa6yav755awssdcim9"; }; buildInputs = [ pkgconfig eina ]; meta = { diff --git a/pkgs/desktops/e17/emotion/default.nix b/pkgs/desktops/e17/emotion/default.nix new file mode 100644 index 00000000000..42790162171 --- /dev/null +++ b/pkgs/desktops/e17/emotion/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje }: +stdenv.mkDerivation rec { + name = "emotion-${version}"; + version = "1.7.5"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1sfw8kpj2fcqymzd6q7p51xxib1n2arvjl1hnwhqkvwhlsq2b4sw"; + }; + buildInputs = [ pkgconfig ecore evas eet eina edje ]; + meta = { + description = "A library to easily integrate media playback into EFL applications"; + longDescription = '' + Emotion is a library to easily integrate media playback into EFL applications, + it will take care of using Ecore's main loop and video display is done using Evas. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix index f8c57543f88..1c3edb07ecf 100644 --- a/pkgs/desktops/e17/enlightenment/default.nix +++ b/pkgs/desktops/e17/enlightenment/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }: +{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus +, embryo, eio, xcbutilkeysyms, libjpeg }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.16.999.65643"; + version = "0.17.1"; src = fetchurl { - url = "http://download.enlightenment.org/snapshots/2011-11-28/${name}.tar.gz"; - sha256 = "1bb577gbccb1wrifrhv9pzm451zhig2p29mwz55b187ls31p36kz"; + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1z2vx9r7yc55rs673jg7d685slgdv9dss45asg50wh5wxp2mfi3y"; }; - buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ]; + buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo + eio xcbutilkeysyms libjpeg ]; configureFlags = '' --with-profile=FAST_PC --disable-illume diff --git a/pkgs/desktops/e17/ethumb/default.nix b/pkgs/desktops/e17/ethumb/default.nix new file mode 100644 index 00000000000..3d1114e0171 --- /dev/null +++ b/pkgs/desktops/e17/ethumb/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet }: +stdenv.mkDerivation rec { + name = "ethumb-${version}"; + version = "1.7.5"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "0prka3knz8p2n46dfrzgwn55khhhrhjny4vvnzkjcwmhvz7kgc9l"; + }; + buildInputs = [ pkgconfig eina evas ecore edje eet ]; + meta = { + description = "A thumbnail generation library"; + longDescription = '' + Ethumb - thumbnail generation library. Features: + * create thumbnails with a predefined frame (possibly an edje frame); + * have an option to create fdo-like thumbnails; + * have a client/server utility; + * TODO: make thumbnails from edje backgrounds, icons and themes; + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix index 71b54f502a2..c271caa980d 100644 --- a/pkgs/desktops/e17/evas/default.nix +++ b/pkgs/desktops/e17/evas/default.nix @@ -2,10 +2,10 @@ , libX11, libXext, eina, eet }: stdenv.mkDerivation rec { name = "evas-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1lyya0nc8p0vs63azkflwq7lqqml94cqzjpg12h43sbvza342rsq"; + sha256 = "0x3k89q2wxgxjsbhdf4qws7jgpjl7rpqji98ca3nf25jf2lm1cvh"; }; buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg libX11 libXext eina eet diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix deleted file mode 100644 index 2c9e8e3563a..00000000000 --- a/pkgs/desktops/kde-3/kdelibs/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre -, pkgconfig, libtiff, libxml2, libxslt, libtool, expat -, freetype, bzip2, cups, attr, acl -}: - -let version = "3.5.10"; in - -stdenv.mkDerivation { - name = "kdelibs-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2"; - sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1"; - }; - - patches = [ - # We're not supposed to use linux/inotify.h, use sys/inotify.h instead. - # Adapted from Gentoo. - ./inotify.patch - - # Fixes compilation issues with openssl-1.0.0 - ./kdelibs-3.5.10-openssl_1.0.0.patch - ]; - - buildInputs = [ - zlib perl qt3 openssl pcre pkgconfig libtiff libxml2 - libxslt expat libtool freetype bzip2 cups - xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft - ]; - - propagatedBuildInputs = [attr acl]; - - # Prevent configure from looking for pkg-config and freetype-config - # in the wrong location (it looks in /usr/bin etc. *before* looking - # in $PATH). - preConfigure = '' - substituteInPlace configure \ - --replace /usr/bin /no-such-path \ - --replace /usr/local/bin /no-such-path \ - --replace /opt/local/bin /no-such-path - ''; - - configureFlags = '' - --without-arts - --with-ssl-dir=${openssl} - --x-includes=${xlibs.libX11}/include - --x-libraries=${xlibs.libX11}/lib - ''; - - meta.platforms = stdenv.lib.platforms.linux; -} diff --git a/pkgs/desktops/kde-3/kdelibs/inotify.patch b/pkgs/desktops/kde-3/kdelibs/inotify.patch deleted file mode 100644 index 3d0b470811a..00000000000 --- a/pkgs/desktops/kde-3/kdelibs/inotify.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rc kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp -*** kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200 ---- kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2009-04-01 13:26:48.000000000 +0200 -*************** -*** 64,74 **** - // debug - #include - -! #ifdef HAVE_INOTIFY - #include - #include - #include -- #include - // Linux kernel headers are documented to not compile - #define _S390_BITOPS_H - #include ---- 64,76 ---- - // debug - #include - -! #if 1 -! #include -! #include -! #elif HAVE_INOTIFY - #include - #include - #include - // Linux kernel headers are documented to not compile - #define _S390_BITOPS_H - #include diff --git a/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch b/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch deleted file mode 100644 index 7a3a96e972f..00000000000 --- a/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.cc kdelibs-3.5.10-new/kio/kssl/kopenssl.cc ---- kdelibs-3.5.10-old/kio/kssl/kopenssl.cc 2006-07-22 01:16:39.000000000 -0700 -+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.cc 2010-03-31 09:34:38.000000000 -0700 -@@ -96,9 +96,14 @@ - static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *, - const EVP_CIPHER *,unsigned char *,int , - pem_password_cb *, void *) = 0L; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L; -+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L; -+#else - static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L; - static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L; - static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L; -+#endif - static int (*K_X509_print_fp) (FILE *, X509*) = 0L; - static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L; - static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L; -@@ -404,9 +409,14 @@ - K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl"); - K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write"); - K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio"); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp"); -+ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it"); -+#else - K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth"); - K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp"); - K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER"); -+#endif - K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp"); - K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12"); - K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp"); -@@ -568,7 +578,7 @@ - K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session"); - K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION"); - K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION"); -- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); -+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); - #endif - - -@@ -956,7 +966,13 @@ - else return -1; - } - -- -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { -+ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) -+ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x); -+ else return -1; -+} -+#else - ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) { - if (K_X509_asn1_meth) return (K_X509_asn1_meth)(); - else return 0L; -@@ -968,7 +984,7 @@ - return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x); - else return -1; - } -- -+#endif - - int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) { - if (K_X509_print_fp) return (K_X509_print_fp)(fp, x); -diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.h kdelibs-3.5.10-new/kio/kssl/kopenssl.h ---- kdelibs-3.5.10-old/kio/kssl/kopenssl.h 2006-07-22 01:16:39.000000000 -0700 -+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.h 2010-03-31 09:35:20.000000000 -0700 -@@ -48,6 +48,9 @@ - #include - #include - #undef crypt -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#define STACK _STACK -+#endif - #endif - - #include -@@ -446,12 +449,12 @@ - */ - int PEM_write_bio_X509(BIO *bp, X509 *x); - -- -+#if OPENSSL_VERSION_NUMBER < 0x10000000L - /* - * X509_asn1_meth - used for netscape output - */ - ASN1_METHOD *X509_asn1_meth(); -- -+#endif - - /* - * ASN1_i2d_fp - used for netscape output -@@ -531,6 +534,9 @@ - */ - void sk_free(STACK *s); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ void sk_free(void *s) { return sk_free(reinterpret_cast(s)); } -+#endif - - /* - * Number of elements in the stack -@@ -543,6 +549,9 @@ - */ - char *sk_value(STACK *s, int n); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast(s), n); } -+#endif - - /* - * Create a new stack -@@ -555,6 +564,9 @@ - */ - int sk_push(STACK *s, char *d); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast(s), reinterpret_cast(d)); } -+#endif - - /* - * Duplicate the stack -diff -Naur kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc ---- kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc 2005-10-10 08:05:44.000000000 -0700 -+++ kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc 2010-03-31 09:34:38.000000000 -0700 -@@ -87,7 +87,7 @@ - - - STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList &certs) { -- STACK_OF(X509) *x509 = sk_new(NULL); -+ STACK_OF(X509) *x509 = reinterpret_cast(sk_new(NULL)); - KSSLCertificate *cert = certs.first(); - while(cert) { - sk_X509_push(x509, cert->getCert()); -diff -Naur kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc ---- kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc 2006-01-19 09:06:12.000000000 -0800 -+++ kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc 2010-03-31 09:34:38.000000000 -0700 -@@ -1003,17 +1003,31 @@ - QByteArray KSSLCertificate::toNetscape() { - QByteArray qba; - #ifdef KSSL_HAVE_SSL --ASN1_HEADER ah; --ASN1_OCTET_STRING os; --KTempFile ktf; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ NETSCAPE_X509 nx; -+ ASN1_OCTET_STRING hdr; -+#else -+ ASN1_HEADER ah; -+ ASN1_OCTET_STRING os; -+#endif -+ KTempFile ktf; - -- os.data = (unsigned char *)NETSCAPE_CERT_HDR; -- os.length = strlen(NETSCAPE_CERT_HDR); -- ah.header = &os; -- ah.data = (char *)getCert(); -- ah.meth = d->kossl->X509_asn1_meth(); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ hdr.length = strlen(NETSCAPE_CERT_HDR); -+ nx.header = &hdr; -+ nx.cert = getCert(); -+ -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx); -+#else -+ os.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ os.length = strlen(NETSCAPE_CERT_HDR); -+ ah.header = &os; -+ ah.data = (char *)getCert(); -+ ah.meth = d->kossl->X509_asn1_meth(); - -- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+#endif - - ktf.close(); - diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index b2456eb33c2..dc5c32bde8f 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -278,7 +278,7 @@ stdenv.mkDerivation ({ [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ]; configureFlags = " - ${if enableMultilib then "" else "--disable-multilib"} + ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} ${if enablePlugin then "--enable-plugin" else ""} ${if ppl != null then "--with-ppl=${ppl}" else ""} diff --git a/pkgs/development/compilers/ghc/7.6.2.nix b/pkgs/development/compilers/ghc/7.6.2.nix new file mode 100644 index 00000000000..fd678d090a2 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.6.2.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: + +stdenv.mkDerivation rec { + version = "7.6.2"; + + name = "ghc-${version}"; + + src = fetchurl { + url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + sha256 = "d5f45184abeacf7e9c6b4f63c7101a5c1d7b4fe9007901159e2287ecf38de533"; + }; + + buildInputs = [ ghc perl gmp ncurses ]; + + enableParallelBuilding = true; + + buildMK = '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + ''; + + preConfigure = '' + echo "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + ''; + + configureFlags = [ + "--with-gcc=${stdenv.gcc}/bin/gcc" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags=["-S" "--keep-file-symbols"]; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = [ + stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.andres + stdenv.lib.maintainers.simons + ]; + platforms = ghc.meta.platforms; + }; + +} diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 67f2b4f5c7e..376033fe239 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.7.20121106"; + version = "7.7.20121213"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "1n3xj8arkzfvs3q1ymxsnbzs23ndsp8pl67sqirl837pkgcmq263"; + sha256 = "0z9ld6271jzv3mx02vqaakirj79pm2vzxnv5a178r6v874qbzx3p"; }; buildInputs = [ ghc perl gmp ncurses ]; diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 07071ef8414..3494f63c11c 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -64,6 +64,13 @@ stdenv.mkDerivation rec { ln -s $f $out/etc/bash_completion.d/ echo -n . done + for s in 1 2 3 4 5 6 7 8 9; do + for f in "$currentPath/share/man/man$s/"*; do + mkdir -p $out/share/man/man$s + ln -sv $f $out/share/man/man$s/ + echo -n . + done + done for f in "$currentPkgDir/"*.conf; do ln -s $f $linkedPkgDir echo -n . diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index 000b57946f6..c5c7841d72a 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -1,12 +1,14 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "gwt-java-2.4.0"; - src = fetchurl { - url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; - sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; + + src = fetchurl { + url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; + sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; }; - buildInputs = [unzip]; + + buildInputs = [ unzip ]; installPhase = '' ensureDir $out @@ -18,4 +20,4 @@ stdenv.mkDerivation { homepage = http://code.google.com/webtoolkit/; description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications."; }; - } +} diff --git a/pkgs/development/compilers/gwt/builder.sh b/pkgs/development/compilers/gwt/builder.sh deleted file mode 100644 index b14a0432ea5..00000000000 --- a/pkgs/development/compilers/gwt/builder.sh +++ /dev/null @@ -1,31 +0,0 @@ -source $stdenv/setup - -tar xfvj $src -mkdir -p $out -cp -av $name $out - -# Create wrapper scripts so that the GWT compiler/host work - -libPath="$libstdcpp5/lib:$glib/lib:$gtk/lib:$atk/lib:$pango/lib:$libX11/lib:$libXt/lib:$out/$name/mozilla-1.7.12" - -mkdir -p $out/bin - -cat > $out/bin/gwt-compile < $out/bin/gwt-shell <. - patches = [ ./boost_filesystem.patch ]; + patches = [ ./boost_filesystem_1_47_0.patch ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boost/1.49-headers.nix b/pkgs/development/libraries/boost/1.49-headers.nix deleted file mode 100644 index afb094a3cad..00000000000 --- a/pkgs/development/libraries/boost/1.49-headers.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "boost-headers-1.49.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2"; - sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x"; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/include - tar xvf $src -C $out/include --strip-components=1 boost_1_49_0/boost - ''; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.viric ]; - }; -} diff --git a/pkgs/development/libraries/boost/1.52-headers.nix b/pkgs/development/libraries/boost/1.53-headers.nix similarity index 65% rename from pkgs/development/libraries/boost/1.52-headers.nix rename to pkgs/development/libraries/boost/1.53-headers.nix index b9e594cf5f9..04bad16bd70 100644 --- a/pkgs/development/libraries/boost/1.52-headers.nix +++ b/pkgs/development/libraries/boost/1.53-headers.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "boost-headers-1.52.0"; + name = "boost-headers-1.53.0"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; - sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2"; + sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq"; }; phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/include - tar xf $src -C $out/include --strip-components=1 boost_1_52_0/boost + tar xf $src -C $out/include --strip-components=1 boost_1_53_0/boost ''; meta = { diff --git a/pkgs/development/libraries/boost/1.52.nix b/pkgs/development/libraries/boost/1.53.nix similarity index 95% rename from pkgs/development/libraries/boost/1.52.nix rename to pkgs/development/libraries/boost/1.53.nix index 352a2d4aac9..c3272e98a14 100644 --- a/pkgs/development/libraries/boost/1.52.nix +++ b/pkgs/development/libraries/boost/1.53.nix @@ -38,7 +38,7 @@ let in stdenv.mkDerivation { - name = "boost-1.52.0"; + name = "boost-1.53.0"; meta = { homepage = "http://boost.org/"; @@ -50,8 +50,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; - sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2"; + sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boost/boost_filesystem.patch b/pkgs/development/libraries/boost/boost_filesystem_1_47_0.patch similarity index 100% rename from pkgs/development/libraries/boost/boost_filesystem.patch rename to pkgs/development/libraries/boost/boost_filesystem_1_47_0.patch diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 7092e08ec60..cdc54ef6691 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, perl, zlib, libjpeg, freetype, libpng, giflib -, enableX11 ? true, libX11, xproto, xextproto, libXext, renderproto, libXrender +{ stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib +, enableX11 ? true, xlibs , enableSDL ? true, SDL }: let s = import ./src-for-default.nix; in @@ -10,16 +10,14 @@ stdenv.mkDerivation { sha256 = s.hash; }; - patches = [ ./ftbfs.patch ]; - nativeBuildInputs = [ perl ]; - buildInputs = [ zlib libjpeg freetype giflib libpng ] + buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL - ++ stdenv.lib.optionals enableX11 [ - xproto libX11 libXext xextproto - renderproto libXrender - ]; + ++ stdenv.lib.optionals enableX11 (with xlibs; [ + xproto libX11 libXext #xextproto + #renderproto libXrender + ]); NIX_LDFLAGS="-lgcc_s"; @@ -31,7 +29,7 @@ stdenv.mkDerivation { "--enable-fbdev" "--enable-mmx" "--enable-sse" - "--enable-sysfs" + #"--enable-sysfs" # not recognized "--with-software" "--with-smooth-scaling" ] ++ stdenv.lib.optionals enableX11 [ diff --git a/pkgs/development/libraries/directfb/ftbfs.patch b/pkgs/development/libraries/directfb/ftbfs.patch deleted file mode 100644 index b6907e70be7..00000000000 --- a/pkgs/development/libraries/directfb/ftbfs.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: André Draszik -Date: Wed, 28 Sep 2011 17:36:00 +0000 (+0100) -Subject: generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871 -X-Git-Url: http://git.directfb.org/?p=core%2FDirectFB.git;a=commitdiff_plain;h=ef5e1398fe4037b63d6513e450f107fcfe91047f - -generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871 - -../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c: In function 'stretch_hvx': -../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: error: 'DSPF_ARGBF88871' undeclared (first use in this function) -../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: note: each undeclared identifier is reported only once for each function it appears in ---- - -diff --git a/src/gfx/generic/generic_stretch_blit.c b/src/gfx/generic/generic_stretch_blit.c -index 65076f4..6dd987b 100644 ---- a/src/gfx/generic/generic_stretch_blit.c -+++ b/src/gfx/generic/generic_stretch_blit.c -@@ -441,7 +441,7 @@ stretch_hvx( CardState *state, DFBRectangle *srect, DFBRectangle *drect ) - } - break; - -- case DSPF_ARGBF88871: -+ case DSPF_RGBAF88871: - if (state->blittingflags & DSBLIT_SRC_PREMULTIPLY) { - for (i=0; iBlut->num_entries; i++) { - int alpha = entries[i].a + 1; diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix index 6651f1783f8..7cb83db5e8d 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -7,6 +7,7 @@ , x264Support ? true, x264 ? null , xvidSupport ? true, xvidcore ? null , vdpauSupport ? true, libvdpau ? null +, vaapiSupport ? true, libva ? null , faacSupport ? false, faac ? null , dc1394Support ? false, libdc1394 ? null , x11grabSupport ? false, libXext ? null, libXfixes ? null @@ -19,6 +20,7 @@ assert vpxSupport -> libvpx != null; assert x264Support -> x264 != null; assert xvidSupport -> xvidcore != null; assert vdpauSupport -> libvdpau != null; +assert vaapiSupport -> libva != null; assert faacSupport -> faac != null; assert x11grabSupport -> libXext != null && libXfixes != null; @@ -39,6 +41,7 @@ stdenv.mkDerivation rec { "--enable-swscale" "--disable-ffplay" "--enable-shared" + "--enable-avresample" "--enable-runtime-cpudetect" ] ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" @@ -62,6 +65,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional vdpauSupport libvdpau + ++ stdenv.lib.optional vaapiSupport libva ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 731b44aa0ec..ca24db94cd0 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -2,12 +2,13 @@ , fetchurl }: -stdenv.mkDerivation { - name = "gnu-efi-3.0r"; +let version = "3.0s"; in stdenv.mkDerivation { + + name = "gnu-efi-${version}"; src = fetchurl { - url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0r.orig.tar.gz"; - sha256 = "1zi298wsg8v29xj4azcawqfjbxqi2w7l60agf7x2ph2lnqlga2v5"; + url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz"; + sha256 = "18bpswzkj81dadq1b7n2s9g0cz60l34ggzxlq21mb8va10j9zmhh"; }; meta = { diff --git a/pkgs/development/libraries/goffice/0.9.nix b/pkgs/development/libraries/goffice/0.10.nix similarity index 82% rename from pkgs/development/libraries/goffice/0.9.nix rename to pkgs/development/libraries/goffice/0.10.nix index 23b65b1c712..793704be255 100644 --- a/pkgs/development/libraries/goffice/0.9.nix +++ b/pkgs/development/libraries/goffice/0.10.nix @@ -3,11 +3,11 @@ , cairo, gconf, libgnomeui }: stdenv.mkDerivation rec { - name = "goffice-0.9.3"; + name = "goffice-0.10.0"; src = fetchurl { - url = "mirror://gnome/sources/goffice/0.9/${name}.tar.xz"; - sha256 = "0l9achvmbmhn2p5qd0nl7vxn5c3nf1ndzlyknczzyiaa6d5zj91h"; + url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; + sha256 = "7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439"; }; buildInputs = [ diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index a9d05596495..ea32e635898 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { xhtml zlib ]; buildTools = [ alex happy ]; + jailbreak = true; meta = { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "A dependently typed functional programming language and proof assistant"; diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix index 86e219ac91d..04149400ff8 100644 --- a/pkgs/development/libraries/haskell/Diff/default.nix +++ b/pkgs/development/libraries/haskell/Diff/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Diff"; - version = "0.2.0"; - sha256 = "15hdkrzwajnfcx8bj4jdcy4jli115g9v20msw1xyc9wnwrmbz97k"; + version = "0.3.0"; + sha256 = "0k7fj4icnh25x21cmrnbqq0sjgxrr2ffhn8bz89qmy5h9dznvy98"; meta = { description = "O(ND) diff algorithm in haskell"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix index 40620901839..f80f74a3dc2 100644 --- a/pkgs/development/libraries/haskell/HSH/default.nix +++ b/pkgs/development/libraries/haskell/HSH/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HSH"; - version = "2.0.4"; - sha256 = "1ddpazmk82716hqd1riqs7vnl4aildgwkjgk80iam49df9p5b8v8"; + version = "2.1.0"; + sha256 = "0gz2hzdvf0gqv33jihn67bvry38c6hkjapb1prxmb3w12lisr4l5"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index c2c4f70b47e..3011f3a4446 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -1,14 +1,14 @@ -{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb -, sybWithClass, text, time, utf8String +{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb, text +, time, utf8String, void }: cabal.mkDerivation (self: { pname = "HStringTemplate"; - version = "0.6.12"; - sha256 = "02jx02qbs4jxpf1s8nzc9lbaz0flkfcy6xj475v77i45xc1hc71p"; + version = "0.7.0"; + sha256 = "0xxxikgjw1dhx7kx3mjyvgh70m9avcd1kbp2bpig6gjwswk0mmai"; buildDepends = [ - blazeBuilder deepseq filepath mtl parsec syb sybWithClass text time - utf8String + blazeBuilder deepseq filepath mtl parsec syb text time utf8String + void ]; meta = { description = "StringTemplate implementation in Haskell"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix similarity index 81% rename from pkgs/development/libraries/haskell/HTTP/4000.2.6.nix rename to pkgs/development/libraries/haskell/HTTP/4000.2.8.nix index 2c85ec7cd9e..6cb7ed57b4c 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.6"; - sha256 = "0rycwrn9cq9mrsgxkbx373zjvmzg4hd8hzclya6ipd3jda1w5r92"; + version = "4000.2.8"; + sha256 = "0p0cwzjw2102bsyfaga6m8b53s6qnhd6byg2j2qla653f6kjlsh8"; buildDepends = [ mtl network parsec ]; meta = { homepage = "https://github.com/haskell/HTTP"; diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix index f58674f2520..f1a0489167e 100644 --- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix +++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SDL-ttf"; - version = "0.6.1"; - sha256 = "0n6vbigkjfvvk98bp7ys14snpd1zmbz69ndhhpnrn02h363vwkal"; + version = "0.6.2"; + sha256 = "0jajnbqnhdd4i8pj8j27m53zwgfs1v06kiwy0s0zml02fdkq8j4a"; buildDepends = [ SDL ]; extraLibraries = [ SDL_ttf ]; meta = { diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix index 1e2dee4fcdc..91c128756f4 100644 --- a/pkgs/development/libraries/haskell/SMTPClient/default.nix +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SMTPClient"; - version = "1.0.4"; - sha256 = "12m0qv8bf0s52yz07sipxlvas8k3xvi1d4lw6960q0nxr40ijyy2"; + version = "1.1.0"; + sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk"; buildDepends = [ extensibleExceptions hsemail network ]; meta = { description = "A simple SMTP client library"; diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index e7bb666e677..fda3ae1474b 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.10.3.0"; - sha256 = "1l4cnfgnynrprfvx0p3n6kca8arsmvb1yxb9ir782rrk537jci50"; + version = "0.10.4.0"; + sha256 = "0inkcrl40j9kgcmmi0xkcszayqjd5yn7i9fyvv0ywfqwpl6lxf5n"; buildDepends = [ deepseq text ]; meta = { homepage = "https://github.com/bos/attoparsec"; - description = "Fast combinator parsing for bytestrings"; + description = "Fast combinator parsing for bytestrings and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index b336a632b9d..c6624208048 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.3.2"; - sha256 = "1bvgfri0c2nyz06r59rm3slpvm1b0s242s4mznmndpdclgg33d9m"; + version = "1.3.2.4"; + sha256 = "1xakp54g5dyppzpm1q3bbx6g4pvs7p2903pyq6bya1n82zsk7yg7"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index bc3eca3050d..5891131d7e8 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "base64-bytestring"; - version = "1.0.0.0"; - sha256 = "0z0r0lrpka3qrq45ajzyxsjc2as7zp6bq7z7sd56rwiziw7vp7vm"; + version = "1.0.0.1"; + sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db"; meta = { homepage = "https://github.com/bos/base64-bytestring"; - description = "Fast base64 encoding and deconding for ByteStrings"; + description = "Fast base64 encoding and decoding for ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index b4de1910465..09287600323 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -1,10 +1,10 @@ -{ cabal, semigroupoids, semigroups }: +{ cabal, semigroupoids, semigroups, tagged }: cabal.mkDerivation (self: { pname = "bifunctors"; - version = "3.0.3"; - sha256 = "1nmrwc9n9qkj9w9c38ja0had32isr6v35j1v19fhqdwk5ddbpxp4"; - buildDepends = [ semigroupoids semigroups ]; + version = "3.2"; + sha256 = "03bszf1127iw5kimjbag5gmgzz7h2qzcd9f7jb53jpiadfhjfx0a"; + buildDepends = [ semigroupoids semigroups tagged ]; meta = { homepage = "http://github.com/ekmett/bifunctors/"; description = "Haskell 98 bifunctors"; diff --git a/pkgs/development/libraries/haskell/bmp/1.2.3.4.nix b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix similarity index 81% rename from pkgs/development/libraries/haskell/bmp/1.2.3.4.nix rename to pkgs/development/libraries/haskell/bmp/1.2.4.1.nix index 404229cf763..a3de1d11830 100644 --- a/pkgs/development/libraries/haskell/bmp/1.2.3.4.nix +++ b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bmp"; - version = "1.2.3.4"; - sha256 = "134nfchsw4q1k3kr09i5w8jxbr659as4523gs5m2dch15wrmrhf6"; + version = "1.2.4.1"; + sha256 = "1ipy8v5n5dmajnai2cf7591chklxcbhpvwjdgvdwglipds2hjpap"; buildDepends = [ binary ]; meta = { homepage = "http://code.ouroborus.net/bmp"; diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 7f972dfd655..58e0ebbbe00 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -1,10 +1,10 @@ -{ cabal, hashable, text }: +{ cabal, deepseq, hashable, text }: cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "0.4.0.4"; - sha256 = "1xzpri688vbd6fvvxczqx8bv53009ygzws7vbjmj2q97wcm8nmwd"; - buildDepends = [ hashable text ]; + version = "1.0"; + sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk"; + buildDepends = [ deepseq hashable text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index c167f191d4d..0b4ae85c73a 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.4.3"; - sha256 = "0ny4si6z6i6g6khcg9d3m9wks42sqh8i8kpgghhdwd37v32l3f34"; + version = "0.5.0"; + sha256 = "1c1j9cxj08nz1pkrdxhphk6zyn1dxf3wbl8phcrzi8qk6q1vi0bi"; buildDepends = [ classyPrelude conduit monadControl resourcet transformers void xmlConduit diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 9f8893bf72f..4033c382766 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,13 +1,13 @@ -{ cabal, basicPrelude, hashable, systemFilepath, text, transformers -, unorderedContainers, vector +{ cabal, basicPrelude, hashable, liftedBase, systemFilepath, text +, transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.4.3"; - sha256 = "1k2iszja03s8azypl8lpkdjvvqsgzg73cl1wp4jl2fqp1psqv36q"; + version = "0.5.0"; + sha256 = "187a1p2x7jw53iramdq3v2m8h451k5nrjrmnv5sz4c8x9jmj04dp"; buildDepends = [ - basicPrelude hashable systemFilepath text transformers + basicPrelude hashable liftedBase systemFilepath text transformers unorderedContainers vector ]; meta = { diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix index 526b9e1f997..2c967d26085 100644 --- a/pkgs/development/libraries/haskell/contravariant/default.nix +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -1,10 +1,10 @@ -{ cabal, transformers }: +{ cabal, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "contravariant"; - version = "0.2.0.2"; - sha256 = "0142s1c914zbfnvysvcc9s3bv8qs6wimnqcmxca1gxaxqvyfkf3p"; - buildDepends = [ transformers ]; + version = "0.4"; + sha256 = "1nqslc9vcx6v6c33fn7mvb1xhr33yl3ja92p788zx8z1drx9cqc3"; + buildDepends = [ tagged transformers transformersCompat ]; meta = { homepage = "http://github.com/ekmett/contravariant/"; description = "Haskell 98 contravariant functors"; diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 64f03d4dcca..004f74cd7e7 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "0.6.2.0"; - sha256 = "1xd90qb026niq2sn7ks8bn92ifb6255saic68bzg6kzj7ydwwdmx"; + version = "0.6.2.1"; + sha256 = "08gbs61qqsq0kh2r33kzm9mmbs3ar5krmp1a0cf21c012k6k55z5"; buildDepends = [ aeson deepseq filepath hastache mtl mwcRandom parsec statistics time transformers vector vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 85b1360c366..a25603453a7 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "0.6.0.2"; - sha256 = "1lj99a46r12zjwmpkn7vj04wapfgdlmw05jwb5lnhy9hxqgcsgng"; + version = "0.6.0.3"; + sha256 = "0j0wmf2nksqh3rqmzyw468bp25zikc5icif5f3rfi1v06ghsk0i5"; buildDepends = [ colour dataDefault diagramsLib forceLayout lens mtl vectorSpace ]; diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 08a9f09be3a..0b7eb1e88de 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.6.0.0"; sha256 = "17qndqsk09fvnvyhhw3xbbjjhfyyp4sivc898vqllyyky0wqmrdk"; buildDepends = [ digestiveFunctors heist mtl text xmlhtml ]; + jailbreak = true; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index df474e63271..4ba8b16ec46 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.0.0"; - sha256 = "1h56nl1rszm098gwrdhm5w63mrnfjp1brfrk5hlj238nmj0djgcd"; + version = "0.6.0.1"; + sha256 = "1ni1hfmpz14yvgjphwz64hqhg7xbhvvqbdnapspipplvnl0rcmhi"; buildDepends = [ mtl text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix index 86fa7122195..aaca850c0d7 100644 --- a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "distributed-process-simplelocalnet"; - version = "0.2.0.8"; - sha256 = "01kzqfbrkl9zzknw0gbdh1c1lss911lphagn2sw6nzl9xpnhjqk0"; + version = "0.2.0.9"; + sha256 = "0bkb26bfpmyhh26hgznnw073kvk78ws6lqi86pxrgnnm9sx5mi21"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 6ecd5d57883..1e83cbaa8d9 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "distributed-process"; - version = "0.4.1"; - sha256 = "1ysm2rq7ldxb5w6m04vf5q3zrgvg99z7kszjqj17r17ps61v898f"; + version = "0.4.2"; + sha256 = "16w8jp66903vn089ysqdn534v0744cr2m6wkqd77zri6a0caaa6c"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/dyre/default.nix b/pkgs/development/libraries/haskell/dyre/default.nix new file mode 100644 index 00000000000..8b3d2cab677 --- /dev/null +++ b/pkgs/development/libraries/haskell/dyre/default.nix @@ -0,0 +1,18 @@ +{ cabal, binary, executablePath, filepath, ghcPaths, ioStorage +, time, xdgBasedir +}: + +cabal.mkDerivation (self: { + pname = "dyre"; + version = "0.8.11"; + sha256 = "0sg5csshznbbyvq72s4sps7bkjlkfxiwcy4i3ip83lrxjw1msvr8"; + buildDepends = [ + binary executablePath filepath ghcPaths ioStorage time xdgBasedir + ]; + meta = { + homepage = "http://github.com/willdonnelly/dyre"; + description = "Dynamic reconfiguration in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix index b6d0b4668f8..22f5953b7e0 100644 --- a/pkgs/development/libraries/haskell/edit-distance/default.nix +++ b/pkgs/development/libraries/haskell/edit-distance/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "edit-distance"; - version = "0.2.1.1"; - sha256 = "1d8h38cn3azvsp2dp5gycglm5bwwd8plbag8ypi38yj6c35a82yn"; + version = "0.2.1.2"; + sha256 = "08dxsp1ar8mr4xrjy37lzl0s1rjnqsdq30p09nclip5pyhcw7g44"; isLibrary = true; isExecutable = true; buildDepends = [ random ]; diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index cbfa53b6d00..4730af58569 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -1,13 +1,16 @@ -{ cabal, semigroupoids, semigroups, transformers }: +{ cabal, MonadRandom, mtl, semigroupoids, semigroups, transformers +}: cabal.mkDerivation (self: { pname = "either"; - version = "3.0.3"; - sha256 = "02kpb8xd19n00ll61haqr6k3hy8qmbdf73gr4zs59q9xh0739qxc"; - buildDepends = [ semigroupoids semigroups transformers ]; + version = "3.4"; + sha256 = "05nbp8gp50wq592k6dsrpzp6wmqjn9pz6mkizqfb65z1wvd1xiz2"; + buildDepends = [ + MonadRandom mtl semigroupoids semigroups transformers + ]; meta = { homepage = "http://github.com/ekmett/either/"; - description = "Haskell 98 either monad transformer"; + description = "An either monad transformer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index 1b1b4b7348e..482fd766487 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec, ranges }: +{ cabal, attoparsec }: cabal.mkDerivation (self: { pname = "email-validate"; - version = "0.3.2"; - sha256 = "0cshrl0if1ivn7c0ggm21r58pzsyp7l5wk3dgl86n6zla9dwdmhq"; - buildDepends = [ parsec ranges ]; + version = "1.0.0"; + sha256 = "0sj1cvn9ap0m8d4cg4cqavvmkd74vp86lyyra9g6f17815sxdbsg"; + buildDepends = [ attoparsec ]; meta = { homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; description = "Validating an email address string against RFC 5322"; diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index d2e68670eb0..7ed890c513c 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "errors"; - version = "1.3.1"; - sha256 = "0vfpnpkiz362bvjyaf35spfk3h6vw7xi1x3f8agzs7kmxrdvrfik"; + version = "1.4.1"; + sha256 = "18npfwr6byh0aib9qxpynr2gf0v92c0xbxky4a733jbdrwli5c40"; buildDepends = [ either safe transformers ]; meta = { description = "Simplified error-handling"; diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 43492d73fae..d114a5aa3af 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; + jailbreak = true; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix new file mode 100644 index 00000000000..6e0cd15c248 --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "ghc-heap-view"; + version = "0.4.2.0"; + sha256 = "0c9yz47j0ddy0l04dabglc99hl7n9wwnz4xj9r8ljafag6l221gp"; + buildDepends = [ transformers ]; + meta = { + description = "Extract the heap representation of Haskell values and thunks"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix new file mode 100644 index 00000000000..4b606e8b73b --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -0,0 +1,20 @@ +{ cabal, cairo, deepseq, fgl, ghcHeapView, graphviz, gtk, mtl +, svgcairo, text, transformers, xdot +}: + +cabal.mkDerivation (self: { + pname = "ghc-vis"; + version = "0.6"; + sha256 = "0gvfs0f6fjg4bzq9q6rrhin6gk1pbyw9qbigi90cz1fg10nq7nzi"; + buildDepends = [ + cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text + transformers xdot + ]; + meta = { + homepage = "http://felsin9.de/nnis/ghc-vis"; + description = "Live visualization of data structures in GHCi"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index aa06d0178be..db1b3c6c467 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.1.2"; - sha256 = "1dy1wdnld6cxx5xqfszywi4f7xv143ar2dq4nb0dnd1dgd5hgmak"; + version = "0.10.2"; + sha256 = "07zdc1qx429rmisb39gdamwn9b1jblvjg7py4fcxx3qj01b6mvxx"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index a0fb693acbb..ededea21fcc 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.8.1"; - sha256 = "0bi60zprgq1dd6prshvgqyyp13l6n5f171aryxg254kjagvrm3lf"; + version = "1.7.8.2"; + sha256 = "0jf49vdms8jzygkwch5k8s611pay0xqwq1lc0p476d37rzb8qpn4"; buildDepends = [ bmp GLUT OpenGL ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 637bb5ba45a..609863e808f 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -1,13 +1,14 @@ -{ cabal, colour, dlist, fgl, filepath, polyparse, text +{ cabal, colour, dlist, fgl, filepath, polyparse, temporary, text , transformers, wlPprintText }: cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.15.0.1"; - sha256 = "137d8n20fbpdz7az79gqharsfl293pl3xn444338i6blfi47ssdy"; + version = "2999.16.0.0"; + sha256 = "1g4q4wyj5amz9xvgnqn143p5nq6m4a0lggxz7jn9l2hwp41bx1g8"; buildDepends = [ - colour dlist fgl filepath polyparse text transformers wlPprintText + colour dlist fgl filepath polyparse temporary text transformers + wlPprintText ]; meta = { homepage = "http://projects.haskell.org/graphviz/"; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index c8b2117c128..68b79bdcc3b 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.1.2.1"; - sha256 = "1d9bbqy1dix60w72zc3g4y7454avngfyl2i8gj99bdqin2wwcgp8"; + version = "4.1.4.0"; + sha256 = "0nhr7ai03hx2qjxlqml0js43iwxhcbpdqkwdvw8pqs396yrjwxdj"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { filepath httpConduit httpTypes lrucache mtl pandoc parsec random regexBase regexTdfa snapCore snapServer tagsoup text time ]; + jailbreak = true; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 906a8e2759a..40c6f44739c 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.3.1"; - sha256 = "04qqsjrn0fh9y4z7gjf3g60w69gqxhzq7dqkraq97p3w45fijm1i"; + version = "1.1.6.2"; + sha256 = "00asrmyb4k9xpsbwwafm3rj1lisssrc3hj3dsr827w9x86xxargy"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index b2311bde6ca..2d50deeef65 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.1.1"; - sha256 = "0q12l93kq5ixvam682ys3a6i3q59amz9cyr1bb06f2zf8qr57b7a"; + version = "7.1.4"; + sha256 = "0vnawm2m7lr7yvpd30divczxl90fayjvsysr7l1lq76qgxjsd576"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index 8b8616fce20..ae62c051ec5 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.0.1.8"; - sha256 = "0skrzvzasm0hg4631nhfppsb7mn60pnxk4v31gipzz780sbx9zi8"; + version = "1.1.0.2"; + sha256 = "0d103cvr168hgyghm6fp67r4lz1p592x45igwld6xq3nyxjxnbp9"; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index f37badde96d..ff8aa25bd2d 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -1,13 +1,13 @@ { cabal, blazeBuilder, filepath, ieee754, mtl, syb, text -, utf8String +, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hastache"; - version = "0.4.2"; - sha256 = "1ad691qxnnx0a6ik0cjdzd8aw7z88p06zckbb3cb1r8pk6m0g7vi"; + version = "0.5.0"; + sha256 = "1c1pphw7qx5l5fdfqchihvp2yrwwb0ln8dfshkvd1giv8cjmbyn8"; buildDepends = [ - blazeBuilder filepath ieee754 mtl syb text utf8String + blazeBuilder filepath ieee754 mtl syb text transformers utf8String ]; meta = { homepage = "http://github.com/lymar/hastache"; diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index a2251f69673..c1d357fdb9e 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.10.2.1"; - sha256 = "14lp27vlzv6qqv325x2vqqvphw5ads5ywjqpjramv3hhd275fn3d"; + version = "0.11.0.1"; + sha256 = "0d5nn0kfs7hbgs4b77i8c8pq2q5hldqk08dacva7xlxvjrlxsyn6"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 8ebc698892f..153cee7db75 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.14"; - sha256 = "1ymmf8zxp2nbygnavhr3ay0fidhd3vhrdqb7mg0qgk8y9kx25brj"; + version = "4.2.15"; + sha256 = "0mhxdbbzq7hl5zxz3dhxyrs5q08y8hxwsm19ba0gx47qvg3znzki"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix index 2a83df47f09..b72f4d947c4 100644 --- a/pkgs/development/libraries/haskell/hsdns/default.nix +++ b/pkgs/development/libraries/haskell/hsdns/default.nix @@ -2,15 +2,15 @@ cabal.mkDerivation (self: { pname = "hsdns"; - version = "1.5"; - sha256 = "2788d1ad5ef07ae5f356a460fb92316118f3a4d9c779ec27fb8243602bcf6399"; + version = "1.6"; + sha256 = "1vf3crkhs7z572bqdf7p2hfcqkjxvnyg0w0cf8b7kyfxzn8bj3fa"; buildDepends = [ network ]; extraLibraries = [ adns ]; noHaddock = true; meta = { - homepage = "http://gitorious.org/hsdns"; + homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; - license = "LGPL"; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index e8c0c9e4da8..bffe1ad5809 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hsemail"; - version = "1.7.4"; - sha256 = "0nigv0zbkm90m5jskfc5a4zx2d3gyqj1y472jplrgd76s15alsmw"; + version = "1.7.5"; + sha256 = "0ls6y48bndwgb7ng29wxim4h36rs6b07dqi6ic4hqgbb7lg6fma4"; buildDepends = [ mtl parsec ]; meta = { homepage = "http://gitorious.org/hsemail"; diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index bc194108d33..4c897f20ef7 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -4,15 +4,14 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.4.3"; - sha256 = "0i963fxamyyi3afac67rkw4340i3xqs1q3lvcy69mq0czbdvgjmc"; + version = "1.4.4"; + sha256 = "09wrvdlqzpa3vjcnirnzpj8nsvqnn5xbilnxaqmjm2agbl8xfj5r"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv silently time transformers ]; - jailbreak = true; meta = { homepage = "http://hspec.github.com/"; description = "Behavior-Driven Development for Haskell"; diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix index d5043024fd6..e26a9d9e02a 100644 --- a/pkgs/development/libraries/haskell/hsyslog/default.nix +++ b/pkgs/development/libraries/haskell/hsyslog/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "hsyslog"; - version = "1.4"; - sha256 = "f3bf4bf47565cb0245afb0e8ffa3f79635b02f0032081845a5999964d828f4db"; + version = "1.5"; + sha256 = "1dpcawnl3a5lw2w8gc9920sjrw43qmq1k2zws8rx2q0r6ps7nhgp"; meta = { - homepage = "http://gitorious.org/hsyslog"; + homepage = "http://github.com/peti/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index b9f47b44006..544f6c0d674 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.7"; - sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i"; + version = "1.8.7.1"; + sha256 = "1m0f9snc2zxj8hvxw3ngw0h78ckvdlxxfjvrryk93blfwbamssi5"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index e30a30fc7aa..05e97291f37 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,15 +1,15 @@ -{ cabal, blazeBuilder, caseInsensitive, classyPreludeConduit -, conduit, dataDefault, httpConduit, httpTypes, liftedBase -, monadControl, network, networkConduit, text, wai, warp, word8 +{ cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit +, dataDefault, httpConduit, httpTypes, liftedBase, monadControl +, network, networkConduit, text, wai, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.1.1.1"; - sha256 = "0xg6xw0j61db75smys2fgjn0nzv2dy8c1ha4m828ssnxlic98lk2"; + version = "0.1.1.2"; + sha256 = "179j6zfmx3g6gc7mzhzhl7ymxkijg9vahjvwjwm0wm15vna52iqa"; buildDepends = [ - blazeBuilder caseInsensitive classyPreludeConduit conduit - dataDefault httpConduit httpTypes liftedBase monadControl network + blazeBuilder caseInsensitive classyPrelude conduit dataDefault + httpConduit httpTypes liftedBase monadControl network networkConduit text wai warp word8 ]; meta = { diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 242f73e9b21..d0837d21bff 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.7.3.0.1"; - sha256 = "1s2dh75jpf2yllw503hjw0x2anhc4c71vz5yylri8nxzx1zs18rq"; + version = "0.8.0"; + sha256 = "14d1gzgwhinkwx3lmc6hvqj6ivjrvy4m6fm2walnyk1zv24zli75"; buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix index 461c790c88b..a77040a5578 100644 --- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix +++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskellSrcExts, regexPosix }: +{ cabal, regexPosix }: cabal.mkDerivation (self: { pname = "language-haskell-extract"; - version = "0.2.3"; - sha256 = "0fz1nin596ihlh77pafzpdf46br1k3pxcxyml2rvly6g0h3yjgpr"; - buildDepends = [ haskellSrcExts regexPosix ]; + version = "0.2.4"; + sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl"; + buildDepends = [ regexPosix ]; meta = { homepage = "http://github.com/finnsson/template-helper"; description = "Module to automatically extract functions from the local code"; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index e815d654b61..e7e40312af3 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "3.8.2"; - sha256 = "1spz4nyv1f7kf4bnw8qgqaks5kc4m0slzw0czj1wh1232w2sz15m"; + version = "3.8.5"; + sha256 = "09z2izh7mqj75yh9f0pb8ky9vnzs9zx2z2mz1ik7l8wid43gm6vn"; buildDepends = [ bifunctors comonad comonadsFd comonadTransformers contravariant distributive filepath genericDeriving hashable diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index 127e888d110..158feeee18a 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "math-functions"; - version = "0.1.1.2"; - sha256 = "09q9647zxvvg7wi81r14qhhy64d1mwgy8kg0zkhdvg4rzw9j669v"; + version = "0.1.3.0"; + sha256 = "06wxr8fbhmsgkpyx2vimx9l6apk0p27mwrxrvbjk0b7m9vsg3ay5"; buildDepends = [ erf vector ]; meta = { homepage = "https://github.com/bos/math-functions"; diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix index 1bde4861b3a..5dd5f65c9e7 100644 --- a/pkgs/development/libraries/haskell/mime-types/default.nix +++ b/pkgs/development/libraries/haskell/mime-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mime-types"; - version = "0.1.0.2"; - sha256 = "1pkhr8k23386qwa1wmlrcilz75di2l8n5kc4n8pnia05p49akfcs"; + version = "0.1.0.3"; + sha256 = "0mzhkqcjlnrs9mwn2crsr1m2mf6pgygs1s3ks8akz1618v6jm6y1"; buildDepends = [ text ]; meta = { homepage = "https://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix index b702f10354c..df63e3ec659 100644 --- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monadcryptorandom"; - version = "0.5"; - sha256 = "19sb9mgfvmmmx1sn0aiq6dn5nl0201xwgs6xqakn7pz5vsqcww2b"; + version = "0.5.1"; + sha256 = "10waxc0i7hcqlgb9iwcdz0xqkym4ihavgwq466xlaqzzhcpp38d6"; buildDepends = [ cryptoApi mtl tagged transformers ]; meta = { homepage = "https://github.com/TomMD/monadcryptorandom"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index ed660062673..d53ddf7ad30 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.10.0.5"; - sha256 = "05mjgvxk3wxfssf4aviigdm6jb73a6bp8lwz86aabdgkgh2i6n54"; + version = "1.10.1"; + sha256 = "127pxs1w99nr6hdancaajm20w3vgmch4xlj0v7221y7i9qcr1y1y"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index 040c931d1f6..90a92019f0e 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "postgresql-libpq"; - version = "0.8.2.1"; - sha256 = "0fjy451gc9lg3kcglq4s5s3hja8ni3adh4jmxd01kfyvyhwggv4d"; + version = "0.8.2.2"; + sha256 = "1mmsfgia318p34l8jx8hihb160sx2wpg2h5r741akcs50v6p5878"; extraLibraries = [ postgresql ]; meta = { homepage = "http://github.com/lpsmith/postgresql-libpq"; diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index 7146359eda4..e2194bf9059 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "profunctors"; - version = "3.2"; - sha256 = "0c7242pk5hfz67cwjy0l7skqyz20akw9j2w7cb8iggcbbb27bgyc"; + version = "3.3"; + sha256 = "0cvar0qr2yf0lmqwhiy2ibajiq9cmqy2ikwn8l5mdxxh5q5rwgjj"; buildDepends = [ comonad tagged ]; meta = { homepage = "http://github.com/ekmett/profunctors/"; diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index 04b0de35465..541fa2026d9 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -1,15 +1,14 @@ -{ cabal, base64Bytestring, base64Conduit, classyPreludeConduit -, conduit, mtl, resourcet, systemFileio, systemFilepath, text -, transformers +{ cabal, base64Bytestring, base64Conduit, classyPrelude, conduit +, mtl, resourcet, systemFileio, systemFilepath, text, transformers }: cabal.mkDerivation (self: { pname = "project-template"; - version = "0.1.1"; - sha256 = "186hqfhhl77yq9gqiw59jbnkk7xmpljqfwwilzjkjknf3ifhs5na"; + version = "0.1.3"; + sha256 = "1nsc4i3s9a7d0nysswhylvnr79z0ax9biiwr7b6jn7jzx0f2bdmm"; buildDepends = [ - base64Bytestring base64Conduit classyPreludeConduit conduit mtl - resourcet systemFileio systemFilepath text transformers + base64Bytestring base64Conduit classyPrelude conduit mtl resourcet + systemFileio systemFilepath text transformers ]; meta = { homepage = "https://github.com/fpco/haskell-ide"; diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix index fbcaa58d777..1819b3d217d 100644 --- a/pkgs/development/libraries/haskell/reflection/default.nix +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reflection"; - version = "1.1.6"; - sha256 = "1ihyx1a8pk1czam0qm1znl851dn4y6jip6s30girgghrvvxmblkw"; + version = "1.1.7"; + sha256 = "073v9y09fvh7nsfqp1jp2ncrq0xkcv5fvikl769ghv2ycgkfxl4z"; buildDepends = [ tagged ]; meta = { homepage = "http://github.com/ekmett/reflection"; diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index 7b15b2bbb92..046fafca43a 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-io"; - version = "3.2.3.1"; - sha256 = "19dnz8xa18yydprnwzgdcbrndi6akwc53rs1104z0awffh83iynm"; + version = "3.2.3.2"; + sha256 = "116qxq0jsq3hbj0hxjxfr9sl29vzj1rpfbzfxgc243v1hh4rdjfr"; buildDepends = [ binary bmp repa vector ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index 7e25fa5913e..4f1367dd559 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "3.0.1"; - sha256 = "12k2yryr31lxhwq42cx05kswljmbli8p8c2wknigzkkam63d8k5h"; + version = "3.0.2"; + sha256 = "0k137iafw0srgmy4qwx3cbx00519c0h91nmszdbx6pzpvf6m5fwm"; buildDepends = [ comonad contravariant semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/semigroupoids"; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 61c783c6727..6ed553516b6 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.2"; - sha256 = "02sk9ql357ybj1h5a4xjn06di5zdafibabhy32j5vs9kpyamvck3"; + version = "1.0.2.1"; + sha256 = "1ik0128gwziv1dajz2g73rk1yac0ymd1w59q3g8c9g8ibwxn9hca"; buildDepends = [ parsec shakespeare text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index a7238ba52eb..01bf73fd501 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.1.1"; - sha256 = "1xzhb3ipax2489311hmiaxp9i44099bsbclcj3ds0rhdfa62xarg"; + version = "1.1.2"; + sha256 = "0iwajn0d0yngzp10j9qbb2gpq1g7r390yqd7pj5dri35rjc6mr8n"; buildDepends = [ aeson shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 11a03eaa9b2..0e04ff4fd44 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.2"; - sha256 = "1n7qymrn2f83a11zdh2950pf8rsqnc52blwi02amjxsvy2piidzm"; + version = "1.0.3.1"; + sha256 = "08w1g19k9v9dvdy45j32kdic8vjhc10ad4g20q5ya0id4cd13qfs"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 16df3f34756..a20ec8e7ca5 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.2.2"; - sha256 = "0svahih2piaj87xfysgjvqqh11gmwz9icrh2g819h68kzh10imlf"; + version = "0.9.3.1"; + sha256 = "1q2lk70l0hk4l6ksjnal1bfkby0i08gdzvj9cscvxs4njxmgdapq"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator bytestringMmap caseInsensitive deepseq enumerator filepath HUnit diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 7f8dc878024..3d25c6c215f 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.9.2.4"; - sha256 = "1kwmrlk9dr033h6q05afnr916wnw5wlxrr87z1myv0a6nzqmdhzl"; + version = "0.9.3.1"; + sha256 = "0wagx1zy52fi4fldbzpsvk5hpdrma9lwsip9zrrbszxf446amd53"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator MonadCatchIOTransformers mtl network diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 30a2d34a99e..7316e519d65 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.10.0.1"; - sha256 = "14j9lgcdyxh7n4yidfvn1r94nziljiqz6nsqgq114v34bnn6l2yn"; + version = "0.11.1"; + sha256 = "0dd66496fjfp80i6whl356sqk7n03rx4ycsah7x11fc9rvplmr3q"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,7 +19,6 @@ cabal.mkDerivation (self: { snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; diff --git a/pkgs/development/libraries/haskell/split/0.2.1.2.nix b/pkgs/development/libraries/haskell/split/0.2.1.2.nix new file mode 100644 index 00000000000..e88f478f976 --- /dev/null +++ b/pkgs/development/libraries/haskell/split/0.2.1.2.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "split"; + version = "0.2.1.2"; + sha256 = "0wjw4j9wgk66h7filzfh0py9b0wwmaynvwqvd6kinxgms86fpvyi"; + meta = { + description = "Combinator library for splitting lists"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/string-qq/default.nix b/pkgs/development/libraries/haskell/string-qq/default.nix new file mode 100644 index 00000000000..78fe1c3930f --- /dev/null +++ b/pkgs/development/libraries/haskell/string-qq/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "string-qq"; + version = "0.0.2"; + sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp"; + meta = { + description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 03ab9a2b84d..1ca325cbf17 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.5.2"; - sha256 = "1whl8qdqyw2saic70kav8srg4f6bcn77mc86m0vk8i8n5mb3q4ny"; + version = "0.5.6.0"; + sha256 = "1cy40b7csna3fwq0bm5mx9d09x52vj517mf38yn8ymd0afff67sb"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 78ec99da8db..581cede2e87 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.1.2"; - sha256 = "1izsjy30saz2il16dwx8sh2s30b1pfgcpq6023v135w1bdrzrnmq"; + version = "0.6.1.3"; + sha256 = "1f2hka9jwlrm9dvw7z3896yfpdzxs2vaw0vbcmj5p401mvzc8w05"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 29b6b11d791..af7b4c57bb7 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "1.1.1"; - sha256 = "0ji83b5z3v6f6a6rgyj5xkjh9vvsqckr7ymzjnhb4zqf0mgymypq"; + version = "1.1.2"; + sha256 = "1vg1mnz6cxxgs48pbpjp4hwyvsysxyzvjfy4p1vd23lwc32cdjqg"; buildDepends = [ cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl network diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix new file mode 100644 index 00000000000..5d0c9ffd91a --- /dev/null +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -0,0 +1,20 @@ +{ cabal, filepath, mtl, QuickCheck, random, regexBase, stm, text +, time, vector, vty +}: + +cabal.mkDerivation (self: { + pname = "vty-ui"; + version = "1.6"; + sha256 = "0chwgzzk2pl9kppd9r6h2azbqc668xpdrrk5y415yi8wcw61s0bc"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + filepath mtl QuickCheck random regexBase stm text time vector vty + ]; + meta = { + homepage = "http://jtdaugherty.github.com/vty-ui/"; + description = "An interactive terminal user interface library for Vty"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 2642af7457e..e475ca7e856 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -1,13 +1,15 @@ -{ cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String -, vector +{ cabal, deepseq, mtl, parallel, parsec, stringQq, terminfo +, utf8String, vector }: cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.20"; - sha256 = "15slw4zpvfkx9qwj2g5ndcxwbw0kkhyq8frvh9kharqd0zqzgqzb"; + version = "4.7.3"; + sha256 = "0x059mzw6v2xf92fdhy0ilyqbics2as6dqrdr6njpp0m6qykkybb"; + isLibrary = true; + isExecutable = true; buildDepends = [ - deepseq mtl parallel parsec terminfo utf8String vector + deepseq mtl parallel parsec stringQq terminfo utf8String vector ]; meta = { homepage = "https://github.com/coreyoconnor/vty"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 1f08f3f1fd4..9cebbde0009 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.2"; - sha256 = "1089sfb4jyi17rw6nivpy96gbc90nyawr35jzwlzl41gzxxmv503"; + version = "1.3.2.1"; + sha256 = "13w3nhz59h4j25fsy95221y71k300plhs4vjqz2wxaigpv9sc2y7"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 0c9b8eb2eb8..cff2cb31850 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.0"; - sha256 = "15y0aw5c4sh1mns4ss39l0wsxrd1b6yq6m5r638x23zl6y7d9j40"; + version = "1.3.0.1"; + sha256 = "0yy0bvkrny4kj77wvn0cflwha6yijfxvnj530ps7xnzv1qm8qn1l"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit text transformers wai diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 56421b213d5..ee6eb288565 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.3.0.1"; - sha256 = "0z6byx71awhjb7fycz1ixsyzzlsrv1i69qwjrfzh9y5wnbchj9yl"; + version = "1.3.0.2"; + sha256 = "1ijxdnl76kkm2qck5qiwdwqvwkbpw8zbilfaz67sfbz3ccwls2fc"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 6a36e873ca6..dd6bf66b676 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.7.1"; - sha256 = "0kabcxzjc686iayhxln2cmnxm3vk3h0685n4d4ybprv5h1nc6ghl"; + version = "1.3.7.2"; + sha256 = "06cwc0lmzgna939svdw7v5s822safkfy3wd4n21f9ml20iskzqm6"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile diff --git a/pkgs/development/libraries/haskell/xdg-basedir/default.nix b/pkgs/development/libraries/haskell/xdg-basedir/default.nix new file mode 100644 index 00000000000..3a12faf07c9 --- /dev/null +++ b/pkgs/development/libraries/haskell/xdg-basedir/default.nix @@ -0,0 +1,14 @@ +{ cabal, filepath }: + +cabal.mkDerivation (self: { + pname = "xdg-basedir"; + version = "0.2.2"; + sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4"; + buildDepends = [ filepath ]; + meta = { + homepage = "http://github.com/willdonnelly/xdg-basedir"; + description = "A basic implementation of the XDG Base Directory specification"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix new file mode 100644 index 00000000000..73cc5c6e764 --- /dev/null +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -0,0 +1,14 @@ +{ cabal, cairo, graphviz, gtk, mtl, polyparse, text }: + +cabal.mkDerivation (self: { + pname = "xdot"; + version = "0.2.2"; + sha256 = "1n7lwshfn5rzbk4fxlkn02fxki2xh5m0304hnb1d5mchxyzhfdan"; + buildDepends = [ cairo graphviz gtk mtl polyparse text ]; + meta = { + description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index dfa96bf2b13..e0bd834f1ea 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,5 +1,5 @@ { cabal, aeson, authenticate, blazeHtml, blazeMarkup, hamlet -, httpConduit, liftedBase, mimeMail, network, persistent +, httpConduit, httpTypes, liftedBase, mimeMail, network, persistent , persistentTemplate, pureMD5, pwstoreFast, random, SHA , shakespeareCss, shakespeareJs, text, transformers , unorderedContainers, wai, yesodCore, yesodForm, yesodJson @@ -8,12 +8,12 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.3"; - sha256 = "0rlp56jsb0cwm1z303b7l9iy5hbip18vlm7fisna4agbf4rj2k0z"; + version = "1.1.4.1"; + sha256 = "18x2m1clk3nqaap51c6ayxbh5q6v0i4srcphgyf26lrxq514pvad"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit - liftedBase mimeMail network persistent persistentTemplate pureMD5 - pwstoreFast random SHA shakespeareCss shakespeareJs text + httpTypes liftedBase mimeMail network persistent persistentTemplate + pureMD5 pwstoreFast random SHA shakespeareCss shakespeareJs text transformers unorderedContainers wai yesodCore yesodForm yesodJson yesodPersistent ]; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 65b24a4534c..bf13f7da174 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.1.7.1"; - sha256 = "07rh6yy8hz660hxz60gvminm166cb5was8qb1l24lrmzchigbf3r"; + version = "1.1.8"; + sha256 = "03yk9ypd314830bk3jjwkzi87bn04lqkh6hq91izn1prvijjiqjm"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 2d0a099002c..9ce33159d8f 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.2.0.2"; - sha256 = "0a3172rgvma420l98hkgvl17ks2a2jkys3rh4qd2bbm9p7qknv3y"; + version = "1.2.1.1"; + sha256 = "1nb0sxg8ln6yiw1a7f896nfqhbrmywhcxcv658g21h8y26jhiizm"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index ec09a68e32c..c1dd27e377d 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.1.1.1"; - sha256 = "10cy50dnhbhwi0yspq0x06gzqpmhkalqq1sww2wjpv13hp53pq3m"; + version = "1.1.2"; + sha256 = "17yv2z7k1s958xyn552wpk0cwpivsnkvia8477yhgbp4n2d1i5jv"; buildDepends = [ pathPieces text vector ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 7923b6e9e8e..a47cc59ecc5 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.1.2"; - sha256 = "0x3vrzqqddi4fmbivmy5pi66jmnc5fh68j5fjfxn5nyhp4n6z0sw"; + version = "1.1.2"; + sha256 = "0rh5vdpiq1ryw7isyaqqw3sif833k8j32m47lvr0dj46lj2jz0a0"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes systemFilepath text transformers unixCompat wai diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index b03274902e6..2d7496b3c1c 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "0.3.3"; - sha256 = "1jb410r905wd26swh2rk59nbyy389gcfz261adhb69awmsyql5x3"; + version = "0.3.3.1"; + sha256 = "052dc68r2k56jzl9yh72kwcgdp35rm9w9vyj6xprqk506i43x7m1"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 50365296270..c4f865d3e85 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.7.2"; - sha256 = "0mxxzcmp63sdn7g30ilp40dsj2iccajc9gpxycnqxqabdzhqkbm0"; + version = "1.1.8"; + sha256 = "0ygcsrq8nf1jvksig72r3i13qz1d3hgh5476fy6l4wl33idk6jb1"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix new file mode 100644 index 00000000000..48a0423653d --- /dev/null +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libeatmydata-65"; + + src = fetchurl { + url = "http://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; + sha256 = "1hfmd24ps5661zbbw1qqgqs6hcwx6ll2fxz2j4cfvkmf0kzw25la"; + }; + + meta = { + homepage = http://www.flamingspork.com/projects/libeatmydata/; + license = "GPLv3+"; + description = "Small LD_PRELOAD library to disable fsync and friends"; + }; +} diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 147ea283dda..56f6242c09e 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -7,11 +7,11 @@ assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != n && glib != null; stdenv.mkDerivation rec { - name = "libgsf-1.14.23"; + name = "libgsf-1.14.25"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "05zvaazf0d584nfirwsz7889lbsl4v781hslv3kda6akiwbwdhdz"; + sha256 = "127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2"; }; nativeBuildInputs = [ intltool pkgconfig ]; @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { doCheck = true; - patches = [ ./syscall-name-clash.patch ]; - meta = { homepage = http://www.gnome.org/projects/libgsf; license = "LGPLv2"; diff --git a/pkgs/development/libraries/libgsf/syscall-name-clash.patch b/pkgs/development/libraries/libgsf/syscall-name-clash.patch deleted file mode 100644 index 01543ade4fd..00000000000 --- a/pkgs/development/libraries/libgsf/syscall-name-clash.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -Naur libgsf-1.14.23-orig/tests/test-cp-msole.c libgsf-1.14.23/tests/test-cp-msole.c ---- libgsf-1.14.23-orig/tests/test-cp-msole.c 2009-05-18 21:55:48.000000000 -0400 -+++ libgsf-1.14.23/tests/test-cp-msole.c 2012-07-15 03:52:03.858382670 -0400 -@@ -34,7 +34,7 @@ - static void clone_dir (GsfInfile *in, GsfOutfile *out); - - static void --clone (GsfInput *input, GsfOutput *output) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) - { - if (gsf_input_size (input) > 0) { - guint8 const *data; -@@ -87,7 +87,7 @@ - gsf_infile_name_by_index (in, i), - is_dir); - -- clone (new_input, new_output); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (new_input, new_output); - } - /* An observation: when you think about the explanation to is_dir - * above, you realize that clone_dir is called even for regular files. -@@ -137,7 +137,7 @@ - - outfile = gsf_outfile_msole_new (output); - g_object_unref (G_OBJECT (output)); -- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); - - return 0; - } -diff -Naur libgsf-1.14.23-orig/tests/test-cp-zip.c libgsf-1.14.23/tests/test-cp-zip.c ---- libgsf-1.14.23-orig/tests/test-cp-zip.c 2009-05-18 21:55:48.000000000 -0400 -+++ libgsf-1.14.23/tests/test-cp-zip.c 2012-07-15 03:54:53.719198559 -0400 -@@ -32,7 +32,7 @@ - #include - - static void --clone (GsfInfile *in, GsfOutfile *out) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInfile *in, GsfOutfile *out) - { - GsfInput *input = GSF_INPUT (in); - GsfOutput *output = GSF_OUTPUT (out); -@@ -85,7 +85,7 @@ - output = gsf_outfile_new_child_full (out, name, is_dir, - "compression-level", level, - NULL); -- clone (GSF_INFILE (input), GSF_OUTFILE (output)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INFILE (input), GSF_OUTFILE (output)); - } - } - gsf_output_close (GSF_OUTPUT (out)); -@@ -137,7 +137,7 @@ - - outfile = gsf_outfile_zip_new (output, &err); - g_object_unref (G_OBJECT (output)); -- clone (infile, outfile); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (infile, outfile); - - return 0; - } -diff -Naur libgsf-1.14.23-orig/tests/test-dump-msole.c libgsf-1.14.23/tests/test-dump-msole.c ---- libgsf-1.14.23-orig/tests/test-dump-msole.c 2011-12-07 18:05:18.000000000 -0500 -+++ libgsf-1.14.23/tests/test-dump-msole.c 2012-07-15 03:56:15.581110536 -0400 -@@ -32,7 +32,7 @@ - #include - - static void --clone (GsfInput *input, GsfOutput *output) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) - { - guint8 const *data; - size_t len; -@@ -72,7 +72,7 @@ - dst = gsf_outfile_new_child (out, - gsf_infile_name_by_index (in, i), - is_dir); -- clone (src, dst); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst); - } - } - -@@ -118,7 +118,7 @@ - g_error_free (err); - return 1; - } -- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); - - return 0; - } -diff -Naur libgsf-1.14.23-orig/tests/test-restore-msole.c libgsf-1.14.23/tests/test-restore-msole.c ---- libgsf-1.14.23-orig/tests/test-restore-msole.c 2011-12-07 18:05:18.000000000 -0500 -+++ libgsf-1.14.23/tests/test-restore-msole.c 2012-07-15 03:57:39.972017963 -0400 -@@ -32,7 +32,7 @@ - #include - - static void --clone (GsfInput *input, GsfOutput *output) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) - { - guint8 const *data; - size_t len; -@@ -72,7 +72,7 @@ - dst = gsf_outfile_new_child (out, - gsf_infile_name_by_index (in, i), - is_dir); -- clone (src, dst); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst); - } - } - -@@ -111,7 +111,7 @@ - - outfile = gsf_outfile_msole_new (output); - g_object_unref (G_OBJECT (output)); -- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); - - return 0; - } diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 05cafecff27..45f75b4f805 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -1,17 +1,20 @@ -{stdenv, fetchurl, pkgconfig, glib }: +{stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { - name = "liboil-0.3.15"; + name = "liboil-0.3.17"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "1m3zcl54sf21cf2ckzny16ihymz8whi60ymyrhmd3m1dlw1knpmf"; + sha256 = "0sgwic99hxlb1av8cm0albzh8myb7r3lpcwxfm606l0bkc3h4pqh"; }; - buildInputs = [pkgconfig glib]; + buildInputs = [ pkgconfig ]; + + patches = [ ./x86_64-cpuid.patch ]; meta = { homepage = http://liboil.freedesktop.org; description = "A library of simple functions that are optimized for various CPUs"; + license = "BSD-2"; }; } diff --git a/pkgs/development/libraries/liboil/x86_64-cpuid.patch b/pkgs/development/libraries/liboil/x86_64-cpuid.patch new file mode 100644 index 00000000000..d86dd79c3bc --- /dev/null +++ b/pkgs/development/libraries/liboil/x86_64-cpuid.patch @@ -0,0 +1,38 @@ +From 705916007fba0a845229a02dc6474cb523eff150 Mon Sep 17 00:00:00 2001 +From: David Schleef +Date: Tue, 20 Jul 2010 21:05:26 +0000 +Subject: x86: Fix cpuid function on x86-64 + +Fixes: #28956. +--- +diff --git a/liboil/liboilcpu-x86.c b/liboil/liboilcpu-x86.c +index e7a1978..ef4d3f2 100644 +--- a/liboil/liboilcpu-x86.c ++++ b/liboil/liboilcpu-x86.c +@@ -162,13 +162,10 @@ get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) + static void + get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) + { ++ *a = op; + __asm__ ( +- " pushq %%rbx\n" + " cpuid\n" +- " mov %%ebx, %%esi\n" +- " popq %%rbx\n" +- : "=a" (*a), "=S" (*b), "=c" (*c), "=d" (*d) +- : "0" (op)); ++ : "+a" (*a), "=b" (*b), "=c" (*c), "=d" (*d)); + } + #endif + +@@ -185,7 +182,7 @@ oil_cpu_detect_cpuid (void) + { + uint32_t eax, ebx, ecx, edx; + uint32_t level; +- char vendor[13] = { 0 }; ++ char vendor[13+4] = { 0 }; + int ret; + + oil_fault_check_enable (); +-- +cgit v0.9.0.2-2-gbebe diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index e02cedeeab3..1f3e5b40937 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation { sha256 = "015jv7pp0a0qxgljgdvf7d01nj4fx0zgzg0wayjp7v86pa38xscm"; }; - buildInputs = [ pkgconfig librdf_raptor ladspaH openssl zlib ]; + buildInputs = [ pkgconfig ladspaH openssl zlib ]; + + propagatedBuildInputs = [ librdf_raptor ]; meta = { description = "A lightweight RDF library with special support for LADSPA plugins."; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 08784a0f257..3e829dc421a 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchurl, glib, libxml2, pkgconfig +{ stdenv, fetchurl, glib, libxml2, pkgconfig, intltool, python , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }: stdenv.mkDerivation { - name = "libsoup-2.38.1"; + name = "libsoup-2.40.3"; src = fetchurl { - url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz; - sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i"; + url = mirror://gnome/sources/libsoup/2.40/libsoup-2.40.3.tar.xz; + sha256 = "82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9"; }; + nativeBuildInputs = [ pkgconfig intltool python ]; - nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; + passthru.propagatedUserEnvPackages = [ glib_networking ]; # glib_networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check"; + preConfigure = '' + substituteInPlace libsoup/tld-parser.py \ + --replace "/usr/bin/env python" ${python}/bin/python + ''; + meta = { inherit (glib.meta) maintainers platforms; }; diff --git a/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch b/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch deleted file mode 100644 index 3e232ee5ac5..00000000000 --- a/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7500e4d1ae85ecf9f61b1446e07ebb887118757c Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos -Date: Sat, 30 Oct 2010 15:55:18 +0200 -Subject: [PATCH 1/2] Fix a crash with documents containing an invalid - %%Pages: comment - -When failed to allocate memory for pages because of invalid %%Pages: -comment, set maxpages to 0 to ignore the comment. Problem spotted -by Marek Kasik. Fixes bug #30867. ---- - libspectre/ps.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libspectre/ps.c b/libspectre/ps.c -index 6c7cfce..4578cec 100644 ---- a/libspectre/ps.c -+++ b/libspectre/ps.c -@@ -597,6 +597,8 @@ psscan(const char *filename, int scanstyle) - if (maxpages > 0) { - doc->pages = (struct page *) PS_calloc(maxpages, - sizeof(struct page)); -+ if (!doc->pages) -+ maxpages = 0; - CHECK_MALLOCED(doc->pages); - } - } --- -1.7.11 - diff --git a/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch b/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch deleted file mode 100644 index 09ab9e11c16..00000000000 --- a/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8ffd9185f81cb8337cece4c8e3672d0e6a97e935 Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: Wed, 24 Nov 2010 15:54:14 +0100 -Subject: [PATCH 2/2] Allocate at least 1 page in doc->pages - -Allocate at least 1 page if there are no %%Pages: or %%Page: comments -in the PS file (#31512). ---- - libspectre/ps.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libspectre/ps.c b/libspectre/ps.c -index 4578cec..0130fb4 100644 ---- a/libspectre/ps.c -+++ b/libspectre/ps.c -@@ -1004,14 +1004,14 @@ psscan(const char *filename, int scanstyle) - section_len += line_len; - } - -+ if (maxpages == 0) { -+ maxpages = 1; -+ doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct page)); -+ CHECK_MALLOCED(doc->pages); -+ } - - newpage: - while (DSCcomment(line) && iscomment(line+2, "Page:")) { -- if (maxpages == 0) { -- maxpages = 1; -- doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct page)); -- CHECK_MALLOCED(doc->pages); -- } - label = ps_gettext(line+length("%%Page:"), &next_char); - if (sscanf(next_char, "%u", &thispage) != 1) thispage = 0; - if (nextpage == 1) { --- -1.7.11 - diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 379727aec5c..a819e0cef6f 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -1,20 +1,18 @@ -{ fetchurl, stdenv, ghostscript }: +{ fetchurl, stdenv, pkgconfig, ghostscript, cairo }: stdenv.mkDerivation rec { - name = "libspectre-0.2.6"; + name = "libspectre-0.2.7"; src = fetchurl { url = "http://libspectre.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1lqdmi7vx497pbigpp77064a4463lmihzh44898l101c69i7qqrg"; + sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"; }; buildInputs = [ # Need `libgs.so'. - ghostscript + pkgconfig ghostscript cairo /*for tests*/ ]; - patches = [ ./0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch ./0002-Allocate-at-least-1-page-in-doc-pages.patch ]; - doCheck = true; meta = { diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 9b2eb19bab4..5caea5ba610 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, intelgen4asm }: +{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: stdenv.mkDerivation rec { - name = "libva-1.0.12"; + name = "libva-1.1.0"; src = fetchurl { - url = "http://cgit.freedesktop.org/libva/snapshot/${name}.tar.bz2"; - sha256 = "1xg8zvmh75w63sc8ykagzrbzswph6g9jardy8v83glkqzilaw2p8"; + url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + sha256 = "1a7g7i96ww8hmim2pq2a3xc89073lzacxn1xh9526bzhlqjdqsnv"; }; - buildInputs = [ autoconf automake libtool libX11 libXext pkgconfig mesa libdrm - libXfixes intelgen4asm ]; + buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; - configureFlags = [ "--enable-i965-driver" "--enable-glx" ]; - - preConfigure = "sh autogen.sh"; + configureFlags = [ "--enable-glx" ]; meta = { homepage = http://www.freedesktop.org/wiki/Software/vaapi; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 640bc7edc32..4e4790bd2a0 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "0.8.0"; + version = "0.8.8"; src = fetchurl { url = "mirror://sourceforge/mlt/${name}.tar.gz"; - sha256 = "1pf61imb5xzgzf65g54kybjr67235rxi20691023mcv34qwppl3v"; + sha256 = "0m4nzxli1pl8w59m4iwwhpmr1xdz7xfknmbl3a0mkkd1jzdiq3nc"; }; buildInputs = diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix deleted file mode 100644 index 47832a114b4..00000000000 --- a/pkgs/development/libraries/qt-4.x/4.7/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ stdenv, fetchurl -, alsaLib, pulseaudio -, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu -, libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig -, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib -, mysql, postgresql, sqlite -, perl, coreutils, libXi -, buildDemos ? false, buildExamples ? false, useDocs ? false -}: - -let - v = "4.7.4"; -in - -stdenv.mkDerivation rec { - name = "qt-${v}"; - - src = fetchurl { - url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz"; - sha256 = "07i283si8rckdsg3h9a4sp213l16hgjrl7cpzclrjvx4x2y5w6cp"; - }; - - preConfigure = - '' - export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" - configureFlags+=" - -docdir $out/share/doc/${name} - -plugindir $out/lib/qt4/plugins - -importdir $out/lib/qt4/imports - -examplesdir $out/share/doc/${name}/examples - -demosdir $out/share/doc/${name}/demos - -datadir $out/share/${name} - -translationdir $out/share/${name}/translations - " - ''; - - configureFlags = - '' - -v -no-separate-debug-info -release -fast -confirm-license -opensource - -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng - -opengl -xrender -xrandr -xinerama -xcursor - -plugin-sql-mysql -system-sqlite - -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked - -fontconfig -I${freetype}/include/freetype2 - -exceptions -xmlpatterns - -multimedia -audio-backend -no-phonon - -webkit -javascript-jit - -make libs -make tools -make translations - ${if buildDemos == true then "-make demos" else "-nomake demos"} - ${if buildExamples == true then "-make examples" else "-nomake examples"} - ${if useDocs then "-make docs" else "-nomake docs"} - ''; - - propagatedBuildInputs = [ - alsaLib - sqlite - libXft - libXrender - libXrandr - libXi - randrproto - xextproto - libXinerama - xineramaproto - libXcursor - zlib - libjpeg - libmng - mysql - postgresql - libpng - which - mesa - libXmu - libXv - openssl - dbus.libs - cups - pkgconfig - libXext - freetype - fontconfig - inputproto - fixesproto - libXfixes - glib - libtiff - pulseaudio - ]; - - buildInputs = [ perl ]; - - prefixKey = "-prefix "; - - prePatch = '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf - ''; - - postInstall = '' - ${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""} - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://qt.nokia.com/products; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = with maintainers; [ urkud sander ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 75f9de5e96a..9aab09094a0 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -1,50 +1,65 @@ -{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false }: +{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false +, cpuConfig ? if stdenv.isi686 then "-b 32 -A 18 -V 1" else "-b 64 -A 31 -V 192" +}: + +# Atlas detects the CPU and optimizes its build accordingly. This is great when +# the code is run on the same machine that built the binary, but in case of a +# central build farm like Hydra, this feature is dangerous because the code may +# be generated utilizing fancy features that users who download the binary +# cannot execute. +# +# To avoid these issues, the build is configured using the 'cpuConfig' +# parameter as follows: +# +# | x86 CPU | x86_64 CPU | +# |---------------------------------------------+------------------------| +# | -b 32 | -b 64 | +# | -A 18 (Pentium II) | -A 31 (Athlon K7) | +# | -V 1 (No SIMD: Pentium II doesn't have SSE) | -V 192 (SSE1 and SSE2) | +# +# Users who want to compile a highly optimized version of ATLAS that's suitable +# for their local machine can override these settings accordingly. let + version = "3.10.1"; + optionalString = stdenv.lib.optionalString; + optional = stdenv.lib.optional; in stdenv.mkDerivation { - name = "atlas-3.9.67"; + name = "atlas-${version}"; src = fetchurl { - url = mirror://sourceforge/math-atlas/atlas3.9.67.tar.bz2; - sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa"; + url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2"; + sha256 = "11ncgdc7kzb2y2gqb3sgarm5saj9fr07r3h2yh2h5bja429b85d2"; }; + buildInputs = [ gfortran ]; + + # Atlas aborts the build if it detects that some kind of CPU frequency + # scaling is active on the build machine because that feature offsets the + # performance timings. We ignore that check, however, because with binaries + # being pre-built on Hydra those timings aren't accurate for the local + # machine in the first place. + patches = optional tolerateCpuTimingInaccuracy ./disable-timing-accuracy-check.patch; + # Configure outside of the source directory. preConfigure = '' mkdir build; cd build; configureScript=../configure; ''; - # * -fPIC allows to build atlas inside shared objects, as octave does. + # * -fPIC is passed even in non-shared builds so that the ATLAS code can be + # used to inside of shared libraries, like Octave does. # - # * Atlas aborts the build if it detects that some kind of CPU frequency - # scaling is active on the build machine because that feature offsets the - # performance timings. We ignore that check, however, because with binaries - # being pre-built on Hydra those timings aren't accurate for the local - # machine in the first place. - # * Atlas detects the cpu and does some tricks. For example, notices the - # hydra AMD Family 10h computer, and uses a SSE trick for it (bit 17 of MXCSR) - # available, for what I know, only in that family. So we hardcode K7 - # -A 31 = Athlon K7 - # -A 18 = Pentium II - # -V 192 = SSE1|SSE2 (Or it takes SSE3 somehow in my machine without SSE3) - # -V 1 = No SIMD (Pentium II does not have any SSE) - # -t 0 = No threading - configureFlags = "-Fa alg -fPIC -t 0" - + optionalString stdenv.isi686 " -b 32 -A 18 -V 1" - + optionalString stdenv.isx86_64 " -A 31 -V 192" - + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0" - + optionalString shared " --shared " - ; - - buildInputs = [ gfortran ]; + # * -t 0 disables use of multi-threading. It's not quite clear what the + # consequences of that setting are and whether it's necessary or not. + configureFlags = "-Fa alg -fPIC -t 0 ${cpuConfig}" + optionalString shared " --shared"; doCheck = true; meta = { homepage = "http://math-atlas.sourceforge.net/"; description = "Automatically Tuned Linear Algebra Software (ATLAS)"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; longDescription = '' The ATLAS (Automatically Tuned Linear Algebra Software) project is an ongoing diff --git a/pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch b/pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch new file mode 100644 index 00000000000..ddacc742d14 --- /dev/null +++ b/pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch @@ -0,0 +1,22 @@ +diff -ubr ATLAS-orig/CONFIG/src/config.c ATLAS/CONFIG/src/config.c +--- ATLAS-orig/CONFIG/src/config.c 2013-02-06 11:23:47.078036878 +0100 ++++ ATLAS/CONFIG/src/config.c 2013-02-06 11:24:16.481120888 +0100 +@@ -711,17 +711,7 @@ + + int ProbeCPUThrottle(int verb, char *targarg, enum OSTYPE OS, enum ASMDIA asmb) + { +- int i, iret; +- char *ln; +- i = strlen(targarg) + 22 + 12; +- ln = malloc(i*sizeof(char)); +- assert(ln); +- sprintf(ln, "%s -O %d -s %d -t", targarg, OS, asmb); +- iret = GetIntProbe(verb, ln, "arch", "CPU THROTTLE", 0); +- free(ln); +- if (iret) printf("CPU Throttling apparently enabled!\n"); +- else printf("Cannot detect CPU throttling.\n"); +- return(iret); ++ return 0; + } + + char *NewAppendedString_SFLAG(char *old, char *flag, char *str) diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index 040395ecf8a..f1c8a84fee2 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -1,10 +1,25 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "STLport-5.2.0"; +stdenv.mkDerivation rec { + name = "STLport-5.2.1"; src = fetchurl { - url = mirror://sourceforge/stlport/STLport-5.2.0.tar.bz2; - md5 = "448d74859407912c0087adcf51bf109a"; + url = "mirror://sourceforge/stlport/${name}.tar.bz2"; + sha256 = "1jbgak1m1qk7d4gyn1p2grbws2icsf7grbs3dh44ai9ck1xh0nvm"; + }; + + # fix hardcoded /usr/bin; not recognizing the standard --disable-static flag + configurePhase = '' + echo Preconf: build/Makefiles/gmake/*/sys.mak + for f in build/Makefiles/gmake/*/sys.mak; do + substituteInPlace "$f" --replace /usr/bin/ "" + done + ./configure --prefix=$out + ''; + + meta = { + description = "An implementation of the C++ Standard Library"; + homepage = http://sourceforge.net/projects/stlport/; + license = "free"; # seems BSD-like }; } diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix new file mode 100644 index 00000000000..548aeb8a2de --- /dev/null +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig +, intelgen4asm }: + +stdenv.mkDerivation rec { + name = "libva-intel-driver-1.0.19"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; + sha256 = "14m7krah3ajkwj190q431lqqa84hdljcdmrcrqkbgaffyjlqvdid"; + }; + + buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 intelgen4asm ]; + + preConfigure = '' + sh autogen.sh + sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure + ''; + + meta = { + homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; + license = "MIT"; + description = "Intel driver for the VAAPI library"; + }; +} diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix new file mode 100644 index 00000000000..a3d51217ead --- /dev/null +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libvdpau, mesa, libva, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libva-vdpau-driver-0.7.4"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2"; + sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; + }; + + buildInputs = [ libvdpau mesa libva pkgconfig ]; + + preConfigure = '' + sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure + ''; + + meta = { + homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; + license = "GPLv2+"; + description = "VDPAU driver for the VAAPI library"; + }; +} diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index aa46517f571..c05bf88ffbf 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -96,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}" universal '' else throw "Target: ${target} is not supported!"} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix index d3831a9c2be..b4cd1a98fb0 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix @@ -1,16 +1,18 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: +{stdenv, src ? null, fetchurl, unzip, makeWrapper, python, jdk}: stdenv.mkDerivation { name = "titanium-mobilesdk-2.1.5.v20121112144658"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip; - sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip; - sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c"; - } - else throw "Platform: ${stdenv.system} not supported!"; + src = if src == null then + if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip; + sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip; + sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c"; + } + else throw "Platform: ${stdenv.system} not supported!" + else src; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 456732abe1f..e3eff458d27 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -2,14 +2,14 @@ {name, app, device ? "iPhone", baseDir ? ""}: stdenv.mkDerivation { - inherit name; + name = stdenv.lib.replaceChars [" "] [""] name; buildCommand = '' ensureDir $out/bin cat > $out/bin/run-test-simulator << "EOF" #! ${stdenv.shell} -e - cd ${app}/${baseDir}/${name}.app - "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication ./${name} -SimulateDevice '${device}' + cd '${app}/${baseDir}/${name}.app' + "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${name}' -SimulateDevice '${device}' EOF chmod +x $out/bin/run-test-simulator ''; diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index df7ace8e4f3..c4b7002a718 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/pkgs/development/tools/build-managers/leiningen/builder.sh @@ -10,7 +10,7 @@ out_bin=$out/bin/lein cp -v $src $out_bin cp -v $jarsrc $out/lib -cp -v $clojuresrc $out/lib +cp -v $clojure/lib/java/* $out/lib for p in $patches; do diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index e5a20b46046..35c340ae0f9 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -1,34 +1,29 @@ -{stdenv, fetchurl, makeWrapper, openjdk, rlwrap}: +{stdenv, fetchurl, makeWrapper, openjdk, rlwrap, clojure }: stdenv.mkDerivation rec { pname = "leiningen"; - version = "1.7.1"; + version = "2.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "7684b899edd6004abafd8e26d2b43d5691217f1aaca535fb94bde1594c8129a5"; + sha256 = "0malymlswxwgh8amkw37qjb8n34ylw3chgbdxgxkq34rkvhv60hb"; }; jarsrc = fetchurl { - url = "https://github.com/downloads/technomancy/leiningen/leiningen-${version}-standalone.jar"; - sha256 = "5d167b7572b9652d44c2b58a13829704842d976fd2236530ef552194e6c12150"; + url = "https://leiningen.s3.amazonaws.com/downloads/leiningen-2.0.0-standalone.jar"; + sha256 = "10jvk19mr5dcl5a9kzna9zslh77v3ixi8awhrhxi30dn1yj3r7ck"; }; - clojuresrc = fetchurl { - url = "http://build.clojure.org/releases/org/clojure/clojure/1.2.1/clojure-1.2.1.jar"; - sha256 = "b38853254a2df9138b2e2c12be0dca3600fa7e2a951fed05fc3ba2d9141a3fb0"; - }; + patches = ./lein_2.0.0.patch; - patches = [ ./lein-rlwrap.patch ./lein.patch ]; - - inherit rlwrap; + inherit rlwrap clojure; builder = ./builder.sh; buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ openjdk ]; + propagatedBuildInputs = [ openjdk clojure ]; meta = { homepage = https://github.com/technomancy/leiningen; diff --git a/pkgs/development/tools/build-managers/leiningen/lein-rlwrap.patch b/pkgs/development/tools/build-managers/leiningen/lein-rlwrap.patch deleted file mode 100644 index 208199f355d..00000000000 --- a/pkgs/development/tools/build-managers/leiningen/lein-rlwrap.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f14307932a316952fae8517c0fcb0962cd204e9a Mon Sep 17 00:00:00 2001 -From: Michel Alexandre Salim -Date: Fri, 4 May 2012 10:56:38 +0700 -Subject: [PATCH] lein-pkg: require rlwrap unconditionally, unless run inside - Emacs or a dumb terminal; chmod to 755 as this is an - executable script - ---- - bin/lein-pkg | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - mode change 100644 => 100755 bin/lein-pkg - -diff --git a/bin/lein-pkg b/bin/lein-pkg -old mode 100644 -new mode 100755 -index 8563da6..1b90ebe ---- lein-pkg.orig -+++ lein-pkg -@@ -3,6 +3,11 @@ - # This variant of the lein script is meant for downstream packagers. - # It has all the cross-platform stuff stripped out as well as the - # logic for running from checkouts and self-upgrading. -+# -+# Note to packagers: -+# rlwrap is now required unless running inside Emacs or in a dumb -+# terminal (this is to improve the 'lein repl' experience). -+# Make sure that your packaging pulls in rlwrap as a dependency - - export LEIN_VERSION="1.7.1" - -@@ -103,10 +108,7 @@ fi - - # Use rlwrap if appropriate - if ([ -z $INSIDE_EMACS ] && [ "$TERM" != "dumb" ]); then -- which rlwrap > /dev/null -- if [ $? -eq 0 ]; then -- RLWRAP="rlwrap -r -m -q '\"'" # custom quote chars -- fi -+ RLWRAP="rlwrap -r -m -q '\"'" # custom quote chars - RLWRAP_CLJ_WORDS_FILE=${RLWRAP_CLJ_WORDS_FILE:-"${HOME}/.clj_completions"} - RLWRAP_CLJ_WORDS_OPTION="" - if [ -r "${RLWRAP_CLJ_WORDS_FILE}" ]; then --- -1.7.9.5 - diff --git a/pkgs/development/tools/build-managers/leiningen/lein.patch b/pkgs/development/tools/build-managers/leiningen/lein.patch deleted file mode 100644 index b62701e2519..00000000000 --- a/pkgs/development/tools/build-managers/leiningen/lein.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- lein-pkg 2012-05-04 11:02:41.524912828 +0700 -+++ lein-pkg-nix 2012-05-04 11:03:11.062543558 +0700 -@@ -76,30 +76,14 @@ - LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)" - LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)" - CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/" --CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar" -+CLOJURE_JAR="$(dirname $0)/../lib/*clojure-1.2.1.jar" - - # apply context specific CLASSPATH entries - if [ -f .lein-classpath ]; then - CLASSPATH="`cat .lein-classpath`:$CLASSPATH" - fi - --SHARE_JARS="ant ant-launcher classworlds clojure-1.2 clojure-contrib \ --lucene-memory maven-ant-tasks maven-artifact maven-artifact-manager \ --maven-error-diagnostics maven-model maven-settings maven-project maven-profile \ --maven-repository-metadata plexus-container-default-alpha plexus-interpolation \ --plexus-utils wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api \ --xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet \ --backport-util-concurrent" # NFI why that last one is necessary --for JAR in $SHARE_JARS; do -- CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar" --done -- --# Do not use installed leiningen jar during self-compilation --if ! { [ "$1" = "compile" ] && -- grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \ -- project.clj ;}; then -- CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar --fi -+CLASSPATH="$CLASSPATH:$(dirname $0)/../lib/*" - - if [ $DEBUG ]; then - echo $CLASSPATH diff --git a/pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch b/pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch new file mode 100644 index 00000000000..23f6b624776 --- /dev/null +++ b/pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch @@ -0,0 +1,4 @@ +46c47 +< LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar +--- +> LEIN_JAR=$(find $(dirname $0)/../lib -name *-standalone.jar | head -n 1) diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix index 1630b0f4072..f6edcf54463 100644 --- a/pkgs/development/tools/documentation/docutils/default.nix +++ b/pkgs/development/tools/documentation/docutils/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.5" a; + version = a.lib.attrByPath ["version"] "0.10" a; buildInputs = with a; [ python pil makeWrapper ]; @@ -10,7 +10,7 @@ in rec { src = fetchurl { url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz"; - sha256 = "03k1dakb5j1xi1xd62vqqy7dkgd1fhr4ahmvvmd5g87wxn2gjz3l"; + sha256 = "0gk0733w34zibzvi6paqqfbbajzaxajc4z5i5wpxlwv73gk281ip"; }; inherit buildInputs; diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 8f8e16dd260..c914e9c8225 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.42"; - sha256 = "03myq4wagx5d9g6v8znw4l67f1irami0fnlw48rxlqhfn33y5mgc"; + version = "1.8.43"; + sha256 = "0wffswyx60qig1is3ki5asp8i4wvd3gqg2r811rw0zxwi3nrjiv6"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index a220f653abf..a9b3dec5092 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -8,7 +8,7 @@ let - basename = "gdb-7.5"; + basename = "gdb-7.5.1"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.bz2"; - md5 = "24a6779a9fe0260667710de1b082ef61"; + sha256 = "084xs90545an51biyy4qd53hsw6p1k6arviq2wlz1a4z526q02q7"; }; # I think python is not a native input, but I leave it diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 2860ac3731f..f09ab2af7d1 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sysbench-0.4.12"; buildInputs = [ autoreconfHook mysql libxslt zlib ]; src = fetchurl { - url = mirror://sourceforge/sysbench/0.4.12/sysbench-0.4.12.tar.gz; + url = mirror://sourceforge/sysbench/sysbench-0.4.12.tar.gz; sha256 = "17pa4cw7wxvlb4mba943lfs3b3jdi64mlnaf4n8jq09y35j79yl3"; }; preAutoreconf = '' diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index 7aa2d57955f..23f0dea4453 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pydb-1.26"; src = fetchurl { - url = "mirror://sourceforge.net/sourceforge/bashdb/pydb-1.26.tar.bz2"; + url = "mirror://sourceforge/sourceforge/bashdb/pydb-1.26.tar.bz2"; sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1"; }; diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 533411b92de..7f1aafa64f7 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { ''; buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isLinux utillinux; + + setupHook = ./setup-hook.sh; meta = with stdenv.lib; { description = "Event-driven I/O framework for the V8 JavaScript engine"; diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh new file mode 100644 index 00000000000..c2888471044 --- /dev/null +++ b/pkgs/development/web/nodejs/setup-hook.sh @@ -0,0 +1,5 @@ +addNodePath () { + addToSearchPath NODE_PATH $1/node_modules +} + +envHooks=(${envHooks[@]} addNodePath) diff --git a/pkgs/development/web/plone/default.nix b/pkgs/development/web/plone/default.nix new file mode 100644 index 00000000000..b53254d2968 --- /dev/null +++ b/pkgs/development/web/plone/default.nix @@ -0,0 +1,10151 @@ + +{ pkgs, python, buildPythonPackage }: + +let plone42Packages = python.modules // rec { + inherit python; + inherit (pkgs) fetchurl stdenv; + + + + accesscontrol = buildPythonPackage rec { + name = "AccessControl-2.13.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/A/AccessControl/${name}.zip"; + md5 = "7e622d99fb17914b4708d26f245cb696"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + acquisition = buildPythonPackage rec { + name = "Acquisition-2.13.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/A/Acquisition/${name}.zip"; + md5 = "8c33160c157b50649e2b2b3224622579"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + archetypes_kss = buildPythonPackage rec { + name = "archetypes.kss-1.7.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/archetypes.kss/${name}.zip"; + md5 = "a8502140123b74f1b7ed4f36d3e56ff3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + archetypes_querywidget = buildPythonPackage rec { + name = "archetypes.querywidget-1.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/archetypes.querywidget/${name}.zip"; + md5 = "cbe134f2806191fd35066bbb7c85bfcc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + archetypes_referencebrowserwidget = buildPythonPackage rec { + name = "archetypes.referencebrowserwidget-2.4.16"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/${name}.zip"; + md5 = "7dd3b0d4e188828701a291449c7495f4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + archetypes_schemaextender = buildPythonPackage rec { + name = "archetypes.schemaextender-2.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/${name}.zip"; + md5 = "865aa5b4b6b26e3bb650d89ddfe77c87"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + argparse = buildPythonPackage rec { + name = "argparse-1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/argparse/${name}.zip"; + md5 = "087399b73047fa5a6482037411ddc968"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + borg_localrole = buildPythonPackage rec { + name = "borg.localrole-3.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/b/borg.localrole/${name}.zip"; + md5 = "04082694dfda9ae5cda62747b8ac7ccf"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + buildout_dumppickedversions = buildPythonPackage rec { + name = "buildout.dumppickedversions-0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/b/buildout.dumppickedversions/${name}.tar.gz"; + md5 = "e81cffff329aaaaf8dd0d1c6bd63c8b0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + clientform = buildPythonPackage rec { + name = "ClientForm-0.2.10"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/C/ClientForm/${name}.zip"; + md5 = "33826886848f89c67a5c8a30b931bd97"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_monkeypatcher = buildPythonPackage rec { + name = "collective.monkeypatcher-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/${name}.zip"; + md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_recipe_omelette = buildPythonPackage rec { + name = "collective.recipe.omelette-0.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.recipe.omelette/${name}.zip"; + md5 = "088bcf60754bead215573ce114207939"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_testcaselayer = buildPythonPackage rec { + name = "collective.testcaselayer-1.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.testcaselayer/${name}.zip"; + md5 = "fd8387d6b6ebd8645ec92f5f1e512450"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_xmltestreport = buildPythonPackage rec { + name = "collective.xmltestreport-1.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.xmltestreport/${name}.tar.gz"; + md5 = "f247d47a019b44694660d785f70c05b3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_z3cform_datagridfield = buildPythonPackage rec { + name = "collective.z3cform.datagridfield-0.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.z3cform.datagridfield/${name}.zip"; + md5 = "c9210337b91305314864da42c12d04c2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_z3cform_datagridfield_demo = buildPythonPackage rec { + name = "collective.z3cform.datagridfield-demo-0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.z3cform.datagridfield/collective.z3cform.datagridfield-0.11.zip"; + md5 = "c9210337b91305314864da42c12d04c2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_z3cform_datetimewidget = buildPythonPackage rec { + name = "collective.z3cform.datetimewidget-1.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/${name}.zip"; + md5 = "89daf27c7f0f235f9c001f0ee50d76e5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + coverage = buildPythonPackage rec { + name = "coverage-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz"; + md5 = "28c43d41b13f8987ea14d7b1d4a4e3ec"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + datetime = buildPythonPackage rec { + name = "DateTime-2.12.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/D/DateTime/${name}.zip"; + md5 = "72a8bcf80b52211ae7fdfe36c693d70c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + diazo = buildPythonPackage rec { + name = "diazo-1.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/diazo/${name}.zip"; + md5 = "d3c2b017af521db4c86fb360c86e0bc8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + documenttemplate = buildPythonPackage rec { + name = "DocumentTemplate-2.13.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/D/DocumentTemplate/${name}.zip"; + md5 = "07bb086c77c1dfe94125ad2efbba94b7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + docutils = buildPythonPackage rec { + name = "docutils-0.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/docutils/${name}.1.tar.gz"; + md5 = "b0d5cd5298fedf9c62f5fd364a274d56"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + elementtree = buildPythonPackage rec { + name = "elementtree-1.2.7-20070827-preview"; + + src = fetchurl { + url = "http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip"; + md5 = "30e2fe5edd143f347e03a8baf5d60f8a"; + }; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + experimental_cssselect = buildPythonPackage rec { + name = "experimental.cssselect-0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/e/experimental.cssselect/${name}.zip"; + md5 = "3fecdcf1fbc3ea6025e115a56a262957"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + extensionclass = buildPythonPackage rec { + name = "ExtensionClass-2.13.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/E/ExtensionClass/${name}.zip"; + md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + feedparser = buildPythonPackage rec { + name = "feedparser-5.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/feedparser/${name}.tar.bz2"; + md5 = "702835de74bd4a578524f311e62c2877"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + five_customerize = buildPythonPackage rec { + name = "five.customerize-1.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/five.customerize/${name}.zip"; + md5 = "32f597c2fa961f7dcc84b23e655d928e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + five_formlib = buildPythonPackage rec { + name = "five.formlib-1.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/five.formlib/${name}.zip"; + md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + five_globalrequest = buildPythonPackage rec { + name = "five.globalrequest-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/five.globalrequest/${name}.tar.gz"; + md5 = "87f8996bd21d4aa156aa26e7d21b8744"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + five_grok = buildPythonPackage rec { + name = "five.grok-1.2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/five.grok/${name}.zip"; + md5 = "b99c3017f3a487dc2a8b7b0b310ee8cf"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + five_intid = buildPythonPackage rec { + name = "five.intid-1.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/five.intid/${name}.zip"; + md5 = "60c6726c07a1c1bf557aeec0ddcee369"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + five_localsitemanager = buildPythonPackage rec { + name = "five.localsitemanager-2.0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/five.localsitemanager/${name}.zip"; + md5 = "5e3a658e6068832bd802018ebc83f2d4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_annotation = buildPythonPackage rec { + name = "grokcore.annotation-1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.annotation/${name}.tar.gz"; + md5 = "a28ccb4b7c86198923d9cce40953314f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_component = buildPythonPackage rec { + name = "grokcore.component-1.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.component/${name}.tar.gz"; + md5 = "24b05b6b132787dbca18acd244c23ffb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_formlib = buildPythonPackage rec { + name = "grokcore.formlib-1.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.formlib/${name}.tar.gz"; + md5 = "dced4aba77053ed78a358a1f5e85d9c4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_security = buildPythonPackage rec { + name = "grokcore.security-1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.security/${name}.tar.gz"; + md5 = "1e668b7e423814fa069c69f2a4014876"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_site = buildPythonPackage rec { + name = "grokcore.site-1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.site/${name}.tar.gz"; + md5 = "bd16753e6d4f1c0ff38266d2ae79633d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_view = buildPythonPackage rec { + name = "grokcore.view-1.13.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.view/${name}.tar.gz"; + md5 = "304363398aa752d5e1479bab39b93e4e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_viewlet = buildPythonPackage rec { + name = "grokcore.viewlet-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.viewlet/${name}.tar.gz"; + md5 = "5e53b3c77941f9ad0ff2aeb7c1b6dd7d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + initgroups = buildPythonPackage rec { + name = "initgroups-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/i/initgroups/${name}.zip"; + md5 = "38e842dcab8445f65e701fec75213acd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + jinja2 = buildPythonPackage rec { + name = "Jinja2-2.5.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/J/Jinja2/${name}.tar.gz"; + md5 = "83b20c1eeb31f49d8e6392efae91b7d5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + kss_core = buildPythonPackage rec { + name = "kss.core-1.6.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/k/kss.core/${name}.zip"; + md5 = "87e66e78c3bbd7af3ecce5b2fef935ae"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + mailinglogger = buildPythonPackage rec { + name = "mailinglogger-3.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/mailinglogger/${name}.tar.gz"; + md5 = "f865f0df6059ce23062b7457d01dbac5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + manuel = buildPythonPackage rec { + name = "manuel-1.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz"; + md5 = "8cd560cf6e8720ecb129c4e5be605fbb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + markdown = buildPythonPackage rec { + name = "Markdown-2.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/M/Markdown/${name}.zip"; + md5 = "122418893e21e91109edbf6e082f830d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + martian = buildPythonPackage rec { + name = "martian-0.11.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/martian/${name}.tar.gz"; + md5 = "865646fcd9dd31613204d5f4c2db943b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + mechanize = buildPythonPackage rec { + name = "mechanize-0.2.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/mechanize/${name}.zip"; + md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + missing = buildPythonPackage rec { + name = "Missing-2.13.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/M/Missing/${name}.zip"; + md5 = "9823cff54444cbbcaef8fc45d8e42572"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + mocker = buildPythonPackage rec { + name = "mocker-1.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/mocker/${name}.tar.bz2"; + md5 = "0bd9f83268e16aef2130fa89e2a4839f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + mr_developer = buildPythonPackage rec { + name = "mr.developer-1.21"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/mr.developer/${name}.zip"; + md5 = "5f832f1709714b09cd7490603afd2365"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + multimapping = buildPythonPackage rec { + name = "MultiMapping-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/M/MultiMapping/${name}.zip"; + md5 = "d69c5904c105b9f2f085d4103e0f0586"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + nose = buildPythonPackage rec { + name = "nose-1.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz"; + md5 = "144f237b615e23f21f6a50b2183aa817"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + nt_svcutils = buildPythonPackage rec { + name = "nt-svcutils-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/n/nose/nose-1.1.2.tar.gz"; + md5 = "144f237b615e23f21f6a50b2183aa817"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + ordereddict = buildPythonPackage rec { + name = "ordereddict-1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/o/ordereddict/${name}.tar.gz"; + md5 = "a0ed854ee442051b249bfad0f638bbec"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + paste = buildPythonPackage rec { + name = "Paste-1.7.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Paste/${name}.tar.gz"; + md5 = "7ea5fabed7dca48eb46dc613c4b6c4ed"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + pastedeploy = buildPythonPackage rec { + name = "PasteDeploy-1.3.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/PasteDeploy/${name}.tar.gz"; + md5 = "eb4b3e2543d54401249c2cbd9f2d014f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + pastescript = buildPythonPackage rec { + name = "PasteScript-1.7.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/PasteScript/${name}.tar.gz"; + md5 = "4c72d78dcb6bb993f30536842c16af4d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ paste pastedeploy ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + persistence = buildPythonPackage rec { + name = "Persistence-2.13.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Persistence/${name}.zip"; + md5 = "92693648ccdc59c8fc71f7f06b1d228c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + pil = buildPythonPackage rec { + name = "PIL-1.1.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip"; + md5 = "92693648ccdc59c8fc71f7f06b1d228c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone = buildPythonPackage rec { + name = "Plone-4.2.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Plone/${name}.zip"; + md5 = "688438bd541e7cb2ab650c8c59282b85"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_alterego = buildPythonPackage rec { + name = "plone.alterego-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.alterego/${name}.zip"; + md5 = "b7b6dbcbba00505d98d5aba83e016408"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_blob = buildPythonPackage rec { + name = "plone.app.blob-1.5.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.blob/${name}.zip"; + md5 = "8d6ba6f360b6bfd40f87914132339660"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_caching = buildPythonPackage rec { + name = "plone.app.caching-1.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.caching/${name}.zip"; + md5 = "83a52efeb7604d4c5b4afbc6c1365c6f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_collection = buildPythonPackage rec { + name = "plone.app.collection-1.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.collection/${name}.zip"; + md5 = "40c9035472e386fc9d0ec1b9a9a3d4f6"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_content = buildPythonPackage rec { + name = "plone.app.content-2.0.12"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.content/${name}.zip"; + md5 = "2f14a85fb66d73e0b699b839caaaad26"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_contentlisting = buildPythonPackage rec { + name = "plone.app.contentlisting-1.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.contentlisting/${name}.zip"; + md5 = "fa6eb45c4ffd0eb3817ad4813ca24916"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_contentmenu = buildPythonPackage rec { + name = "plone.app.contentmenu-2.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/${name}.zip"; + md5 = "b1c7e5a37c659ba30b3a077e149b1752"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_contentrules = buildPythonPackage rec { + name = "plone.app.contentrules-2.1.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/${name}.zip"; + md5 = "74d2fed9095a7c5f890b6f27de78dafc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_controlpanel = buildPythonPackage rec { + name = "plone.app.controlpanel-2.2.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/${name}.zip"; + md5 = "401c8880865f398c281953f5837108b9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_customerize = buildPythonPackage rec { + name = "plone.app.customerize-1.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.customerize/${name}.zip"; + md5 = "6a3802c4e8fbd955597adc6a8298febf"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_dexterity = buildPythonPackage rec { + name = "plone.app.dexterity-1.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.dexterity/${name}.zip"; + md5 = "25ccd382f9e08cfdfe4a9b7e455030bc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_discussion = buildPythonPackage rec { + name = "plone.app.discussion-2.1.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.discussion/${name}.zip"; + md5 = "b0cb1fbdf8a7a238cf5a58fb10c24731"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_folder = buildPythonPackage rec { + name = "plone.app.folder-1.0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.folder/${name}.zip"; + md5 = "8ea860daddb4c93c0b7f2b5f7106fef0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_form = buildPythonPackage rec { + name = "plone.app.form-2.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.form/${name}.zip"; + md5 = "8017f8f782d992825ed71d16b126c4e7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_i18n = buildPythonPackage rec { + name = "plone.app.i18n-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.i18n/${name}.zip"; + md5 = "a10026573463dfc1899bf4062cebdbf2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_imaging = buildPythonPackage rec { + name = "plone.app.imaging-1.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.imaging/${name}.zip"; + md5 = "8d494cd69b3f6be7fcb9e21c20277765"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_intid = buildPythonPackage rec { + name = "plone.app.intid-1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.intid/${name}.tar.gz"; + md5 = "863077002bd272ff11c47de0f7f9db1a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_iterate = buildPythonPackage rec { + name = "plone.app.iterate-2.1.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.iterate/${name}.zip"; + md5 = "db598cfc0986737145ddc7e6b70a1794"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_jquery = buildPythonPackage rec { + name = "plone.app.jquery-1.4.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.jquery/${name}.zip"; + md5 = "a12d56f3dfd2ba6840bf21a6bd860b90"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_jquerytools = buildPythonPackage rec { + name = "plone.app.jquerytools-1.3.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/${name}.zip"; + md5 = "326470a34e07aa98c40d75ec22484572"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_kss = buildPythonPackage rec { + name = "plone.app.kss-1.7.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.kss/${name}.zip"; + md5 = "97a35086fecfe25e55b65042eb35e796"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_layout = buildPythonPackage rec { + name = "plone.app.layout-2.2.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.layout/${name}.zip"; + md5 = "90ea408f5e01aeb01517d55eb6b6063a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_linkintegrity = buildPythonPackage rec { + name = "plone.app.linkintegrity-1.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/${name}.zip"; + md5 = "41810cc85ca05921a329aac5bc4cf403"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_locales = buildPythonPackage rec { + name = "plone.app.locales-4.2.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.locales/${name}.zip"; + md5 = "baf48a0a5278a18fa1c2848d3470464f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_lockingbehavior = buildPythonPackage rec { + name = "plone.app.lockingbehavior-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.lockingbehavior/${name}.tar.gz"; + md5 = "a25745f1f40c6298da1b228ccd95ee27"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_openid = buildPythonPackage rec { + name = "plone.app.openid-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.openid/${name}.tar.gz"; + md5 = "ae0748f91cab0612a498926d405d8edd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_portlets = buildPythonPackage rec { + name = "plone.app.portlets-2.3.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.portlets/${name}.zip"; + md5 = "534be67a7a17a71ca1e76f6f149ff2ac"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_querystring = buildPythonPackage rec { + name = "plone.app.querystring-1.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.querystring/${name}.zip"; + md5 = "b501910b23def9b58e8309d1e469eb6f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_redirector = buildPythonPackage rec { + name = "plone.app.redirector-1.1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.redirector/${name}.zip"; + md5 = "7d441340a83b8ed72a03bc16148a5f21"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_referenceablebehavior = buildPythonPackage rec { + name = "plone.app.referenceablebehavior-0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.referenceablebehavior/${name}.zip"; + md5 = "2359140966f753204d5091bb49fce85c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_registry = buildPythonPackage rec { + name = "plone.app.registry-1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.registry/${name}.zip"; + md5 = "0fdbb01e9ff71108f1be262c39b41b81"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_relationfield = buildPythonPackage rec { + name = "plone.app.relationfield-1.2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.relationfield/${name}.zip"; + md5 = "d19888741677cd457ac7f22dde97ded0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_search = buildPythonPackage rec { + name = "plone.app.search-1.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.search/${name}.zip"; + md5 = "bd5a1f4b5016a6d0a8697e7a9cc04833"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_stagingbehavior = buildPythonPackage rec { + name = "plone.app.stagingbehavior-0.1b4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.stagingbehavior/${name}.zip"; + md5 = "0f9589ec056c303ea0c81a804dd411eb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_testing = buildPythonPackage rec { + name = "plone.app.testing-4.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.testing/${name}.zip"; + md5 = "1a40df72c8beda9520b83dc449a97a3c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_textfield = buildPythonPackage rec { + name = "plone.app.textfield-1.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.textfield/${name}.zip"; + md5 = "f832887a40826d6f68c48b48f071fb9c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_theming = buildPythonPackage rec { + name = "plone.app.theming-1.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.theming/${name}.zip"; + md5 = "2da6d810e0d5f295dd0daa2b60731a1b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_upgrade = buildPythonPackage rec { + name = "plone.app.upgrade-1.2.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/${name}.zip"; + md5 = "2798dd50863d8c25624400b988a0acdd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_users = buildPythonPackage rec { + name = "plone.app.users-1.1.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.users/${name}.zip"; + md5 = "97895d8dbdf885784be1afbf5b8b364c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_uuid = buildPythonPackage rec { + name = "plone.app.uuid-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.uuid/${name}.zip"; + md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_versioningbehavior = buildPythonPackage rec { + name = "plone.app.versioningbehavior-1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.versioningbehavior/${name}.zip"; + md5 = "6c153e3fa10b9ffea9742d0dad7b3b85"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_viewletmanager = buildPythonPackage rec { + name = "plone.app.viewletmanager-2.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/${name}.zip"; + md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_vocabularies = buildPythonPackage rec { + name = "plone.app.vocabularies-2.1.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/${name}.zip"; + md5 = "34d4eb9c95879811fec0875aa3235ed3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_workflow = buildPythonPackage rec { + name = "plone.app.workflow-2.0.10"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.workflow/${name}.zip"; + md5 = "350ea680ccf7eb9b1598927cafad4f38"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_z3cform = buildPythonPackage rec { + name = "plone.app.z3cform-0.6.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/${name}.zip"; + md5 = "2e77f5e03d48a6fb2eb9994edb871917"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_autoform = buildPythonPackage rec { + name = "plone.autoform-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.autoform/${name}.zip"; + md5 = "4cb2935ba9cda3eb3ee801ad8cda7c60"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_behavior = buildPythonPackage rec { + name = "plone.behavior-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.behavior/${name}.zip"; + md5 = "a18feb9ec744b2a64028c366a8835d59"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_browserlayer = buildPythonPackage rec { + name = "plone.browserlayer-2.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.browserlayer/${name}.zip"; + md5 = "bce02f4907a4f29314090c525e5fc28e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_cachepurging = buildPythonPackage rec { + name = "plone.cachepurging-1.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.cachepurging/${name}.zip"; + md5 = "886814ac4deef0f1ed99a2eb60864264"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_caching = buildPythonPackage rec { + name = "plone.caching-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.caching/${name}.zip"; + md5 = "2c2e3b27d13b9101c92dfed222fde36c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_contentrules = buildPythonPackage rec { + name = "plone.contentrules-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.contentrules/${name}.zip"; + md5 = "a32370656c4fd58652fcd8a234db69c5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_dexterity = buildPythonPackage rec { + name = "plone.dexterity-1.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.dexterity/${name}.zip"; + md5 = "c8f495e368ada3a4566d99995d09e64c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_directives_dexterity = buildPythonPackage rec { + name = "plone.directives.dexterity-1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.directives.dexterity/${name}.zip"; + md5 = "713b87644e3591b60b4a8ebd52987477"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_directives_form = buildPythonPackage rec { + name = "plone.directives.form-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.directives.form/${name}.zip"; + md5 = "e40a4b3fdde3768a137a450374934565"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_fieldsets = buildPythonPackage rec { + name = "plone.fieldsets-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.fieldsets/${name}.zip"; + md5 = "4158c8a1f784fcb5cecbd63deda7222f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_folder = buildPythonPackage rec { + name = "plone.folder-1.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.folder/${name}.zip"; + md5 = "1674ff18b7a9452d0c2063cf11c679b7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_formwidget_autocomplete = buildPythonPackage rec { + name = "plone.formwidget.autocomplete-1.2.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.formwidget.autocomplete/${name}.zip"; + md5 = "06b3bfed9ea51fe2e93827f539fc7f07"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_formwidget_contenttree = buildPythonPackage rec { + name = "plone.formwidget.contenttree-1.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.formwidget.contenttree/${name}.zip"; + md5 = "2ea222d53ca856de7c6df831707f4ac1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_formwidget_namedfile = buildPythonPackage rec { + name = "plone.formwidget.namedfile-1.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.formwidget.namedfile/${name}.zip"; + md5 = "9274db2f5d7b4d07748fabfd125e49d0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_i18n = buildPythonPackage rec { + name = "plone.i18n-2.0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.i18n/${name}.zip"; + md5 = "ef36aa9a294d507abb37787f9f7700bd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_indexer = buildPythonPackage rec { + name = "plone.indexer-1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.indexer/${name}.zip"; + md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_intelligenttext = buildPythonPackage rec { + name = "plone.intelligenttext-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/${name}.zip"; + md5 = "51688fa0815b49e00334e3ef948328ba"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_keyring = buildPythonPackage rec { + name = "plone.keyring-2.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.keyring/${name}.zip"; + md5 = "f3970e9bddb2cc65e461a2c62879233f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_locking = buildPythonPackage rec { + name = "plone.locking-2.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.locking/${name}.zip"; + md5 = "a7f8b8db78f57272d351d7fe0d067eb2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_memoize = buildPythonPackage rec { + name = "plone.memoize-1.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.memoize/${name}.zip"; + md5 = "d07cd14b976160e1f26a859e3370147e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_mocktestcase = buildPythonPackage rec { + name = "plone.mocktestcase-1.0b3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.mocktestcase/${name}.tar.gz"; + md5 = "6de66da6d610537d1f5c31e2ab0f36ee"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_namedfile = buildPythonPackage rec { + name = "plone.namedfile-1.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.namedfile/${name}.zip"; + md5 = "06f5bfa7079f889307ac5760e4cb4a7b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_openid = buildPythonPackage rec { + name = "plone.openid-2.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.openid/${name}.zip"; + md5 = "d4c36926a6dbefed035ed92c29329ce1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_outputfilters = buildPythonPackage rec { + name = "plone.outputfilters-1.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.outputfilters/${name}.zip"; + md5 = "a5ef28580f7fa7f2dc1768893995b0f7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_portlet_collection = buildPythonPackage rec { + name = "plone.portlet.collection-2.1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/${name}.zip"; + md5 = "5f0006dbb3e0b56870383dfdedc49228"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_portlet_static = buildPythonPackage rec { + name = "plone.portlet.static-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.portlet.static/${name}.zip"; + md5 = "ec0dc691b4191a41ff97779b117f9985"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_portlets = buildPythonPackage rec { + name = "plone.portlets-2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.portlets/${name}.zip"; + md5 = "12b9a33f787756a48617c2d2dd63c538"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_protect = buildPythonPackage rec { + name = "plone.protect-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.protect/${name}.zip"; + md5 = "74925ffb08782e72f9b1e850fa78fffa"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_recipe_alltests = buildPythonPackage rec { + name = "plone.recipe.alltests-1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.recipe.alltests/${name}.zip"; + md5 = "c4ba0f67a2fdd259bd0e7d946bd35674"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_recipe_zeoserver = buildPythonPackage rec { + name = "plone.recipe.zeoserver-1.2.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.recipe.zeoserver/${name}.zip"; + md5 = "cd58899a7d534fe2d0ef42990a07c499"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_registry = buildPythonPackage rec { + name = "plone.registry-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.registry/${name}.zip"; + md5 = "6be3d2ec7e2d170e29b8c0bc65049aff"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_reload = buildPythonPackage rec { + name = "plone.reload-2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.reload/${name}.zip"; + md5 = "49eab593c81b78a9b80d54786aa4ad72"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_resource = buildPythonPackage rec { + name = "plone.resource-1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.resource/${name}.zip"; + md5 = "594d41e3acd913ae92f2e9ef96503b9f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_rfc822 = buildPythonPackage rec { + name = "plone.rfc822-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.rfc822/${name}.zip"; + md5 = "b5b79bb5a9181da624a7e88940a45424"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_scale = buildPythonPackage rec { + name = "plone.scale-1.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.scale/${name}.zip"; + md5 = "7c59522b4806ee24f5e0a5fa69c523a5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_schemaeditor = buildPythonPackage rec { + name = "plone.schemaeditor-1.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.schemaeditor/${name}.zip"; + md5 = "0b0fb4b20d9463b3fef82c2079a897d7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_session = buildPythonPackage rec { + name = "plone.session-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.session/${name}.zip"; + md5 = "2f9d3b88e813a47135af56a4da8bbde1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_stringinterp = buildPythonPackage rec { + name = "plone.stringinterp-1.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.stringinterp/${name}.zip"; + md5 = "81909716210c6ac3fd0ee87f45ea523d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_subrequest = buildPythonPackage rec { + name = "plone.subrequest-1.6.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.subrequest/${name}.zip"; + md5 = "cc12f68a22565415b10dbeef0020baa4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_supermodel = buildPythonPackage rec { + name = "plone.supermodel-1.1.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.supermodel/${name}.zip"; + md5 = "00b3d723bb1a48116fe3bf8754f17085"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_synchronize = buildPythonPackage rec { + name = "plone.synchronize-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.synchronize/${name}.zip"; + md5 = "d25e86ace8daa0816861296c3288c4fb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_testing = buildPythonPackage rec { + name = "plone.testing-4.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.testing/${name}.zip"; + md5 = "fa40f6d3e3e254409c486c1c2c3e8804"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_theme = buildPythonPackage rec { + name = "plone.theme-2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.theme/${name}.zip"; + md5 = "c592d0d095e9fc76cc81597cdf6d0c37"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_transformchain = buildPythonPackage rec { + name = "plone.transformchain-1.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.transformchain/${name}.zip"; + md5 = "f5fb7ca894249e3e666501c4fae52a6c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_uuid = buildPythonPackage rec { + name = "plone.uuid-1.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.uuid/${name}.zip"; + md5 = "183fe2911a7d6c9f6b3103855e98ad8a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_z3cform = buildPythonPackage rec { + name = "plone.z3cform-0.7.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.z3cform/${name}.zip"; + md5 = "da891365156a5d5824d4e504465886a2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plonetheme_classic = buildPythonPackage rec { + name = "plonetheme.classic-1.2.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plonetheme.classic/${name}.zip"; + md5 = "9dc15871937f9cdf94cdfdb9be77a221"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plonetheme_sunburst = buildPythonPackage rec { + name = "plonetheme.sunburst-1.2.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/${name}.zip"; + md5 = "be02660c869e04ac8cf6ade3559f2516"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_archetypes = buildPythonPackage rec { + name = "Products.Archetypes-1.8.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.Archetypes/${name}.zip"; + md5 = "74be68879b27228c084a9be869132a98"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_atcontenttypes = buildPythonPackage rec { + name = "Products.ATContentTypes-2.1.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/${name}.zip"; + md5 = "abfb5209ffa11dc2c1a15c488e75d89c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_atreferencebrowserwidget = buildPythonPackage rec { + name = "Products.ATReferenceBrowserWidget-3.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/${name}.zip"; + md5 = "157bdd32155c8353450c17c649aad042"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_btreefolder2 = buildPythonPackage rec { + name = "Products.BTreeFolder2-2.13.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/${name}.tar.gz"; + md5 = "f57c85673036af7ccd34c3fa251f6bb2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfactionicons = buildPythonPackage rec { + name = "Products.CMFActionIcons-2.1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/${name}.tar.gz"; + md5 = "ab1dc62404ed11aea84dc0d782b2235e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ eggtestinfo ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfcalendar = buildPythonPackage rec { + name = "Products.CMFCalendar-2.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/${name}.tar.gz"; + md5 = "49458e68dc3b6826ea9a3576ac014419"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ eggtestinfo ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfcore = buildPythonPackage rec { + name = "Products.CMFCore-2.2.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFCore/${name}.tar.gz"; + md5 = "9320a4023b8575097feacfd4a400e930"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfdefault = buildPythonPackage rec { + name = "Products.CMFDefault-2.2.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/${name}.tar.gz"; + md5 = "fe7d2d3906ee0e3b484e4a02401576ab"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ eggtestinfo ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfdifftool = buildPythonPackage rec { + name = "Products.CMFDiffTool-2.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/${name}.zip"; + md5 = "7b7ed9b8f7b4f438e92e299823f92c86"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfdynamicviewfti = buildPythonPackage rec { + name = "Products.CMFDynamicViewFTI-4.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/${name}.zip"; + md5 = "7d39d416b41b2d93954bc73d9d0e077f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfeditions = buildPythonPackage rec { + name = "Products.CMFEditions-2.2.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/${name}.zip"; + md5 = "7dc744b3b896c1b212d9ba37b1752b65"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfformcontroller = buildPythonPackage rec { + name = "Products.CMFFormController-3.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/${name}.zip"; + md5 = "6573df7dcb39e3b63ba22abe2acd639e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfplacefulworkflow = buildPythonPackage rec { + name = "Products.CMFPlacefulWorkflow-1.5.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/${name}.zip"; + md5 = "9041e1f52eab5b348c0dfa85be438722"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfplone = buildPythonPackage rec { + name = "Products.CMFPlone-4.2.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/${name}.zip"; + md5 = "9c9663cb2b68c07e3d9a2fceaa97eaa1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfquickinstallertool = buildPythonPackage rec { + name = "Products.CMFQuickInstallerTool-3.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/${name}.tar.gz"; + md5 = "af34adb87ddf2b6da48eff8b70ca2989"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmftestcase = buildPythonPackage rec { + name = "Products.CMFTestCase-0.9.12"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFTestCase/${name}.zip"; + md5 = "fbfdfe7bdb2158419d9899b4ab8c43eb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmftopic = buildPythonPackage rec { + name = "Products.CMFTopic-2.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFTopic/${name}.tar.gz"; + md5 = "4abeeaafe6b6b1d2f2936bf5431cccba"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ eggtestinfo ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfuid = buildPythonPackage rec { + name = "Products.CMFUid-2.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFUid/${name}.tar.gz"; + md5 = "e20727959351dffbf0bac80613eee110"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ eggtestinfo ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_contentmigration = buildPythonPackage rec { + name = "Products.contentmigration-2.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.contentmigration/${name}.zip"; + md5 = "1cef33faec03e655b7c52c317db50ed2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_dcworkflow = buildPythonPackage rec { + name = "Products.DCWorkflow-2.2.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/${name}.tar.gz"; + md5 = "c90a16c4f3611015592ba8173a5f1863"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ eggtestinfo ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_extendedpathindex = buildPythonPackage rec { + name = "Products.ExtendedPathIndex-3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/${name}.zip"; + md5 = "00c048a4b103200bdcbda61fa22c66df"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_externaleditor = buildPythonPackage rec { + name = "Products.ExternalEditor-1.1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/${name}.zip"; + md5 = "475fea6e0b958c0c51cfdbfef2f4e623"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_externalmethod = buildPythonPackage rec { + name = "Products.ExternalMethod-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/${name}.zip"; + md5 = "15ba953ef6cb632eb571977651252ea6"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_genericsetup = buildPythonPackage rec { + name = "Products.GenericSetup-1.7.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/${name}.tar.gz"; + md5 = "c48967c81c880ed33ee16a14caab3b11"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_i18ntestcase = buildPythonPackage rec { + name = "Products.i18ntestcase-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.i18ntestcase/${name}.zip"; + md5 = "f72f72e573975f15adfabfeef34fd721"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_kupu = buildPythonPackage rec { + name = "Products.kupu-1.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.kupu/${name}.zip"; + md5 = "b884fcc7f510426974d8d3c4333da4f4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_mailhost = buildPythonPackage rec { + name = "Products.MailHost-2.13.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.MailHost/${name}.zip"; + md5 = "1102e523435d8bf78a15b9ddb57478e1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_marshall = buildPythonPackage rec { + name = "Products.Marshall-2.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.Marshall/${name}.zip"; + md5 = "bde4d7f75195c1ded8371554b04d2541"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_mimetools = buildPythonPackage rec { + name = "Products.MIMETools-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.MIMETools/${name}.zip"; + md5 = "ad5372fc1190599a19493db0864448ec"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_mimetypesregistry = buildPythonPackage rec { + name = "Products.MimetypesRegistry-2.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/${name}.zip"; + md5 = "898166bb2aaececc8238ad4ee4826793"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_ofsp = buildPythonPackage rec { + name = "Products.OFSP-2.13.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.OFSP/${name}.zip"; + md5 = "c76d40928753c2ee56db873304e65bd5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_passwordresettool = buildPythonPackage rec { + name = "Products.PasswordResetTool-2.0.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/${name}.zip"; + md5 = "8dfd65f06c3f4a4b0742d1b44b65f014"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_placelesstranslationservice = buildPythonPackage rec { + name = "Products.PlacelessTranslationService-2.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/${name}.zip"; + md5 = "a94635eb712563c5a002520713f5d6dc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_plonelanguagetool = buildPythonPackage rec { + name = "Products.PloneLanguageTool-3.2.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/${name}.zip"; + md5 = "bd9eb6278bf76e8cbce99437ca362164"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_plonepas = buildPythonPackage rec { + name = "Products.PlonePAS-4.0.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/${name}.zip"; + md5 = "c19241b558c994ff280a2e1f50aa1f19"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_plonetestcase = buildPythonPackage rec { + name = "Products.PloneTestCase-0.9.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/${name}.zip"; + md5 = "ddd5810937919ab5233ebd64893c8bae"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_pluggableauthservice = buildPythonPackage rec { + name = "Products.PluggableAuthService-1.9.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/${name}.tar.gz"; + md5 = "f78f16e46d016c2848bc84254fa66596"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_pluginregistry = buildPythonPackage rec { + name = "Products.PluginRegistry-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/${name}.tar.gz"; + md5 = "5b166193ca1eb84dfb402051f779ebab"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_portaltransforms = buildPythonPackage rec { + name = "Products.PortalTransforms-2.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/${name}.zip"; + md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_pythonscripts = buildPythonPackage rec { + name = "Products.PythonScripts-2.13.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/${name}.zip"; + md5 = "04c86f2c45a29a162297a80dac61d14f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_resourceregistries = buildPythonPackage rec { + name = "Products.ResourceRegistries-2.2.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/${name}.zip"; + md5 = "9cf6efbcf2a6510033c06e1d3af94080"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_securemailhost = buildPythonPackage rec { + name = "Products.SecureMailHost-1.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/${name}.zip"; + md5 = "7db0f1fa867bd0df972082f502a7a707"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_standardcachemanagers = buildPythonPackage rec { + name = "Products.StandardCacheManagers-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/${name}.zip"; + md5 = "c5088b2b62bd26d63d9579a04369cb73"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_statusmessages = buildPythonPackage rec { + name = "Products.statusmessages-4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.statusmessages/${name}.zip"; + md5 = "265324b0a58a032dd0ed038103ed0473"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_tinymce = buildPythonPackage rec { + name = "Products.TinyMCE-1.2.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/${name}.zip"; + md5 = "108b919bfcff711d2116e41eccbede58"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_validation = buildPythonPackage rec { + name = "Products.validation-2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.validation/${name}.zip"; + md5 = "afa217e2306637d1dccbebf337caa8bf"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_zcatalog = buildPythonPackage rec { + name = "Products.ZCatalog-2.13.23"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/${name}.zip"; + md5 = "d425171516dfc70e543a4e2b852301cb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_zctextindex = buildPythonPackage rec { + name = "Products.ZCTextIndex-2.13.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/${name}.zip"; + md5 = "8bbfa5fcd3609246990a9314d6f826b4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_zopeversioncontrol = buildPythonPackage rec { + name = "Products.ZopeVersionControl-1.1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/${name}.zip"; + md5 = "238239102f3ac798ee4f4c53343a561f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_zsqlmethods = buildPythonPackage rec { + name = "Products.ZSQLMethods-2.13.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/${name}.zip"; + md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + py = buildPythonPackage rec { + name = "py-1.3.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/py/${name}.tar.gz"; + md5 = "b64d73a04121c1c4e27c7ec335ef87c8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + pygments = buildPythonPackage rec { + name = "Pygments-1.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; + md5 = "54be67c04834f13d7e255e1797d629a5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + python_dateutil = buildPythonPackage rec { + name = "python-dateutil-1.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-dateutil/${name}.tar.gz"; + md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + python_gettext = buildPythonPackage rec { + name = "python-gettext-1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-gettext/${name}.zip"; + md5 = "cd4201d440126d1296d1d2bc2b4795f3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + python_openid = buildPythonPackage rec { + name = "python-openid-2.2.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-openid/${name}.zip"; + md5 = "f89d9d4f4dccfd33b5ce34eb4725f751"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + pytz = buildPythonPackage rec { + name = "pytz-2012c"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012c.tar.gz"; + md5 = "1aa85f072e3d34ae310665967a0ce053"; + }; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + record = buildPythonPackage rec { + name = "Record-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/R/Record/${name}.zip"; + md5 = "cfed6a89d4fb2c9cb995e9084c3071b7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + repoze_retry = buildPythonPackage rec { + name = "repoze.retry-1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/repoze.retry/${name}.tar.gz"; + md5 = "55f9dbde5d7f939d93c352fef0f2ce8b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + repoze_tm2 = buildPythonPackage rec { + name = "repoze.tm2-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/repoze.tm2/${name}.tar.gz"; + md5 = "c645a878874c8876c9c6b3467246afbc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + repoze_who = buildPythonPackage rec { + name = "repoze.who-2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/repoze.who/${name}.tar.gz"; + md5 = "eab01991b6a2979678ce6015815262e2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + repoze_xmliter = buildPythonPackage rec { + name = "repoze.xmliter-0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/repoze.xmliter/${name}.zip"; + md5 = "99da76bcbad6fbaced4a273bde29b10e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + restrictedpython = buildPythonPackage rec { + name = "RestrictedPython-3.6.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/R/RestrictedPython/${name}.zip"; + md5 = "aa75a7dcc7fbc966357837cc66cacec6"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + roman = buildPythonPackage rec { + name = "roman-1.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/roman/${name}.tar.gz"; + md5 = "4f8832ed4108174b159c2afb4bd1d1dd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + rwproperty = buildPythonPackage rec { + name = "rwproperty-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/rwproperty/${name}.tar.gz"; + md5 = "050bdf066492b3cd82a3399f8efea6b1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + simplejson = buildPythonPackage rec { + name = "simplejson-2.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz"; + md5 = "d7a7acf0bd7681bd116b5c981d2f7959"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + sphinx = buildPythonPackage rec { + name = "Sphinx-1.1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz"; + md5 = "8f55a6d4f87fc6d528120c5d1f983e98"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + tempstorage = buildPythonPackage rec { + name = "tempstorage-2.12.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/t/tempstorage/${name}.zip"; + md5 = "7a2b76b39839e229249b1bb175604480"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + tl_eggdeps = buildPythonPackage rec { + name = "tl.eggdeps-0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/t/tl.eggdeps/${name}.tar.gz"; + md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + transaction = buildPythonPackage rec { + name = "transaction-1.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz"; + md5 = "30b062baa34fe1521ad979fb088c8c55"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + unidecode = buildPythonPackage rec { + name = "Unidecode-0.04.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/U/Unidecode/${name}2.tar.gz"; + md5 = "351dc98f4512bdd2e93f7a6c498730eb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + unittest2 = buildPythonPackage rec { + name = "unittest2-0.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/u/unittest2/${name}.tar.gz"; + md5 = "a0af5cac92bbbfa0c3b0e99571390e0f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + webob = buildPythonPackage rec { + name = "WebOb-1.0.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/W/WebOb/${name}.zip"; + md5 = "9809f9fb64fca8690a7da533fa29a272"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + wicked = buildPythonPackage rec { + name = "wicked-1.1.10"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/w/wicked/${name}.zip"; + md5 = "f65611f11d547d7dc8e623bf87d3929d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + wsgi_intercept = buildPythonPackage rec { + name = "wsgi-intercept-0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip"; + md5 = "f65611f11d547d7dc8e623bf87d3929d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_autoinclude = buildPythonPackage rec { + name = "z3c.autoinclude-0.3.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/${name}.zip"; + md5 = "6a615ae18c12b459bceb3ae28e8e7709"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_batching = buildPythonPackage rec { + name = "z3c.batching-1.1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.batching/${name}.tar.gz"; + md5 = "d1dc834781d228127ca6d15301757863"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_blobfile = buildPythonPackage rec { + name = "z3c.blobfile-0.1.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.blobfile/${name}.zip"; + md5 = "2e806640aa2f3b51e4578f35c44f567a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_caching = buildPythonPackage rec { + name = "z3c.caching-2.0a1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.caching/${name}.tar.gz"; + md5 = "17f250b5084c2324a7d15c6810ee628e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_checkversions = buildPythonPackage rec { + name = "z3c.checkversions-0.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.checkversions/${name}.tar.gz"; + md5 = "907f3a28aac04ad98fb3c4c5879a1eaf"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_coverage = buildPythonPackage rec { + name = "z3c.coverage-1.2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.coverage/${name}.tar.gz"; + md5 = "d7f323a6c89f848fab38209f2162294d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_form = buildPythonPackage rec { + name = "z3c.form-2.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.form/${name}.tar.gz"; + md5 = "f029f83dd226f695f55049ed1ecee95e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_formwidget_query = buildPythonPackage rec { + name = "z3c.formwidget.query-0.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/${name}.zip"; + md5 = "d9f7960b1a5a81d8ba5241530f496522"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_objpath = buildPythonPackage rec { + name = "z3c.objpath-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.objpath/${name}.tar.gz"; + md5 = "63641934441b255ebeeaeabc618f01ed"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_ptcompat = buildPythonPackage rec { + name = "z3c.ptcompat-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.ptcompat/${name}.tar.gz"; + md5 = "bfe1ba6f9a38679705bd3eb5a5a2d7c4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_recipe_compattest = buildPythonPackage rec { + name = "z3c.recipe.compattest-0.12.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.recipe.compattest/${name}.tar.gz"; + md5 = "ed5a1bde7ce384154721913846c736c7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_recipe_depgraph = buildPythonPackage rec { + name = "z3c.recipe.depgraph-0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.recipe.depgraph/${name}.zip"; + md5 = "eb734419815146eb5b7080b5e17346dc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_recipe_sphinxdoc = buildPythonPackage rec { + name = "z3c.recipe.sphinxdoc-0.0.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.recipe.sphinxdoc/${name}.tar.gz"; + md5 = "86e6965c919b43fa1de07588580f8790"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_relationfield = buildPythonPackage rec { + name = "z3c.relationfield-0.6.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.relationfield/${name}.zip"; + md5 = "e34a6230cdfbd4a0bc1c90a77600e0e7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_template = buildPythonPackage rec { + name = "z3c.template-1.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.template/${name}.tar.gz"; + md5 = "330e2dba8cd064d5790392afd9f460dd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_zcmlhook = buildPythonPackage rec { + name = "z3c.zcmlhook-1.0b1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/${name}.tar.gz"; + md5 = "7b6c80146f5930409eb0b355ddf3daeb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zc_lockfile = buildPythonPackage rec { + name = "zc.lockfile-1.0.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.lockfile/${name}.tar.gz"; + md5 = "6cf83766ef9935c33e240b0904c7a45e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zc_recipe_egg = buildPythonPackage rec { + name = "zc.recipe.egg-1.3.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/${name}.tar.gz"; + md5 = "1cb6af73f527490dde461d3614a36475"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zc_recipe_testrunner = buildPythonPackage rec { + name = "zc.recipe.testrunner-1.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.recipe.testrunner/${name}.tar.gz"; + md5 = "1be4a1518e5b94890634468118242850"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zc_relation = buildPythonPackage rec { + name = "zc.relation-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.relation/${name}.tar.gz"; + md5 = "7e479095954fc6d8f648951434695837"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zc_resourcelibrary = buildPythonPackage rec { + name = "zc.resourcelibrary-1.3.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.resourcelibrary/${name}.tar.gz"; + md5 = "bebe49f3e930f896a8ea75531bf3fae8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zc_sourcefactory = buildPythonPackage rec { + name = "zc.sourcefactory-0.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.sourcefactory/${name}.tar.gz"; + md5 = "532dfd0a72489023268c19e3788b105d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zconfig = buildPythonPackage rec { + name = "ZConfig-2.9.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/ZConfig/${name}.zip"; + md5 = "5c932690a70c8907efd240cdd76a7bc4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zdaemon = buildPythonPackage rec { + name = "zdaemon-2.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz"; + md5 = "291a875f82e812110557eb6704af8afe"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zexceptions = buildPythonPackage rec { + name = "zExceptions-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zExceptions/${name}.zip"; + md5 = "4c679696c959040d8e656ef85ae40136"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zlog = buildPythonPackage rec { + name = "zLOG-2.11.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zLOG/${name}.tar.gz"; + md5 = "68073679aaa79ac5a7b6a5c025467147"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zodb3 = buildPythonPackage rec { + name = "ZODB3-3.10.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/ZODB3/${name}.tar.gz"; + md5 = "6f180c6897a1820948fee2a6290503cd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zodbcode = buildPythonPackage rec { + name = "zodbcode-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zodbcode/${name}.tar.gz"; + md5 = "9b128f89aa2a2117fae4f74757eefeff"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope2 = buildPythonPackage rec { + name = "Zope2-2.13.19"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/Zope2/${name}.zip"; + md5 = "26fee311aace7c12e406543ea91eb42a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_annotation = buildPythonPackage rec { + name = "zope.annotation-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.annotation/${name}.tar.gz"; + md5 = "4238153279d3f30ab5613438c8e76380"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_apidoc = buildPythonPackage rec { + name = "zope.app.apidoc-3.7.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.apidoc/${name}.zip"; + md5 = "91e969b2d1089bb0a6a303990d269f0a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_applicationcontrol = buildPythonPackage rec { + name = "zope.app.applicationcontrol-3.5.10"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.applicationcontrol/${name}.tar.gz"; + md5 = "f785c13698192c83024fda75f1f3d822"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_appsetup = buildPythonPackage rec { + name = "zope.app.appsetup-3.14.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.appsetup/${name}.tar.gz"; + md5 = "2c3da1f514e6793e2bf612cb06ad9076"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_authentication = buildPythonPackage rec { + name = "zope.app.authentication-3.8.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.authentication/${name}.tar.gz"; + md5 = "f8eb74fbdeebfd32c5e15c0f03aa3623"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_basicskin = buildPythonPackage rec { + name = "zope.app.basicskin-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.basicskin/${name}.tar.gz"; + md5 = "75915a315f336a5b614db67df1093eb3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_broken = buildPythonPackage rec { + name = "zope.app.broken-3.6.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.broken/${name}.tar.gz"; + md5 = "e6a7efdd1ea1facfd8c5ba4b25d395cb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_cache = buildPythonPackage rec { + name = "zope.app.cache-3.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.cache/${name}.zip"; + md5 = "8dd74574e869ce236ced0de7e349bb5c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_catalog = buildPythonPackage rec { + name = "zope.app.catalog-3.8.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.catalog/${name}.tar.gz"; + md5 = "1ce21dee4e8256cfe254f8ee24c6ecef"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_component = buildPythonPackage rec { + name = "zope.app.component-3.9.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.component/${name}.tar.gz"; + md5 = "bc2dce245d2afe462529c350956711e0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_container = buildPythonPackage rec { + name = "zope.app.container-3.9.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.container/${name}.tar.gz"; + md5 = "1e286c59f0166e517d67ddd723641c84"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_content = buildPythonPackage rec { + name = "zope.app.content-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.content/${name}.tar.gz"; + md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_dav = buildPythonPackage rec { + name = "zope.app.dav-3.5.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.dav/${name}.tar.gz"; + md5 = "19ec8dc5f7ad21468dea1c46e86d95dd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_debug = buildPythonPackage rec { + name = "zope.app.debug-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.debug/${name}.tar.gz"; + md5 = "1a9d349b14d91137b57da52a2b9d185f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_debugskin = buildPythonPackage rec { + name = "zope.app.debugskin-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.debugskin/${name}.tar.gz"; + md5 = "bd95d2848aa3108e53717d13b3c0924d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_dependable = buildPythonPackage rec { + name = "zope.app.dependable-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.dependable/${name}.zip"; + md5 = "5f180620a880e6ec754e3a34bd110891"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_error = buildPythonPackage rec { + name = "zope.app.error-3.5.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.error/${name}.tar.gz"; + md5 = "bab82dd06233e9b5e34e9709e8993ace"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_exception = buildPythonPackage rec { + name = "zope.app.exception-3.6.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.exception/${name}.tar.gz"; + md5 = "af161d3e7c17db7f56f7816a6f2d980c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_file = buildPythonPackage rec { + name = "zope.app.file-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.file/${name}.tar.gz"; + md5 = "fff140c36a2872c85b55433835ac3b98"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_folder = buildPythonPackage rec { + name = "zope.app.folder-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.folder/${name}.tar.gz"; + md5 = "5ba3a2a7ec527a7eb0cc3c2eb7bb75e9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_form = buildPythonPackage rec { + name = "zope.app.form-4.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.form/${name}.tar.gz"; + md5 = "3d2b164d9d37a71490a024aaeb412e91"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_ftp = buildPythonPackage rec { + name = "zope.app.ftp-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.ftp/${name}.tar.gz"; + md5 = "b0769f90023156a86cb3f46040e6b5b0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_generations = buildPythonPackage rec { + name = "zope.app.generations-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.generations/${name}.tar.gz"; + md5 = "ca74e0f4a01ad8767e1bba6332c39aa2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_http = buildPythonPackage rec { + name = "zope.app.http-3.9.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.http/${name}.tar.gz"; + md5 = "26f73a3affecefc3aff960cd8b088681"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_i18n = buildPythonPackage rec { + name = "zope.app.i18n-3.6.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.i18n/${name}.tar.gz"; + md5 = "c8573307ba08926214b7944a05e43632"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_interface = buildPythonPackage rec { + name = "zope.app.interface-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.interface/${name}.tar.gz"; + md5 = "b15522275a435c609bd44f2f019bd13c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_interpreter = buildPythonPackage rec { + name = "zope.app.interpreter-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.interpreter/${name}.tar.gz"; + md5 = "fb8a2aa57dcfa3af2f30801dfafc78c4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_intid = buildPythonPackage rec { + name = "zope.app.intid-3.7.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.intid/${name}.tar.gz"; + md5 = "0d2c1daf5d1d6fd09351b652042a2dac"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_keyreference = buildPythonPackage rec { + name = "zope.app.keyreference-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.keyreference/${name}.tar.gz"; + md5 = "78539e472016a8ca57b34b6ea0ab7d9d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_locales = buildPythonPackage rec { + name = "zope.app.locales-3.6.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.locales/${name}.tar.gz"; + md5 = "bd2b4c6040e768f33004b1210d3207fa"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_localpermission = buildPythonPackage rec { + name = "zope.app.localpermission-3.7.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.localpermission/${name}.tar.gz"; + md5 = "121509781b19ce55ebe890fa408702fc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_locking = buildPythonPackage rec { + name = "zope.app.locking-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.locking/${name}.tar.gz"; + md5 = "4edce1ba26f6c56b0eb79f703d8a80fe"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_onlinehelp = buildPythonPackage rec { + name = "zope.app.onlinehelp-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.onlinehelp/${name}.tar.gz"; + md5 = "67d0be66965e34b24ef18c269da62e4c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_pagetemplate = buildPythonPackage rec { + name = "zope.app.pagetemplate-3.11.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.pagetemplate/${name}.tar.gz"; + md5 = "2d304729c0d6a9ab67dd5ea852f19476"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_preference = buildPythonPackage rec { + name = "zope.app.preference-3.8.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.preference/${name}.tar.gz"; + md5 = "ab6906261854c61ff9f0a13c7612d3e8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_preview = buildPythonPackage rec { + name = "zope.app.preview-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.preview/${name}.tar.gz"; + md5 = "e698c10b043fb944150a825af9af536e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_principalannotation = buildPythonPackage rec { + name = "zope.app.principalannotation-3.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.principalannotation/${name}.tar.gz"; + md5 = "29c6bf8e817330b0d29de253686a68f2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_publication = buildPythonPackage rec { + name = "zope.app.publication-3.12.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.publication/${name}.zip"; + md5 = "d8c521287f52fb9f40fa9b8c2acb4675"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_publisher = buildPythonPackage rec { + name = "zope.app.publisher-3.10.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.publisher/${name}.zip"; + md5 = "66e9110e2967d8d204a65a98e2227404"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_renderer = buildPythonPackage rec { + name = "zope.app.renderer-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.renderer/${name}.tar.gz"; + md5 = "1cc605baf5dab7db50b0a0fd218566f3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_rotterdam = buildPythonPackage rec { + name = "zope.app.rotterdam-3.5.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.rotterdam/${name}.tar.gz"; + md5 = "4cb3c53844bc7481f9b7d60f3c5e3a85"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_schema = buildPythonPackage rec { + name = "zope.app.schema-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.schema/${name}.tar.gz"; + md5 = "92b7c3f4512f3433acc931ecb6ffc936"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_security = buildPythonPackage rec { + name = "zope.app.security-3.7.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.security/${name}.tar.gz"; + md5 = "c7cec00f6d8379b93180faf6ffaa89ea"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_securitypolicy = buildPythonPackage rec { + name = "zope.app.securitypolicy-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.securitypolicy/${name}.tar.gz"; + md5 = "e3c6ef1db3228dbbb60a452c1a2a8f27"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_server = buildPythonPackage rec { + name = "zope.app.server-3.6.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.server/${name}.tar.gz"; + md5 = "d3a75eaf2a3f4759352dd3243dfb1d50"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_session = buildPythonPackage rec { + name = "zope.app.session-3.6.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.session/${name}.tar.gz"; + md5 = "93467bf6854d714b53e71f36a9d770f3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_skins = buildPythonPackage rec { + name = "zope.app.skins-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.skins/${name}.tar.gz"; + md5 = "a0bc210720ee50e40adb93e9c685e884"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_testing = buildPythonPackage rec { + name = "zope.app.testing-3.7.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.testing/${name}.tar.gz"; + md5 = "6fd3eb11e24973a3dbdf5f1ab655c0d4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_tree = buildPythonPackage rec { + name = "zope.app.tree-3.6.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.tree/${name}.tar.gz"; + md5 = "fbde3403c682bc7cf7b73d43cd2eed3a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_twisted = buildPythonPackage rec { + name = "zope.app.twisted-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.twisted/${name}.tar.gz"; + md5 = "9e98868b8be8a0c4f720036366364a67"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_undo = buildPythonPackage rec { + name = "zope.app.undo-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.undo/${name}.tar.gz"; + md5 = "7a40060aa0451a635a31d6e12d17a82e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_wsgi = buildPythonPackage rec { + name = "zope.app.wsgi-3.9.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.wsgi/${name}.tar.gz"; + md5 = "9c766908b720d777e02e0b0a9ac8a8a1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_zcmlfiles = buildPythonPackage rec { + name = "zope.app.zcmlfiles-3.7.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.zcmlfiles/${name}.tar.gz"; + md5 = "0e8991d2bed71ee6b98a2c48d21e1126"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_zopeappgenerations = buildPythonPackage rec { + name = "zope.app.zopeappgenerations-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.zopeappgenerations/${name}.tar.gz"; + md5 = "4c8a0bc409677f8b17dc57737d41f919"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_zptpage = buildPythonPackage rec { + name = "zope.app.zptpage-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.zptpage/${name}.tar.gz"; + md5 = "aed8ec49e10911bd1e9d2c9d467fd098"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_applicationcontrol = buildPythonPackage rec { + name = "zope.applicationcontrol-3.5.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.applicationcontrol/${name}.tar.gz"; + md5 = "5e4bb54afe55185e15bd9d1ba3750857"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_authentication = buildPythonPackage rec { + name = "zope.authentication-3.7.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.authentication/${name}.zip"; + md5 = "7d6bb340610518f2fc71213cfeccda68"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_broken = buildPythonPackage rec { + name = "zope.broken-3.6.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.broken/${name}.zip"; + md5 = "eff24d7918099a3e899ee63a9c31bee6"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_browser = buildPythonPackage rec { + name = "zope.browser-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.browser/${name}.zip"; + md5 = "4ff0ddbf64c45bfcc3189e35f4214ded"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_browsermenu = buildPythonPackage rec { + name = "zope.browsermenu-3.9.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.browsermenu/${name}.zip"; + md5 = "a47c7b1e786661c912a1150bf8d1f83f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_browserpage = buildPythonPackage rec { + name = "zope.browserpage-3.12.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.browserpage/${name}.tar.gz"; + md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_browserresource = buildPythonPackage rec { + name = "zope.browserresource-3.10.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.browserresource/${name}.zip"; + md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_cachedescriptors = buildPythonPackage rec { + name = "zope.cachedescriptors-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/${name}.zip"; + md5 = "263459a95238fd61d17e815d97ca49ce"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_catalog = buildPythonPackage rec { + name = "zope.catalog-3.8.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.catalog/${name}.tar.gz"; + md5 = "f9baff3997e337f0a23ac158258c8842"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_component = buildPythonPackage rec { + name = "zope.component-3.9.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.component/${name}.tar.gz"; + md5 = "22780b445b1b479701c05978055d1c82"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_componentvocabulary = buildPythonPackage rec { + name = "zope.componentvocabulary-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/${name}.tar.gz"; + md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_configuration = buildPythonPackage rec { + name = "zope.configuration-3.7.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.configuration/${name}.zip"; + md5 = "5b0271908ef26c05059eda76928896ea"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_container = buildPythonPackage rec { + name = "zope.container-3.11.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.container/${name}.tar.gz"; + md5 = "fc66d85a17b8ffb701091c9328983dcc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_contentprovider = buildPythonPackage rec { + name = "zope.contentprovider-3.7.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.contentprovider/${name}.tar.gz"; + md5 = "1bb2132551175c0123f17939a793f812"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_contenttype = buildPythonPackage rec { + name = "zope.contenttype-3.5.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.zip"; + md5 = "c6ac80e6887de4108a383f349fbdf332"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_copy = buildPythonPackage rec { + name = "zope.copy-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.tar.gz"; + md5 = "a9836a5d36cd548be45210eb00407337"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_copypastemove = buildPythonPackage rec { + name = "zope.copypastemove-3.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.copypastemove/${name}.tar.gz"; + md5 = "f335940686d15cfc5520c42f2494a924"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_datetime = buildPythonPackage rec { + name = "zope.datetime-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.datetime/${name}.tar.gz"; + md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_deferredimport = buildPythonPackage rec { + name = "zope.deferredimport-3.5.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.deferredimport/${name}.tar.gz"; + md5 = "68fce3bf4f011d4a840902fd763884ee"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_deprecation = buildPythonPackage rec { + name = "zope.deprecation-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.deprecation/${name}.tar.gz"; + md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_documenttemplate = buildPythonPackage rec { + name = "zope.documenttemplate-3.4.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.documenttemplate/${name}.tar.gz"; + md5 = "d5c302534ee0913c39bdc227e1592cb7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_dottedname = buildPythonPackage rec { + name = "zope.dottedname-3.4.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.dottedname/${name}.tar.gz"; + md5 = "62d639f75b31d2d864fe5982cb23959c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_dublincore = buildPythonPackage rec { + name = "zope.dublincore-3.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.dublincore/${name}.tar.gz"; + md5 = "2e34e42e454d896feb101ac74af62ded"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_error = buildPythonPackage rec { + name = "zope.error-3.7.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.error/${name}.tar.gz"; + md5 = "281445a906458ff5f18f56923699a127"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_event = buildPythonPackage rec { + name = "zope.event-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.event/${name}.tar.gz"; + md5 = "6e8af2a16157a74885d4f0d88137cefb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_exceptions = buildPythonPackage rec { + name = "zope.exceptions-3.6.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.exceptions/${name}.tar.gz"; + md5 = "d7234d99d728abe3d9275346e8d24fd9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_file = buildPythonPackage rec { + name = "zope.file-0.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.file/${name}.tar.gz"; + md5 = "5df3b63c678f4b445be345f1dff1bc9b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_filerepresentation = buildPythonPackage rec { + name = "zope.filerepresentation-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/${name}.tar.gz"; + md5 = "4a7a434094f4bfa99a7f22e75966c359"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_formlib = buildPythonPackage rec { + name = "zope.formlib-4.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.formlib/${name}.zip"; + md5 = "eed9c94382d11a4dececd0a48ac1d3f2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_globalrequest = buildPythonPackage rec { + name = "zope.globalrequest-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.globalrequest/${name}.zip"; + md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_hookable = buildPythonPackage rec { + name = "zope.hookable-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.hookable/${name}.tar.gz"; + md5 = "fe6713aef5b6c0f4963fb984bf326da0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_html = buildPythonPackage rec { + name = "zope.html-2.1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.html/${name}.tar.gz"; + md5 = "868cb987e400b9a290355a1207d47143"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_i18n = buildPythonPackage rec { + name = "zope.i18n-3.7.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.i18n/${name}.tar.gz"; + md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_i18nmessageid = buildPythonPackage rec { + name = "zope.i18nmessageid-3.5.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/${name}.tar.gz"; + md5 = "cb84bf61c2b7353e3b7578057fbaa264"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_index = buildPythonPackage rec { + name = "zope.index-3.6.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.index/${name}.tar.gz"; + md5 = "65c34f446f54ffd711e34ede9eb89dad"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_interface = buildPythonPackage rec { + name = "zope.interface-3.6.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.zip"; + md5 = "9df962180fbbb54eb1875cff9fe436e5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_intid = buildPythonPackage rec { + name = "zope.intid-3.7.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.intid/${name}.zip"; + md5 = "241f2fe62fb60f6319d9902b12bc333d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_keyreference = buildPythonPackage rec { + name = "zope.keyreference-3.6.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.keyreference/${name}.tar.gz"; + md5 = "3774c90f236f880547f4c042ee0997e9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_kgs = buildPythonPackage rec { + name = "zope.kgs-1.2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.kgs/${name}.tar.gz"; + md5 = "15ed01a270bddcf253b1c08479549692"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_lifecycleevent = buildPythonPackage rec { + name = "zope.lifecycleevent-3.6.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/${name}.tar.gz"; + md5 = "3ba978f3ba7c0805c81c2c79ea3edb33"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_location = buildPythonPackage rec { + name = "zope.location-3.9.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.location/${name}.tar.gz"; + md5 = "1684a8f986099d15296f670c58e713d8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_login = buildPythonPackage rec { + name = "zope.login-1.0.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.login/${name}.zip"; + md5 = "4eceb766329125a80aee1b4b4809869a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_mimetype = buildPythonPackage rec { + name = "zope.mimetype-1.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.mimetype/${name}.tar.gz"; + md5 = "c865758c896707287f86ba603f06a84b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_minmax = buildPythonPackage rec { + name = "zope.minmax-1.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.minmax/${name}.tar.gz"; + md5 = "0c3fbac9623f402ed758dace80080d55"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_mkzeoinstance = buildPythonPackage rec { + name = "zope.mkzeoinstance-3.9.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.mkzeoinstance/${name}.tar.gz"; + md5 = "2c2dcf7cc7de58f7d009ca3294f54377"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_modulealias = buildPythonPackage rec { + name = "zope.modulealias-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.modulealias/${name}.tar.gz"; + md5 = "77f4603524b578a5c6b4b4fdde58a484"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_pagetemplate = buildPythonPackage rec { + name = "zope.pagetemplate-3.6.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/${name}.zip"; + md5 = "834a4bf702c05fba1e669677b4dc871f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_password = buildPythonPackage rec { + name = "zope.password-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.password/${name}.tar.gz"; + md5 = "230f93a79020c8a3dc01d79832546e3c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_pluggableauth = buildPythonPackage rec { + name = "zope.pluggableauth-1.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.pluggableauth/${name}.tar.gz"; + md5 = "85d16cb2e5b41bf2a438828857719566"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_preference = buildPythonPackage rec { + name = "zope.preference-3.8.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.preference/${name}.tar.gz"; + md5 = "bb8b1c9f65387a51be429407528cc453"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_principalannotation = buildPythonPackage rec { + name = "zope.principalannotation-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.principalannotation/${name}.tar.gz"; + md5 = "652685ca13cefaad78dbc5c6507fc9ab"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_principalregistry = buildPythonPackage rec { + name = "zope.principalregistry-3.7.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.principalregistry/${name}.tar.gz"; + md5 = "9b90adc7915d9bbed4237db432fc70c2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_processlifetime = buildPythonPackage rec { + name = "zope.processlifetime-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.processlifetime/${name}.tar.gz"; + md5 = "69604bfd668a01ebebdd616a8f26ccfe"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_proxy = buildPythonPackage rec { + name = "zope.proxy-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.proxy/${name}.zip"; + md5 = "a400b0a26624b17fa889dbcaa989d440"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_ptresource = buildPythonPackage rec { + name = "zope.ptresource-3.9.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.ptresource/${name}.tar.gz"; + md5 = "f4645e51c15289d3fdfb4139039e18e9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_publisher = buildPythonPackage rec { + name = "zope.publisher-3.12.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.publisher/${name}.tar.gz"; + md5 = "495131970cc7cb14de8e517fb3857ade"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_ramcache = buildPythonPackage rec { + name = "zope.ramcache-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.ramcache/${name}.zip"; + md5 = "87289e15f0e51f50704adda1557c02a7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_rdb = buildPythonPackage rec { + name = "zope.rdb-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.rdb/${name}.tar.gz"; + md5 = "2068b469c07c9c0b41392cd9839e3728"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_schema = buildPythonPackage rec { + name = "zope.schema-4.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.zip"; + md5 = "bfa0460b68df0dbbf7a5dc793b0eecc6"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_security = buildPythonPackage rec { + name = "zope.security-3.7.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.security/${name}.tar.gz"; + md5 = "072ab8d11adc083eace11262da08630c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_securitypolicy = buildPythonPackage rec { + name = "zope.securitypolicy-3.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.securitypolicy/${name}.tar.gz"; + md5 = "fe9ba029384c0640b2ba175ba1805cd8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_sendmail = buildPythonPackage rec { + name = "zope.sendmail-3.7.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.sendmail/${name}.tar.gz"; + md5 = "8a513ecf2b41cad849f6607bf16d6818"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_sequencesort = buildPythonPackage rec { + name = "zope.sequencesort-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.sequencesort/${name}.tar.gz"; + md5 = "cfc35fc426a47f5c0ee43c416224b864"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_server = buildPythonPackage rec { + name = "zope.server-3.6.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.server/${name}.tar.gz"; + md5 = "2a758720fd6d9bdfb1cea8d644c27923"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_session = buildPythonPackage rec { + name = "zope.session-3.9.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.session/${name}.tar.gz"; + md5 = "2934e9f2daa01555e9a7a1f9945c3493"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_site = buildPythonPackage rec { + name = "zope.site-3.9.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.site/${name}.tar.gz"; + md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_size = buildPythonPackage rec { + name = "zope.size-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.size/${name}.tar.gz"; + md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_structuredtext = buildPythonPackage rec { + name = "zope.structuredtext-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.structuredtext/${name}.tar.gz"; + md5 = "eabbfb983485d0879322bc878d2478a0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_tal = buildPythonPackage rec { + name = "zope.tal-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.tal/${name}.zip"; + md5 = "13869f292ba36b294736b7330b1396fd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_tales = buildPythonPackage rec { + name = "zope.tales-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.tales/${name}.tar.gz"; + md5 = "1c5060bd766a0a18632b7879fc9e4e1e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_testbrowser = buildPythonPackage rec { + name = "zope.testbrowser-3.11.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.testbrowser/${name}.tar.gz"; + md5 = "64abbee892121e7f1a91aed12cfc155a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_testing = buildPythonPackage rec { + name = "zope.testing-3.9.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz"; + md5 = "8999f3d143d416dc3c8b2a5bd6f33e28"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_thread = buildPythonPackage rec { + name = "zope.thread-3.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.thread/${name}.tar.gz"; + md5 = "3567037865b746c933d4af86e5aefa35"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_traversing = buildPythonPackage rec { + name = "zope.traversing-3.13.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.traversing/${name}.zip"; + md5 = "eaad8fc7bbef126f9f8616b074ec00aa"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_viewlet = buildPythonPackage rec { + name = "zope.viewlet-3.7.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.viewlet/${name}.tar.gz"; + md5 = "367e03096df57e2f9b74fff43f7901f9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_xmlpickle = buildPythonPackage rec { + name = "zope.xmlpickle-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.xmlpickle/${name}.tar.gz"; + md5 = "b579f35546b095aec2c890d3f8a46911"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zopeundo = buildPythonPackage rec { + name = "ZopeUndo-2.12.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/ZopeUndo/${name}.zip"; + md5 = "2b8da09d1b98d5558f62e12f6e52c401"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + eggtestinfo = buildPythonPackage rec { + name = "eggtestinfo-0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/e/eggtestinfo/${name}.tar.gz"; + md5 = "6f0507aee05f00c640c0d64b5073f840"; + }; + + # circular dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + +}; in plone42Packages + +# Not Found: ['nt-svcutils', 'PIL', 'wsgi-intercept'] +# Version Error: ['collective.z3cform.datagridfield-demo'] diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index a72223543aa..1f80998da92 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm -, mesa, openal}: +, mesa, openal, alsaOss }: stdenv.mkDerivation { name = "minecraft-1.4.7"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { # wrapper for minecraft export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/ - ${jre}/bin/java -jar $out/minecraft.jar + ${alsaOss}/bin/aoss ${jre}/bin/java -jar $out/minecraft.jar EOF chmod +x $out/bin/minecraft diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix new file mode 100644 index 00000000000..3b06cd8694c --- /dev/null +++ b/pkgs/games/minetest/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchgit, cmake, irrlicht3843, libpng12, bzip2, + libjpeg, libXxf86vm, mesa, openal, libvorbis, x11 }: + +let + version = "0.4.4"; + sources = { + src = fetchgit { + url = "https://github.com/celeron55/minetest.git"; + rev = "ab06fca4bed26f3dc97d5e5cff437d075d7acff8"; + }; + data = fetchgit { + url = "https://github.com/celeron55/minetest_game.git"; + rev = "3928eccf74af0288d12ffb14f8222fae479bc06b"; + }; + }; +in stdenv.mkDerivation { + name = "minetest-${version}"; + + src = sources.src; + + cmakeFlags = [ + "-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht" + ]; + + buildInputs = [ + cmake irrlicht3843 libpng12 bzip2 libjpeg + libXxf86vm mesa openal libvorbis x11 + ]; + + postInstall = '' + mkdir -pv $out/share/minetest/games/minetest_game/ + cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ + ''; + + meta = { + homepage = "http://minetest.net/"; + description = "Minetest is an infinite-world block sandbox game."; + license = "LGPLv2.1+"; + }; +} diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index c0f9d213762..65a61cb6cab 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -1,78 +1,96 @@ -{ stdenv, fetchurl, unzip, zlib, libpng, bzip2, SDL, SDL_mixer } : +{ stdenv, fetchurl, unzip, zlib, libpng, bzip2, SDL, SDL_mixer, makeWrapper } : let - # This is the default "pakset" of objects, images, text, music, etc. + result = withPak (mkPak pak128); + + ver_1 = "112"; + ver_2 = "1"; + ver_h2 = "${ver_1}-${ver_2}"; + + # "pakset" of objects, images, text, music, etc. + mkPak = src: stdenv.mkDerivation { + name = "simutrans-pakset"; + inherit src; + unpackPhase = "true"; + buildInputs = [ unzip ]; + installPhase = '' + mkdir -p $out + cd $out + unzip ${src} + mv simutrans/*/* . + rm -rf simutrans + ''; + }; pak64 = fetchurl { - url = http://sourceforge.net/projects/simutrans/files/pak64/110-0-1/simupak64-110-0-1.zip/download; - name = "pak64.zip"; - sha256 = "0gs6k9dbbhh60g2smsx2jza65vyss616bpngwpvilrvb5rzzrxcq"; + url = "mirror://sourceforge/simutrans/pak64/${ver_h2}/simupak64-${ver_h2}.zip"; + sha256 = "1197rl2534wx9wdafarlr42qjw6pyghz4bynq2g68pi10h8csypw"; + }; + pak128 = fetchurl { + url = "mirror://sourceforge/simutrans/pak128/pak128%20for%20${ver_1}/pak128-2.2.0--${ver_1}.0.zip"; + sha256 = "13rwv9q3fa3ac0k11ds7zkpd00k4mn14rb0cknknvyz46icb9n80"; }; - # The source distribution seems to be missing some text files. - # So we will get them from the binary Linux release (which apparently has them). - langtab = fetchurl { - url = http://sourceforge.net/projects/simutrans/files/simutrans/110-0-1/simulinux-110-0-1.zip/download; - name = "simulinux-110-0-1.zip"; - sha256 = "15z13kazdzhfzwxry7a766xkkdzaidvscylzrjkx3nnbcq6461s4"; - }; -in -stdenv.mkDerivation rec { - pname = "simutrans"; - version = "110.0.1"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://github.com/aburch/simutrans/tarball/v110.0.1"; - name = "${name}.tar.gz"; - sha256 = "ab0e42e5013d6d2fd5d3176b39dc45e482583b3bad178aac1188bf2ec88feb51"; + withPak = pak: stdenv.mkDerivation { + inherit (binaries) name; + unpackPhase = "true"; + buildInputs = [ makeWrapper ]; + installPhase = ''makeWrapper "${binaries}/bin/simutrans" "$out/bin/simutrans" --add-flags -objects --add-flags "${pak}"''; + inherit (binaries) meta; }; - buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ]; + binaries = stdenv.mkDerivation rec { + pname = "simutrans"; + name = "${pname}-${ver_1}.${ver_2}"; - prePatch = '' - # Use ~/.simutrans instead of ~/simutrans - sed -i 's@%s/simutrans@%s/.simutrans@' simsys_s.cc - ''; + src = fetchurl { + url = "mirror://sourceforge/simutrans/simutrans/${ver_h2}/simutrans-src-${ver_h2}.zip"; + sha256 = "1xrxpd5m2dc9bk8w21smfj28r41ji1qaihjwkwrifgz6rhg19l5c"; + }; + sourceRoot = "."; - preConfigure = '' - # Configuration as per the readme.txt - sed -i 's@#BACKEND = sdl@BACKEND = sdl@' config.template - sed -i 's@#COLOUR_DEPTH = 16@COLOUR_DEPTH = 16@' config.template - sed -i 's@#OSTYPE = linux@OSTYPE = linux@' config.template - sed -i 's@#OPTIMISE = 1@OPTIMISE = 1@' config.template + buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ]; - cp config.template config.default - ''; + preConfigure = '' + # Configuration as per the readme.txt + sed \ + -e 's@#BACKEND = sdl@BACKEND = sdl@' \ + -e 's@#COLOUR_DEPTH = 16@COLOUR_DEPTH = 16@' \ + -e 's@#OSTYPE = linux@OSTYPE = linux@' \ + < config.template > config.default - installPhase = '' - # Erase the source distribution object definitions, will be replaced with langtab. - rm -r simutrans + # Different default data dir + sed -i -e 's:argv\[0\]:"'$out'/share/simutrans/":' \ + simmain.cc - # Default pakset and binary release core objects. - unzip ${pak64} - unzip ${langtab} + # Use ~/.simutrans instead of ~/simutrans ##not working + #sed -i -e 's@%s/simutrans@%s/.simutrans@' simsys_s.cc - mv sim simutrans/ - - mkdir -p $out/simutrans - cp -r simutrans $out - - mkdir -p $out/bin - ln -s $out/simutrans/sim $out/bin/simutrans - ''; - - meta = { - description = "Simutrans is a simulation game in which the player strives to run a successful transport system."; - longDescription = '' - Simutrans is a cross-platform simulation game in which the - player strives to run a successful transport system by - transporting goods, passengers, and mail between - places. Simutrans is an open source remake of Transport Tycoon. + # No optimization overriding + sed -i -e '/-O$/d' Makefile ''; - homepage = http://www.simutrans.com/; - license = "Artistic"; - maintainers = [ stdenv.lib.maintainers.kkallio ]; - platforms = stdenv.lib.platforms.linux; + installPhase = '' + mkdir -p $out/share/ + mv simutrans $out/share/ + + mkdir -p $out/bin/ + mv build/default/sim $out/bin/simutrans + ''; + + meta = { + description = "A simulation game in which the player strives to run a successful transport system"; + longDescription = '' + Simutrans is a cross-platform simulation game in which the + player strives to run a successful transport system by + transporting goods, passengers, and mail between + places. Simutrans is an open source remake of Transport Tycoon. + ''; + + homepage = http://www.simutrans.com/; + license = "Artistic"; + maintainers = [ stdenv.lib.maintainers.kkallio ]; + platforms = stdenv.lib.platforms.linux; + }; }; -} + +in result diff --git a/pkgs/games/six/default.nix b/pkgs/games/six/default.nix deleted file mode 100644 index a95ed6c50c6..00000000000 --- a/pkgs/games/six/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, arts, kdelibs, libX11, libXext, libXt, perl, qt3, zlib }: - -let - - versionNumber = "0.5.3"; - -in - -stdenv.mkDerivation { - - name = "six-${versionNumber}"; - - src = fetchurl { - url = "http://six.retes.hu/download/six-${versionNumber}.tar.gz"; - sha256 = "0hialm0kxr11rp5z452whjmxp2vaqqj668d0dfs32fd10ggi8wj4"; - }; - - meta = { - description = "Six - A Hex playing program for KDE"; - homepage = http://six.retes.hu/; - license = "GPLv2"; - platforms = stdenv.lib.platforms.linux; - }; - - buildInputs = [ arts kdelibs libX11 libXext libXt perl qt3 zlib ]; - - # Supress some warnings which are less useful to us when making packages. - NIX_CFLAGS_COMPILE = "-Wno-conversion -Wno-parentheses"; - - # Without "--x-libraries=", we get the error - # "impure path `/usr/lib' used in link". - configureFlags = "--x-libraries="; - - patches = [ ./gcc43-includes.patch ]; -} diff --git a/pkgs/games/six/gcc43-includes.patch b/pkgs/games/six/gcc43-includes.patch deleted file mode 100644 index 83096bb0da2..00000000000 --- a/pkgs/games/six/gcc43-includes.patch +++ /dev/null @@ -1,38 +0,0 @@ -This patch makes six compile with gcc 4.3 by including more header files. It -is based on the advice at . - ---- a/six/carrier.h -+++ b/six/carrier.h -@@ -2,6 +2,7 @@ - #ifndef CARRIER_H - #define CARRIER_H - -+#include - #include - #include - -diff --git a/six/hexgame.cpp b/six/hexgame.cpp -index 720e977..5d0dafe 100644 ---- a/six/hexgame.cpp -+++ b/six/hexgame.cpp -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - #include - -diff --git a/six/main.cpp b/six/main.cpp -index 7fb5c21..b925a0c 100644 ---- a/six/main.cpp -+++ b/six/main.cpp -@@ -4,6 +4,8 @@ - #include "carrier.h" - #include "misc.h" - -+#include -+ - #include - #include - #include diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index e642e6f9124..80f3d72c579 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -1,53 +1,35 @@ -{stdenv, fetchurl, SDL, mesa, SDL_image, SDL_ttf, SDL_mixer, libpng, libjpeg, zlib -, curl, libvorbis, libtheora, xvidcore, pkgconfig, gtk, glib, libxml2, gtksourceview -, gtkglext, openal, gettext, p7zip }: +{ stdenv, fetchurl, libtheora, xvidcore, mesa, SDL, SDL_ttf, SDL_mixer +, curl, libjpeg, libpng, gettext, cunit, enableEditor?false }: stdenv.mkDerivation rec { - name = "ufoai-2.3"; + name = "ufoai-2.4"; src = fetchurl { - url = mirror://sourceforge/ufoai/ufoai-2.3-source.tar.bz2; - sha256 = "1pb41q5wx180l6xv8gm1sw8b7cji42znnb6qpjaap6vpgc8k3hp9"; + url = "mirror://sourceforge/ufoai/${name}-source.tar.bz2"; + sha256 = "0kxrbcjrharcwz319s90m789i4my9285ihp5ax6kfhgif2vn2ji5"; }; srcData = fetchurl { - url = mirror://sourceforge/ufoai/ufoai-2.3-data.tar; - sha256 = "0952kx6cbi4y89fbz1ig32rvsmfhzqpvdf79rq4axag9d3i5qlqf"; + url = "mirror://sourceforge/ufoai/${name}-data.tar"; + sha256 = "1drhh08cqqkwv1yz3z4ngkplr23pqqrdx6cp8c3isy320gy25cvb"; }; - srcI18n = fetchurl { - url = mirror://sourceforge/ufoai/ufoai-2.3-i18n.tar.bz2; - sha256 = "14fzv8a4xng6kfl6aw8yzz6vl2j5vryxija5b2yz75jbfpa94i09"; - }; + preConfigure = ''tar xvf "${srcData}"''; - # for the xvidcore static lib - NIX_CFLAGS_COMPILE = "-pthread -lm"; + configureFlags = [ "--enable-release" "--enable-sse" ] + ++ stdenv.lib.optional enableEditor "--enable-uforadiant"; - # Order is important, x libs include a libpng version that fails for ufoai - buildInputs = [ libpng SDL mesa SDL_image SDL_ttf SDL_mixer libjpeg zlib curl libvorbis - libtheora xvidcore pkgconfig glib gtk gtkglext gtksourceview libxml2 openal gettext - p7zip ]; + buildInputs = [ + libtheora xvidcore mesa SDL SDL_ttf SDL_mixer + curl libjpeg libpng gettext cunit + ]; - enableParallelBuilding = true; - - preConfigure = '' - tar xvf $srcI18n - ''; - - configureFlags = "--enable-release"; - - postInstall = '' - pushd $out/share/ufoai - tar xvf $srcData - popd - ''; - - installTargets = "install_exec"; + NIX_CFLAGS_LINK = "-lgcc_s"; # to avoid occasional runtime error in finding libgcc_s.so.1 meta = { - homepage = http://www.ultimatestunts.nl/; - description = "Squad-based tactical strategy game in the tradition of X-Com"; + homepage = http://ufoai.org; + description = "A squad-based tactical strategy game in the tradition of X-Com"; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix new file mode 100644 index 00000000000..e6f3523fa24 --- /dev/null +++ b/pkgs/games/vessel/default.nix @@ -0,0 +1,84 @@ +{ stdenv, requireFile, SDL, pulseaudio, alsaLib }: + +stdenv.mkDerivation rec { + name = "vessel-12082012"; + + goBuyItNow = '' + We cannot download the full version automatically, as you require a license. + Once you bought a license, you need to add your downloaded version to the nix store. + You can do this by using "nix-prefetch-url file://${name}-bin" in the + directory where you saved it. + ''; + + src = if (stdenv.isi686) then + requireFile { + message = goBuyItNow; + name = "${name}-bin"; + sha256 = "1vpwcrjiln2mx43h7ib3jnccyr3chk7a5x2bw9kb4lw8ycygvg96"; + } else throw "unsupported platform ${stdenv.s:ystem} only i686-linux supported for now."; + + phases = "installPhase"; + ld_preload = ./isatty.c; + + libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ] + + ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ; + + installPhase = '' + ensureDir $out/libexec/strangeloop/vessel/ + ensureDir $out/bin + + # allow scripting of the mojoinstaller + gcc -fPIC -shared -o isatty.so $ld_preload + + echo @@@ + echo @@@ this next step appears to hang for a while + echo @@@ + + # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. + LD_PRELOAD=./isatty.so $(cat $NIX_GCC/nix-support/dynamic-linker) $src << IM_A_BOT + n + $out/libexec/strangeloop/vessel/ + IM_A_BOT + + # use nix SDL libraries + rm $out/libexec/strangeloop/vessel/x86/libSDL* + rm $out/libexec/strangeloop/vessel/x86/libstdc++* + + # props to Ethan Lee (the Vessel porter) for understanding + # how $ORIGIN works in rpath. There is hope for humanity. + patchelf \ + --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \ + $out/libexec/strangeloop/vessel/x86/vessel.x86 + + # we need to libs to find their deps + for lib in $out/libexec/strangeloop/vessel/x86/lib* ; do + patchelf \ + --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \ + $lib + done + + cat > $out/bin/Vessel << EOW + #!/bin/sh + cd $out/libexec/strangeloop/vessel/ + exec ./x86/vessel.x86 + EOW + + chmod +x $out/bin/Vessel + ''; + + meta = { + description = "A fluid physics based puzzle game"; + longDescription = '' + Living liquid machines have overrun this world of unstoppable progress, + and it is the role of their inventor, Arkwright, to stop the chaos they are + causing. Vessel is a game about a man with the power to bring ordinary matter + to life, and all the consequences that ensue. + ''; + homepage = http://www.strangeloopgames.com; + license = [ "unfree" ]; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + platforms = [ "i686-linux"] ; + }; + +} diff --git a/pkgs/games/vessel/isatty.c b/pkgs/games/vessel/isatty.c new file mode 100644 index 00000000000..38ee2b6ce2e --- /dev/null +++ b/pkgs/games/vessel/isatty.c @@ -0,0 +1,6 @@ +// We override isatty to help 'automate' installers. + +// Some installers (mojoinstall) have a stdio GUI that refuses to run if you +// feed it a file on stdin. This should help that. + +int isatty(int fd) { return 1; } diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index fc9beb23987..aeb7e37cd7e 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, unzip, pkgconfig, zlib, curl, libjpeg, libpng, libvorbis -, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal +, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal, freetype +, makeWrapper }: stdenv.mkDerivation rec { name = "warsow-${version}"; - version = "1.02"; + version = "1.03"; mversion = "1.02"; # sometimes only engine is updated src1 = fetchurl { - url = "http://www.warsow.net:1337/~warsow/1.02/warsow_1.02_sdk.tar.gz"; - sha256 = "0b5vra4qihkkcw4jn54r8l2lyl2mp67b4y1m76nyz7f34vng1hdy"; + url = "http://www.warsow.net:1337/~warsow/${version}/warsow_${version}_sdk.tar.gz"; + sha256 = "0z6r5v30p8fxbszmkxssv5fnnjw7w5wfn7wfgbwvmy87ayi7mkcq"; }; src2 = fetchurl { - url = "http://www.warsow.net:1337/~warsow/1.02/warsow_1.02.tar.gz"; + url = "http://www.warsow.net:1337/~warsow/${mversion}/warsow_${mversion}.tar.gz"; sha256 = "0ai5v1h5g9nq21ixz23v0qsj9dr7dbiz7l8r34mq4c3z6ili8zpy"; }; unpackPhase = '' @@ -25,18 +26,20 @@ stdenv.mkDerivation rec { substituteInPlace snd_openal/snd_main.c --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 ''; buildInputs = [ unzip pkgconfig zlib curl libjpeg libpng libvorbis libtheora - libXxf86dga libXxf86vm libXinerama SDL mesa openal ]; + libXxf86dga libXxf86vm libXinerama SDL mesa openal makeWrapper + ]; installPhase = '' dest=$out/opt/warsow cd release - for f in warsow wsw_server wswtv_server; do - substituteInPlace $f --replace BINARY_DIR= BINARY_DIR=$dest - done mkdir -p $dest mkdir -p $out/bin - cp -v {warsow,wsw_server,wswtv_server}.* $dest + cp -v {warsow,wsw_server,wswtv_server}* $dest cp -rv basewsw libs $dest - cp -v warsow wsw_server wswtv_server $out/bin + # Since 1.03 some modules are _always_ downloaded from server, thus + makeWrapper $dest/warsow $out/bin/warsow \ + --suffix-each LD_LIBRARY_PATH ':' "${freetype}/lib" + makeWrapper $dest/wsw_server $out/bin/wsw_server + makeWrapper $dest/wswtv_server $out/bin/wswtv_server ''; postFixup = '' p=$out/opt/warsow/warsow.* diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index 5e0ab620865..fcdc3c31f29 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -5,7 +5,7 @@ with { inherit (import ./trivial.nix) or; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; - inherit (import ./lists.nix) concatMap concatLists all; + inherit (import ./lists.nix) concatMap concatLists all deepSeqList; inherit (import ./misc.nix) maybeAttr; }; @@ -314,4 +314,5 @@ rec { overrideExisting = old: new: old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old)); + deepSeqAttrs = x: y: deepSeqList (attrValues x) y; } diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index ede7018fb23..0916355568c 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -1,4 +1,7 @@ # General list operations. +with { + inherit (import ./trivial.nix) deepSeq; +}; rec { inherit (builtins) head tail length isList add sub lessThan; @@ -220,4 +223,5 @@ rec { ++ zipTwoLists (tail xs) (tail ys) else []; + deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y; } diff --git a/pkgs/lib/trivial.nix b/pkgs/lib/trivial.nix index af47a8c8841..8af3474f2a6 100644 --- a/pkgs/lib/trivial.nix +++ b/pkgs/lib/trivial.nix @@ -1,3 +1,8 @@ +with { + inherit (import ./lists.nix) deepSeqList; + inherit (import ./attrsets.nix) deepSeqAttrs; +}; + rec { # Identity function. @@ -22,4 +27,12 @@ rec { # evaluation of its first argument. seq = x: y: if x == null then y else y; + # Like `seq', but recurses into lists and attribute sets to force evaluation + # of all list elements/attributes. + deepSeq = x: y: + if builtins.isList x + then deepSeqList x y + else if builtins.isAttrs x + then deepSeqAttrs x y + else seq x y; } diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index 1cb1185b8bb..6ddac61d91b 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -68,6 +68,14 @@ rec { merge = lib.concatStrings; }; + # Like ‘string’, but add newlines between every value. Useful for + # configuration file contents. + lines = mkOptionType { + name = "string"; + check = lib.traceValIfNot builtins.isString; + merge = lib.concatStringsSep "\n"; + }; + envVar = mkOptionType { name = "environment variable"; inherit (string) check; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index f19298e7ccd..6cc13aa3013 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation { description = "A standards-based printing system for UNIX"; license = stdenv.lib.licenses.gpl2; # actually LGPL for the library and GPL for the rest maintainers = [ stdenv.lib.maintainers.urkud stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 514655bd727..5b9ef87a129 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, cups, zlib, libjpeg, libusb, python, saneBackends, dbus -, pkgconfig, polkit, qtSupport ? true, qt4 +{stdenv, fetchurl, cups, zlib, libjpeg, libusb, pythonPackages, saneBackends, dbus +, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp }: stdenv.mkDerivation rec { @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { prePatch = '' sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in + sed -i s,/etc/hp/,$out/etc/hp/, base/g.py ''; # --disable-network-build Until we have snmp @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups --enable-policykit - --disable-network-build" + " export makeFlags=" halpredir=$out/share/hal/fdi/preprobe/10osvendor @@ -41,8 +42,27 @@ stdenv.mkDerivation rec { "; ''; - buildInputs = [libjpeg cups libusb python saneBackends dbus pkgconfig] ++ - stdenv.lib.optional qtSupport qt4; + postInstall = '' + wrapPythonPrograms + ''; + + buildInputs = [ + libjpeg + cups + libusb + pythonPackages.python + pythonPackages.wrapPython + saneBackends + dbus + pkgconfig + net_snmp + ] ++ stdenv.lib.optional qtSupport qt4; + + pythonPath = with pythonPackages; [ + pythonDBus + pygobject + recursivePthLoader + ] ++ stdenv.lib.optional qtSupport pyqt4; meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; diff --git a/pkgs/misc/emulators/wine/build_winetricks.sh b/pkgs/misc/emulators/wine/build_winetricks.sh new file mode 100644 index 00000000000..2d19e749f2d --- /dev/null +++ b/pkgs/misc/emulators/wine/build_winetricks.sh @@ -0,0 +1,17 @@ +#!bash +source $stdenv/setup +mkdir -p $out/bin +cp $src/src/winetricks $out/bin/winetricks +chmod +x $out/bin/winetricks +cd $out/bin +patch -u -p0 < $patch + +mkdir -p "$out/share/man/man1" +cp "$src/src/winetricks.1" "$out/share/man/man1/" + +patchShebangs "$out" + +substituteInPlace "$out/bin/winetricks" --replace "/usr/bin/perl" `which perl` + +# add stuff to PATH +sed -i "2i PATH=\"${pathAdd}:\${PATH}\"" "$out/bin/winetricks" diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index f4968158dd2..010e65f62eb 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,16 +7,17 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; stdenv.mkDerivation rec { - name = "wine-${meta.version}"; + version = "1.5.23"; + name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0l5kr3iq1lkv3gcw8ljzfjcfnsh9b5crdd4i0dzwdk1i3bfw2xxc"; + sha256 = "1wgs2bdl3sn3j0za7fk9zfjlii1x6qkvmyw4jxzz1mfw6nizswzr"; }; gecko = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-1.5-x86.msi"; - sha256 = "2e372a1b87ff2a22ad5127400ece4b09e55591d9f84e00bb562d294898a49b5c"; + url = "mirror://sourceforge/wine/wine_gecko-1.9-x86.msi"; + sha256 = "10p7djsf85xjk8rzg3hgw5fskrn8402y2aijy701xwm4hy9ga79g"; }; buildInputs = [ @@ -46,7 +47,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - version = "1.5.21"; homepage = "http://www.winehq.org/"; license = "LGPL"; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix new file mode 100644 index 00000000000..8a0901ddb80 --- /dev/null +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl, cabextract, unzip, p7zip } : + +stdenv.mkDerivation rec { + rev = "939"; + name = "winetricks-${rev}"; + + src = fetchsvn { + url = "http://winetricks.googlecode.com/svn/trunk"; + inherit rev; + }; + + buildInputs = [ perl which ]; + + pathAdd = stdenv.lib.concatStringsSep "/bin:" # coreutils is for sha1sum + [ wine perl which coreutils zenity curl cabextract unzip p7zip ] + + "/bin"; + + patch = ./winetricks.patch; + + builder = ./build_winetricks.sh; + + meta = { + description = "A script to install DLLs needed to work around problems in Wine"; + license = "LGPLv2.1"; + homepage = http://code.google.com/p/winetricks/; + }; +} + diff --git a/pkgs/misc/emulators/wine/winetricks.patch b/pkgs/misc/emulators/wine/winetricks.patch new file mode 100644 index 00000000000..f419a0dcee4 --- /dev/null +++ b/pkgs/misc/emulators/wine/winetricks.patch @@ -0,0 +1,21 @@ +--- upstream-winetricks 2013-01-12 13:26:12.333076904 -0800 ++++ winetricks 2013-01-12 14:37:39.675092352 -0800 +@@ -3398,7 +3398,7 @@ + WINETRICKS_OPT_SHAREDPREFIX=${WINETRICKS_OPT_SHAREDPREFIX:-0} + + # Mac folks tend to not have sha1sum, but we can make do with openssl +- if [ -x "`which sha1sum 2>/dev/null`" ] ++ if [ -e "`which sha1sum 2>/dev/null`" ] + then + WINETRICKS_SHA1SUM="sha1sum" + elif [ -x "`which openssl 2>/dev/null`" ] +@@ -3628,7 +3628,7 @@ + if ! test "$WINETRICKS_LIB" + then + WINETRICKS_SRCDIR=`dirname "$0"` +- WINETRICKS_SRCDIR=`cd "$WINETRICKS_SRCDIR"; /bin/pwd` ++ WINETRICKS_SRCDIR=`cd "$WINETRICKS_SRCDIR"; pwd` + + # Which GUI helper to use (none/zenity/kdialog). See winetricks_detect_gui. + WINETRICKS_GUI=none + diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 77d3c2f35ab..826924b8e8e 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,19 +1,18 @@ { stdenv, fetchurl, alsaLib, dbus, expat, libsamplerate , libsndfile, makeWrapper, pkgconfig, python, pythonDBus -, firewireSupport ? false, ffado ? null }: +, firewireSupport ? false, ffado ? null, bash }: assert firewireSupport -> ffado != null; stdenv.mkDerivation rec { name = "jackdbus-${version}"; - version = "1.9.8"; + version = "1.9.9.5"; src = fetchurl { urls = [ - "http://pkgs.fedoraproject.org/lookaside/pkgs/jack-audio-connection-kit/jack-1.9.8.tgz/1dd2ff054cab79dfc11d134756f27165/jack-1.9.8.tgz" - "http://www.grame.fr/~letz/jack-1.9.8.tgz" + https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2 ]; - sha256 = "0788092zxrivcfnfg15brpjkf14x8ma8cwjz4k0b9xdxajn2wwac"; + sha256 = "1ggba69jsfg7dmjzlyqz58y2wa92lm3vwdy4r15bs7mvxb65mvv5"; }; buildInputs = @@ -21,10 +20,11 @@ stdenv.mkDerivation rec { pkgconfig python pythonDBus ] ++ (stdenv.lib.optional firewireSupport ffado); - patches = ./ffado_setbuffsize-jack2.patch; + patchPhase = '' + substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash + ''; configurePhase = '' - cd jack-1.9.8 python waf configure --prefix=$out --dbus --alsa ${if firewireSupport then "--firewire" else ""} ''; diff --git a/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch b/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch deleted file mode 100644 index 7771639280d..00000000000 --- a/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch +++ /dev/null @@ -1,140 +0,0 @@ -https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/jack2 - -From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001 -From: Adrian Knoth -Date: Sat, 17 Mar 2012 22:36:30 +0100 -Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size - -This is a port of Jonathan Woithe's patch from jackd1. -With sufficiently recent versions of FFADO, it allows to change -the buffersize at runtime. ---- - linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++---- - linux/firewire/JackFFADODriver.h | 6 ++++ - 2 files changed, 65 insertions(+), 6 deletions(-) - -diff --git a/jack-1.9.8/linux/firewire/JackFFADODriver.cpp b/jack-1.9.8/linux/firewire/JackFFADODriver.cpp -index b33e1cd..085b78a 100644 ---- a/jack-1.9.8/linux/firewire/JackFFADODriver.cpp -+++ b/jack-1.9.8/linux/firewire/JackFFADODriver.cpp -@@ -3,6 +3,7 @@ - Copyright (C) 2004 Grame - Copyright (C) 2007 Pieter Palmers - Copyright (C) 2009 Devin Anderson -+Copyright (C) 2012 Jonathan Woithe, Adrian Knoth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -48,7 +49,10 @@ - namespace Jack - { - -+// Basic functionality requires API version 8. If version 9 or later -+// is present the buffers can be resized at runtime. - #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8 -+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9 - - #define jack_get_microseconds GetMicroSeconds - -@@ -281,19 +285,68 @@ - int - JackFFADODriver::SetBufferSize (jack_nframes_t nframes) - { -- printError("Buffer size change requested but not supported!!!"); -+ ffado_driver_t* driver = (ffado_driver_t*)fDriver; -+ signed int chn; -+ -+ // The speed of this function isn't critical; we can afford the -+ // time to check the FFADO API version. -+ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE || -+ ffado_streaming_set_period_size == NULL) { -+ printError("unsupported on current version of FFADO; please upgrade FFADO"); -+ return -1; -+ } - -- /* - driver->period_size = nframes; - driver->period_usecs = - (jack_time_t) floor ((((float) nframes) / driver->sample_rate) - * 1000000.0f); -- */ -+ -+ -+ // Reallocate the null and scratch buffers. -+ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); -+ if(driver->nullbuffer == NULL) { -+ printError("could not allocate memory for null buffer"); -+ return -1; -+ } -+ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); -+ if(driver->scratchbuffer == NULL) { -+ printError("could not allocate memory for scratch buffer"); -+ return -1; -+ } -+ -+ // MIDI buffers need reallocating -+ for (chn = 0; chn < driver->capture_nchannels; chn++) { -+ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { -+ // setup the midi buffer -+ if (driver->capture_channels[chn].midi_buffer != NULL) -+ free(driver->capture_channels[chn].midi_buffer); -+ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); -+ } -+ } -+ for (chn = 0; chn < driver->playback_nchannels; chn++) { -+ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { -+ if (driver->playback_channels[chn].midi_buffer != NULL) -+ free(driver->playback_channels[chn].midi_buffer); -+ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); -+ } -+ } -+ -+ // Notify FFADO of the period size change -+ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) { -+ printError("could not alter FFADO device period size"); -+ return -1; -+ } -+ -+ // This is needed to give the shadow variables a chance to -+ // properly update to the changes. -+ sleep(1); - - /* tell the engine to change its buffer size */ -- //driver->engine->set_buffer_size (driver->engine, nframes); -+ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails - -- return -1; // unsupported -+ UpdateLatencies(); -+ -+ return 0; - } - - typedef void (*JackDriverFinishFunction) (jack_driver_t *); -@@ -306,7 +359,7 @@ - - assert(params); - -- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) { -+ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) { - printError("Incompatible libffado version! (%s)", ffado_get_version()); - return NULL; - } -diff --git a/jack-1.9.8/linux/firewire/JackFFADODriver.h b/jack-1.9.8/linux/firewire/JackFFADODriver.h -index cb2a45d..790f4dd 100644 ---- a/jack-1.9.8/linux/firewire/JackFFADODriver.h -+++ b/jack-1.9.8/linux/firewire/JackFFADODriver.h -@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver - int Read(); - int Write(); - -+ // BufferSize can be changed -+ bool IsFixedBufferSize() -+ { -+ return false; -+ } -+ - int SetBufferSize(jack_nframes_t nframes); - }; - --- -1.7.10 diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 74379880706..5928406eb54 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation { - name = "uboot-2009.11"; + name = "uboot-2012.07"; src = fetchurl { - url = "ftp://ftp.denx.de/pub/u-boot/u-boot-2009.11.tar.bz2"; - sha256 = "1rld7q3ww89si84g80hqskd1z995lni5r5xc4d4322n99wqiarh6"; + url = "ftp://ftp.denx.de/pub/u-boot/u-boot-2012.07.tar.bz2"; + sha256 = "15nli6h9a127ldizsck3g4ysy5j4m910wawspgpadz4vjyk213p0"; }; nativeBuildInputs = [ unzip ]; @@ -40,6 +40,15 @@ stdenv.mkDerivation { cp tools/{envcrc,mkimage} $out/bin ''; + # They have 'errno.h' included by a "-idirafter". As the gcc + # wrappers add the glibc include as "-idirafter", the only way + # we can make the glibc take priority is to -include errno.h. + postPatch = if stdenv ? glibc && stdenv.glibc != null then '' + sed -i 's,$(HOSTCPPFLAGS),-include ${stdenv.glibc}/include/errno.h $(HOSTCPPFLAGS),' config.mk + '' else ""; + + patches = [ ./sheevaplug-sdio.patch ./sheevaplug-config.patch ]; + configurePhase = assert platform ? uboot && platform.uboot != null; assert (platform ? ubootConfig); diff --git a/pkgs/misc/uboot/sheevaplug-config.patch b/pkgs/misc/uboot/sheevaplug-config.patch new file mode 100644 index 00000000000..487756217bf --- /dev/null +++ b/pkgs/misc/uboot/sheevaplug-config.patch @@ -0,0 +1,57 @@ +diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h +index 7c8497c..b0da1e5 100644 +--- a/include/configs/sheevaplug.h ++++ b/include/configs/sheevaplug.h +@@ -50,7 +50,6 @@ + #define CONFIG_CMD_MII + #define CONFIG_CMD_MMC + #define CONFIG_CMD_NAND +-#define CONFIG_JFFS2_NAND + #define CONFIG_CMD_PING + #define CONFIG_CMD_USB + /* +@@ -73,25 +72,36 @@ + * it has to be rounded to sector size + */ + #define CONFIG_ENV_SIZE 0x20000 /* 128k */ +-#define CONFIG_ENV_ADDR 0xa0000 +-#define CONFIG_ENV_OFFSET 0xa0000 /* env starts here */ ++#define CONFIG_ENV_ADDR 0x60000 ++#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ + + /* + * Default environment variables + */ +-#define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \ ++#define CONFIG_BOOTCOMMAND "${x_bootcmd_ubi0}; " \ ++ "${x_bootcmd_ubi1}; " \ ++ "${x_bootcmd_ubi2}; " \ ++ "${x_bootcmd_ubi3}; " \ + "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ +- "${x_bootcmd_usb}; bootm 0x6400000;" ++ "${x_bootcmd_usb}; bootm 0x200000 0x1100000;" + + #define CONFIG_MTDPARTS "orion_nand:512k(uboot)," \ +- "0x1ff00000@512k(rootfs) rw\0" ++ "0x1ff00000@512k(rootfs)\0" ++#define CONFIG_MTDPARTSK "orion_nand:512k(uboot)," \ ++ "0x1ff00000@512k(rootfs)rw\0" + + #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ +- "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ ++ "=ttyS0,115200 mtdparts="CONFIG_MTDPARTSK \ ++ "mtdparts=mtdparts="CONFIG_MTDPARTS \ + "mtdids=nand0=orion_nand\0" \ +- "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \ ++ "ipaddr=192.168.1.4\0" \ ++ "x_bootcmd_ubi0=ubi part nand0,1\0" \ ++ "x_bootcmd_ubi1=ubifsmount rootfs\0" \ ++ "x_bootcmd_ubi2=ubifsload 0x200000 /nixos-kernel\0" \ ++ "x_bootcmd_ubi3=ubifsload 0x1100000 /nixos-initrd\0" \ + "x_bootcmd_usb=usb start\0" \ +- "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0" ++ "x_bootargs_root=ubi.mtd=rootfs root=ubi0:rootfs rw rootfstype=ubifs " \ ++ "init=/boot/nixos-init systemConfig=/boot/default/system\0" + + /* + * Ethernet Driver configuration diff --git a/pkgs/misc/uboot/sheevaplug-sdio.patch b/pkgs/misc/uboot/sheevaplug-sdio.patch new file mode 100644 index 00000000000..3a4ea2933a3 --- /dev/null +++ b/pkgs/misc/uboot/sheevaplug-sdio.patch @@ -0,0 +1,1091 @@ +diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h +index a9499b7..1294d7f 100644 +--- a/arch/arm/include/asm/arch-kirkwood/config.h ++++ b/arch/arm/include/asm/arch-kirkwood/config.h +@@ -66,6 +66,7 @@ + #define MV_SATA_BASE KW_SATA_BASE + #define MV_SATA_PORT0_OFFSET KW_SATA_PORT0_OFFSET + #define MV_SATA_PORT1_OFFSET KW_SATA_PORT1_OFFSET ++#define MV_SDIO_BASE KW_SDIO_BASE + + /* + * NAND configuration +@@ -107,6 +108,14 @@ + #endif /* CONFIG_CMD_NET */ + + /* ++ * SDIO/MMC Card Configuration ++ */ ++#ifdef CONFIG_CMD_MMC ++#define CONFIG_MMC ++#define CONFIG_MV_SDIO ++#endif /* CONFIG_CMD_MMC */ ++ ++/* + * USB/EHCI + */ + #ifdef CONFIG_CMD_USB +diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h +index 47771d5..343214b 100644 +--- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h ++++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h +@@ -55,6 +55,7 @@ + #define KW_EGIGA0_BASE (KW_REGISTER(0x72000)) + #define KW_EGIGA1_BASE (KW_REGISTER(0x76000)) + #define KW_SATA_BASE (KW_REGISTER(0x80000)) ++#define KW_SDIO_BASE (KW_REGISTER(0x90000)) + + /* Kirkwood Sata controller has two ports */ + #define KW_SATA_PORT0_OFFSET 0x2000 +diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile +index c567737..081d5f4 100644 +--- a/drivers/mmc/Makefile ++++ b/drivers/mmc/Makefile +@@ -34,6 +34,7 @@ COBJS-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o + COBJS-$(CONFIG_MMC_SPI) += mmc_spi.o + COBJS-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o + COBJS-$(CONFIG_MV_SDHCI) += mv_sdhci.o ++COBJS-$(CONFIG_MV_SDIO) += mv_sdio.o + COBJS-$(CONFIG_MXC_MMC) += mxcmmc.o + COBJS-$(CONFIG_MXS_MMC) += mxsmmc.o + COBJS-$(CONFIG_OMAP_HSMMC) += omap_hsmmc.o +diff --git a/drivers/mmc/mv_sdio.c b/drivers/mmc/mv_sdio.c +new file mode 100644 +index 0000000..35969d3 +--- /dev/null ++++ b/drivers/mmc/mv_sdio.c +@@ -0,0 +1,675 @@ ++/* ++ * (C) Copyright 2009 ++ * Marvell Semiconductor ++ * Written-by: Gérald Kerma ++ * ++ * (C) Copyright 2003 ++ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301 USA ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef CONFIG_KIRKWOOD ++#include ++#endif ++#include "mv_sdio.h" ++ ++#ifdef CONFIG_MMC ++ ++#define DRIVER_NAME "mv-sdio" ++ ++#ifdef DEBUG ++#define pr_debug(fmt, args...) printf(fmt, ##args) ++#else ++#define pr_debug(...) do { } while(0) ++#endif ++ ++//static mv_sdio_t *mvsd = (mv_sdio_t *)mmc->priv; ++static mv_sdio_t *mvsd = (mv_sdio_t *)MV_SDIO_BASE; ++ ++static int is_sdhc; ++extern int fat_register_device(block_dev_desc_t *dev_desc, int part_no); ++static block_dev_desc_t mmc_dev; ++block_dev_desc_t * mmc_get_dev(int dev) ++{ ++ return ((block_dev_desc_t *)&mmc_dev); ++} ++ ++/* ++ * FIXME needs to read cid and csd info to determine block size ++ * and other parameters ++ */ ++static uchar mmc_buf[MMC_BLOCK_SIZE]; ++static mv_mmc_csd_t mv_mmc_csd; ++static int mmc_ready = 0; ++ ++/* MMC_DEFAULT_RCA should probably be just 1, but this may break other code ++ that expects it to be shifted. */ ++static u_int16_t rca = 0; ++ ++/* used for debug */ ++static u_int32_t mv_mmc_size(const struct mv_mmc_csd *csd) ++{ ++ u_int32_t block_len, mult, blocknr; ++ ++ block_len = csd->read_bl_len << 12; ++ mult = csd->c_size_mult1 << 8; ++ blocknr = (csd->c_size+1) * mult; ++ ++ return blocknr * block_len; ++} ++ ++static int isprint (unsigned char ch) ++{ ++ if (ch >= 32 && ch < 127) ++ return (1); ++ ++ return (0); ++} ++ ++static int toprint(char *dst, char c) ++{ ++ if (isprint(c)) { ++ *dst = c; ++ return 1; ++ } ++ ++ return sprintf(dst,"\\x%02x", c); ++ ++} ++ ++static void print_mmc_cid(mv_mmc_cid_t *cid) ++{ ++ printf("MMC found. Card desciption is:\n"); ++ printf("Manufacturer ID = %02x%02x%02x\n", ++ cid->id[0], cid->id[1], cid->id[2]); ++ printf("HW/FW Revision = %x %x\n",cid->hwrev, cid->fwrev); ++ cid->hwrev = cid->fwrev = 0; /* null terminate string */ ++ printf("Product Name = %s\n",cid->name); ++ printf("Serial Number = %02x%02x%02x\n", ++ cid->sn[0], cid->sn[1], cid->sn[2]); ++ printf("Month = %d\n",cid->month); ++ printf("Year = %d\n",1997 + cid->year); ++} ++ ++static void print_sd_cid(mv_sd_cid_t *cid) ++{ ++ int len; ++ char tbuf[64]; ++ ++ printf("SD%s found. Card desciption is:\n", is_sdhc?"HC":""); ++ ++ len = 0; ++ len += toprint(&tbuf[len], cid->oid_0); ++ len += toprint(&tbuf[len], cid->oid_1); ++ tbuf[len] = 0; ++ ++ printf("Manufacturer: 0x%02x, OEM \"%s\"\n", ++ cid->mid, tbuf); ++ ++ len = 0; ++ len += toprint(&tbuf[len], cid->pnm_0); ++ len += toprint(&tbuf[len], cid->pnm_1); ++ len += toprint(&tbuf[len], cid->pnm_2); ++ len += toprint(&tbuf[len], cid->pnm_3); ++ len += toprint(&tbuf[len], cid->pnm_4); ++ tbuf[len] = 0; ++ ++ printf("Product name: \"%s\", revision %d.%d\n", ++ tbuf, ++ cid->prv >> 4, cid->prv & 15); ++ ++ printf("Serial number: %u\n", ++ cid->psn_0 << 24 | cid->psn_1 << 16 | cid->psn_2 << 8 | ++ cid->psn_3); ++ printf("Manufacturing date: %d/%d\n", ++ cid->mdt_1 & 15, ++ 2000+((cid->mdt_0 & 15) << 4)+((cid->mdt_1 & 0xf0) >> 4)); ++ ++ printf("CRC: 0x%02x, b0 = %d\n", ++ cid->crc >> 1, cid->crc & 1); ++} ++ ++static void mvsdio_set_clock(unsigned int clock) ++{ ++ unsigned int m; ++ ++ m = MVSDMMC_BASE_FAST_CLOCK/(2*clock) - 1; ++ ++ pr_debug("mvsdio_set_clock: dividor = 0x%x clock=%d\n", ++ m, clock); ++ ++ ++ writew(m & 0x7ff, &mvsd->CLK_DIV); ++ ++ if (isprint(1)) ++ udelay(10*1000); ++} ++ ++/****************************************************/ ++static ulong * mv_mmc_cmd(ulong cmd, ulong arg, ushort xfermode, ushort resptype, ushort waittype) ++/****************************************************/ ++{ ++ static ulong resp[4]; ++ ushort done ; ++ int err = 0 ; ++ ulong curr, start, diff, hz; ++ ushort response[8]; ++ ++ pr_debug("mv_mmc_cmd %x, arg: %x,xfer: %x,resp: %x, wait : %x\n" ++ , (unsigned int)cmd, (unsigned int)arg, xfermode, resptype, waittype); ++ ++ ++ /* clear status */ ++ writew(0xffff, &mvsd->NOR_INTR_STATUS); ++ writew(0xffff, &mvsd->ERR_INTR_STATUS); ++ ++ start = get_timer(0); ++ hz = CONFIG_SYS_HZ; ++ ++ while((readw(&mvsd->PRESENT_STATE0) & CARD_BUSY)) { ++ curr = get_timer(0); ++ diff = (long) curr - (long) start; ++ if (diff > (3*hz)) ++ { ++ /* 3 seconds timeout, card busy, can't sent cmd */ ++ printf("card too busy \n"); ++ return 0; ++ } ++ } ++ ++ writew((ushort)(arg&0xffff), &mvsd->ARG_LOW); ++ writew((ushort)(arg>>16), &mvsd->ARG_HI); ++ writew(xfermode, &mvsd->XFER_MODE); ++ if( (cmd == MMC_CMD_READ_BLOCK) || (cmd == 25) ) ++ { ++ writew(((cmd << 8) | resptype | 0x3c ) , &mvsd->CMD); ++ pr_debug("cmd reg : %x\n", readw(&mvsd->CMD)) ; ++ ++ } ++ else ++ { ++ writew(((cmd << 8) | resptype ), &mvsd->CMD); ++ } ++ ++ done = readw(&mvsd->NOR_INTR_STATUS) & waittype; ++ start = get_timer(0); ++ ++ while( done!=waittype) ++ { ++ done = readw(&mvsd->NOR_INTR_STATUS) & waittype; ++ ++ if( readw(&mvsd->NOR_INTR_STATUS) & 0x8000 ) ++ { ++ pr_debug("Error! cmd : %d, err : %04x\n", (unsigned int)cmd, readw(&mvsd->ERR_INTR_STATUS)) ; ++ ++ return 0 ; /* error happen */ ++ } ++ ++ curr = get_timer(0); ++ diff = (long) curr - (long) start; ++ if (diff > (3*hz)) ++ { ++ pr_debug("cmd timeout, status : %04x\n", readw(&mvsd->NOR_INTR_STATUS)); ++ pr_debug("xfer mode : %04x\n", readw(&mvsd->XFER_MODE)); ++ ++ err = 1 ; ++ break; ++ } ++ } ++ ++ response[0] = readw(&mvsd->RSP0); ++ response[1] = readw(&mvsd->RSP1); ++ response[2] = readw(&mvsd->RSP2); ++ response[3] = readw(&mvsd->RSP3); ++ response[4] = readw(&mvsd->RSP4); ++ response[5] = readw(&mvsd->RSP5); ++ response[6] = readw(&mvsd->RSP6); ++ response[7] = readw(&mvsd->RSP7); ++ ++ memset(resp, 0, sizeof(resp)); ++ ++ switch (resptype & 0x3) { ++ case SDIO_CMD_RSP_48: ++ case SDIO_CMD_RSP_48BUSY: ++ resp[0] = ((response[2] & 0x3f) << (8 - 8)) | ++ ((response[1] & 0xffff) << (14 - 8)) | ++ ((response[0] & 0x3ff) << (30 - 8)); ++ resp[1] = ((response[0] & 0xfc00) >> 10); ++ break; ++ ++ case SDIO_CMD_RSP_136: ++ resp[3] = ((response[7] & 0x3fff) << 8) | ++ ((response[6] & 0x3ff) << 22); ++ resp[2] = ((response[6] & 0xfc00) >> 10) | ++ ((response[5] & 0xffff) << 6) | ++ ((response[4] & 0x3ff) << 22); ++ resp[1] = ((response[4] & 0xfc00) >> 10) | ++ ((response[3] & 0xffff) << 6) | ++ ((response[2] & 0x3ff) << 22); ++ resp[0] = ((response[2] & 0xfc00) >> 10) | ++ ((response[1] & 0xffff) << 6) | ++ ((response[0] & 0x3ff) << 22); ++ break; ++ default: ++ return 0; ++ } ++ int i; ++ pr_debug("MMC resp :"); ++ for (i=0; i<4; ++i ) { ++ pr_debug(" %08x", (unsigned int)resp[i]); ++ } ++ pr_debug("\n"); ++ if( err ) ++ return NULL ; ++ else ++ return resp; ++} ++ ++/****************************************************/ ++static int mv_mmc_block_read(uchar *dst, ulong src, ulong len) ++/****************************************************/ ++{ ++ ulong *resp; ++ ++ if (len == 0) { ++ return 0; ++ } ++ ++ if (is_sdhc) { ++ /* SDHC: use block address */ ++ src >>= 9; ++ } ++ ++ pr_debug("mmc_block_rd dst %lx src %lx len %d\n", (ulong)dst, src, (int)len); ++ ++ /* prepare for dma transfer */ ++ writew(((ulong)(dst))&0xffff,&mvsd->SYS_ADDR_LOW); ++ writew(((ulong)(dst)>>16)&0xffff,&mvsd->SYS_ADDR_HI); ++ writew(len,&mvsd->BLK_SIZE); ++ writew(1,&mvsd->BLK_COUNT); ++ ++ /* send read command */ ++ resp = mv_mmc_cmd(MMC_CMD_READ_BLOCK, src, 0x10 , ++ SDIO_CMD_RSP_48, SDIO_NOR_XFER_DONE); ++ if (!resp) { ++ pr_debug("mv_mmc_block_read: mmc read block cmd fails\n"); ++ return -EIO; ++ } ++ ++ return 0; ++} ++ ++/****************************************************/ ++int mv_mmc_read(ulong src, uchar *dst, int size) ++/****************************************************/ ++{ ++ ulong end, part_start, part_end, part_len, aligned_start, aligned_end; ++ ulong mmc_block_size, mmc_block_address; ++ ++ if (size == 0) { ++ return 0; ++ } ++ ++ if (!mmc_ready) { ++ printf("Please initial the MMC first\n"); ++ return -1; ++ } ++ ++ mmc_block_size = MMC_BLOCK_SIZE; ++ mmc_block_address = ~(mmc_block_size - 1); ++ ++ end = src + size; ++ part_start = ~mmc_block_address & src; ++ part_end = ~mmc_block_address & end; ++ aligned_start = mmc_block_address & src; ++ aligned_end = mmc_block_address & end; ++ ++ /* all block aligned accesses */ ++ pr_debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", ++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end); ++ ++ if (part_start) { ++ part_len = mmc_block_size - part_start; ++ pr_debug("ps src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", ++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end); ++ ++ if ((mv_mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) < 0) { ++ return -1; ++ } ++ memcpy(dst, mmc_buf+part_start, part_len); ++ dst += part_len; ++ src += part_len; ++ } ++ pr_debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", ++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end); ++ ++ for (; src < aligned_end; aligned_start +=mmc_block_size, src += mmc_block_size, dst += mmc_block_size) { ++ pr_debug("al src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", ++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end); ++ ++ if ((mv_mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) < 0) { ++ printf("mmc block read error\n"); ++ return -1; ++ } ++ memcpy(dst, mmc_buf, mmc_block_size); ++ } ++ pr_debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", ++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end); ++ ++ if (part_end && src < end) { ++ pr_debug("pe src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", ++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end); ++ ++ if ((mv_mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0) { ++ return -1; ++ } ++ memcpy(dst, mmc_buf, part_end); ++ } ++ return 0; ++} ++ ++/****************************************************/ ++static ulong mv_mmc_bread(int dev_num, ulong blknr, ulong blkcnt, ulong *dst) ++/****************************************************/ ++{ ++ int mmc_block_size = MMC_BLOCK_SIZE; ++ ulong src = blknr * mmc_block_size; ++ ++ mv_mmc_read(src, (uchar *)dst, blkcnt*mmc_block_size); ++ return blkcnt; ++} ++ ++/****************************************************/ ++int mmc_legacy_init(int verbose) ++/****************************************************/ ++{ ++ int retries, rc = -ENODEV; ++ ulong *resp; ++ int sd_ver20; ++ int is_sd; ++ ushort reg; ++ uchar cidbuf[64]; ++ ++ sd_ver20 = 0; ++ is_sdhc = 0; ++ is_sd = 0; ++ ++ /* Initial Host Ctrl : Timeout : max , Normal Speed mode, 4-bit data mode */ ++ /* Big Endian, SD memory Card, Push_pull CMD Line */ ++ writew( SDIO_HOST_CTRL_TMOUT(0xf) | ++ SDIO_HOST_CTRL_DATA_WIDTH_4_BITS | ++ SDIO_HOST_CTRL_BIG_ENDIAN | ++ SDIO_HOST_CTRL_PUSH_PULL_EN | ++ SDIO_HOST_CTRL_CARD_TYPE_MEM_ONLY , ++ &mvsd->HOST_CTRL); ++ ++ writew( 0, &mvsd->CLK_CTRL); ++ ++ /* enable status */ ++ writew( 0xffff, &mvsd->NOR_STATUS_EN); ++ writew( 0xffff, &mvsd->ERR_STATUS_EN); ++ ++ /* disable interrupts */ ++ writew( 0, &mvsd->NOR_INTR_EN); ++ writew( 0, &mvsd->ERR_INTR_EN); ++ ++ writew( 0x100, &mvsd->SW_RESET); ++ udelay(10000); ++ ++ mv_mmc_csd.c_size = 0; ++ ++ /* reset */ ++ retries = 10; ++ resp = mv_mmc_cmd(0, 0, 0, SDIO_CMD_RSP_NONE, SDIO_NOR_CMD_DONE ); ++ pr_debug("cmd 0 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ ++ pr_debug ("trying to detect SD card version\n"); ++ ++ resp = mv_mmc_cmd(8, 0x000001aa, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ pr_debug("cmd 8 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ if (resp && (resp[0] & 0x1ff)==0x1aa) { ++ pr_debug ("SD version 2.0 card detected\n"); ++ ++ sd_ver20 = 1; ++ } ++ ++ if (sd_ver20) ++ retries = 50; ++ else ++ retries = 10; ++ ++ while (retries--) { ++ resp = mv_mmc_cmd(55, 0, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ pr_debug("cmd 55 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ ++ if (sd_ver20) ++ resp = mv_mmc_cmd(41, 0x40300000, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ else ++ resp = mv_mmc_cmd(41, 0x00300000, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ ++ pr_debug("cmd 41 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ ++ if (resp && (resp[0] & 0x80000000)) { ++ pr_debug ("detected SD card\n"); ++ ++ is_sd = 1; ++ break; ++ } ++ ++ udelay(100*1000); ++ } ++ ++ if (retries <= 0 && !is_sd) { ++ pr_debug ("failed to detect SD card, trying MMC\n"); ++ ++ retries = 10; ++ while (retries--) { ++ resp = mv_mmc_cmd(1, 0, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ pr_debug("cmd 01 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ ++ if (resp && (resp[0] & 0x80000000)) { ++ printf ("detected MMC card\n"); ++ reg = readw(&mvsd->HOST_CTRL); ++ reg &= ~(0x3<<1); ++ reg |= SDIO_HOST_CTRL_CARD_TYPE_IO_MMC; ++ writew( reg, &mvsd->HOST_CTRL); ++ break; ++ } ++ ++ udelay(100*1000); ++ } ++ } ++ ++ if (retries <= 0) { ++ pr_debug ("detect fails\n"); ++ ++ return -ENODEV; ++ } ++ ++ /* try to get card id */ ++ resp = mv_mmc_cmd(2, 0, 0, SDIO_CMD_RSP_136, SDIO_NOR_CMD_DONE ); ++ pr_debug("cmd 2 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ ++ if (resp == NULL) { ++ pr_debug ("read cid fails\n"); ++ ++ return -ENODEV; ++ } ++ ++ if (is_sd) { ++ mv_sd_cid_t *cid = (mv_sd_cid_t *) resp; ++ ++ memcpy(cidbuf, resp, sizeof(mv_sd_cid_t)); ++ ++ sprintf((char *) mmc_dev.vendor, ++ "Man %02x OEM %c%c \"%c%c%c%c%c\"", ++ cid->mid, cid->oid_0, cid->oid_1, ++ cid->pnm_0, cid->pnm_1, cid->pnm_2, cid->pnm_3, cid->pnm_4); ++ ++ sprintf((char *) mmc_dev.product, "%d", ++ (cid->psn_0 << 24) | (cid->psn_1 <<16) | (cid->psn_2 << 8) | (cid->psn_3 << 8)); ++ ++ sprintf((char *) mmc_dev.revision, "%d.%d", cid->prv>>4, cid->prv & 0xff); ++ ++ } else { ++ /* TODO configure mmc driver depending on card attributes */ ++ mv_mmc_cid_t *cid = (mv_mmc_cid_t *) resp; ++ ++ memcpy(cidbuf, resp, sizeof(mv_sd_cid_t)); ++ ++ ++ sprintf((char *) mmc_dev.vendor, ++ "Man %02x%02x%02x Snr %02x%02x%02x", ++ cid->id[0], cid->id[1], cid->id[2], ++ cid->sn[0], cid->sn[1], cid->sn[2]); ++ sprintf((char *) mmc_dev.product, "%s", cid->name); ++ sprintf((char *) mmc_dev.revision, "%x %x", cid->hwrev, cid->fwrev); ++ } ++ ++ /* fill in device description */ ++ mmc_dev.if_type = IF_TYPE_MMC; ++ mmc_dev.part_type = PART_TYPE_DOS; ++ mmc_dev.dev = 0; ++ mmc_dev.lun = 0; ++ mmc_dev.type = 0; ++ ++ /* FIXME fill in the correct size (is set to 128MByte) */ ++ mmc_dev.blksz = MMC_BLOCK_SIZE; ++ mmc_dev.lba = 0x10000; ++ ++ mmc_dev.removable = 0; ++ mmc_dev.block_read = (unsigned long) mv_mmc_bread; ++ ++ /* MMC exists, get CSD too */ ++ resp = mv_mmc_cmd(MMC_CMD_SET_RCA, 0, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ if (resp == NULL) { ++ pr_debug ("set rca fails\n"); ++ ++ return -ENODEV; ++ } ++ pr_debug("cmd3 resp : 0x%08x 0x%08x 0x%08x 0x%08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]); ++ ++ ++ if (is_sd) ++ rca = resp[0] >> 16; ++ else ++ rca = 0; ++ ++ resp = mv_mmc_cmd(MMC_CMD_SEND_CSD, rca<<16, 0, SDIO_CMD_RSP_136,SDIO_NOR_CMD_DONE ); ++ pr_debug("cmd 9 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ if (resp == NULL) { ++ pr_debug ("read csd fails\n"); ++ ++ return -ENODEV; ++ } ++ ++ memcpy(&mv_mmc_csd, (mv_mmc_csd_t *) resp, sizeof(mv_mmc_csd_t)); ++ rc = 0; ++ mmc_ready = 1; ++ ++ /* FIXME add verbose printout for csd */ ++ pr_debug ("size = %u\n", mv_mmc_size(&mv_mmc_csd)); ++ ++ ++ resp = mv_mmc_cmd(7, rca<<16, 0, SDIO_CMD_RSP_48BUSY, SDIO_NOR_CMD_DONE); ++ if (resp == NULL) { ++ pr_debug ("select card fails\n"); ++ ++ return -ENODEV; ++ } ++ pr_debug("cmd 7 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ ++ if (is_sd) { ++ resp = mv_mmc_cmd(55, rca<<16, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ if (resp == NULL) { ++ pr_debug ("cmd55 fails\n"); ++ ++ return -ENODEV; ++ } ++ pr_debug("cmd55 resp : 0x%08x 0x%08x 0x%08x 0x%08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]); ++ ++ ++ resp = mv_mmc_cmd(6, (rca<<16) | 0x2 , 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ if (resp == NULL) { ++ pr_debug ("cmd55 fails\n"); ++ ++ return -ENODEV; ++ } ++ pr_debug("cmd6 resp : 0x%08x 0x%08x 0x%08x 0x%08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]); ++ ++ } ++ ++ resp = (ulong *) &mv_mmc_csd; ++ pr_debug("csd: 0x%08x 0x%08x 0x%08x 0x%08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]); ++ ++ ++ /* check SDHC */ ++ if ((resp[0]&0xf0000000)==0x40000000) ++ is_sdhc = 1; ++ ++ /* set block len */ ++ resp = mv_mmc_cmd(MMC_CMD_SET_BLOCKLEN, MMC_BLOCK_SIZE, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ if (!resp) { ++ pr_debug("mv_mmc_block_read: set blk len fails\n"); ++ return -ENODEV; ++ } ++ ++ if (verbose) { ++ if (is_sd) ++ print_sd_cid((mv_sd_cid_t *) cidbuf); ++ else ++ print_mmc_cid((mv_mmc_cid_t *) cidbuf); ++ } ++ ++ mvsdio_set_clock(CONFIG_SYS_MMC_CLK_PP); ++ ++ fat_register_device(&mmc_dev,1); /* partitions start counting with 1 */ ++ ++ return 0; ++} ++ ++#endif /* CONFIG_MMC */ +diff --git a/drivers/mmc/mv_sdio.h b/drivers/mmc/mv_sdio.h +new file mode 100644 +index 0000000..9707000 +--- /dev/null ++++ b/drivers/mmc/mv_sdio.h +@@ -0,0 +1,310 @@ ++/* ++ * (C) Copyright 2009 ++ * Marvell Semiconductor ++ * Written-by: Gérald Kerma ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301 USA ++ */ ++ ++#ifndef _MVSDIO_INCLUDE ++#define _MVSDIO_INCLUDE ++ ++//#define SDIO_REG(x) (MV_SDIO_BASE + (x)) ++ ++#define MVSDMMC_DMA_SIZE 65536 ++#define MVSDMMC_CMD_TIMEOUT 2 /* 100 usec*/ ++ ++/* ++ * Clock rates ++ */ ++ ++#define MVSD_CLOCKRATE_MAX 50000000 ++#define MVSD_BASE_DIV_MAX 0x7ff ++ ++#define CONFIG_SYS_MMC_CLK_PP 25000000 ++ ++/* ++ * The base MMC clock rate ++ */ ++ ++#define MVSDMMC_CLOCKRATE_MIN 100000 ++#define MVSDMMC_CLOCKRATE_MAX MVSD_CLOCKRATE_MAX ++#define MVSDMMC_BASE_FAST_CLOCK CONFIG_SYS_TCLK ++ ++ ++/* ++ * SDIO register ++ */ ++#ifndef __ASSEMBLY__ ++ ++/* ++ * Structure for struct SoC access. ++ * Names starting with '_' are fillers. ++ */ ++typedef struct mv_sdio { ++ /* reg Offset */ ++ u32 SYS_ADDR_LOW; /* 0x00 */ ++ u32 SYS_ADDR_HI; /* 0x04 */ ++ u32 BLK_SIZE; /* 0x08 */ ++ u32 BLK_COUNT; /* 0x0c */ ++ u32 ARG_LOW; /* 0x10 */ ++ u32 ARG_HI; /* 0x14 */ ++ u32 XFER_MODE; /* 0x18 */ ++ u32 CMD; /* 0x1c */ ++ u32 RSP0; /* 0x20 */ ++ u32 RSP1; /* 0x24 */ ++ u32 RSP2; /* 0x28 */ ++ u32 RSP3; /* 0x2c */ ++ u32 RSP4; /* 0x30 */ ++ u32 RSP5; /* 0x34 */ ++ u32 RSP6; /* 0x38 */ ++ u32 RSP7; /* 0x3c */ ++ u32 BUF_DATA_PORT; /* 0x40 */ ++ u32 RSVED; /* 0x44 */ ++ u32 PRESENT_STATE0; /* 0x48 */ ++ u32 PRESENT_STATE1; /* 0x4c */ ++ u32 HOST_CTRL; /* 0x50 */ ++ u32 BLK_GAP_CTRL; /* 0x54 */ ++ u32 CLK_CTRL; /* 0x58 */ ++ u32 SW_RESET; /* 0x5c */ ++ u32 NOR_INTR_STATUS; /* 0x60 */ ++ u32 ERR_INTR_STATUS; /* 0x64 */ ++ u32 NOR_STATUS_EN; /* 0x68 */ ++ u32 ERR_STATUS_EN; /* 0x6c */ ++ u32 NOR_INTR_EN; /* 0x70 */ ++ u32 ERR_INTR_EN; /* 0x74 */ ++ u32 AUTOCMD12_ERR_STATUS; /* 0x78 */ ++ u32 CURR_BYTE_LEFT; /* 0x7c */ ++ u32 CURR_BLK_LEFT; /* 0x80 */ ++ u32 AUTOCMD12_ARG_LOW; /* 0x84 */ ++ u32 AUTOCMD12_ARG_HI; /* 0x88 */ ++ u32 AUTOCMD12_INDEX; /* 0x8c */ ++ u32 AUTO_RSP0; /* 0x90 */ ++ u32 AUTO_RSP1; /* 0x94 */ ++ u32 AUTO_RSP2; /* 0x98 */ ++ u32 _9c; /* 0x9c */ ++ u32 _a0[0x78]; /* 0xa0 */ ++ u32 CLK_DIV; /* 0x128 */ ++ ++} mv_sdio_t; ++ ++#endif /* __ASSEMBLY__ */ ++ ++/* ++ * SDIO_PRESENT_STATE ++ */ ++ ++#define CARD_BUSY (1 << 1) ++#define CMD_INHIBIT (1 << 0) ++#define CMD_TXACTIVE (1 << 8) ++#define CMD_RXACTIVE (1 << 9) ++#define CMD_AUTOCMD12ACTIVE (1 << 14) ++ ++#define CMD_BUS_BUSY (CMD_AUTOCMD12ACTIVE| \ ++ CMD_RXACTIVE| \ ++ CMD_TXACTIVE| \ ++ CMD_INHIBIT| \ ++ CARD_BUSY) ++ ++/* ++ * SDIO_CMD ++ */ ++ ++#define SDIO_CMD_RSP_NONE (0 << 0) ++#define SDIO_CMD_RSP_136 (1 << 0) ++#define SDIO_CMD_RSP_48 (2 << 0) ++#define SDIO_CMD_RSP_48BUSY (3 << 0) ++ ++#define SDIO_CMD_CHECK_DATACRC16 (1 << 2) ++#define SDIO_CMD_CHECK_CMDCRC (1 << 3) ++#define SDIO_CMD_INDX_CHECK (1 << 4) ++#define SDIO_CMD_DATA_PRESENT (1 << 5) ++#define SDIO_UNEXPECTED_RESP (1 << 7) ++ ++ ++/* ++ * SDIO_XFER_MODE ++ */ ++ ++#define SDIO_XFER_MODE_STOP_CLK (1 << 5) ++#define SDIO_XFER_MODE_HW_WR_DATA_EN (1 << 1) ++#define SDIO_XFER_MODE_AUTO_CMD12 (1 << 2) ++#define SDIO_XFER_MODE_INT_CHK_EN (1 << 3) ++#define SDIO_XFER_MODE_TO_HOST (1 << 4) ++ ++ ++/* ++ * SDIO_HOST_CTRL ++ */ ++ ++#define SDIO_HOST_CTRL_PUSH_PULL_EN (1 << 0) ++ ++#define SDIO_HOST_CTRL_CARD_TYPE_MEM_ONLY (0 << 1) ++#define SDIO_HOST_CTRL_CARD_TYPE_IO_ONLY (1 << 1) ++#define SDIO_HOST_CTRL_CARD_TYPE_IO_MEM_COMBO (2 << 1) ++#define SDIO_HOST_CTRL_CARD_TYPE_IO_MMC (3 << 1) ++#define SDIO_HOST_CTRL_CARD_TYPE_MASK (3 << 1) ++ ++#define SDIO_HOST_CTRL_BIG_ENDIAN (1 << 3) ++#define SDIO_HOST_CTRL_LSB_FIRST (1 << 4) ++#define SDIO_HOST_CTRL_ID_MODE_LOW_FREQ (1 << 5) ++#define SDIO_HOST_CTRL_HALF_SPEED (1 << 6) ++#define SDIO_HOST_CTRL_DATA_WIDTH_4_BITS (1 << 9) ++#define SDIO_HOST_CTRL_HI_SPEED_EN (1 << 10) ++ ++ ++#define SDIO_HOST_CTRL_TMOUT_MASK (0xf << 11) ++#define SDIO_HOST_CTRL_TMOUT_MAX (0xf << 11) ++#define SDIO_HOST_CTRL_TMOUT(x) ((x) << 11) ++#define SDIO_HOST_CTRL_TMOUT_EN (1 << 15) ++ ++#define SDIO_HOST_CTRL_DFAULT_OPEN_DRAIN \ ++ (SDIO_HOST_CTRL_TMOUT(x)(0xf)) ++#define SDIO_HOST_CTRL_DFAULT_PUSH_PULL \ ++ (SDIO_HOST_CTRL_TMOUT(x)(0xf) | SDIO_HOST_CTRL_PUSH_PULL_EN) ++ ++ ++/* ++ * NOR status bits ++ */ ++ ++#define SDIO_NOR_ERROR (1 << 15) ++#define SDIO_NOR_UNEXP_RSP (1 << 14) ++#define SDIO_NOR_AUTOCMD12_DONE (1 << 13) ++#define SDIO_NOR_SUSPEND_ON (1 << 12) ++#define SDIO_NOR_LMB_FF_8W_AVAIL (1 << 11) ++#define SDIO_NOR_LMB_FF_8W_FILLED (1 << 10) ++#define SDIO_NOR_READ_WAIT_ON (1 << 9) ++#define SDIO_NOR_CARD_INT (1 << 8) ++#define SDIO_NOR_READ_READY (1 << 5) ++#define SDIO_NOR_WRITE_READY (1 << 4) ++#define SDIO_NOR_DMA_INI (1 << 3) ++#define SDIO_NOR_BLK_GAP_EVT (1 << 2) ++#define SDIO_NOR_XFER_DONE (1 << 1) ++#define SDIO_NOR_CMD_DONE (1 << 0) ++ ++ ++/* ++ * ERR status bits ++ */ ++ ++#define SDIO_ERR_CRC_STATUS (1 << 14) ++#define SDIO_ERR_CRC_STARTBIT (1 << 13) ++#define SDIO_ERR_CRC_ENDBIT (1 << 12) ++#define SDIO_ERR_RESP_TBIT (1 << 11) ++#define SDIO_ERR_SIZE (1 << 10) ++#define SDIO_ERR_CMD_STARTBIT (1 << 9) ++#define SDIO_ERR_AUTOCMD12 (1 << 8) ++#define SDIO_ERR_DATA_ENDBIT (1 << 6) ++#define SDIO_ERR_DATA_CRC (1 << 5) ++#define SDIO_ERR_DATA_TIMEOUT (1 << 4) ++#define SDIO_ERR_CMD_INDEX (1 << 3) ++#define SDIO_ERR_CMD_ENDBIT (1 << 2) ++#define SDIO_ERR_CMD_CRC (1 << 1) ++#define SDIO_ERR_CMD_TIMEOUT (1 << 0) ++ ++#define SDIO_ERR_INTR_MASK 0xFFFF ++ ++ ++#define MMC_BLOCK_SIZE 512 ++#define MMC_CMD_RESET 0 ++#define MMC_CMD_SEND_OP_COND 1 ++#define MMC_CMD_ALL_SEND_CID 2 ++#define MMC_CMD_SET_RCA 3 ++#define MMC_CMD_SELECT_CARD 7 ++#define MMC_CMD_SEND_CSD 9 ++#define MMC_CMD_SEND_CID 10 ++#define MMC_CMD_SEND_STATUS 13 ++#define MMC_CMD_SET_BLOCKLEN 16 ++#define MMC_CMD_READ_BLOCK 17 ++#define MMC_CMD_RD_BLK_MULTI 18 ++#define MMC_CMD_WRITE_BLOCK 24 ++#define MMC_MAX_BLOCK_SIZE 512 ++ ++typedef struct mv_mmc_cid ++{ ++ /* FIXME: BYTE_ORDER */ ++ uchar year:4, ++ month:4; ++ uchar sn[3]; ++ uchar fwrev:4, ++ hwrev:4; ++ uchar name[6]; ++ uchar id[3]; ++} mv_mmc_cid_t; ++ ++typedef struct mv_mmc_csd ++{ ++ uchar ecc:2, ++ file_format:2, ++ tmp_write_protect:1, ++ perm_write_protect:1, ++ copy:1, ++ file_format_grp:1; ++ uint64_t content_prot_app:1, ++ rsvd3:4, ++ write_bl_partial:1, ++ write_bl_len:4, ++ r2w_factor:3, ++ default_ecc:2, ++ wp_grp_enable:1, ++ wp_grp_size:5, ++ erase_grp_mult:5, ++ erase_grp_size:5, ++ c_size_mult1:3, ++ vdd_w_curr_max:3, ++ vdd_w_curr_min:3, ++ vdd_r_curr_max:3, ++ vdd_r_curr_min:3, ++ c_size:12, ++ rsvd2:2, ++ dsr_imp:1, ++ read_blk_misalign:1, ++ write_blk_misalign:1, ++ read_bl_partial:1; ++ ushort read_bl_len:4, ++ ccc:12; ++ uchar tran_speed; ++ uchar nsac; ++ uchar taac; ++ uchar rsvd1:2, ++ spec_vers:4, ++ csd_structure:2; ++} mv_mmc_csd_t; ++ ++typedef struct { ++ char pnm_0; /* product name */ ++ char oid_1; /* OEM/application ID */ ++ char oid_0; ++ uint8_t mid; /* manufacturer ID */ ++ char pnm_4; ++ char pnm_3; ++ char pnm_2; ++ char pnm_1; ++ uint8_t psn_2; /* product serial number */ ++ uint8_t psn_1; ++ uint8_t psn_0; /* MSB */ ++ uint8_t prv; /* product revision */ ++ uint8_t crc; /* CRC7 checksum, b0 is unused and set to 1 */ ++ uint8_t mdt_1; /* manufacturing date, LSB, RRRRyyyy yyyymmmm */ ++ uint8_t mdt_0; /* MSB */ ++ uint8_t psn_3; /* LSB */ ++} mv_sd_cid_t; ++ ++#endif /* _MVSDIO_INCLUDE */ +diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h +index 83dd8ff..7c8497c 100644 +--- a/include/configs/sheevaplug.h ++++ b/include/configs/sheevaplug.h +@@ -1,3 +1,4 @@ ++ + /* + * (C) Copyright 2009 + * Marvell Semiconductor +@@ -47,7 +48,9 @@ + #define CONFIG_CMD_DHCP + #define CONFIG_CMD_ENV + #define CONFIG_CMD_MII ++#define CONFIG_CMD_MMC + #define CONFIG_CMD_NAND ++#define CONFIG_JFFS2_NAND + #define CONFIG_CMD_PING + #define CONFIG_CMD_USB + /* +@@ -70,8 +73,8 @@ + * it has to be rounded to sector size + */ + #define CONFIG_ENV_SIZE 0x20000 /* 128k */ +-#define CONFIG_ENV_ADDR 0x60000 +-#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ ++#define CONFIG_ENV_ADDR 0xa0000 ++#define CONFIG_ENV_OFFSET 0xa0000 /* env starts here */ + + /* + * Default environment variables +@@ -81,10 +84,11 @@ + "${x_bootcmd_usb}; bootm 0x6400000;" + + #define CONFIG_MTDPARTS "orion_nand:512k(uboot)," \ +- "3m@1m(kernel),1m@4m(psm),13m@5m(rootfs) rw\0" ++ "0x1ff00000@512k(rootfs) rw\0" + + #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ + "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ ++ "mtdids=nand0=orion_nand\0" \ + "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \ + "x_bootcmd_usb=usb start\0" \ + "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0" diff --git a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix new file mode 100644 index 00000000000..cee03741dce --- /dev/null +++ b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix @@ -0,0 +1,12 @@ +{ stdenv, writeScript }: + +assert stdenv.isDarwin; + +stdenv.mkDerivation rec { + name = "darwin-native-x11-and-opengl"; + + builder = writeScript "${name}-builder.sh" '' + /bin/mkdir -p $out + /bin/ln -sv /usr/X11/{bin,lib,include,share} $out/ + ''; +} diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix new file mode 100644 index 00000000000..c76ee8d9298 --- /dev/null +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: + +stdenv.mkDerivation rec { + name = "alsa-oss-1.0.25"; + + src = fetchurl { + url = "ftp://ftp.alsa-project.org/pub/oss-lib/${name}.tar.bz2"; + # url = "http://alsa.cybermirror.org/oss-lib/${name}.tar.bz2"; + sha256 = "ed823b8e42599951d896c1709615d4cf7cb1cb3a7c55c75ccee82e24ccaf28e3"; + }; + + buildInputs = [ alsaLib ncurses libsamplerate ]; + buildNativeInputs = [ gettext ]; + + configureFlags = "--disable-xmlto"; + + installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; + + preConfigure = + '' + ''; + + meta = { + description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation"; + + longDescription = '' + The Advanced Linux Sound Architecture (ALSA) provides audio and + MIDI functionality to the Linux-based operating system. + ''; + + homepage = http://www.alsa-project.org/; + }; +} diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 8c77cffe177..9c2821d7776 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, kernel, perl, makeWrapper }: # BLCR 0.8.4 works for kernel version up to 2.6.38 (including 2.6.38.x) +# BLCR 0.8.5 should works for kernel version up to 3.7.1 + assert stdenv.isLinux; -assert builtins.compareVersions "2.6.39" kernel.version == 1; +assert builtins.compareVersions "3.7.2" kernel.version == 1; stdenv.mkDerivation { - name = "blcr-0.8.4-${kernel.version}"; + name = "blcr_${kernel.version}-0.8.5"; src = fetchurl { - url = https://ftg.lbl.gov/assets/projects/CheckpointRestart/downloads/blcr-0.8.4.tar.gz; - sha256 = "d851da66627d9212ac37bc9ea2aba40008ff2dc51d45dbd395ca2e403c3d78cf"; + url = http://crd.lbl.gov/assets/Uploads/FTG/Projects/CheckpointRestart/downloads/blcr-0.8.5.tar.gz; + sha256 = "01a809nfbr715pnidlslv55pxadm3021l97p98zkqy8chyrnkjb0"; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix index 162423dbc05..bc9c8efe063 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-2030-ucode-18.168.6.1"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8"; }; diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch deleted file mode 100644 index 13d17ad6485..00000000000 --- a/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/fs/cifs/transport.c.old 2012-11-06 10:53:23.640093369 +0100 -+++ a/fs/cifs/transport.c 2012-11-06 10:54:31.835469340 +0100 -@@ -176,8 +176,8 @@ - * after the retries we will kill the socket and - * reconnect which may clear the network problem. - */ -- if ((i >= 14) || (!server->noblocksnd && (i > 2))) { -- cERROR(1, "sends on sock %p stuck for 15 seconds", -+ if ((i >= 119) || (!server->noblocksnd && (i > 2))) { -+ cERROR(1, "sends on sock %p stuck for 119 seconds", - ssocket); - rc = -EAGAIN; - break; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix deleted file mode 100644 index 20e14ccf5e2..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix +++ /dev/null @@ -1,222 +0,0 @@ -{ stdenv, fetchurl, extraConfig ? "", ... } @ args: - -let - configWithPlatform = kernelPlatform: - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWLWIFI_LEDS? y - IWLWIFI_SPECTRUM_MEASUREMENT y - IWL3945_SPECTRUM_MEASUREMENT y - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - OCFS2_FS_POSIX_ACL y - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PCI_LEGACY y - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Enable Xen Dom0 support. - XEN_DOM0 y - XEN_PCI_PASSTHROUGH y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "2.6.32.24-xen-179eca5"; - localVersion = "-xen-179eca5"; - - src = fetchurl { - url = "http://nixos.org/tarballs/linux-${version}.tar.bz2"; - sha256 = "09a7xh4hvw0hzq67dqdxn8p4rkd907937xvshx30rg4ab6717scf"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - - meta.description = "Linux kernel suitable for Xen Domain 0"; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 557ee6b52c6..9f736f02402 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.59"; + version = "3.0.64"; 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 = "0w0l0vsky921j6wvhydl8ggzwkwkhr0lk2lkd7lshhmv9c6bdg86"; + sha256 = "0vya753ayxzjk7ymnw5i2rwcpxp8lss7xf1gl7fzakn6kz780nky"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix deleted file mode 100644 index 0ec50303ee2..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ /dev/null @@ -1,251 +0,0 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_L2CAP y - BT_SCO y # audio support - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Devtmpfs support. - DEVTMPFS y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.1.10"; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "1vcpbh7wnc9smw2l5ci27a5p0rgmc1a5dc6a1aljm6f6wcfic8lz"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index f843f8b057a..afa62fe7798 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -146,8 +146,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem @@ -237,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.2.37"; + version = "3.2.38"; testing = false; modDirVersion = version; @@ -248,7 +250,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1h8lx0gvb1q962lghjpixa6q89k4yrgvpiw8hplb3w2jicqs4948"; + sha256 = "10hm4cy56xjl5ckv3jj3grw31qfhwrgia0wq71c34dw0mv3bix8w"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix deleted file mode 100644 index 0db9a5c375d..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ /dev/null @@ -1,260 +0,0 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.3.8"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0bgppngf711mlxp0jcsnv5xc0xxc8vs5rzc1czkv2igrfb1kvrnz"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 8d8c56daab0..47ab87d2f34 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -148,8 +148,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem @@ -231,6 +233,9 @@ let # Devtmpfs support. DEVTMPFS y + # Easier debug of NFS issues + SUNRPC_DEBUG y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; @@ -239,7 +244,7 @@ in import ./generic.nix ( rec { - version = "3.4.26"; + version = "3.4.31"; testing = false; preConfigure = '' @@ -248,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 = "1zmv1g90fgqrabc0qb5ip551mh12ps1zin3hbygysc89j684rbk1"; + sha256 = "1148f77iab0p5j61v42a4jka4ndwnjpd6lkqhwiqs61lmv3m7j2r"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix deleted file mode 100644 index 78f60c9906a..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ /dev/null @@ -1,266 +0,0 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - XEN_DOM0 y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.5.7"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0k3r0qrlfgn7yk35wf4c49yvyy79kzn42qcrf5kms5iir838kini"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix deleted file mode 100644 index 3fb47da7be6..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ /dev/null @@ -1,270 +0,0 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR? y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS? y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH? y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - XEN_DOM0 y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Media support - MEDIA_CAMERA_SUPPORT? y - MEDIA_RC_SUPPORT? y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.6.11"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0cnbdhsgxxdl44gqfqlh8nyf6yzmdz7xkfa0xh2rzdscwqh8085h"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 2822c33c828..5479edf8c44 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -148,8 +148,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem @@ -237,6 +239,9 @@ let MEDIA_RC_SUPPORT? y MEDIA_USB_SUPPORT y + # Easier debug of NFS issues + SUNRPC_DEBUG y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; @@ -245,7 +250,7 @@ in import ./generic.nix ( rec { - version = "3.7.3"; + version = "3.7.8"; testing = false; preConfigure = '' @@ -254,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 = "05421g78kx01ia0pq3d3y3gkrzqb5grfhhy7vy1ixlq8a23kc6b7"; + sha256 = "0phn7a6sfc89n3p6irk349jcxfaa5fi04in9h4wsm25klgw16vxa"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f886c2c49f4..5288050d70d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -119,20 +119,6 @@ rec { features.aufs3 = true; }; - aufs3_1 = rec { - name = "aufs3.1"; - version = "3.1.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "82c9fe43d197072a82cab6f02a5fd5cc4f50306a"; - sha256 = "f03d00964c9fc9975144d315fb79a1cd56d99f8c11853ed81d34afca35cd560a"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - aufs3_2 = rec { name = "aufs3.2"; version = "3.2.20121210"; @@ -147,20 +133,6 @@ rec { features.aufs3 = true; }; - aufs3_3 = rec { - name = "aufs3.3"; - version = "3.3.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "65ab607cfb2c411d86da8fcee25c0f6dada1c4d5"; - sha256 = "55c887932f1c12aed4ee20d9e749a80e9e0412951bd0a40fa3949ba972764a0a"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - aufs3_4 = rec { name = "aufs3.4"; version = "3.4.20121210"; @@ -175,34 +147,6 @@ rec { features.aufs3 = true; }; - aufs3_5 = rec { - name = "aufs3.5"; - version = "3.5.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "1658e9080c0e49f38feee5027cf0d32940a661ca"; - sha256 = "4577fe1dd34299520155767a7c42697d41aabc0055ae8b1e448449b8c24a1044"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - - aufs3_6 = rec { - name = "aufs3.6"; - version = "3.6.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "f541ebfd88df0f4e6f9daf55053282e4f52cc4d9"; - sha256 = "4d615a5f3c14a6a7c49bc6d65e78a2cdb89321cbd8a53f87cc8fe9edda382c3a"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - # not officially released yet, but 3.x seems to work fine aufs3_7 = rec { name = "aufs3.7"; @@ -244,12 +188,6 @@ rec { features.cifsTimeout = true; }; - cifs_timeout_3_5_7 = - { name = "cifs-timeout"; - patch = ./cifs-timeout-3.5.7.patch; - features.cifsTimeout = true; - }; - no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; @@ -261,12 +199,6 @@ rec { patch = ./dell-rfkill.patch; }; - # seems no longer necessary on 3.6 - perf3_5 = - { name = "perf-3.5"; - patch = ./perf-3.5.patch; - }; - sheevaplug_modules_2_6_35 = { name = "sheevaplug_modules-2.6.35"; patch = ./sheevaplug_modules-2.6.35.patch; diff --git a/pkgs/os-specific/linux/kernel/perf-3.5.patch b/pkgs/os-specific/linux/kernel/perf-3.5.patch deleted file mode 100644 index 6d62a1db80e..00000000000 --- a/pkgs/os-specific/linux/kernel/perf-3.5.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://permalink.gmane.org/gmane.linux.kernel.perf.user/960 - -Fix to build perf. - -diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c -index 9f6cebd..d5491f1 100644 ---- a/tools/perf/util/evsel.c -+++ b/tools/perf/util/evsel.c -@@ -15,7 +15,7 @@ - #include "cpumap.h" - #include "thread_map.h" - #include "target.h" --#include "../../include/linux/perf_event.h" -+#include "../../../include/linux/perf_event.h" - - #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y)) - #define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0)) diff --git a/pkgs/os-specific/linux/modutils/default.nix b/pkgs/os-specific/linux/modutils/default.nix deleted file mode 100644 index 3a063408a2f..00000000000 --- a/pkgs/os-specific/linux/modutils/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, bison, flex}: - -stdenv.mkDerivation { - name = "modutils-2.4.27"; - src = fetchurl { - url = mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-2.4.27.tar.bz2; - md5 = "bac989c74ed10f3bf86177fc5b4b89b6"; - }; - buildInputs = [bison flex]; -} diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 98a03002fc2..c0ba9d88554 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -48,6 +48,7 @@ installPhase() { patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* + patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* if test -z "$libsOnly"; then diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5583d123cfe..c965ef01c72 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,23 +8,25 @@ with stdenv.lib; -let versionNumber = "310.19"; in +let versionNumber = "310.32"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; builder = ./builder.sh; + patches = [ ./version-test.patch ]; + src = if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0bqcg2zlp42msz1pghrpmjy6bw1abm6xxh129m8pz80ydb085l45"; + sha256 = "13dc2s312h4k4bp7qb2ymdafr739jxbh0f3h1ilrkyjkd945cgnl"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0wjwm8m6hakr22xn2fm59abr1by65p987h7jgaa8q5zvmzgrxd87"; + sha256 = "1wk0lcm712glffdmwpk4drrwb0fjva7qhpxylnqs7fl7d3acnsvq"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -38,6 +40,8 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; + openclPath = stdenv.lib.makeLibraryPath [zlib]; + programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); diff --git a/pkgs/os-specific/linux/nvidia-x11/version-test.patch b/pkgs/os-specific/linux/nvidia-x11/version-test.patch new file mode 100644 index 00000000000..9b6908ee5c0 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/version-test.patch @@ -0,0 +1,19 @@ +diff -Naur NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh NVIDIA-patched/kernel/conftest.sh +--- NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh 2013-01-14 18:11:17.000000000 -0430 ++++ NVIDIA-patched/kernel/conftest.sh 2013-02-05 14:44:50.757999124 -0430 +@@ -1699,11 +1699,13 @@ + # kernel older than 2.6.6, that's all we require to + # build the module. + # ++ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) + PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) + SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) + +- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ +- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then ++ if [ -n "$VERSION" -a -n "$PATCHLEVEL" -a -n "$SUBLEVEL" \ ++ -a "$VERSION" -ge 3 -o "$VERSION" -eq 2 -a "$PATCHLEVEL" -ge 7 \ ++ -o "$PATCHLEVEL" -eq 6 -a "$SUBLEVEL" -ge 6 ]; then + SELECTED_MAKEFILE=Makefile.kbuild + RET=0 + fi diff --git a/pkgs/os-specific/linux/ov511/default.nix b/pkgs/os-specific/linux/ov511/default.nix deleted file mode 100644 index 628261e6c5f..00000000000 --- a/pkgs/os-specific/linux/ov511/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ./ov511-2.30-default.nix diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh b/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh deleted file mode 100644 index 21a2ac725ca..00000000000 --- a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh +++ /dev/null @@ -1,18 +0,0 @@ -source $stdenv/setup - -hashname=$(basename $kernel) -echo $hashname -if echo "$hashname" | grep -q '^[a-z0-9]\{32\}-'; then - hashname=$(echo "$hashname" | cut -c -32) -fi - -stripHash $kernel -version=$(echo $strippedName | cut -c 7-)-$hashname - -echo "version $version" - -export version - -mkdir -p $out/lib/modules/$version/kernel/drivers/usb/media/ - -genericBuild diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix b/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix deleted file mode 100644 index ec9cda0e4d1..00000000000 --- a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, kernel}: - -stdenv.mkDerivation { - name = "ov511-2.30-${kernel.version}"; - builder = ./ov511-2.30-builder.sh; - src = fetchurl { - url = http://nixos.org/tarballs/ov511-2.30.tar.bz2; - md5 = "9eacf9e54f2f54a59ddbf14221a53f2a"; - }; - patches = [./ov511-kernel.patch ./ov511-2.32-kdir.patch]; - inherit kernel; - NIX_GLIBC_FLAGS_SET=1; -} diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch b/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch deleted file mode 100644 index e0a1175a7ff..00000000000 --- a/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc ov511-2.32/Makefile ov511-2.32.new/Makefile -*** ov511-2.32/Makefile 2006-03-28 17:47:31.000000000 +0200 ---- ov511-2.32.new/Makefile 2006-07-17 09:46:17.000000000 +0200 -*************** -*** 114,120 **** - - else # We were called from command line - -! KDIR := /lib/modules/$(shell uname -r)/build - PWD := $(shell pwd) - - default: ---- 114,120 ---- - - else # We were called from command line - -! KDIR := $(kernel)/lib/modules/$(version)/build - PWD := $(shell pwd) - - default: diff --git a/pkgs/os-specific/linux/ov511/ov511-kernel.patch b/pkgs/os-specific/linux/ov511/ov511-kernel.patch deleted file mode 100644 index eca39e90fce..00000000000 --- a/pkgs/os-specific/linux/ov511/ov511-kernel.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -rc ov511-2.32/do_install.sh ov511-2.32.new/do_install.sh -*** ov511-2.32/do_install.sh 2003-11-12 09:24:29.000000000 +0100 ---- ov511-2.32.new/do_install.sh 2006-07-16 19:44:56.000000000 +0200 -*************** -*** 8,15 **** - - UNAME=`uname -r` - -! INSTALL_PATH_2_4=/lib/modules/$UNAME/kernel/drivers/usb/ -! INSTALL_PATH_2_6=/lib/modules/$UNAME/kernel/drivers/usb/media/ - - MAJMIN=`echo $UNAME | cut -d . -f 1-2` - ---- 8,15 ---- - - UNAME=`uname -r` - -! INSTALL_PATH_2_4=$out/lib/modules/$version/kernel/drivers/usb/ -! INSTALL_PATH_2_6=$out/lib/modules/$version/kernel/drivers/usb/media/ - - MAJMIN=`echo $UNAME | cut -d . -f 1-2` - -*************** -*** 35,41 **** - install $MODULE $INSTALL_PATH - done - -! echo Finding module dependencies -! /sbin/depmod -ae - - echo All done! ---- 35,41 ---- - install $MODULE $INSTALL_PATH - done - -! #echo Finding module dependencies -! #/sbin/depmod -ae - - echo All done! diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 2fb852acc31..4de8ad6db0f 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: stdenv.mkDerivation rec { - name = "powertop-2.1"; + name = "powertop-2.2"; src = fetchurl { url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz"; - sha256 = "16161nlah4i4hq8vyx7ds1vq7icdzwm7gmyjg0xhcrs1r9n83m1x"; + sha256 = "0a5haxawcjrlwwxx4j5kd4ad05gjmcr13v8gswfwfxcn7fyf2f8k"; }; buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ]; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 94e3573b70e..c95060a5ffb 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.0-rc13-${kernel.version}"; + name = "spl-0.6.0-rc14-${kernel.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc13.tar.gz; - sha256 = "1frbifj1yd7pznlhsqsiksip5amx4ljvasg8h80haaxk0yvvkr9b"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz; + sha256 = "00wyamf13z8ins4s14xf0b3hfjfz4w084mr17hs3k5xifb5jxa8g"; }; patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; diff --git a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch new file mode 100644 index 00000000000..1a8d294fd22 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch @@ -0,0 +1,37 @@ +From ab889004b8972258a87798133451f99dfce21823 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Mon, 4 Feb 2013 12:41:14 +0100 +Subject: [PATCH 7/8] Ignore IPv6 link-local addresses + +Returning IPv6 link-local addresses is a bad idea, because they only +work if an application connects specifically over the corresponding +interface. So you get errors like: + + $ curl -6 http://my-machine/ + curl: (7) Failed to connect to fe80::d6be:d9ff:fe1b:8477: Invalid argument + +To prevent this, this patch filters out link-local addresses. So if +you don't have a routable IPv6 address, nss-myhostname will fall back +to returning ::1. +--- + src/nss-myhostname/netlink.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/nss-myhostname/netlink.c b/src/nss-myhostname/netlink.c +index 53c3b50..621ca1d 100644 +--- a/src/nss-myhostname/netlink.c ++++ b/src/nss-myhostname/netlink.c +@@ -155,6 +155,10 @@ int ifconf_acquire_addresses(struct address **_list, unsigned *_n_list) { + ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE) + continue; + ++ if (ifaddrmsg->ifa_family == AF_INET6 && ++ ifaddrmsg->ifa_scope == RT_SCOPE_LINK) ++ continue; ++ + if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED) + continue; + +-- +1.8.1 + diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch b/pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch new file mode 100644 index 00000000000..6937c6c594e --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch @@ -0,0 +1,42 @@ +From ef9b259ae24e7bf4ebec04b0b0a44964bc661bb5 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Mon, 4 Feb 2013 12:43:08 +0100 +Subject: [PATCH 8/8] Fix a segfault in nscd when using nss-myhostname +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Nscd expects that an NSS module's gethostbyname4_r function returns +its first result in the pre-allocated gaih_addrtuple denoted by **pat. +(See nscd/aicache.c in the Glibc sources.) However, nss-myhostname +doesn't fill in **pat but allocates the first result in ‘buffer’, then +sets *pat. So nscd crashes (e.g. when running ‘getent ahosts +my-machine’). + +Hard to tell if this is a bug in nscd, since there doesn't seem to be +a proper API spec for gethostbyname4_r. But in any case, this patch +fixes the crash by copying the first result to **pat. +--- + src/nss-myhostname/nss-myhostname.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c +index 834a806..b0fb832 100644 +--- a/src/nss-myhostname/nss-myhostname.c ++++ b/src/nss-myhostname/nss-myhostname.c +@@ -176,7 +176,11 @@ enum nss_status _nss_myhostname_gethostbyname4_r( + /* Verify the size matches */ + assert(idx == ms); + +- *pat = r_tuple_prev; ++ /* Nscd expects us to store the first record in **pat. */ ++ if (*pat) ++ **pat = *r_tuple_prev; ++ else ++ *pat = r_tuple_prev; + + if (ttlp) + *ttlp = 0; +-- +1.8.1 + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e331b86872e..9e64bb7ed40 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { ./0004-Set-switch-to-configuration-hints-for-some-units.patch ./0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch ./0006-Don-t-call-plymouth-quit.patch + ./0007-Ignore-IPv6-link-local-addresses.patch + ./0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch; buildInputs = @@ -31,6 +33,8 @@ stdenv.mkDerivation rec { [ "--localstatedir=/var" "--sysconfdir=/etc" "--with-rootprefix=$(out)" + "--with-kbd-loadkeys=${kbd}/bin/loadkeys" + "--with-kbd-setfont=${kbd}/bin/setfont" "--with-rootprefix=$(out)" "--with-dbusinterfacedir=$(out)/share/dbus-1/interfaces" "--with-dbuspolicydir=$(out)/etc/dbus-1/system.d" @@ -63,9 +67,7 @@ stdenv.mkDerivation rec { PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python NIX_CFLAGS_COMPILE = - [ "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\"" - "-DKBD_SETFONT=\"${kbd}/bin/setfont\"" - # Can't say ${polkit}/bin/pkttyagent here because that would + [ # Can't say ${polkit}/bin/pkttyagent here because that would # lead to a cyclic dependency. "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" "-fno-stack-protector" diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index a69c5646d74..b3d94e26396 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl }: +{ stdenv, fetchurl, lib, openssl, dbus_libs, pkgconfig, libnl +, readlineSupport ? true, readline +}: + +assert readlineSupport -> readline != null; stdenv.mkDerivation rec { version = "1.1"; @@ -10,19 +14,27 @@ stdenv.mkDerivation rec { sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5"; }; + extraConfig = + '' + CONFIG_DEBUG_SYSLOG=y + CONFIG_CTRL_IFACE_DBUS=y + CONFIG_CTRL_IFACE_DBUS_NEW=y + CONFIG_CTRL_IFACE_DBUS_INTRO=y + CONFIG_DRIVER_NL80211=y + CONFIG_LIBNL32=y + ${stdenv.lib.optionalString readlineSupport "CONFIG_READLINE=y"} + ''; + preBuild = '' cd wpa_supplicant cp -v defconfig .config - echo CONFIG_DEBUG_SYSLOG=y | tee -a .config - echo CONFIG_CTRL_IFACE_DBUS=y | tee -a .config - echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config - echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config - echo CONFIG_DRIVER_NL80211=y | tee -a .config - echo CONFIG_LIBNL32=y | tee -a .config + echo "$extraConfig" >> .config + cat .config substituteInPlace Makefile --replace /usr/local $out ''; - buildInputs = [ openssl dbus_libs libnl ]; + buildInputs = [ openssl dbus_libs libnl ] + ++ lib.optional readlineSupport readline; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 17c7d3824d7..4769d78a2fd 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: stdenv.mkDerivation { - name = "zfs-0.6.0-rc13-${kernel.version}"; + name = "zfs-0.6.0-rc14-${kernel.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc13.tar.gz; - sha256 = "1kpx7sa49ir93kmlrjwjzd6v4kzmda4j9cf6bv2p4s3yrmiz3cjv"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz; + sha256 = "0ny2lbhyfsfwfcasa1iv2hz12hzcskx9mv641955d844dh32z9fg"; }; patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index a6ae56b6534..f853b3ebacc 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, boost }: +{ stdenv, fetchurl, boostHeaders }: -stdenv.mkDerivation { - name = "mini-httpd-1.1"; +stdenv.mkDerivation rec { + name = "mini-httpd-1.2"; src = fetchurl { - url = "mirror://savannah/mini-httpd/mini-httpd-1.1.tar.gz"; - sha256 = "12hqvh67hgxmc9b3fhb8gb5ash7j6f7d0mxv47zkmjl7k3vw3ny7"; + url = "mirror://savannah/mini-httpd/${name}.tar.gz"; + sha256 = "1547312rg2phxwny9vm1bkyid251n7wy4p1mgs6f5yq6ypwrsr6p"; }; - buildInputs = [ boost ]; + buildInputs = [ boostHeaders ]; + + enableParallelBuilding = true; meta = { homepage = "http://mini-httpd.nongnu.org/"; diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix new file mode 100644 index 00000000000..6c6cde8a46a --- /dev/null +++ b/pkgs/servers/mail/petidomo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, flex, bison, sendmailPath ? "/var/setuid-wrappers/sendmail" }: + +stdenv.mkDerivation rec { + name = "petidomo-4.3"; + + src = fetchurl { + url = "mirror://sourceforge/petidomo/${name}.tar.gz"; + sha256 = "0x4dbxc4fcfg1rw5ywpcypvylnzn3y4rh0m6fz4h4cdnzb8p1lvm"; + }; + + buildInputs = [ flex bison ]; + + configureFlags = "--with-mta=${sendmailPath}"; + + enableParallelBuilding = true; + + doCheck = true; + + meta = { + homepage = "http://petidomo.sourceforge.net/"; + description = "a simple and easy to administer mailing list server"; + license = stdenv.lib.licenses.gpl3Plus; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix index 713d8537738..b7f2d7d2a50 100644 --- a/pkgs/servers/sql/postgresql/8.3.x.nix +++ b/pkgs/servers/sql/postgresql/8.3.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.3.22"; in +let version = "8.3.23"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1iphzr8mpfz050f95vhcji4k22mih3wl65z4559y4hh4kiqg7f0p"; + sha256 = "1n8qj1bvyx83jsn2x2l8xzk53c014gkz8hwvswvnzcdyvlbnd90p"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index eef39aa40d6..37713d87fd5 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.15"; in +let version = "8.4.16"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0kdwg598c7ws2bvi5q5qgn2pbvznzpxs63chvp0xj6nzpcdpg0va"; + sha256 = "0bv10jh9pg523rzgbqjq4lzq4ai3275pqhkg0qkr40ap756xj0wd"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 4f87cbd55ae..c0766ba2813 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.11"; in +let version = "9.0.12"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0b3vw1a1x658famvgsfi1dladrbkc5j3h1ibaasgx9ffqn6xrp56"; + sha256 = "090m5cxw7jv9q2jgwbs3qm57z6ldf0mcavc0wsmqk1ywrdrniw40"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 83097f52124..18716707fd9 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.7"; in +let version = "9.1.8"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "10iw6c6v1s7a00s0dr8agvb2fg2dmdvg84mk05206rb0islyl6fz"; + sha256 = "0vacnhqs9mrjrx9vh4r66a9smwl1d4qrmjlsq3ydnqj0lbfzk20x"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 6341fa952f5..45173ad6511 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.2.2"; in +let version = "9.2.3"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1wzphj8vdqpzaihqmrkm9p4wlfvgr9psg5hnrmzwp5l8m5aai9z1"; + sha256 = "0zszqgp64pn7z9ab36bi989apj6hi20yxvcrk26jvhy0j0radxf4"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 7e4c0f23015..217489f4dc0 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchgit, autoconf, automake }: -let - version = "2.0"; -in stdenv.mkDerivation { - name = "bash-completion-${version}"; + name = "bash-completion-2.0-95-gd08b9f2"; - src = fetchurl { - url = "http://bash-completion.alioth.debian.org/files/bash-completion-${version}.tar.bz2"; - sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804"; + src = fetchgit { + url = "http://anonscm.debian.org/git/bash-completion/bash-completion.git"; + rev = "d08b9f233559b3dced20050ba312b08fe0de53b4"; + sha256 = "0jybaib2bmpk5qd80y1l6wmfcd0b95cmf1l3hcb0ckpj0pjff0bn"; }; + buildInputs = [ autoconf automake ]; + + preConfigure = "autoreconf -i"; + doCheck = true; meta = { @@ -18,6 +20,7 @@ stdenv.mkDerivation { description = "Programmable completion for the bash shell"; license = "GPL"; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index c54a66423a5..6f5e5d34582 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -41,7 +41,7 @@ let # Add a utility function to produce derivations that use this # stdenv and its shell. mkDerivation = attrs: - if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable") then + if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable" || l == lib.licenses.proprietary) then throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" else (derivation ( diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix index 0bc33bcb7fa..3cab25837e6 100644 --- a/pkgs/tools/X11/xlaunch/default.nix +++ b/pkgs/tools/X11/xlaunch/default.nix @@ -45,7 +45,7 @@ EOF else RESET_OPTION=\"-noreset\" fi; - XCMD=\"\$(egrep \"^env\" /etc/init/xserver.conf | sed -e \"s/env/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" + XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" echo \"\$XCMD\" echo \"\$XCMD\" | bash & while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix new file mode 100644 index 00000000000..710c58029aa --- /dev/null +++ b/pkgs/tools/compression/lzip/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "lzip-1.14-rc3"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/lzip/${name}.tar.gz"; + sha256 = "040mmfadvhry68bv10baqi1bs8g5wwbf5rx0widyz69llpn64mw9"; + }; + + doCheck = true; + + meta = { + homepage = "http://www.nongnu.org/lzip/lzip.html"; + description = "a lossless data compressor based on the LZMA algorithm"; + license = stdenv.lib.licenses.gpl3Plus; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix new file mode 100644 index 00000000000..ac60cd6134f --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, cmake, intltool, gettext +, libxml2, enchant, isocodes, icu, libpthreadstubs +, pango, cairo, libxkbfile, xorg +}: + +stdenv.mkDerivation rec { + name = "fcitx-4.2.7"; + src = fetchurl { + url = "https://fcitx.googlecode.com/files/${name}_dict.tar.xz"; + sha256 = "1dfvr77j9vnlg76155clrjxnm59r5fzv0d3n6c6yn10zb0bjd40c"; + }; + + buildInputs = [ + cmake enchant pango gettext libxml2 isocodes pkgconfig libxkbfile + intltool cairo icu libpthreadstubs xorg.libXau xorg.libXdmcp + ]; + + cmakeFlags = '' + -DENABLE_DBUS=OFF + -DENABLE_QT=OFF + -DENABLE_QT_IM_MODULE=OFF + -DENABLE_OPENCC=OFF + -DENABLE_PRESAGE=OFF + -DENABLE_XDGAUTOSTART=OFF + ''; + + meta = { + homepage = "https://code.google.com/p/fcitx/"; + description = "A Flexible Input Method Framework"; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 59978e2865c..a9bdf1b2b92 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -2,17 +2,22 @@ stdenv.mkDerivation { name = "cowsay-3.03"; + src = fetchurl { url = http://www.nog.net/~tony/warez/cowsay-3.03.tar.gz; - sha256 = "1bxj802na2si2bk5zh7n0b7c33mg8a5n2wnvh0vihl9bmjkp51hb"; + sha256 = "1s3c0g5vmsadicc4lrlkmkm8znm4y6wnxd8kyv9xgm676hban1il"; }; - buildInputs = [perl]; + + buildInputs = [ perl ]; + installPhase = '' bash ./install.sh $out ''; meta = { - description = "cowsay is a program which generates ASCII pictures of a cow with a message."; + description = "A program which generates ASCII pictures of a cow with a message"; homepage = http://www.nog.net/~tony/warez/cowsay.shtml; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.rob ]; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 249456580d4..1bd40025e5d 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid -, pkgconfig, gtkmm, gnomedocutils, libxml2 }: +, pkgconfig, gtkmm, libxml2 }: -stdenv.mkDerivation { - name = "gparted-0.8.1"; +stdenv.mkDerivation rec { + name = "gparted-0.14.1"; src = fetchurl { - url = mirror://sourceforge/gparted/gparted-0.5.1/gparted-0.8.1.tar.bz2; - sha256 = "128pnrcqp3d4a4jnjxm0mqglbyrs2q841pmg5g8ilyc827b6j163"; + url = "mirror://sourceforge/gparted/${name}.tar.bz2"; + sha256 = "0697sq2dbs9cn689bk68gs9pj3k08bfp9wfg6j291zrprdd3rddi"; }; configureFlags = "--disable-doc"; - buildInputs = - [ parted gtk glib intltool gettext libuuid pkgconfig gtkmm - gnomedocutils libxml2 - ]; + buildInputs = [ + parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 + ]; - meta = { + meta = { description = "Graphical disk partitioning tool"; homepage = http://gparted.sourceforge.net; license = "GPLv2"; diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix new file mode 100644 index 00000000000..341939ea40f --- /dev/null +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, gnu_efi, unzip }: + +stdenv.mkDerivation rec { + name = "gummiboot-16"; + + buildInputs = [ unzip ]; + + patches = [ ./no-usr.patch ]; + + buildFlags = [ + "GNU_EFI=${gnu_efi}" + ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") "ARCH=ia32"; + + installPhase = "mkdir -p $out/bin; mv gummiboot.efi $out/bin"; + + src = fetchurl { + url = "http://cgit.freedesktop.org/gummiboot/snapshot/${name}.zip"; + sha256 = "0as5svmvsbz08qgbvns77qfb36xi9lx2138ikiinqv6finzm8fi1"; + }; + + meta = { + description = "A simple UEFI boot manager which executes configured EFI images"; + + homepage = http://freedesktop.org/wiki/Software/gummiboot; + + license = stdenv.lib.licenses.lgpl21Plus; + + platforms = [ "x86_64-linux" "i686-linux" ]; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/tools/misc/gummiboot/no-usr.patch b/pkgs/tools/misc/gummiboot/no-usr.patch new file mode 100644 index 00000000000..7f63e20d3e9 --- /dev/null +++ b/pkgs/tools/misc/gummiboot/no-usr.patch @@ -0,0 +1,20 @@ +diff -Naur gummiboot-16-orig/Makefile gummiboot-16/Makefile +--- gummiboot-16-orig/Makefile 2013-01-24 04:20:58.000000000 -0500 ++++ gummiboot-16/Makefile 2013-02-01 17:27:42.922371399 -0500 +@@ -1,13 +1,13 @@ + VERSION=16 + + ARCH=$(shell $(CC) -dumpmachine | sed "s/\(-\).*$$//") +-LIBDIR=$(shell echo $$(cd /usr/lib/$$(gcc -print-multi-os-directory); pwd)) ++LIBDIR=$(GNU_EFI)/lib + LIBEFIDIR=$(or $(wildcard $(LIBDIR)/gnuefi), $(LIBDIR)) + + CPPFLAGS = \ + -I. \ +- -I/usr/include/efi \ +- -I/usr/include/efi/$(ARCH) ++ -I$(GNU_EFI)/include/efi \ ++ -I$(GNU_EFI)/include/efi/$(ARCH) + + CFLAGS = \ + -DVERSION=$(VERSION) \ diff --git a/pkgs/tools/misc/parted/2.3.nix b/pkgs/tools/misc/parted/2.3.nix deleted file mode 100644 index 649def69115..00000000000 --- a/pkgs/tools/misc/parted/2.3.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline -, utillinux, enableStatic ? false, hurd ? null }: - -stdenv.mkDerivation rec { - name = "parted-2.3"; - - src = fetchurl { - url = "mirror://gnu/parted/${name}.tar.xz"; - sha256 = "0sabj81nawcjm8ww34lxg65ka8crv3w2ab4crh8ypw5agg681836"; - }; - - buildInputs = [ libuuid ] - ++ stdenv.lib.optional (readline != null) readline - ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (devicemapper != null) devicemapper - ++ stdenv.lib.optional (hurd != null) hurd; - - configureFlags = - (if (readline != null) - then [ "--with-readline" ] - else [ "--without-readline" ]) - ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" - ++ stdenv.lib.optional enableStatic "--enable-static"; - - doCheck = true; - - preCheck = - stdenv.lib.optionalString doCheck - # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'. - "export PATH=\"${utillinux}/sbin:$PATH\""; - - meta = { - description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions"; - - longDescription = '' - GNU Parted is an industrial-strength package for creating, destroying, - resizing, checking and copying partitions, and the file systems on - them. This is useful for creating space for new operating systems, - reorganising disk usage, copying data on hard disks and disk imaging. - - It contains a library, libparted, and a command-line frontend, parted, - which also serves as a sample implementation and script backend. - ''; - - homepage = http://www.gnu.org/software/parted/; - license = "GPLv3+"; - - maintainers = [ - # Add your name here! - stdenv.lib.maintainers.ludo - ]; - - # GNU Parted requires libuuid, which is part of util-linux-ng. - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 930cd67bb13..2a525676192 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man" + configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc" sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in ''; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 5a6cff8bd11..0f44c67e01c 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { inherit sslSupport openssl; }; + patches = [ ./fix-curl-multi-cleanup.patch ]; + preConfigure = '' sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure ''; diff --git a/pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch b/pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch new file mode 100644 index 00000000000..f6e42040cb8 --- /dev/null +++ b/pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch @@ -0,0 +1,32 @@ +commit 249c981407b8c52edf2b0833a78cd3d3d8bd2823 +Author: Shea Levy +Date: Sun Feb 10 13:27:10 2013 -0500 + + curl_multi_cleanup: Don't try to cleanup the closure_handle if it is NULL. + + Without this, curl_multi_cleanup(curl_multi_init()) segfaults. + + Signed-off-by: Shea Levy + +diff --git a/lib/multi.c b/lib/multi.c +index fa0afb9..5b9d0bb 100644 +--- a/lib/multi.c ++++ b/lib/multi.c +@@ -1773,11 +1773,13 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle) + /* Close all the connections in the connection cache */ + close_all_connections(multi); + +- multi->closure_handle->dns.hostcache = multi->hostcache; +- Curl_hostcache_clean(multi->closure_handle); ++ if (multi->closure_handle) { ++ multi->closure_handle->dns.hostcache = multi->hostcache; ++ Curl_hostcache_clean(multi->closure_handle); + +- Curl_close(multi->closure_handle); +- multi->closure_handle = NULL; ++ Curl_close(multi->closure_handle); ++ multi->closure_handle = NULL; ++ } + + Curl_hash_destroy(multi->sockhash); + multi->sockhash = NULL; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index dc2a8498223..6ed89adee6e 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dhcpcd-5.5.6"; + name = "dhcpcd-5.6.7"; src = fetchurl { url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "1rz8n6crw6yh9hzqwdqjpl37v60i1szr7dbhf6gvm374gpf10zv5"; + sha256 = "144cjcjnr85jiwbw5iv3hvn97sc0z25ya3r31cn0wv11jrsw6b0h"; }; configureFlags = "--sysconfdir=/etc"; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix new file mode 100644 index 00000000000..c51c8f59ff7 --- /dev/null +++ b/pkgs/tools/networking/fping/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "fping-3.4"; + + src = fetchurl { + url = "http://www.fping.org/dist/${name}.tar.gz"; + sha256 = "1zkawlk6lcqw6nakqnl3v0x1cwnxrx2lmg9q6j76mw9i96pjh9fl"; + }; + + meta = { + homepage = "http://fping.org/"; + description = "A program to send ICMP echo probes to network hosts."; + }; +} diff --git a/pkgs/tools/networking/nss-myhostname/default.nix b/pkgs/tools/networking/nss-myhostname/default.nix deleted file mode 100644 index 80296b0d992..00000000000 --- a/pkgs/tools/networking/nss-myhostname/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "nss-myhostname-0.3"; - - src = fetchurl { - url = "http://0pointer.de/lennart/projects/nss-myhostname/${name}.tar.gz"; - sha256 = "1wnawxklsv3z796l752j7a21gvj2615fk12qr1bir3apipm499rb"; - }; - - patches = [ ./nscd-segfault.patch ./ignore-ipv6-link-local.patch ]; - - meta = { - description = "Name Service Switch module ensuring that the hostname always resolves to a valid address"; - homepage = http://0pointer.de/lennart/projects/nss-myhostname/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch b/pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch deleted file mode 100644 index 396bb2e10cc..00000000000 --- a/pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- nss-myhostname-0.3/netlink.c 2011-05-09 08:56:34.344579140 -0400 -+++ nss-myhostname-0.3-new/netlink.c 2012-10-06 23:52:10.577755588 -0400 -@@ -179,6 +179,10 @@ - ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE) - continue; - -+ if (ifaddrmsg->ifa_family == AF_INET6 && -+ ifaddrmsg->ifa_scope == RT_SCOPE_LINK) -+ continue; -+ - if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED) - continue; - diff --git a/pkgs/tools/networking/nss-myhostname/nscd-segfault.patch b/pkgs/tools/networking/nss-myhostname/nscd-segfault.patch deleted file mode 100644 index a2947461c87..00000000000 --- a/pkgs/tools/networking/nss-myhostname/nscd-segfault.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- nss-myhostname-0.3/nss-myhostname.c 2011-05-09 09:01:27.421581560 -0400 -+++ nss-myhostname-0.3-new/nss-myhostname.c 2012-10-06 23:40:09.836894004 -0400 -@@ -177,7 +177,11 @@ - /* Verify the size matches */ - assert(idx == ms); - -- *pat = r_tuple_prev; -+ /* Nscd expects us to store the first record in **pat. */ -+ if (*pat) -+ **pat = *r_tuple_prev; -+ else -+ *pat = r_tuple_prev; - - if (ttlp) - *ttlp = 0; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 3aa818db728..2879c5cc1a1 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "openresolv-3.4.6"; + name = "openresolv-3.5.4"; src = fetchurl { url = "http://roy.marples.name/downloads/openresolv/${name}.tar.bz2"; - sha256 = "026z4973b0vqp5acr6mn5fyxyc84y4ahg1f8fddh8dph86jcnhba"; + sha256 = "0in40iha4ghk12lr2p65v0by3h0jp7qsdajmj4vm7iis0plzr4db"; }; configurePhase = diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index f52b344aeac..3b6c28d2ac1 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "wget-1.14"; src = fetchurl { - url = "mirror://gnu/wget/${name}.tar.gz"; - sha256 = "0sf26vlklxx20fjnj30fx6rijpcyvdl6cjmh6m2bjnvn7a78k9pk"; + url = "mirror://gnu/wget/${name}.tar.xz"; + sha256 = "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p"; }; preConfigure = stdenv.lib.optionalString doCheck diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 4adc4969377..ff36e0cc3cc 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.4pre3048_99ed558"; + name = "nix-1.4pre3056_79a3ba7"; src = fetchurl { - url = "http://hydra.nixos.org/build/3851906/download/5/${name}.tar.xz"; - sha256 = "4b2a75200d8b7ac21887f061b68b4e34d1edd69616916f86072d6f5bc7260d90"; + url = "http://hydra.nixos.org/build/4070551/download/5/${name}.tar.xz"; + sha256 = "7478fd6fea91ec094645e8487b9ef001abd300703d79e04743f4d212469cf13d"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 3c99b22c1e1..446e25772f1 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 5a34813d8d9..988989b82f7 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -1,19 +1,19 @@ -{ fetchurl, stdenv, parted, libuuid, gettext }: +{ fetchurl, stdenv, parted, libuuid, gettext, guile }: stdenv.mkDerivation rec { - name = "fdisk-1.3.0a"; + name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see http://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html src = fetchurl { - url = "mirror://gnu/fdisk/${name}.tar.bz2"; - sha256 = "1g2zvl560f7p1hd4q50d1msy6qp7949mdkagfy8ki8cayp8fp267"; + url = "mirror://gnu/fdisk/${name}.tar.gz"; + sha256 = "04nd7civ561x2lwcmxhsqbprml3178jfc58fy1v7hzqg5k4nbhy3"; }; - buildInputs = [ parted libuuid gettext ]; + buildInputs = [ parted libuuid gettext guile ]; doCheck = true; meta = { - description = "GNU fdisk, a command-line disk partitioning tool"; + description = "A command-line disk partitioning tool"; longDescription = '' GNU fdisk provides alternatives to util-linux fdisk and util-linux @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/fdisk/; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.linux; + #platforms = stdenv.lib.platforms.linux; # was failing for long without anyone complaining }; } diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix new file mode 100644 index 00000000000..fc9e3785cf3 --- /dev/null +++ b/pkgs/tools/text/podiff/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "podiff-${version}"; + version = "1.1"; + + src = fetchurl { + url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.1.tar.gz"; + sha256 = "1zz6bcmka5zvk2rq775qv122lqh54aijkxlghvx7z0r6kh880x59"; + }; + + patchPhase = '' + sed "s#PREFIX=/usr#PREFIX=$out#g" -i Makefile + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "Finds differences in translations between two PO files, or revisions"; + homepage = http://puszcza.gnu.org.ua/software/podiff; + license = licenses.gpl3Plus; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index 77532fd216c..fc7ee9f6f06 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -1,22 +1,19 @@ -{stdenv, fetchurl, opensp, perl}: +{ stdenv, fetchurl, opensp, perl }: -stdenv.mkDerivation { - # OpenJade-1.3.2 requires gcc 3.3 to build. - # The next release is likely to be compatible with newer gccs. - # If so the overrideGCC in top-level/all-packages should be removed. - name = "OpenJade-1.3.2"; +stdenv.mkDerivation rec { + name = "openjade-1.3.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/openjade-1.3.2.tar.gz"; + url = "mirror://sourceforge/openjade/${name}.tar.gz"; sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x"; }; - buildInputs = [opensp perl]; + buildInputs = [ opensp perl ]; configureFlags = [ "--enable-spincludedir=${opensp}/include/OpenSP" "--enable-splibdir=${opensp}/lib" - ]; + ]; meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index 5d5d85d3c1d..24612de549e 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -4,9 +4,8 @@ stdenv.mkDerivation rec { name = "tex4ht-1.0.2009_06_11_1038"; src = fetchurl { - url = "http://www.tug.org/applications/tex4ht/tex4ht.zip"; - # http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${name}.tar.gz"; - sha1 = "2970cec5f4afc9039b82d6a4210f21d70ded2f5a"; + url = "http://tug.org/applications/tex4ht/tex4ht.zip"; + sha256 = "15gj18ihds6530af42clpa4zskak5kah9wzs2hd19a9ymwjsccd6"; }; buildInputs = [ tetex unzip ]; @@ -22,17 +21,15 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - for f in src/tex4ht src/t4ht src/htcmd bin/unix/*; do # */ - mv $f $out/bin/. + for f in src/tex4ht src/t4ht src/htcmd "bin/unix/"*; do + mv $f $out/bin/ done - - mkdir -p $out/share - cp -r texmf $out/share/. + mv texmf $out/ ''; meta = { - homepage = http://www.cse.ohio-state.edu/~gurari/TeX4ht/mn.html; - # LaTeX Project Public License - license = "LPPL"; + homepage = "http://tug.org/tex4ht/"; + description = "a system to convert (La)TeX documents to HTML and various other formats"; + license = "LPPL"; # LaTeX Project Public License }; -} \ No newline at end of file +} diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 2d422385bd5..e490d55bc5f 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -1,10 +1,10 @@ args: with args; rec { - version = "1.1.1"; + version = "1.3.0"; name = "moderncv-${version}"; src = fetchurl { url = "https://launchpad.net/moderncv/trunk/${version}/+download/moderncv-${version}.zip"; - sha256 = "929c118eff339a5c59ed58cc961ddee787e9a5933d12ec8801613fd2e2500e9f"; + sha256 = "0wdj90shi04v97b2d6chhvm9qrp0bcvsm46441730ils1y74wisq"; }; buildInputs = [texLive unzip]; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix new file mode 100644 index 00000000000..b48cc7cddcc --- /dev/null +++ b/pkgs/tools/video/swfmill/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl +, pkgconfig, libxslt, freetype, libpng, libxml2 +}: + +stdenv.mkDerivation rec { + name = "swfmill-0.3.2"; + + src = fetchurl { + url = "http://swfmill.org/releases/${name}.tar.gz"; + sha256 = "077agf62q0xz95dxj4cq9avcqwin94vldrpb80iqwjskvkwpz9gy"; + }; + + buildInputs = [ pkgconfig libxslt freetype libpng libxml2 ]; + + meta = { + description = "An xml2swf and swf2xml processor with import functionalities"; + homepage = "http://swfmill.org"; + license = "GPLv2"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51cb39f7687..d90ae101f50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -169,8 +169,7 @@ let ### Symbolic names. - - x11 = xlibsWrapper; + x11 = if stdenv.isDarwin then darwinX11AndOpenGL else xlibsWrapper; # `xlibs' is the set of X library components. This used to be the # old modular X llibraries project (called `xlibs') but now it's just @@ -238,7 +237,7 @@ let # just the plain stdenv. stdenv_32bit = lowPrio ( if system == "x86_64-linux" then - overrideGCC stdenv gcc43_multi + overrideGCC stdenv gcc46_multi else stdenv); @@ -737,9 +736,9 @@ let fakeroot = callPackage ../tools/system/fakeroot { }; - fcron = callPackage ../tools/system/fcron { }; + fcitx = callPackage ../tools/inputmethods/fcitx { }; - fdisk = callPackage ../tools/system/fdisk { }; + fcron = callPackage ../tools/system/fcron { }; fdm = callPackage ../tools/networking/fdm {}; @@ -772,6 +771,8 @@ let fox = callPackage ../development/libraries/fox/default.nix { }; fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; + fping = callPackage ../tools/networking/fping {}; + fprot = callPackage ../tools/security/fprot { }; freeipmi = callPackage ../tools/system/freeipmi {}; @@ -824,6 +825,10 @@ let inherit (xorg) libXpm; }; + gnufdisk = callPackage ../tools/system/fdisk { + guile = guile_1_8; + }; + gnugrep = # Use libiconv only on non-GNU platforms (we can't test with # `stdenv ? glibc' at this point.) @@ -900,6 +905,8 @@ let gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; + gummiboot = callPackage ../tools/misc/gummiboot { }; + gupnp = callPackage ../development/libraries/gupnp { inherit (gnome) libsoup; }; @@ -1072,6 +1079,8 @@ let lxc = callPackage ../os-specific/linux/lxc { }; + lzip = callPackage ../tools/compression/lzip { }; + lzma = xz; xz = callPackage ../tools/compression/xz { }; @@ -1108,6 +1117,8 @@ let minecraft = callPackage ../games/minecraft { }; + minetest = callPackage ../games/minetest { }; + miniupnpc = callPackage ../tools/networking/miniupnpc { }; miniupnpd = callPackage ../tools/networking/miniupnpd { }; @@ -1215,8 +1226,6 @@ let inherit (pythonPackages) pysqlite; }; - nss_myhostname = callPackage ../tools/networking/nss-myhostname {}; - nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; ntfs3g = callPackage ../tools/filesystems/ntfs-3g { }; @@ -1252,10 +1261,7 @@ let opendkim = callPackage ../development/libraries/opendkim { }; - openjade = callPackage ../tools/text/sgml/openjade { - stdenv = overrideGCC stdenv gcc33; - opensp = opensp.override { stdenv = overrideGCC stdenv gcc33; }; - }; + openjade = callPackage ../tools/text/sgml/openjade { }; openobex = callPackage ../tools/bluetooth/openobex { }; @@ -1296,7 +1302,6 @@ let patchutils = callPackage ../tools/text/patchutils { }; parted = callPackage ../tools/misc/parted { hurd = null; }; - parted_2_3 = callPackage ../tools/misc/parted/2.3.nix { hurd = null; }; hurdPartedCross = if crossSystem != null && crossSystem.config == "i586-pc-gnu" @@ -1373,6 +1378,8 @@ let libpng = libpng12; }; + podiff = callPackage ../tools/text/podiff { }; + polipo = callPackage ../servers/polipo { }; polkit_gnome = callPackage ../tools/security/polkit-gnome { }; @@ -2124,6 +2131,13 @@ let binutilsCross = null; })); + gcc46_multi = if system == "x86_64-linux" then lowPrio ( + wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override { + stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc); + profiledCompiler = false; + enableMultilib = true; + })) else throw "Multilib gcc not supported on this system"; + gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { inherit noSysDirs; # I'm not sure if profiling with enableParallelBuilding helps a lot. @@ -2363,25 +2377,26 @@ let # Current Haskell Platform: 2012.4.0.0 haskellPlatform = haskellPackages.haskellPlatform; - haskellPackages_ghc6104 = recurseIntoAttrs (haskell.packages_ghc6104); + haskellPackages_ghc6104 = haskell.packages_ghc6104; haskellPackages_ghc6121 = haskell.packages_ghc6121; haskellPackages_ghc6122 = haskell.packages_ghc6122; - haskellPackages_ghc6123 = recurseIntoAttrs (haskell.packages_ghc6123); + haskellPackages_ghc6123 = haskell.packages_ghc6123; haskellPackages_ghc701 = haskell.packages_ghc701; haskellPackages_ghc702 = haskell.packages_ghc702; haskellPackages_ghc703 = haskell.packages_ghc703; - haskellPackages_ghc704 = recurseIntoAttrs (haskell.packages_ghc704); + haskellPackages_ghc704 = haskell.packages_ghc704; haskellPackages_ghc721 = haskell.packages_ghc721; haskellPackages_ghc722 = haskell.packages_ghc722; # For the default version, we build profiling versions of the libraries, too. # The following three lines achieve that: the first two make Hydra build explicit # profiling and non-profiling versions; the final respects the user-configured # default setting. - haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741); - haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); - haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); + haskellPackages_ghc741 = haskell.packages_ghc741; + haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc742.noProfiling); + haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc742.profiling); haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); - haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761); + haskellPackages_ghc761 = haskell.packages_ghc761; + haskellPackages_ghc762 = recurseIntoAttrs (haskell.packages_ghc762); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; @@ -2402,9 +2417,6 @@ let gprolog = callPackage ../development/compilers/gprolog { }; - gwt = callPackage ../development/compilers/gwt { - libstdcpp5 = gcc33.gcc; - }; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; ikarus = callPackage ../development/compilers/ikarus { }; @@ -2629,7 +2641,7 @@ let stalin = callPackage ../development/compilers/stalin { }; - strategoPackages = strategoPackages018; + strategoPackages = recurseIntoAttrs strategoPackages018; strategoPackages016 = callPackage ../development/compilers/strategoxt/0.16.nix { stdenv = overrideInStdenv stdenv [gnumake380]; @@ -2727,6 +2739,8 @@ let clojure = callPackage ../development/interpreters/clojure { }; + clojureUnstable = callPackage ../development/interpreters/clojure { version = "1.5.0-RC1"; }; + clojure_binary = callPackage ../development/interpreters/clojure/binary.nix { }; clojure_wrapper = callPackage ../development/interpreters/clojure/wrapper.nix { @@ -3266,6 +3280,8 @@ let swigWithJava = swig; + swfmill = callPackage ../tools/video/swfmill { }; + swftools = callPackage ../tools/video/swftools { }; texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { }; @@ -3372,12 +3388,11 @@ let boost144 = callPackage ../development/libraries/boost/1.44.nix { }; boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; - boost152 = callPackage ../development/libraries/boost/1.52.nix { }; - boost = boost152; + boost153 = callPackage ../development/libraries/boost/1.53.nix { }; + boost = boost153; - boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; - boostHeaders152 = callPackage ../development/libraries/boost/1.52-headers.nix { }; - boostHeaders = boostHeaders152; + boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { }; + boostHeaders = boostHeaders153; botan = callPackage ../development/libraries/botan { }; @@ -3600,7 +3615,8 @@ let freealut = callPackage ../development/libraries/freealut { }; - freeglut = callPackage ../development/libraries/freeglut { }; + freeglut = if stdenv.isDarwin then darwinX11AndOpenGL else + callPackage ../development/libraries/freeglut { }; freetype = callPackage ../development/libraries/freetype { }; @@ -3757,7 +3773,7 @@ let libart = gnome.libart_lgpl; }; - goffice_0_9 = callPackage ../development/libraries/goffice/0.9.nix { + goffice_0_10 = callPackage ../development/libraries/goffice/0.10.nix { inherit (gnome) libglade libgnomeui; gconf = gnome.GConf; libart = gnome.libart_lgpl; @@ -4104,6 +4120,8 @@ let libdwarf = callPackage ../development/libraries/libdwarf { }; + libeatmydata = callPackage ../development/libraries/libeatmydata { }; + libebml = callPackage ../development/libraries/libebml { }; libedit = callPackage ../development/libraries/libedit { }; @@ -4499,7 +4517,10 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - mesa = callPackage ../development/libraries/mesa { }; + darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { }; + + mesa = if stdenv.isDarwin then darwinX11AndOpenGL else + callPackage ../development/libraries/mesa { }; metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; @@ -4522,7 +4543,9 @@ let mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; - mlt = callPackage ../development/libraries/mlt { }; + mlt = callPackage ../development/libraries/mlt { + ffmpeg = ffmpeg_1_1; + }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; @@ -4740,8 +4763,6 @@ let qt4 = pkgs.kde4.qt4; - qt47 = callPackage ../development/libraries/qt-4.x/4.7 { }; - qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; @@ -4962,6 +4983,10 @@ let ucommon = callPackage ../development/libraries/ucommon { }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; + + vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; + vamp = callPackage ../development/libraries/audio/vamp { }; vcdimager = callPackage ../development/libraries/vcdimager { }; @@ -5221,6 +5246,11 @@ let python = python27; }); + plone42Packages = recurseIntoAttrs (import ../development/web/plone { + inherit pkgs buildPythonPackage; + python = python27; + }); + foursuite = callPackage ../development/python-modules/4suite { }; bsddb3 = callPackage ../development/python-modules/bsddb3 { }; @@ -5376,6 +5406,8 @@ let nginx = callPackage ../servers/http/nginx { }; + petidomo = callPackage ../servers/mail/petidomo { }; + popa3d = callPackage ../servers/mail/popa3d { }; postfix = callPackage ../servers/mail/postfix { }; @@ -5570,6 +5602,7 @@ let alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; + alsaOss = callPackage ../os-specific/linux/alsa-oss { }; microcode2ucode = callPackage ../os-specific/linux/microcode/converter.nix { }; @@ -5778,18 +5811,6 @@ let ]; }; - linux_2_6_32_xen = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32-xen.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_31 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs2_2_6_32 - kernelPatches.cifs_timeout_2_6_29 - kernelPatches.no_xsave - kernelPatches.dell_rfkill - ]; - }; - linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5821,15 +5842,6 @@ let ]; }; - linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_1 - ]; - }; - linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5846,15 +5858,6 @@ let ''; }; - linux_3_3 = makeOverridable (import ../os-specific/linux/kernel/linux-3.3.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_3 - ]; - }; - linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5867,34 +5870,6 @@ let ]; }; - linux_3_5 = makeOverridable (import ../os-specific/linux/kernel/linux-3.5.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_5 - kernelPatches.perf3_5 - kernelPatches.cifs_timeout_3_5_7 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - - linux_3_6 = makeOverridable (import ../os-specific/linux/kernel/linux-3.6.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_6 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_7 = makeOverridable (import ../os-specific/linux/kernel/linux-3.7.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5996,10 +5971,6 @@ let */ ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; - ov511 = callPackage ../os-specific/linux/ov511 { - stdenv = overrideGCC stdenv gcc34; - }; - perf = callPackage ../os-specific/linux/kernel/perf.nix { }; spl = callPackage ../os-specific/linux/spl/default.nix { }; @@ -6029,17 +6000,11 @@ let # Build the kernel modules for the some of the kernels. linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 pkgs.linuxPackages_2_6_32); - linuxPackages_2_6_32_xen = linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen; linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35); linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); - linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen); - linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); - linuxPackages_3_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_5 pkgs.linuxPackages_3_5); - linuxPackages_3_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6 pkgs.linuxPackages_3_6); - linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi pkgs.linuxPackages_3_6_rpi); linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 pkgs.linuxPackages_3_7); # The current default kernel / kernel modules. @@ -6110,10 +6075,6 @@ let inherit stdenv module_init_tools modules buildEnv; }; - modutils = callPackage ../os-specific/linux/modutils { - stdenv = overrideGCC stdenv gcc34; - }; - multipath_tools = callPackage ../os-specific/linux/multipath-tools { }; nettools = callPackage ../os-specific/linux/net-tools { }; @@ -6705,7 +6666,14 @@ let d4x = callPackage ../applications/misc/d4x { }; - darcs = lib.setName "darcs-${haskellPackages.darcs.version}" haskellPackages.darcs; + darcs = haskellPackages.darcs.override { + # A variant of the Darcs derivation that containts only the executable and + # thus has no dependencies on other Haskell packages. + cabal = { mkDerivation = x: rec { final = haskellPackages.cabal.mkDerivation (self: (x final) // { + isLibrary = false; + configureFlags = "-f-library"; }); }.final; + }; + }; darktable = callPackage ../applications/graphics/darktable { inherit (gnome) GConf libglade; @@ -6946,6 +6914,10 @@ let inherit (gnome) libgnome libgnomeui vte; }; + guitarix = callPackage ../applications/audio/guitarix { + fftw = fftwSinglePrec; + }; + wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; wireshark = callPackage ../applications/networking/sniffers/wireshark { }; @@ -7078,7 +7050,7 @@ let }; gnumeric = callPackage ../applications/office/gnumeric { - goffice = goffice_0_9; + goffice = goffice_0_10; inherit (gnome) libglade scrollkeeper; }; @@ -7300,7 +7272,7 @@ let librecad2 = callPackage ../applications/misc/librecad/2.0.nix { }; - libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix { + libreoffice = callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; @@ -7360,9 +7332,7 @@ let merkaartor = callPackage ../applications/misc/merkaartor { }; - meshlab = callPackage ../applications/graphics/meshlab { - qt = qt47; - }; + meshlab = callPackage ../applications/graphics/meshlab { }; mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; @@ -7403,6 +7373,7 @@ let monotone = callPackage ../applications/version-management/monotone { lua = lua5; + boost = boost149; }; monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) { @@ -7436,6 +7407,10 @@ let pulseSupport = config.pulseaudio or false; }; + mplayer2 = callPackage ../applications/video/mplayer2 { + ffmpeg = ffmpeg_1_1; + }; + MPlayerPlugin = browser: import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { inherit browser; @@ -7511,14 +7486,6 @@ let openjump = callPackage ../applications/misc/openjump { }; - openoffice = callPackage ../applications/office/openoffice { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome) GConf ORBit2; - neon = neon029; - libwpd = libwpd_08; - zip = zip.override { enableNLS = false; }; - }; - openscad = callPackage ../applications/graphics/openscad {}; opera = callPackage ../applications/networking/browsers/opera { @@ -7598,9 +7565,7 @@ let pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qemu = callPackage ../applications/virtualization/qemu/0.15.nix { }; - - qemu_1_0 = callPackage ../applications/virtualization/qemu/1.0.nix { }; + qemu = callPackage ../applications/virtualization/qemu { }; qemuImage = callPackage ../applications/virtualization/qemu/linux-img { }; @@ -7631,10 +7596,6 @@ let rdesktop = callPackage ../applications/networking/remote/rdesktop { }; - RealPlayer = callPackage_i686 ../applications/video/RealPlayer { - libstdcpp5 = gcc33.gcc; - }; - recode = callPackage ../tools/text/recode { }; retroshare = callPackage ../applications/networking/p2p/retroshare { @@ -7676,7 +7637,7 @@ let siproxd = callPackage ../applications/networking/siproxd { }; skype = callPackage_i686 ../applications/networking/instant-messengers/skype { - usePulseAudio = config.pulseaudio or false; # disabled by default (the 100% cpu bug) + usePulseAudio = config.pulseaudio or true; }; st = callPackage ../applications/misc/st { }; @@ -7776,11 +7737,7 @@ let teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; - taskjuggler = callPackage ../applications/misc/taskjuggler { - # KDE support is not working yet. - inherit (kde3) kdelibs kdebase; - withKde = config.taskJuggler.kde or false; - }; + taskjuggler = callPackage ../applications/misc/taskjuggler { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -7946,20 +7903,18 @@ let wrapFirefox = { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }: + let + cfg = stdenv.lib.attrByPath [ browserName ] {} config; + enableAdobeFlash = cfg.enableAdobeFlash or true; + enableGnash = cfg.enableGnash or false; + in import ../applications/networking/browsers/firefox/wrapper.nix { inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; plugins = - let - cfg = stdenv.lib.attrByPath [ browserName ] {} config; - enableAdobeFlash = cfg.enableAdobeFlash or true; - enableGnash = cfg.enableGnash or false; - in assert !(enableGnash && enableAdobeFlash); ([ ] ++ lib.optional enableGnash gnash ++ lib.optional enableAdobeFlash flashplayer - # RealPlayer is disabled by default for legal reasons. - ++ lib.optional (system != "i686-linux" && cfg.enableRealPlayer or false) RealPlayer ++ lib.optional (cfg.enableDjvu or false) (djview4) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer @@ -7967,7 +7922,7 @@ let ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ); libs = - if config.browserName.enableQuakeLive or false + if cfg.enableQuakeLive or false then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] else [ ]; }; @@ -8010,9 +7965,7 @@ let xfe = callPackage ../applications/misc/xfe { }; - xfig = callPackage ../applications/graphics/xfig { - stdenv = overrideGCC stdenv gcc34; - }; + xfig = callPackage ../applications/graphics/xfig { }; xineUI = callPackage ../applications/video/xine-ui { }; @@ -8173,10 +8126,7 @@ let gnugo = callPackage ../games/gnugo { }; - gparted = callPackage ../tools/misc/gparted { - parted = parted_2_3; - inherit (gnome) gnomedocutils; - }; + gparted = callPackage ../tools/misc/gparted { }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { inherit (gnome) libglademm; @@ -8262,10 +8212,6 @@ let simutrans = callPackage ../games/simutrans { }; - six = callPackage ../games/six { - inherit (kde3) arts kdelibs; - }; - soi = callPackage ../games/soi {}; # You still can override by passing more arguments. @@ -8310,10 +8256,7 @@ let trigger = callPackage ../games/trigger { }; - ufoai = callPackage ../games/ufoai { - inherit (gnome) gtksourceview gtkglext; - libpng = libpng12; - }; + ufoai = callPackage ../games/ufoai { }; ultimatestunts = callPackage ../games/ultimatestunts { }; @@ -8331,6 +8274,8 @@ let vectoroids = callPackage ../games/vectoroids { }; + vessel = callPackage_i686 ../games/vessel { }; + warmux = callPackage ../games/warmux { }; warsow = callPackage ../games/warsow { @@ -8391,18 +8336,6 @@ let gnome = recurseIntoAttrs gnome2; - kde3 = recurseIntoAttrs { - - kdelibs = callPackage ../desktops/kde-3/kdelibs { - stdenv = overrideGCC stdenv gcc43; - }; - - arts = callPackage ../development/libraries/arts { - inherit (pkgs.kde3) kdelibs; - }; - - }; - kde4 = recurseIntoAttrs pkgs.kde47; kde47 = kdePackagesFor (pkgs.kde47 // { @@ -8978,7 +8911,7 @@ let texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor - texLivePGF texLiveBeamer texLiveModerncv tipa ]; + texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht ]; }); /* Look in configurations/misc/raskin.nix for usage example (around revisions @@ -9042,6 +8975,12 @@ let # Wine cannot be built in 64-bit; use a 32-bit build instead. wine = callPackage_i686 ../misc/emulators/wine { }; + # winetricks is a shell script with no binary components. Safe to just use the current platforms + # build instead of the i686 specific build. + winetricks = callPackage ../misc/emulators/wine/winetricks.nix { + inherit (gnome2) zenity; + }; + x2x = callPackage ../tools/X11/x2x { }; xosd = callPackage ../misc/xosd { }; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 69c99db89a2..a03f0a6fe46 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -277,6 +277,12 @@ prefFun = ghcHEADPrefs; }; + packages_ghc762 = + packages { ghcPath = ../development/compilers/ghc/7.6.2.nix; + ghcBinary = ghc704Binary; + prefFun = ghcHEADPrefs; + }; + # Reasonably current HEAD snapshot. Should *always* be lowPrio. packages_ghcHEAD = packages { ghcPath = ../development/compilers/ghc/head.nix; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 64b172c0c21..077583399be 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -126,7 +126,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT = self.GLUT_2_3_1_0; # 7.6 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok html = self.html_1_0_1_2; # 7.6 ok - HTTP = self.HTTP_4000_2_6; # 7.6 ok + HTTP = self.HTTP_4000_2_8; # 7.6 ok HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok network = self.network_2_4_1_0; # 7.6 ok @@ -138,7 +138,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexBase = self.regexBase_0_93_2; # 7.6 ok regexCompat = self.regexCompat_0_95_1; # 7.6 ok regexPosix = self.regexPosix_0_95_2; # 7.6 ok - split = self.split_0_2_1_1; # 7.6 ok + split = self.split_0_2_1_2; # 7.6 ok stm = self.stm_2_4_2; # 7.6 ok syb = self.syb_0_3_7; # 7.6 ok text = self.text_0_11_2_3; # 7.6 ok @@ -525,7 +525,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {}; bmp_1_2_2_1 = callPackage ../development/libraries/haskell/bmp/1.2.2.1.nix {}; - bmp_1_2_3_4 = callPackage ../development/libraries/haskell/bmp/1.2.3.4.nix {}; + bmp_1_2_4_1 = callPackage ../development/libraries/haskell/bmp/1.2.4.1.nix {}; bmp = self.bmp_1_2_2_1; # later versions work only with ghc 7.6 and beyond Boolean = callPackage ../development/libraries/haskell/Boolean {}; @@ -751,6 +751,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dualTree = callPackage ../development/libraries/haskell/dual-tree {}; + dyre = callPackage ../development/libraries/haskell/dyre {}; + editDistance = callPackage ../development/libraries/haskell/edit-distance {}; editline = callPackage ../development/libraries/haskell/editline {}; @@ -835,6 +837,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; + ghcHeapView = callPackage ../development/libraries/haskell/ghc-heap-view { + cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled + }; + ghcMod = callPackage ../development/libraries/haskell/ghc-mod { inherit (pkgs) emacs; }; @@ -847,6 +853,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {}; + ghcVis = callPackage ../development/libraries/haskell/ghc-vis { + cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled + }; + gio = callPackage ../development/libraries/haskell/gio {}; gitit = callPackage ../development/libraries/haskell/gitit {}; @@ -967,8 +977,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; - HTTP_4000_2_6 = callPackage ../development/libraries/haskell/HTTP/4000.2.6.nix {}; - HTTP = self.HTTP_4000_2_6; + HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; + HTTP = self.HTTP_4000_2_8; httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {}; @@ -1558,6 +1568,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringCombinators = callPackage ../development/libraries/haskell/string-combinators {}; + stringQq = callPackage ../development/libraries/haskell/string-qq {}; + stringsearch = callPackage ../development/libraries/haskell/stringsearch {}; strptime = callPackage ../development/libraries/haskell/strptime {}; @@ -1606,7 +1618,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; - split = self.split_0_2_1_1; + split_0_2_1_2 = callPackage ../development/libraries/haskell/split/0.2.1.2.nix {}; + split = self.split_0_2_1_2; stbImage = callPackage ../development/libraries/haskell/stb-image {}; @@ -1771,6 +1784,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vty = callPackage ../development/libraries/haskell/vty {}; + vtyUi = callPackage ../development/libraries/haskell/vty-ui {}; + wai = callPackage ../development/libraries/haskell/wai {}; waiAppStatic = callPackage ../development/libraries/haskell/wai-app-static {}; @@ -1822,6 +1837,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); X11Xft = callPackage ../development/libraries/haskell/X11-xft {}; + xdgBasedir = callPackage ../development/libraries/haskell/xdg-basedir {}; + + xdot = callPackage ../development/libraries/haskell/xdot { + polyparse = self.polyparse_1_7; + }; + xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {}; xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {}; xhtml_3000_2_0_5 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.5.nix {}; @@ -1979,10 +2000,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Applications. - darcs = callPackage ../applications/version-management/darcs { - tar = self.tar_0_3_2_0; - haskeline = self.haskeline_0_6_4_7; - }; + darcs = callPackage ../applications/version-management/darcs {}; leksah = callPackage ../applications/editors/leksah { QuickCheck = self.QuickCheck2; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index e8d775a9a30..cd70773869d 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -77,8 +77,7 @@ releaseTools.sourceTarball { mkdir ../$releaseName cp -prd . ../$releaseName echo nixpkgs > ../$releaseName/channel-name - (cd .. && tar cfa $out/tarballs/$releaseName.tar.bz2 $releaseName) || false - (cd .. && tar cfa $out/tarballs/$releaseName.tar.lzma $releaseName) || false + (cd .. && tar cfa $out/tarballs/$releaseName.tar.xz $releaseName) || false mkdir -p $out/release-notes cp doc/NEWS.html $out/release-notes/index.html diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9f8a219e0cb..a51abf44ff2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1479,7 +1479,7 @@ rec { propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ClassMethodModifiers ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract strictures SubName TryTiny ]; meta = { homepage = http://www.dbix-class.org/; - description = "Extensible and flexible object <-> relational mapper."; + description = "Extensible and flexible object <-> relational mapper"; license = "perl"; }; }; @@ -2460,12 +2460,16 @@ rec { }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-1.77"; + name = "IO-Socket-SSL-1.81"; src = fetchurl { url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; - sha256 = "2a090167a0d13cdefdac7fb25ca49decd5fd925f37d032bca98c73c4856570a9"; + sha256 = "1vg7jpn7vz3a2j3fxjjkaxiiqg7azqmy7afrpghiqkjcr8b6zs9y"; }; propagatedBuildInputs = [ URI NetSSLeay ]; + meta = { + description = "Nearly transparent SSL encapsulation for IO::Socket::INET"; + license = "perl"; + }; }; IOString = buildPerlPackage rec { @@ -2637,9 +2641,9 @@ rec { url = mirror://cpan/authors/id/P/PE/PERIGRIN/JSON-Any-1.29.tar.gz; sha256 = "15v2j9dh58r7r4s7rnnmgnzzbyz61bhyxwpx1z7r811ixs9bkks2"; }; - buildInputs = [ JSON ]; + propagatedBuildInputs = [ JSON ]; meta = { - description = "Wrapper Class for the various JSON classes."; + description = "Wrapper Class for the various JSON classes"; license = "perl"; }; }; @@ -2651,7 +2655,7 @@ rec { sha256 = "1lv9riws9f72gya2fsp5jvbd1fbzyi8423x38a491ryy9cai2ph3"; }; meta = { - description = "JSON::XS compatible pure-Perl module."; + description = "JSON::XS compatible pure-Perl module"; license = "perl"; }; }; @@ -2716,7 +2720,7 @@ rec { }; propagatedBuildInputs = [ HTMLParser HTMLTagset LinguaStem /* MemoizeExpireLRU */ ]; meta = { - description = "Part-of-speech tagger for English natural language processing."; + description = "Part-of-speech tagger for English natural language processing"; license = "gpl_3"; }; }; @@ -3524,14 +3528,18 @@ rec { }; NetSSLeay = buildPerlPackage rec { - name = "Net-SSLeay-1.42"; + name = "Net-SSLeay-1.52"; src = fetchurl { url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz"; - sha256 = "17gxf0d1l0qlxn0d6gqz1dlzl6cdqv0jg47k0h1fcs45rlcpgjmn"; + sha256 = "1fkpdlpg99rdq2vlm6bgmqc8iazhcrfzvbpwxnn20k0viwpy7v28"; }; buildInputs = [ pkgs.openssl ]; OPENSSL_PREFIX = pkgs.openssl; doCheck = false; # Test performs network access. + meta = { + description = "Perl extension for using OpenSSL"; + license = "SSLeay"; + }; }; NetTwitterLite = buildPerlPackage { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 54b1743576d..18eb59b0077 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -251,6 +251,18 @@ pythonPackages = python.modules // rec { }; }); + awscli = buildPythonPackage rec { + name = "awscli-0.5.0"; + namePrefix = ""; + + src = fetchurl { + url = https://github.com/aws/aws-cli/archive/0.5.0.tar.gz; + sha256 = "0smgcisl2p7p2y2i299x7g271kdmgs0hnzngw5030phvh0lq202i"; + }; + + propagatedBuildInputs = [ argparse botocore ]; + + }; logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.1"; @@ -337,6 +349,27 @@ pythonPackages = python.modules // rec { }; + botocore = buildPythonPackage rec { + name = "botocore-0.5.2"; + + src = fetchurl { + url = https://github.com/boto/botocore/archive/0.5.2.tar.gz; + sha256 = "18073mydin0mwk1d7vdlmsiz3rvhjzxkaaqrmxw440acbipnngq2"; + }; + + propagatedBuildInputs = [ dateutil requests014 ]; + + meta = { + homepage = https://github.com/boto/botocore; + + license = "bsd"; + + description = "A low-level interface to a growing number of Amazon Web Services"; + + }; + }; + + # bugz = buildPythonPackage (rec { # name = "bugz-0.9.3"; # @@ -365,6 +398,12 @@ pythonPackages = python.modules // rec { md5 = "4e3b521600e475c56a0a66459a5fc7bb"; }; + # TODO: consider if this patch should be an option + # 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/; description = "A software build and configuration system"; @@ -576,13 +615,15 @@ pythonPackages = python.modules // rec { dateutil = buildPythonPackage (rec { - name = "dateutil-1.5"; + name = "dateutil-2.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg"; + sha256 = "1vlx0lpsxjxz64pz87csx800cwfqznjyr2y7nk3vhmzhkwzyqi2c"; }; + propagatedBuildInputs = [ six ]; + meta = { description = "Powerful extensions to the standard datetime module"; homepage = http://pypi.python.org/pypi/python-dateutil; @@ -970,6 +1011,20 @@ pythonPackages = python.modules // rec { }; }); + gcovr = buildPythonPackage rec { + name = "gcovr-2.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/gcovr/${name}.tar.gz"; + md5 = "672db629469882b93c40016aebff50ac"; + }; + + meta = { + description = "A Python script for summarizing gcov data"; + license = "BSD"; + }; + }; + genshi = buildPythonPackage { name = "genshi-0.6"; @@ -1267,11 +1322,11 @@ pythonPackages = python.modules // rec { }; lxml = buildPythonPackage ( rec { - name = "lxml-2.2.2"; + name = "lxml-3.0.2"; src = fetchurl { - url = http://pypi.python.org/packages/source/l/lxml/lxml-2.2.2.tar.gz; - sha256 = "0zjpsy67wcs69qhb06ficl3a5z229hmczpr8h84rkk05vaagj8qv"; + url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz"; + md5 = "38b15b0dd5e9292cf98be800e84a3ce4"; }; buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; @@ -1624,6 +1679,8 @@ pythonPackages = python.modules // rec { }; buildInputs = [ coverage ]; + + doCheck = ! stdenv.isDarwin; }; nose2 = if isPy26 then null else (buildPythonPackage rec { @@ -1940,6 +1997,45 @@ pythonPackages = python.modules // rec { doCheck = false; }; + + pillow = buildPythonPackage rec { + name = "Pillow-1.7.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip"; + md5 = "41d8688d4db72673069a6dc63b5289d6"; + }; + + buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib ]; + + configurePhase = '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;' + ''; + + doCheck = true; + + meta = { + homepage = http://python-imaging.github.com/Pillow; + + description = "Fork of The Python Imaging Library (PIL)"; + + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. + ''; + + license = "http://www.pythonware.com/products/pil/license.htm"; + + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + polib = buildPythonPackage rec { name = "polib-${version}"; version = "1.0.1"; @@ -2639,6 +2735,35 @@ pythonPackages = python.modules // rec { }; + requests = buildPythonPackage rec { + name = "requests-1.1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; + md5 = "a0158815af244c32041a3147ee09abf3"; + }; + + meta = { + description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + homepage = http://docs.python-requests.org/en/latest/; + }; + }; + + requests014 = buildPythonPackage rec { + name = "requests-0.14.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; + md5 = "3de30600072cbc7214ae342d1d08aa46"; + }; + + meta = { + description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + homepage = http://docs.python-requests.org/en/latest/; + }; + }; + + reviewboard = buildPythonPackage rec { name = "ReviewBoard-1.6.13"; @@ -3369,6 +3494,24 @@ pythonPackages = python.modules // rec { }; + websockify = buildPythonPackage rec { + version = "0.3.0"; + name = "websockify-${version}"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/w/websockify/websockify-${version}.tar.gz"; + md5 = "29b6549d3421907de4bbd881ecc2e1b1"; + }; + + propagatedBuildInputs = [ numpy ]; + + meta = { + description = "WebSockets support for any application/server"; + homepage = https://github.com/kanaka/websockify; + }; + }; + + webtest = buildPythonPackage rec { version = "1.2.3"; name = "webtest-${version}"; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 5b1294b0157..8af1ca90267 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -10,16 +10,13 @@ let coreutils.crossDrv = nativePlatforms; dropbear.crossDrv = nativePlatforms; tigervnc.crossDrv = nativePlatforms; - #openoffice.crossDrv = nativePlatforms; wxGTK.crossDrv = nativePlatforms; #firefox = nativePlatforms; xorg = { #xorgserver.crossDrv = nativePlatforms; }; nixUnstable.crossDrv = nativePlatforms; - linuxPackages_3_3.kernel.crossDrv = linux; linuxPackages_3_4.kernel.crossDrv = linux; - linuxPackages_3_6.kernel.crossDrv = linux; }; /* Basic list of packages to be natively built, @@ -36,7 +33,7 @@ in /* Test some cross builds to the Sheevaplug */ let crossSystem = { - config = "armv5tel-unknown-linux-gnueabi"; + config = "armv5tel-unknown-linux-gnueabi"; bigEndian = false; arch = "arm"; float = "soft"; @@ -57,7 +54,7 @@ in { /* Test some cross builds to the Sheevaplug - uclibc*/ let crossSystem = { - config = "armv5tel-unknown-linux-gnueabi"; + config = "armv5tel-unknown-linux-gnueabi"; bigEndian = false; arch = "arm"; float = "soft"; @@ -86,7 +83,7 @@ in { /* Test some cross builds to the mipsel */ let crossSystem = { - config = "mipsel-unknown-linux"; + config = "mipsel-unknown-linux"; bigEndian = false; arch = "mips"; float = "soft"; @@ -120,7 +117,7 @@ in { /* Test some cross builds to the ultrasparc */ let crossSystem = { - config = "sparc64-unknown-linux"; + config = "sparc64-unknown-linux"; bigEndian = true; arch = "sparc64"; float = "hard"; @@ -236,7 +233,7 @@ in { /* Linux on the fuloong */ let crossSystem = { - config = "mips64el-unknown-linux"; + config = "mips64el-unknown-linux"; bigEndian = false; arch = "mips"; float = "hard"; @@ -274,7 +271,7 @@ in { /* Linux on the Ben Nanonote */ let crossSystem = { - config = "mipsel-unknown-linux"; + config = "mipsel-unknown-linux"; bigEndian = false; arch = "mips"; float = "soft"; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 2f5b9bffc33..05a78a099f7 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -582,7 +582,6 @@ in gv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gwenhywfar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gwrap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gwt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gxneur = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; hadoop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; harfbuzz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1105,7 +1104,6 @@ in nvidia_x11_legacy96 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; openafsClient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; openiscsi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ov511 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; perf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; spl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; sysprof = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1362,7 +1360,6 @@ in openfire = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; openlierox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; openobex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - openoffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; opensc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; openscad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; opensc_dnie_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1502,7 +1499,6 @@ in qshowdiff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qsynth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qt3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qt47 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qt_gstreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qtpfsgui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qtractor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1523,7 +1519,6 @@ in rdesktop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rdf4store = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rdiff_backup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - RealPlayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; recutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; redshift = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; relfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index c734935b27a..af86918655a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -207,7 +207,6 @@ with (import ./release-lib.nix); ntp = linux; ocaml = linux; octave = linux; - openoffice = linux; openssh = linux; openssl = all; pam_console = linux;