diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index e4ab5798918..c5f147ed032 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -20,20 +20,20 @@ stdenv.mkDerivation { patches = let - debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-2"; + debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-3"; in [ (fetchurl { - url = "${debPrefix}/35_CVE-2010-4262.dpatch"; - sha256 = "18741b3dbipgr55fyp5x0296za3336ylln639jw8yjcyd1call22"; + url = "${debPrefix}/35_CVE-2010-4262.patch"; + sha256 = "1pj669sz49wzjvvm96gwbnani7wqi0ijh21imqdzqw47qxdv7zp5"; }) (fetchurl { - url = "${debPrefix}/13_remove_extra_libs.dpatch"; - sha256 = "0v3k30ib7xq5wfhd3yacnal4gbih7nqw0z0aycvc0hafffl97i46"; + url = "${debPrefix}/13_remove_extra_libs.patch"; + sha256 = "1qb14ay0c8xrjzhi21jl7sl8mdzxardldzpnflkzml774bbpn8av"; }) (fetchurl { - url = "${debPrefix}/36_libpng15.dpatch"; - sha256 = "0ssmvlcpjn3iqj3l38db8j8qpqbzixlwpczq01m49r5w9l3viy8k"; + url = "${debPrefix}/36_libpng15.patch"; + sha256 = "0jd5bqj7sj9bbnxg2d0y6zmv4ka4qif2x4zc84ngdqga5433anvn"; }) ]; diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 652450e510b..b8edd93455d 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, zlib, libpng, libjpeg, perl, expat, qt3, libX11, libXext, libSM, libICE, -withKde, kdelibs, kdebase }: stdenv.mkDerivation rec { @@ -13,7 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [zlib libpng libX11 libXext libSM libICE perl expat libjpeg] - ++ (if withKde then [kdelibs] else []) ; patches = [ ./timezone-glibc.patch ]; @@ -51,7 +49,6 @@ stdenv.mkDerivation rec { --x-includes=${libX11}/include --x-libraries=${libX11}/lib --with-qt-dir=${qt3} - --with-kde-support=${if withKde then "yes" else "no"} --with-ical-support=${if withKde then "yes" else "no"} "; preInstall = '' @@ -61,7 +58,7 @@ stdenv.mkDerivation rec { installFlags = # kde_locale is not defined when installing without kde. - if withKde then "" else "kde_locale=\${out}/share/locale"; + "kde_locale=\${out}/share/locale"; meta = { homepage = "http://www.taskjuggler.org"; 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/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index db3833f1855..87fa119252c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -3,6 +3,7 @@ , libxslt, tcl, tk, makeWrapper , svnSupport, subversionClient, perlLibs, smtpPerlLibs , guiSupport +, withManual ? true , pythonSupport ? true , sendEmailSupport }: @@ -26,8 +27,7 @@ stdenv.mkDerivation { patches = [ ./docbook2texi.patch ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] - ++ # documentation tools - [ asciidoc texinfo xmlto docbook2x + ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk]; @@ -91,7 +91,7 @@ stdenv.mkDerivation { notSupported $out/libexec/git-core/git-send-email "reinstall with config git = { sendEmailSupport = true } set" '') - + ''# Install man pages and Info manual + + stdenv.lib.optionalString withManual ''# Install man pages and Info manual make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \ -C Documentation '' 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/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/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/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 < -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/haskell/HTTP/4000.2.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.7.nix similarity index 81% rename from pkgs/development/libraries/haskell/HTTP/4000.2.6.nix rename to pkgs/development/libraries/haskell/HTTP/4000.2.7.nix index 2c85ec7cd9e..0711e47b005 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.7.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.6"; - sha256 = "0rycwrn9cq9mrsgxkbx373zjvmzg4hd8hzclya6ipd3jda1w5r92"; + version = "4000.2.7"; + sha256 = "0a5zjhrbdp8hwmkc709i2qwnxx4lafrp6wssdms6g5l97a52bdc2"; buildDepends = [ mtl network parsec ]; meta = { homepage = "https://github.com/haskell/HTTP"; 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..835cdce2e91 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.1"; + sha256 = "1r53mnj4b4x0prcqqf6y3gdia2j1l3155iw79jzlx0cnxbdsfnc7"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet 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/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..66a5b51b189 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.4.4"; + sha256 = "1xsqdifqm68mlrmpmj04nqd5r83psq5ffis2pm8k8vwl1n1jv8kn"; 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..4514e587051 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.4.4"; + sha256 = "0f49b07r5isz57wjmgpfvq4hg9m5q59ad918rk1v24xdvn4y3all"; buildDepends = [ - basicPrelude hashable systemFilepath text transformers + basicPrelude hashable liftedBase systemFilepath text transformers unorderedContainers vector ]; meta = { 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/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/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..91b24e56378 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.1"; + sha256 = "1paglfhd2xjr32sh5npl3kvamv4nps9fpy0wk9ya0l26w4c3bdsm"; + 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/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix new file mode 100644 index 00000000000..99aa99fc9d3 --- /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.1.0"; + sha256 = "1icq5620j37n85d08yfpln75f9944flbqyqhjqsf0qr72zsm3w11"; + 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/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..06c415ea978 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.5"; + sha256 = "18rv53bqf07w0y1qs96v3krimvjx5salq9mn168l01vl98blwhvv"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index a2251f69673..7547fcff410 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"; + sha256 = "1zbwbgabdj6x0vi7l8wfq7rx77p8b4zxz5wv43nr67irszyz1k7w"; 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/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/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-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/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/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/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..14a70b44c4f 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"; + sha256 = "0js56njy5rbviavga5qlp8d989wdpqf7lcyhwrjf1clf3k4f8anl"; 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..8174c897a8c 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { MonadCatchIOTransformers mtl random regexPosix text time unixCompat unorderedContainers vector zlibEnum ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 7f8dc878024..9250666430c 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { caseInsensitive enumerator MonadCatchIOTransformers mtl network snapCore text time unixCompat ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 30a2d34a99e..34ee639564d 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -1,22 +1,22 @@ { cabal, aeson, attoparsec, cereal, clientsession, comonad -, configurator, directoryTree, dlist, errors, filepath, hashable -, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom -, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text -, time, transformers, unorderedContainers, vector, vectorAlgorithms -, xmlhtml +, configurator, directoryTree, dlist, either, errors, filepath +, hashable, heist, lens, logict, MonadCatchIOTransformers, mtl +, mwcRandom, pwstoreFast, regexPosix, snapCore, snapServer, stm +, syb, text, time, transformers, unorderedContainers, vector +, vectorAlgorithms, xmlhtml }: cabal.mkDerivation (self: { pname = "snap"; - version = "0.10.0.1"; - sha256 = "14j9lgcdyxh7n4yidfvn1r94nziljiqz6nsqgq114v34bnn6l2yn"; + version = "0.11.0"; + sha256 = "0mw1fxjijd3z9bz1znrc5vfxa4mc1by481gxfmk2hdlcsib9sp7n"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec cereal clientsession comonad configurator - directoryTree dlist errors filepath hashable heist lens logict - MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix - snapCore snapServer stm syb text time transformers + directoryTree dlist either errors filepath hashable heist lens + logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast + regexPosix snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; jailbreak = true; 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/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/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/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..67a43687092 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"; + sha256 = "060548zbjsvf6zvixiyic729fd9862z3qwz349ric60jfa20cdpx"; 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..ae36c5180c3 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"; + sha256 = "10xjpky7dglqbhc6i49q9ckkhq23wyyqd7karlp0byhprmspnifq"; 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/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/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/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/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/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/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..e971dd6d80e 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,10 @@ rec { # evaluation of its first argument. seq = x: y: if x == null then y else y; + 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/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/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/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/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/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/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/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/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index b1bc15ff083..3b77c7104ff 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; buildNativeInputs = [ pkgconfig ]; 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/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/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix new file mode 100644 index 00000000000..a59854c82d2 --- /dev/null +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, gnu_efi }: + +stdenv.mkDerivation rec { + name = "gummiboot-16"; + + 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}.tar.gz"; + sha256 = "1znvbxrhc7pkbhbw9bvg4zhfkp81q7fy4mq2jsw6vimccr7h29a0"; + }; + + 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/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 799c5e9dd85..3199c1cadb8 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }: stdenv.mkDerivation rec { - name = "wget-1.13.4"; + name = "wget-1.14"; src = fetchurl { - url = "mirror://gnu/wget/${name}.tar.gz"; - sha256 = "1kadjg63x1mm741dxdidwsn1rz0f7dkzbq59v0iww87jr45p3ir4"; + url = "mirror://gnu/wget/${name}.tar.xz"; + sha256 = "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p"; }; preConfigure = stdenv.lib.optionalString doCheck 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c51bd9e05ec..b5ffabd80ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -161,8 +161,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 @@ -728,8 +727,6 @@ let fcron = callPackage ../tools/system/fcron { }; - fdisk = callPackage ../tools/system/fdisk { }; - fdm = callPackage ../tools/networking/fdm {}; figlet = callPackage ../tools/misc/figlet { }; @@ -814,6 +811,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.) @@ -890,6 +891,8 @@ let gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; + gummiboot = callPackage ../tools/misc/gummiboot { }; + gupnp = callPackage ../development/libraries/gupnp { inherit (gnome) libsoup; }; @@ -1242,10 +1245,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 { }; @@ -1363,6 +1363,8 @@ let libpng = libpng12; }; + podiff = callPackage ../tools/text/podiff { }; + polipo = callPackage ../servers/polipo { }; polkit_gnome = callPackage ../tools/security/polkit-gnome { }; @@ -2404,10 +2406,11 @@ let # profiling and non-profiling versions; the final respects the user-configured # default setting. haskellPackages_ghc741 = haskell.packages_ghc741; - haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); - haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); + 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 = haskell.packages_ghc761; + haskellPackages_ghc762 = recurseIntoAttrs (haskell.packages_ghc762); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; @@ -2428,9 +2431,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 { }; @@ -2656,7 +2656,7 @@ let stalin = callPackage ../development/compilers/stalin { }; - strategoPackages = strategoPackages018; + strategoPackages = recurseIntoAttrs strategoPackages018; strategoPackages016 = callPackage ../development/compilers/strategoxt/0.16.nix { stdenv = overrideInStdenv stdenv [gnumake380]; @@ -3661,7 +3661,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 { }; @@ -4601,7 +4602,12 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; mesa_noglu = callPackage ../development/libraries/mesa { }; - mesa = callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h + mesa = if stdenv.isDarwin then darwinX11AndOpenGL + else callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h + 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; }; @@ -5068,6 +5074,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 { }; @@ -5887,18 +5897,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 = @@ -6101,10 +6099,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 { }; @@ -6134,7 +6128,6 @@ 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); @@ -6214,10 +6207,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 { }; @@ -7430,7 +7419,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; }; @@ -7566,6 +7555,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; @@ -7641,14 +7634,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 { @@ -7902,11 +7887,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 { }; @@ -8132,9 +8113,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 { }; @@ -8384,10 +8363,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. @@ -8512,18 +8487,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 // { 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..be8744c4493 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_7; # 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 @@ -835,6 +835,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 +851,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 +975,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_7 = callPackage ../development/libraries/haskell/HTTP/4000.2.7.nix {}; + HTTP = self.HTTP_4000_2_7; httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {}; @@ -1558,6 +1566,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 +1616,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 {}; @@ -1822,6 +1833,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); X11Xft = callPackage ../development/libraries/haskell/X11-xft {}; + 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 {}; 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 7e80f23a19f..a51abf44ff2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2641,7 +2641,7 @@ 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"; license = "perl"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64fa96af7ce..154feb5c9c8 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"; # @@ -576,13 +609,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; @@ -2639,6 +2674,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"; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 63fffd7d316..d5a57337f4f 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -10,7 +10,6 @@ let coreutils.hostDrv = nativePlatforms; dropbear.hostDrv = nativePlatforms; tigervnc.hostDrv = nativePlatforms; - #openoffice.hostDrv = nativePlatforms; wxGTK.hostDrv = nativePlatforms; #firefox = nativePlatforms; xorg = { diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index e683a5c5c3a..f5fc2f3a7f6 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -584,7 +584,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; }; @@ -1107,7 +1106,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; }; @@ -1364,7 +1362,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; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 833210e8de9..b3b58f43e1b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -210,7 +210,6 @@ with (import ./release-lib.nix); ntp = linux; ocaml = linux; octave = linux; - openoffice = linux; openssh = linux; openssl = all; pam_console = linux;